Merge pull request #91 from dpalou/ionic7

Mobile app: Use module-info instead of module-description
catalyst · Jul 24, 2024 · d9ba6d2 · d9ba6d2
2 parents 2a7a191 + d7f200b
commit d9ba6d2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 119 deletions.
diff --git a/classes/output/mobile.php b/classes/output/mobile.php
@@ -47,7 +47,6 @@ public static function main_view($args) {
         global $OUTPUT, $USER, $DB;
 
         $args = (object) $args;
-        $versionname = $args->appversioncode >= 3950 ? 'latest' : 'ionic3';
         $cm = get_coursemodule_from_id('subcourse', $args->cmid);
         $context = \context_module::instance($cm->id);
 
@@ -92,13 +91,14 @@ public static function main_view($args) {
             'currentgrade' => $currentgrade,
             'hasgrade' => isset($currentgrade),
             'warning' => $warning,
+            'canusemoduleinfo' => $args->appversioncode >= 44000,
         ];
 
         return [
             'templates' => [
                 [
                     'id' => 'main',
-                    'html' => $OUTPUT->render_from_template("mod_subcourse/mobile_view_$versionname", $data),
+                    'html' => $OUTPUT->render_from_template('mod_subcourse/mobile_view_latest', $data),
                 ],
             ],
             'javascript' => '',

diff --git a/templates/mobile_view_ionic3.mustache b/templates/mobile_view_ionic3.mustache
diff --git a/templates/mobile_view_latest.mustache b/templates/mobile_view_latest.mustache
@@ -60,11 +60,22 @@
 
 {{=<% %>=}}
 <div>
-    <core-course-module-description
-        description="<% subcourse.intro %>"
-        component="mod_subcourse"
-        componentId="<% cmid %>">
-    </core-course-module-description>
+    <%#canusemoduleinfo%>
+        <core-course-module-info
+            [module]="module"
+            description="<% subcourse.intro %>"
+            component="mod_subcourse"
+            componentId="<% cmid %>"
+            [courseId]="courseId">
+        </core-course-module-info>
+    <%/canusemoduleinfo%>
+    <%^canusemoduleinfo%>
+        <core-course-module-description
+            description="<% subcourse.intro %>"
+            component="mod_subcourse"
+            componentId="<% cmid %>">
+        </core-course-module-description>
+    <%/canusemoduleinfo%>
 
     <%# warning %>
     <ion-card class="ion-text-wrap core-warning-card">

diff --git a/tests/output_mobile_test.php b/tests/output_mobile_test.php
@@ -79,15 +79,5 @@ public function test_main_view() {
 
         $this->assertEquals('main', $mainview3950['templates'][0]['id']);
         $this->assertStringContainsString('plugin.mod_subcourse.currentgrade', $mainview3950['templates'][0]['html']);
-
-        // Ionic3 compatible view for the app version 3.9.4.
-        $mainview3940 = \mod_subcourse\output\mobile::main_view([
-            'cmid' => $subcourse->cmid,
-            'courseid' => $metacourse->id,
-            'appversioncode' => 3940,
-        ]);
-
-        $this->assertEquals('main', $mainview3940['templates'][0]['id']);
-        $this->assertStringContainsString('plugin.mod_subcourse.currentgrade', $mainview3940['templates'][0]['html']);
     }
 }