CTP-3838 - Improve card html (#12)

* CTP-3838 - Improve card html Improve padding, only output progress html when completion enabled.
ucl-isd · Oct 4, 2024 · ed1062b · ed1062b
1 parent c517fb5
commit ed1062b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 20 deletions.
diff --git a/block_pickup.php b/block_pickup.php
@@ -122,7 +122,7 @@ public function fetch_recent_courses(): array {
         global $USER, $DB;
 
         // Get recent courses.
-         $sql = "SELECT c.id, c.fullname, c.visible, cc.name as catname
+         $sql = "SELECT c.id, c.fullname, c.visible, c.enablecompletion, cc.name as catname
                    FROM {user_lastaccess} ula
                    JOIN {course} c ON c.id = ula.courseid
                    JOIN {course_categories} cc ON cc.id = c.category
@@ -152,9 +152,12 @@ public function fetch_recent_courses(): array {
             $course->coursecategory = $cr->catname;
 
             /* Progress. */
-            if ($percentage = progress::get_course_progress_percentage($cr, $USER->id)) {
-                $percentage = floor($percentage);
-                $course->progress = $percentage;
+            if ($cr->enablecompletion) {
+                $course->progressenabled = true;
+                $course->progress = 0; // Default.
+                if ($percentage = progress::get_course_progress_percentage($cr, $USER->id)) {
+                    $course->progress = floor($percentage);
+                }
             }
 
             /* Course image. */

diff --git a/templates/content.mustache b/templates/content.mustache
@@ -54,7 +54,7 @@
     }
 }}
 <div id="block-pickup-content">
-  <div class="container">
+  <div class="container p-0 px-md-3">
 
     {{! Header and link. }}
     <div class="pb-3">

diff --git a/templates/coursecard.mustache b/templates/coursecard.mustache
@@ -29,7 +29,7 @@
 {{! Coursecard. }}
 <div class="pickup-card h-100 bg-white position-relative pb-3">
     {{^visible}}
-        <div class="position-absolute p-1" style="top:0;right: 0; z-index: 666;">
+        <div class="position-absolute p-1" style="top:0; right: 0; z-index: 666;">
             <span class="badge badge-pill badge-warning border border-dark" >{{#str}} hiddenfromstudents {{/str}}</span>
         </div>
     {{/visible}}
@@ -44,26 +44,24 @@
         </div>
 
         {{! Name & Catagory. }}
-        <div class="pickup-card-details pt-2 px-3">
+        <div class="pickup-card-details px-3 pt-3">
             <a href="{{viewurl}}" class="stretched-link font-weight-bold line-clamp-3">{{fullname}}</a>
             <div class="line-clamp-1 text-muted"><small>{{coursecategory}}</small></div>
         </div>
 
+        {{! Progress. }}
+        {{#progressenabled}}
         <div class="dashboard-card-meta mt-auto px-3">
-
-            {{! Progress. }}
-            <div class="{{^progress}} invisible {{/progress}}">
-                <small>Progress: {{progress}}%</small>
-                <div class="progress ">
-                    <div class="progress-bar bg-success" role="progressbar"
-                    aria-label="{{#str}} progress {{/str}}"
-                    aria-valuenow="{{progress}}"
-                    style="width: {{progress}}%"
-                    aria-valuemin="0"
-                    aria-valuemax="100"></div>
-                </div>
+            <small>{{#str}} progress {{/str}}: {{progress}}%</small>
+            <div class="progress">
+                <div class="progress-bar bg-success" role="progressbar"
+                aria-label="{{#str}} progress {{/str}}"
+                aria-valuenow="{{progress}}"
+                style="width: {{progress}}%"
+                aria-valuemin="0"
+                aria-valuemax="100"></div>
             </div>
         </div>
-
+        {{/progressenabled}}
     </div>
 </div>