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 · 8bd5171 · 8bd5171
1 parent 40c2b7e
commit 8bd5171
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/apiclients/easikit/classes/requests/getcomponentgrade.php b/apiclients/easikit/classes/requests/getcomponentgrade.php
@@ -83,7 +83,7 @@ public function process_response($response): array {
                     'MAB_SEQ' => $value['sequence_number'],
                     'AST_CODE' => $value['assessment_component_type']['code'],
                     'MAB_PERC' => $matches[1],
-                    'MAB_NAME' => $value['name'],
+                    'MAB_NAME' => preg_replace('/\s*\(\d+%?\)$/', '', $value['name']),
                     'MKS_CODE' => $value['mark_scheme']['code'],
                     'APA_ROMC' => $value['schedule']['location']['room']['identifier'],
                 ];

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>