Merge branch 'MDL-65621-dimmed-courses' of https://github.com/stopfst…

…edt/moodle
robjoyce · Aug 14, 2019 · 523e51f · 523e51f
2 parents 9311a83 + 1606fb6
commit 523e51f
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 5 deletions.
diff --git a/blocks/myoverview/templates/view-cards.mustache b/blocks/myoverview/templates/view-cards.mustache
@@ -29,7 +29,8 @@
                 "fullname": "course 3",
                 "hasprogress": true,
                 "progress": 10,
-                "coursecategory": "Miscellaneous"
+                "coursecategory": "Miscellaneous",
+                "visible": true
             }
         ]
     }

diff --git a/blocks/myoverview/templates/view-list.mustache b/blocks/myoverview/templates/view-list.mustache
@@ -29,7 +29,8 @@
                 "fullname": "course 3",
                 "hasprogress": true,
                 "progress": 10,
-                "coursecategory": "Miscellaneous"
+                "coursecategory": "Miscellaneous",
+                "visible": true
             }
         ]
     }
@@ -65,6 +66,11 @@
                         </span>
                         {{{fullname}}}
                     </a>
+                    {{^visible}}
+                        <div class="d-flex flex-wrap">
+                            <span class="tag tag-info">{{#str}} hiddenfromstudents {{/str}}</span>
+                        </div>
+                    {{/visible}}
                 </div>
             </div>
             {{#hasprogress}}

diff --git a/blocks/myoverview/templates/view-summary.mustache b/blocks/myoverview/templates/view-summary.mustache
@@ -30,7 +30,8 @@
                 "summary": "This course is about assignments",
                 "hasprogress": true,
                 "progress": 10,
-                "coursecategory": "Miscellaneous"
+                "coursecategory": "Miscellaneous",
+                "visible": true
             }
         ]
     }
@@ -75,6 +76,11 @@
                     </a>
                     {{> block_myoverview/course-action-menu }}
                 </div>
+                {{^visible}}
+                    <div class="d-flex flex-wrap">
+                        <span class="tag tag-info">{{#str}} hiddenfromstudents {{/str}}</span>
+                    </div>
+                {{/visible}}
                 <div class="summary">
                     <span class="sr-only">{{#str}}aria:coursesummary, block_myoverview{{/str}}</span>
                     {{{summary}}}

diff --git a/course/classes/external/course_summary_exporter.php b/course/classes/external/course_summary_exporter.php
@@ -105,6 +105,9 @@ public static function define_properties() {
             ),
             'enddate' => array(
                 'type' => PARAM_INT,
+            ),
+            'visible' => array(
+                'type' => PARAM_BOOL,
             )
         );
     }

diff --git a/course/lib.php b/course/lib.php
@@ -4621,7 +4621,7 @@ function course_get_recent_courses(int $userid = null, int $limit = 0, int $offs
     }
 
     $basefields = array('id', 'idnumber', 'summary', 'summaryformat', 'startdate', 'enddate', 'category',
-            'shortname', 'fullname', 'timeaccess', 'component');
+            'shortname', 'fullname', 'timeaccess', 'component', 'visible');
 
     $sort = trim($sort);
     if (empty($sort)) {

diff --git a/course/templates/coursecard.mustache b/course/templates/coursecard.mustache
@@ -28,7 +28,8 @@
                 "courseimage": "https://moodlesite/pluginfile/123/course/overviewfiles/123.jpg",
                 "fullname": "course 3",
                 "hasprogress": true,
-                "progress": 10
+                "progress": 10,
+                "visible": true
             }
         ]
     }
@@ -63,6 +64,11 @@
                         </span>
                     {{$coursename}}{{/coursename}}
                 </a>
+                {{^visible}}
+                    <div class="d-flex flex-wrap">
+                        <span class="tag tag-info">{{#str}} hiddenfromstudents {{/str}}</span>
+                    </div>
+                {{/visible}}
             </div>
             {{$menu}}{{/menu}}
         </div>