Merge pull request #213 from dpalou/mobile

Adapt mobile code to ionic 7
ndunand · Aug 8, 2024 · d8313ae · d8313ae
2 parents fa158fc + c718c70
commit d8313ae
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 888 deletions.
diff --git a/classes/output/mobile.php b/classes/output/mobile.php
@@ -47,11 +47,9 @@ public static function mobile_init($args) {
 
         $args = (object) $args;
 
-        $foldername = $args->appversioncode >= 3950 ? 'latest' : 'ionic3';
-
         return [
             'templates' => [],
-            'javascript' => file_get_contents($CFG->dirroot . "/mod/choicegroup/mobile/js/$foldername/init.js"),
+            'javascript' => file_get_contents($CFG->dirroot . "/mod/choicegroup/mobile/js/latest/init.js"),
         ];
     }
 
@@ -66,7 +64,7 @@ public static function mobile_course_view($args) {
 
         $args = (object) $args;
 
-        $foldername = $args->appversioncode >= 3950 ? 'latest' : 'ionic3';
+        $versionname = $args->appversioncode >= 44000 ? 'latest' : 'ionic5';
         $cm = get_coursemodule_from_id('choicegroup', $args->cmid);
         $course = $DB->get_record('course', ['id' => $cm->course]);
 
@@ -142,10 +140,10 @@ public static function mobile_course_view($args) {
             'templates' => [
                 [
                     'id' => 'main',
-                    'html' => $OUTPUT->render_from_template("mod_choicegroup/mobile_view_page_$foldername", $data),
+                    'html' => $OUTPUT->render_from_template("mod_choicegroup/mobile_view_page_$versionname", $data),
                 ],
             ],
-            'javascript' => file_get_contents($CFG->dirroot . "/mod/choicegroup/mobile/js/$foldername/courseview.js"),
+            'javascript' => file_get_contents($CFG->dirroot . "/mod/choicegroup/mobile/js/latest/courseview.js"),
             'otherdata' => [
                 'data' => json_encode($responses),
                 'allowupdate' => $choicegroup->allowupdate ? 1 : 0,

diff --git a/mobile/js/ionic3/courseview.js b/mobile/js/ionic3/courseview.js