count sessions properly

marcusgreen · Nov 2, 2023 · 478160f · 478160f
1 parent 5eb0236
commit 478160f
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 13 deletions.
diff --git a/amd/build/modform.min.js b/amd/build/modform.min.js
diff --git a/amd/build/modform.min.js.map b/amd/build/modform.min.js.map
diff --git a/amd/src/modform.js b/amd/src/modform.js
@@ -67,9 +67,9 @@ export const init = () => {
         sesscbx.forEach((cbx) => {
             var cboxid = cbx.id.split('_')[4];
             debugger;
-            if (cboxid == sessionid) {
-                cbx.checked = true;
-            }
+                if ((cboxid == sessionid) && (cboxid > 0)) {
+                    cbx.checked = !cbx.checked;
+                }
         });
     }
     /**

diff --git a/lib.php b/lib.php
@@ -174,6 +174,7 @@ function get_table_data(\stdClass $driprelease) : array {
     $contentcounter = 0;
     $sessioncounter = 0;
     $selections = [];
+    $flag = false;
     if (isset($driprelease->id)) {
         $selections = $DB->get_records_menu('tool_driprelease_cmids', ['driprelease' => $driprelease->id],
             null, 'id,coursemoduleid');
@@ -193,12 +194,11 @@ function get_table_data(\stdClass $driprelease) : array {
                     ['id' => $cm->id],
                     'availability'
                 );
-                    $availability = get_availability($record->availability);
-                   $row['calculatedavailability']['start'] = $availability['from'] ?? '';
-                   $row['calculatedavailability']['end'] = $availability['to'] ?? '';
+                $fromto = get_from_to($record->availability);
+                $row['calculatedavailability']['start'] = $fromto['from'] ?? '';
+                $row['calculatedavailability']['end'] = $fromto['to'] ?? '';
             }
             $row['sessioncounter'] = $sessioncounter;
-
             $data[] = add_header($row);
         }
         $contentcounter++;
@@ -207,7 +207,15 @@ function get_table_data(\stdClass $driprelease) : array {
     }
     return $data ?? [];
 }
-
+function get_from_to($availability) {
+    $ob = json_decode($availability);
+    if (!$ob) {
+        return [];
+    }
+    $fromto['from'] = $ob->c[1]->t;
+    $fromto['to'] = $ob->c[2]->t;
+    return $fromto;
+}
 /**
  * Simplify get_table_data
  *

diff --git a/templates/quiz.mustache b/templates/quiz.mustache
@@ -76,8 +76,8 @@
         {{#isheader}}
             <tr>
                 <td colspan="6">
-                <button id=sessionid_{{calculatedavailability.sessioncounter}}>Session</button>
-                    {{#str}} session, tool_driprelease {{/str}} {{{calculatedavailability.sessioncounter}}}:
+                <button id=sessionid_{{sessioncounter}}>Session</button>
+                    {{#str}} session, tool_driprelease {{/str}} {{{sessioncounter}}}:
                     {{#calculatedavailability.start}}
                     {{< core/time_element }}
                     {{$timestampval}}{{calculatedavailability.start}}{{/timestampval}}
@@ -98,7 +98,7 @@
 
         {{^isheader}}
             <tr>
-            <td> <input name = "select" type='checkbox' id='id_cmid_{{id}}_ses_{{calculatedavailability.sessioncounter}}' {{selected}} >
+            <td> <input name = "select" type='checkbox' id='id_cmid_{{id}}_ses_{{sessioncounter}}' {{selected}} >
             </td>
             <td><a href={{config.wwwroot}}/mod/quiz/view.php?id={{id}} >{{{name}}}</a></td><td>{{{intro}}}</td>
             <td>{{questioncount}}</td>