Merge branch 'MDL-65621-dimmed-courses' of https://github.com/stopfstedt/moodle

This commit is contained in:
Adrian Greeve 2019-08-14 14:56:07 +08:00
commit 523e51ff4d
6 changed files with 27 additions and 5 deletions

View File

@ -29,7 +29,8 @@
"fullname": "course 3",
"hasprogress": true,
"progress": 10,
"coursecategory": "Miscellaneous"
"coursecategory": "Miscellaneous",
"visible": true
}
]
}

View File

@ -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}}

View File

@ -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}}}

View File

@ -105,6 +105,9 @@ class course_summary_exporter extends \core\external\exporter {
),
'enddate' => array(
'type' => PARAM_INT,
),
'visible' => array(
'type' => PARAM_BOOL,
)
);
}

View File

@ -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)) {

View File

@ -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>