From 520d6a2a5d4b92f7362e2feba5c8c054ea7c7603 Mon Sep 17 00:00:00 2001
From: Mark Nelson <markn@moodle.com>
Date: Mon, 9 Jul 2018 23:45:19 +0800
Subject: [PATCH] #207 No need to use a table/list when displaying only one
 issue

---
 classes/output/mobile.php                    |  9 ++++---
 templates/mobile_view_activity_page.mustache | 28 +++++++-------------
 view.php                                     | 25 ++++++-----------
 3 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/classes/output/mobile.php b/classes/output/mobile.php
index 1e36d63..f8abacc 100644
--- a/classes/output/mobile.php
+++ b/classes/output/mobile.php
@@ -60,7 +60,11 @@ class mobile {
             $certificate->introformat, $context->id, 'mod_customcert', 'intro');
 
         // Get any issues this person may have.
-        $issues = $DB->get_records('customcert_issues', ['userid' => $USER->id, 'customcertid' => $certificate->id]);
+        $issue = false;
+        if ($issues = $DB->get_records('customcert_issues', ['userid' => $USER->id, 'customcertid' => $certificate->id],
+                'timecreated DESC')) {
+            $issue = reset($issues);
+        }
 
         $candownload = true;
         $canmanage = has_capability('mod/customcert:manage', $context);
@@ -101,8 +105,7 @@ class mobile {
         $data = [
             'certificate' => $certificate,
             'cmid' => $cm->id,
-            'hasissues' => !empty($issues),
-            'issues' => array_values($issues),
+            'issue' => $issue,
             'showgroups' => !empty($groups),
             'groups' => array_values($groups),
             'canmanage' => $canmanage,
diff --git a/templates/mobile_view_activity_page.mustache b/templates/mobile_view_activity_page.mustache
index 1d389e2..8488f51 100644
--- a/templates/mobile_view_activity_page.mustache
+++ b/templates/mobile_view_activity_page.mustache
@@ -50,12 +50,9 @@
             "requiredtime": "60"
         },
         "cmid": "25",
-        "hasissues": "true",
-        "issues": [
-            {
-                "timecreated": "1528370177"
-            }
-        ],
+        "issue": {
+            "timecreated": "1528370177"
+        },
         "showgroups": "true",
         "groups": [
             {
@@ -84,20 +81,15 @@
 {{=<% %>=}}
 <div>
     <core-course-module-description description="<% certificate.intro %>" component="mod_customcert" componentId="<% cmid %>"></core-course-module-description>
-    <%#hasissues%>
+    <%#issue%>
         <%^canmanage%>
-            <ion-list>
-                <ion-list-header class="text-center">
-                    {{ 'plugin.mod_customcert.receiveddate' | translate }}
-                </ion-list-header>
-                <%#issues%>
-                    <ion-item class="text-center">
-                        {{ <% timecreated %> | coreToLocaleString }}
-                    </ion-item>
-                <%/issues%>
-            </ion-list>
+            <ion-item>
+                {{ 'plugin.mod_customcert.receiveddate' | translate }}
+                <br />
+                <div class="timerewarded">{{ <% timecreated %> | coreToLocaleString }}</div>
+            </ion-item>
         <%/canmanage%>
-    <%/hasissues%>
+    <%/issue%>
     <%#candownload%>
         <ion-item>
             <button ion-button block core-course-download-module-main-file moduleId="<% cmid %>" courseId="<% certificate.course %>" component="mod_customcert" [files]="[{fileurl: '<% fileurl %>', timemodified: '<% currenttimestamp %>'}]">
diff --git a/view.php b/view.php
index a6e9ce8..4c1e01d 100644
--- a/view.php
+++ b/view.php
@@ -124,35 +124,26 @@ if (!$downloadown && !$downloadissue) {
     }
 
     // If the current user has been issued a customcert generate HTML to display the details.
-    $issuelist = '';
+    $issuehtml = '';
     $issues = $DB->get_records('customcert_issues', array('userid' => $USER->id, 'customcertid' => $customcert->id));
     if ($issues && !$canmanage) {
-        $table = new html_table();
-        $table->class = 'generaltable';
-        $table->head = array(get_string('receiveddate', 'customcert'));
-        $table->align = array('left');
-        $table->attributes = array('style' => 'width:20%; margin:auto');
-
-        foreach ($issues as $issue) {
-            $row = array();
-            $row[] = userdate($issue->timecreated);
-            $table->data[$issue->id] = $row;
-        }
-
-        $issuelist = html_writer::table($table) . "<br />";
+        // Get the most recent issue (there should only be one).
+        $issue = reset($issues);
+        $issuestring = get_string('receiveddate', 'customcert') . ': ' . userdate($issue->timecreated);
+        $issuehtml = $OUTPUT->box($issuestring);
     }
 
     // Create the button to download the customcert.
     $linkname = get_string('getcustomcert', 'customcert');
     $link = new moodle_url('/mod/customcert/view.php', array('id' => $cm->id, 'downloadown' => true));
-    $downloadbutton = new single_button($link, $linkname);
-    $downloadbutton = html_writer::tag('div', $OUTPUT->render($downloadbutton), array('style' => 'text-align:center'));
+    $downloadbutton = new single_button($link, $linkname, 'post', true);
+    $downloadbutton = $OUTPUT->render($downloadbutton);
 
     // Output all the page data.
     echo $OUTPUT->header();
     echo $OUTPUT->heading(format_string($customcert->name));
     echo $intro;
-    echo $issuelist;
+    echo $issuehtml;
     echo $downloadbutton;
     if (isset($reporttable)) {
         echo $OUTPUT->heading(get_string('listofissues', 'customcert'), 3);