Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/ModalBox.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/ModalBox.java (revision 2a866b0b2007bd6cb837acd87eb14b6b273b9416) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/ModalBox.java (revision 247a55902407fd8d8add6e629d80ad7fa4762aab) @@ -39,8 +39,8 @@ } - void setupRender() { + void afterRender() { JSONObject json = new JSONObject(); - json.put("keyboard", true); - json.put("backdrop", "static"); + json.put("keyboard", false); + json.put("backdrop", "true"); json.put("focus", true); javaScriptSupport.require("ModalBox").invoke("activate").with(componentClientId, json); Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.java (revision 2a866b0b2007bd6cb837acd87eb14b6b273b9416) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.java (revision 247a55902407fd8d8add6e629d80ad7fa4762aab) @@ -32,4 +32,5 @@ import info.ajanovski.eprms.tap.annotations.AdministratorPage; import info.ajanovski.eprms.tap.annotations.InstructorPage; +import info.ajanovski.eprms.tap.components.ModalBox; import info.ajanovski.eprms.tap.services.CourseManager; import info.ajanovski.eprms.tap.services.GenericService; @@ -102,4 +103,16 @@ @InjectComponent private Zone zTable; + + @InjectComponent + private Zone zWorkEvaluation; + + @InjectComponent + private Zone zAll; + + @InjectComponent + private ModalBox newWorkEvaluationModal; + + @InjectComponent + private ModalBox newWorkReportModal; @Persist @@ -178,4 +191,5 @@ newWorkReport = null; newWorkEvaluation = null; + newWorkReportModal.hide(); if (request.isXHR()) { ajaxResponseRenderer.addRender("zWorkReport", zWorkReport).addRender("zTable", zTable); @@ -196,4 +210,7 @@ newWorkReport = null; newWorkEvaluation = wa; + if (request.isXHR()) { + ajaxResponseRenderer.addRender(zWorkEvaluation); + } } @@ -227,4 +244,12 @@ newWorkReport = null; newWorkEvaluation = null; + newWorkEvaluationModal.hide(); + if (request.isXHR()) { + ajaxResponseRenderer.addRender(zTable); + } + } + + public List getListHiddenProjects() { + return projectManager.orderProjectList(projectsToHide); } @@ -294,8 +319,18 @@ public void onActionFromCancelNewWorkReport() { newWorkReport = null; + newWorkEvaluation = null; + newWorkReportModal.hide(); + if (request.isXHR()) { + ajaxResponseRenderer.addRender(zAll); + } } public void onActionFromCancelNewWorkEvaluation() { - newWorkEvaluation = null; + newWorkReport = null; + newWorkEvaluation = null; + newWorkEvaluationModal.hide(); + if (request.isXHR()) { + ajaxResponseRenderer.addRender(zAll).addRender(zWorkEvaluation); + } } Index: eprms-tap/src/main/resources/META-INF/modules/ModalBox.js =================================================================== --- eprms-tap/src/main/resources/META-INF/modules/ModalBox.js (revision 2a866b0b2007bd6cb837acd87eb14b6b273b9416) +++ eprms-tap/src/main/resources/META-INF/modules/ModalBox.js (revision 247a55902407fd8d8add6e629d80ad7fa4762aab) @@ -1,11 +1,9 @@ -define(["jquery", "bootstrap/modal"], function($) { +define(["jquery","bootstrap/modal"], function($) { var activate = function(modalId, options) { - console.log("MODAL ACTIVATE"); $('#' + modalId).modal(options); } var hide = function(modalId) { - console.log("MODAL HIDE"); var $modal = $('#' + modalId); if ($modal.length > 0) { Index: eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.tml =================================================================== --- eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.tml (revision 2a866b0b2007bd6cb837acd87eb14b6b273b9416) +++ eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.tml (revision 247a55902407fd8d8add6e629d80ad7fa4762aab) @@ -23,5 +23,5 @@ All - +
-
+
-
+ @@ -76,11 +77,36 @@ t:WebEditor.areaType=""> - - - + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ - ${message:cancel-label} + ${message:cancel-label}
@@ -154,6 +180,6 @@

+ t:context="workReport"> ${message:evaluation-label}

@@ -207,4 +233,5 @@ +
Index: eprms-tap/src/main/webapp/WEB-INF/app.properties =================================================================== --- eprms-tap/src/main/webapp/WEB-INF/app.properties (revision 2a866b0b2007bd6cb837acd87eb14b6b273b9416) +++ eprms-tap/src/main/webapp/WEB-INF/app.properties (revision 247a55902407fd8d8add6e629d80ad7fa4762aab) @@ -5,6 +5,7 @@ code-regexp=^[a-zA-Z]+[a-zA-Z0-9\-\_]*[a-zA-Z0-9]+$ code-regexp-message=code can only start with latin letters, contain _ or -, and finish with latin letters or numbers. -evaluatePostingAsATeam-label=Evaluate as a team -setAccepted-label=Accepted +evaluatePostingAsATeam-label=Team +setAccepted-label=Accept +setRejected-label=Reject evalDiscussionPostFor-label=Evaluate critique for DiscussionPostEvaluationTypeIdea-label=Idea @@ -82,5 +83,5 @@ new-label=Create paste-label=Paste -percentEvaluated-label=Evaluated % of total work in this activity +percentEvaluated-label=Evaluated % of total work percentReported-label=Reporting % of total work in this activity that has been completed personal-label=Personal Index: eprms-tap/src/main/webapp/WEB-INF/app_mk.properties =================================================================== --- eprms-tap/src/main/webapp/WEB-INF/app_mk.properties (revision 2a866b0b2007bd6cb837acd87eb14b6b273b9416) +++ eprms-tap/src/main/webapp/WEB-INF/app_mk.properties (revision 247a55902407fd8d8add6e629d80ad7fa4762aab) @@ -4,6 +4,7 @@ code-regexp=^[a-zA-Z]+[a-zA-Z0-9\-\_]*[a-zA-Z0-9]+$ code-regexp-message=code can only start with latin letters, contain _ or -, and finish with latin letters or numbers. -evaluatePostingAsATeam-label=Евалуирај како тим +evaluatePostingAsATeam-label=Тимски setAccepted-label=Прифатено +setRejected-label=Одбиено evalDiscussionPostFor-label=Евалуирај осврт за DiscussionPostEvaluationTypeIdea-label=Идеја @@ -84,6 +85,6 @@ newActivity-label=Нова активност new-label=Креирај -percentEvaluated-label=Евалуирано е дека се изработени % од вкупната работа на оваа активност -percentReported-label=Известуваме % од вкупната работа во оваа задача кој е завршен +percentEvaluated-label=Евалуирано % од работата +percentReported-label=Известуваме % од работата е завршен personal-label=Лични points-label=Points