MDL-63794 block_myoverview: Display the course category name in block

moodle · Dec 17, 2018 · 6c52667 · 6c52667
1 parent d657d80
commit 6c52667
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 23 deletions.
diff --git a/blocks/myoverview/templates/view-cards.mustache b/blocks/myoverview/templates/view-cards.mustache
@@ -28,7 +28,8 @@
                 "courseimage": "https://moodlesite/pluginfile/123/course/overviewfiles/123.jpg",
                 "fullname": "course 3",
                 "hasprogress": true,
-                "progress": 10
+                "progress": 10,
+                "coursecategory": "Miscellaneous"
             }
         ]
     }
@@ -50,4 +51,13 @@
             {{#shortentext}}50, {{{fullname}}} {{/shortentext}}
         </span>
     {{/coursename}}
+    {{$coursecategory}}
+        <span class="sr-only">
+            {{#str}}aria:coursecategory, core_course{{/str}}
+        </span>
+        <div>{{{coursecategory}}}</div>
+    {{/coursecategory}}
+    {{$divider}}
+        <div class="pl-1 pr-1">|</div>
+    {{/divider}}
 {{/ core_course/coursecards }}
diff --git a/blocks/myoverview/templates/view-list.mustache b/blocks/myoverview/templates/view-list.mustache
@@ -28,7 +28,8 @@
                 "courseimage": "https://moodlesite/pluginfile/123/course/overviewfiles/123.jpg",
                 "fullname": "course 3",
                 "hasprogress": true,
-                "progress": 10
+                "progress": 10,
+                "coursecategory": "Miscellaneous"
             }
         ]
     }
@@ -42,14 +43,19 @@
         <div class="row-fluid">
             <div class="{{#hasprogress}}col-md-6 span6{{/hasprogress}}{{^hasprogress}}col-md-11 span11{{/hasprogress}} d-flex align-items-center">
                 <a href="{{viewurl}}" class="coursename">
-                    {{#showshortname}}
+                    <div class="text-muted muted d-flex" style="flex-flow:wrap;">
+                        <span class="sr-only">
+                            {{#str}}aria:coursecategory, core_course{{/str}}
+                        </span>
+                        <div>{{{coursecategory}}}</div>
+                        {{#showshortname}}
+                        <div class="pl-1 pr-1">|</div>
                         <span class="sr-only">
                             {{#str}}aria:courseshortname, core_course{{/str}}
                         </span>
-                        <div class="text-muted muted">
-                            {{{shortname}}}
-                        </div>
-                    {{/showshortname}}
+                        <div>{{{shortname}}}</div>
+                        {{/showshortname}}
+                    </div>
                     {{> core_course/favouriteicon }}
                     <span class="sr-only">
                         {{#str}}aria:coursename, core_course{{/str}}

diff --git a/blocks/myoverview/templates/view-summary.mustache b/blocks/myoverview/templates/view-summary.mustache
@@ -29,7 +29,8 @@
                 "fullname": "course 3",
                 "summary": "This course is about assignments",
                 "hasprogress": true,
-                "progress": 10
+                "progress": 10,
+                "coursecategory": "Miscellaneous"
             }
         ]
     }
@@ -49,19 +50,24 @@
             <div class="align-self-stretch d-flex flex-column w-100">
                 <div class="d-flex mb-1">
                     <a href="{{viewurl}}" class="coursename">
-                        {{#showshortname}}
+                        <div class="text-muted muted mb-1 d-flex" style="flex-flow:wrap;">
+                            <span class="sr-only">
+                                {{#str}}aria:coursecategory, core_course{{/str}}
+                            </span>
+                            <div>{{{coursecategory}}}</div>
+                            {{#showshortname}}
+                            <div class="pl-1 pr-1">|</div>
                             <span class="sr-only">
                                 {{#str}}aria:courseshortname, core_course{{/str}}
                             </span>
-                            <div class="text-muted muted mb-1">
-                                {{{shortname}}}
-                            </div>
-                        {{/showshortname}}
+                            <div>{{{shortname}}}</div>
+                            {{/showshortname}}
+                        </div>
                         {{> core_course/favouriteicon }}
                         <span class="sr-only">
                             {{#str}}aria:coursename, core_course{{/str}}
                         </span>
-                        <h6 class="d-inline h5">{{{fullname}}}</h4>
+                        <h6 class="d-inline h5">{{{fullname}}}</h6>
                     </a>
                     {{> block_myoverview/course-action-menu }}
                 </div>

diff --git a/course/classes/external/course_summary_exporter.php b/course/classes/external/course_summary_exporter.php
@@ -65,6 +65,7 @@ protected function get_other_values(renderer_base $output) {
             $hasprogress = true;
         }
         $progress = floor($progress);
+        $coursecategory = \core_course_category::get($this->data->category, MUST_EXIST, true);
         return array(
             'fullnamedisplay' => get_course_display_name_for_list($this->data),
             'viewurl' => (new moodle_url('/course/view.php', array('id' => $this->data->id)))->out(false),
@@ -73,7 +74,8 @@ protected function get_other_values(renderer_base $output) {
             'hasprogress' => $hasprogress,
             'isfavourite' => $this->related['isfavourite'],
             'hidden' => boolval(get_user_preferences('block_myoverview_hidden_course_' . $this->data->id, 0)),
-            'showshortname' => $CFG->courselistshortnames ? true : false
+            'showshortname' => $CFG->courselistshortnames ? true : false,
+            'coursecategory' => $coursecategory->name
         );
     }
 
@@ -149,6 +151,9 @@ public static function define_other_properties() {
             ),
             'showshortname' => array(
                 'type' => PARAM_BOOL
+            ),
+            'coursecategory' => array(
+                'type' => PARAM_TEXT
             )
         );
     }

diff --git a/course/templates/coursecards.mustache b/course/templates/coursecards.mustache
@@ -28,7 +28,8 @@
                 "courseimage": "https://moodlesite/pluginfile/123/course/overviewfiles/123.jpg",
                 "fullname": "course 3",
                 "hasprogress": true,
-                "progress": 10
+                "progress": 10,
+                "coursecategory": "Miscellaneous"
             }
         ]
     }
@@ -47,14 +48,18 @@
         <div class="card-body pr-1 course-info-container" id="course-info-container-{{id}}-{{uniqid}}">
             <div class="d-flex align-items-start">
                 <a href="{{viewurl}}" class="coursename mr-2 text-truncate">
-                    <span class="sr-only">
-                        {{#str}}aria:courseshortname, core_course{{/str}}
-                    </span>
-                    {{#showshortname}}
-                    <div class="text-muted muted w-100 mb-1 text-truncate">
-                        {{{shortname}}}
+                    <div class="text-muted muted d-flex w-100 mb-1 text-truncate" style="flex-flow:wrap;">
+                        {{$coursecategory}}{{/coursecategory}}
+                        {{#showshortname}}
+                        {{$divider}}{{/divider}}
+                        <span class="sr-only">
+                            {{#str}}aria:courseshortname, core_course{{/str}}
+                        </span>
+                        <div>
+                            {{{shortname}}}
+                        </div>
+                        {{/showshortname}}
                     </div>
-                    {{/showshortname}}
                     {{> core_course/favouriteicon }}
                     <span class="sr-only">
                         {{#str}}aria:coursename, core_course{{/str}}

diff --git a/lang/en/course.php b/lang/en/course.php
@@ -22,6 +22,7 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+$string['aria:coursecategory'] = 'Course category';
 $string['aria:courseimage'] = 'Course image';
 $string['aria:courseshortname'] = 'Course short name';
 $string['aria:coursename'] = 'Course name';