CTP-3094 Restore the sequence number as a separate column

CTP-3095 Remove percentage string in assessment component name and add percentage to weight number
ucl-isd · Feb 8, 2024 · 993bc87 · 993bc87
1 parent 40c2b7e
commit 993bc87
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/classes/output/renderer.php b/classes/output/renderer.php
@@ -171,6 +171,9 @@ public function render_dashboard(array $moduledeliveries, int $courseid) : strin
             if (!empty($moduledelivery->componentgrades) && is_array($moduledelivery->componentgrades)) {
                 $componentgrades = array_values($moduledelivery->componentgrades);
                 foreach ($componentgrades as $componentgrade) {
+                    // Remove percentage from mab name.
+                    $componentgrade->mabname = preg_replace('/\s*\(\d+%?\)$/', '', $componentgrade->mabname);
+
                     // Add the select source url.
                     $selectsourceurl = new \moodle_url(
                         '/local/sitsgradepush/select_source.php',

diff --git a/lang/en/local_sitsgradepush.php b/lang/en/local_sitsgradepush.php
@@ -93,6 +93,7 @@
 $string['dashboard:seq'] = 'SEQ';
 $string['dashboard:sits_assessment'] = 'SITS assessment';
 $string['dashboard:weight'] = 'Weight';
+$string['dashboard:mab_perc'] = '{$a}%';
 $string['dashboard:asttype'] = 'AST TYPE';
 $string['dashboard:source'] = 'Source';
 $string['dashboard:moodle_activity'] = 'Moodle activity';

diff --git a/templates/dashboard.mustache b/templates/dashboard.mustache
@@ -129,6 +129,7 @@
     <table class="module-delivery-table table table-bordered mb-5">
         <thead class="thead-light">
         <tr class="small">
+            <th>{{#str}} dashboard:seq, local_sitsgradepush {{/str}}</th>
             <th>{{#str}} dashboard:sits_assessment, local_sitsgradepush {{/str}}</th>
             <th>{{#str}} dashboard:weight, local_sitsgradepush {{/str}}</th>
             <th>{{#str}} dashboard:moodle_activity, local_sitsgradepush {{/str}}</th>
@@ -138,11 +139,9 @@
         <tbody>
         {{#componentgrades}}
             <tr>
-                <th scope="row">
-                    <span class="badge badge-dark">{{mabseq}}</span>
-                    {{mabname}}
-                </th>
-                <td>{{mabperc}}</td>
+                <td>{{mabseq}}</td>
+                <td>{{mabname}}</td>
+                <td>{{#str}} dashboard:mab_perc, local_sitsgradepush, {{mabperc}} {{/str}}</td>
                 <td>
                     {{#assessmentmapping}}
                         <p>