' . get_string('dashboard:header:desc', 'local_sitsgradepush') . '
'; echo $renderer->render_dashboard($result, $courseid); echo '' . get_string('error:assessmentisnotmapped', 'local_sitsgradepush') . '
'; } echo ''; // Initialize javascript. -$PAGE->requires->js_call_amd('local_sitsgradepush/sitsgradepush', 'init', [$coursemodule->course, $coursemoduleid, $mappingids]); +$PAGE->requires->js_call_amd('local_sitsgradepush/sitsgradepush', 'init', [$coursemodule->course, $coursemoduleid]); // And the page footer. echo $OUTPUT->footer(); diff --git a/lang/en/local_sitsgradepush.php b/lang/en/local_sitsgradepush.php index 3c3e591..35e8105 100644 --- a/lang/en/local_sitsgradepush.php +++ b/lang/en/local_sitsgradepush.php @@ -51,12 +51,12 @@ $string['settings:sync_threshold'] = 'Sync Threshold'; $string['settings:sync_threshold:desc'] = 'The threshold to allow for running synchronous mark transfer task'; $string['label:gradepushassessmentselect'] = 'Select SITS assessment to link to'; -$string['label:jumpto'] = 'Jump to: '; +$string['label:jumpto'] = 'Jump to'; $string['label:pushall'] = 'Transfer All'; $string['label:reassessmentselect'] = 'Re-assessment'; $string['label:pushgrade'] = 'Transfer Marks'; $string['label:ok'] = 'OK'; -$string['label:lastpushtext'] = 'Last scheduled transfer task {$a->statustext} {$a->date} at {$a->time}'; +$string['label:lastpushtext'] = 'Last transferred {$a->date} at {$a->time}'; $string['option:none'] = 'NONE'; $string['gradepushassessmentselect'] = 'Select SITS assessment'; $string['gradepushassessmentselect_help'] = 'Select SITS assessment to link to this activity.'; @@ -79,19 +79,24 @@ $string['index:lastsublogtransfer'] = 'Last Submission Log Transfer'; // Marks transfer dashboard page. -$string['dashboard:header'] = 'SITS Marks Transfer Dashboard'; -$string['dashboard:moduledelivery'] = 'MODULE DELIVERY: {$a}'; +$string['dashboard:header'] = 'SITS assessment mapping and mark transfer'; +$string['dashboard:header:desc'] = 'Map SITS assessments to Moodle activites and transfer marks from Moodle to SITS.'; +$string['dashboard:moduledelivery'] = 'MODULE DELIVERY'; $string['dashboard:academicyear'] = 'ACADEMIC YEAR: {$a}'; $string['dashboard:level'] = 'LEVEL: {$a}'; $string['dashboard:mapcode'] = 'MAP CODE: {$a}'; $string['dashboard:seq'] = 'SEQ'; -$string['dashboard:title'] = 'TITLE'; -$string['dashboard:weight'] = 'WEIGHT'; +$string['dashboard:sits_assessment'] = 'SITS assessment'; +$string['dashboard:weight'] = 'Weight'; $string['dashboard:asttype'] = 'AST TYPE'; -$string['dashboard:source'] = 'SOURCE'; +$string['dashboard:source'] = 'Source'; +$string['dashboard:moodle_activity'] = 'Moodle activity'; +$string['dashboard:marks_to_transfer'] = 'Marks to transfer'; +$string['dashboard:view_marks_to_transfer'] = 'View marks to transfer'; $string['dashboard:actions'] = 'ACTIONS'; -$string['dashboard:transfermark'] = 'Transfer Mark'; +$string['dashboard:transfermarks'] = 'Transfer marks'; $string['dashboard:changesource'] = 'Change Source'; +$string['dashboard:marks_transfer_in_progress'] = 'Marks transfer in progress'; // Select source page. $string['selectsource:header'] = 'Select Source'; @@ -181,3 +186,10 @@ $string['email:content:success'] = 'Marks Transfer Task from {$a->activityname} to {$a->mab} has been {$a->status}.| {{#str}} dashboard:sits_assessment, local_sitsgradepush {{/str}} | +{{#str}} dashboard:weight, local_sitsgradepush {{/str}} | +{{#str}} dashboard:moodle_activity, local_sitsgradepush {{/str}} | +{{#str}} dashboard:marks_to_transfer, local_sitsgradepush {{/str}} | +
|---|---|---|---|
| + {{mabseq}} + {{mabname}} + | +{{mabperc}} | +
+ {{#assessmentmapping}}
+ + {{type}} + {{name}} + + {{/assessmentmapping}} + + {{#assessmentmapping}}Edit {{/assessmentmapping}} + {{^assessmentmapping}}Add {{/assessmentmapping}} + activity + + |
+
+ {{#assessmentmapping}}
+
+
+ {{/assessmentmapping}}
+
+
+ {{#markstotransfer}}
+
+ {{/markstotransfer}}
+
+
+ |
+
| {{#str}} error:no_mab_found, local_sitsgradepush {{/str}} | +|||
{{latest-transferred-text}}
+ + +{{#module-delivery-tables}} + {{> local_sitsgradepush/marks_transfer_history_table }} + {{^students}} +{{#str}} error:nostudentfoundformapping, local_sitsgradepush {{/str}}
+ {{/students}} +{{/module-delivery-tables}} + + +{{#invalid-students}} + {{> local_sitsgradepush/marks_transfer_history_table }} +{{/invalid-students}} + + +{{> local_sitsgradepush/confirmation_modal }} + +{{#js}} + require(['jquery'], function($) { + $('.js-btn-transfer-all-marks').on('click', function() { + $('#js-transfer-modal-button').attr('data-async', $(this).attr('data-async')); + }); + }); +{{/js}} \ No newline at end of file diff --git a/templates/assessmentgrades.mustache b/templates/marks_transfer_history_table.mustache similarity index 65% rename from templates/assessmentgrades.mustache rename to templates/marks_transfer_history_table.mustache index e2a294a..dfa283d 100644 --- a/templates/assessmentgrades.mustache +++ b/templates/marks_transfer_history_table.mustache @@ -14,25 +14,30 @@ along with Moodle. If not, see|
-
-
- {{lasttask}}
-
-
-
- |
- |||||
|---|---|---|---|---|---|
| Student | Portico number | @@ -87,6 +90,4 @@ {{/students}}||||
{{#str}} error:nostudentfoundformapping, local_sitsgradepush {{/str}}
-{{/students}} \ No newline at end of file +|
-
-
- {{#str}} dashboard:moduledelivery, local_sitsgradepush, {{moduledelivery}} {{/str}}
- {{#str}} dashboard:academicyear, local_sitsgradepush, {{academicyear}} {{/str}}
- |
- |||||
|---|---|---|---|---|---|
|
-
-
- {{#str}} dashboard:mapcode, local_sitsgradepush, {{mapcode}} {{/str}}
- {{#str}} dashboard:level, local_sitsgradepush, {{level}} {{/str}} {{graduatetype}}
- |
- |||||
| {{#str}} dashboard:seq, local_sitsgradepush {{/str}} | -{{#str}} dashboard:title, local_sitsgradepush {{/str}} | -{{#str}} dashboard:weight, local_sitsgradepush {{/str}} | -{{#str}} dashboard:source, local_sitsgradepush {{/str}} | -{{#str}} dashboard:actions, local_sitsgradepush {{/str}} | -|
| {{mabseq}} | -{{mabname}} | -{{mabperc}} | -- {{#assessmentmapping}} - {{name}} - {{/assessmentmapping}} - {{^assessmentmapping}} - - {{/assessmentmapping}} - | -
-
-
-
-
-
-
-
-
- {{#assessmentmapping}}
- {{{statusicon}}}
- {{/assessmentmapping}}
- {{^assessmentmapping}}
-
- {{/assessmentmapping}}
-
-
- |
- |
| {{#str}} error:no_mab_found, local_sitsgradepush {{/str}} | -|||||