From d0b237b30675b0f04bc8979a136579505aa61cb6 Mon Sep 17 00:00:00 2001 From: Mihail Geshoski Date: Wed, 18 Sep 2019 17:57:47 +0800 Subject: [PATCH] MDL-64438 block_recentlyaccessedcourses: Optionally show course category AMOS BEGIN CPY [displaycategories,block_myoverview],[displaycategories,block_recentlyaccessedcourses] AMOS END --- .../amd/build/main.min.js | Bin 3529 -> 3665 bytes .../amd/build/main.min.js.map | Bin 22955 -> 23379 bytes .../recentlyaccessedcourses/amd/src/main.js | 3 + .../block_recentlyaccessedcourses.php | 9 +++ .../classes/output/main.php | 4 +- .../lang/en/block_recentlyaccessedcourses.php | 4 +- blocks/recentlyaccessedcourses/settings.php | 34 +++++++++++ .../templates/course-card.mustache | 15 +++-- .../templates/main.mustache | 2 +- ..._recentlyaccessedcourses_dashboard.feature | 55 ++++++++++++++++-- blocks/recentlyaccessedcourses/upgrade.txt | 5 ++ blocks/recentlyaccessedcourses/version.php | 2 +- 12 files changed, 119 insertions(+), 14 deletions(-) create mode 100644 blocks/recentlyaccessedcourses/settings.php diff --git a/blocks/recentlyaccessedcourses/amd/build/main.min.js b/blocks/recentlyaccessedcourses/amd/build/main.min.js index 6c3de1c93c6a3517f6132dccbfde9d6e01254b6c..4d8e69fd15ada5a16645c15b15f5352b81c8509c 100644 GIT binary patch delta 140 zcmX>peNkq@Z&oKCe`oKB|D`ALi?hZk#VYA+{C$umE>R;>4=fY!?C%%i=;`Mgq^XyZ zSdyrrl#*Fokds)MoL^d0oSK|ilA4}hRH>w?lWLo!mz!9ikye_QT#}ier;(^xov2rw dkzbCg)HcO>@;TNh#?;B0Y|@OWn_byj*a6h8F^B*F delta 55 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 Q true); } + + /** + * Allow the block to have a configuration page + * + * @return boolean + */ + public function has_config() { + return true; + } } diff --git a/blocks/recentlyaccessedcourses/classes/output/main.php b/blocks/recentlyaccessedcourses/classes/output/main.php index 631af28407b..0534d17670e 100644 --- a/blocks/recentlyaccessedcourses/classes/output/main.php +++ b/blocks/recentlyaccessedcourses/classes/output/main.php @@ -46,6 +46,7 @@ class main implements renderable, templatable { global $USER; $nocoursesurl = $output->image_url('courses', 'block_recentlyaccessedcourses')->out(false); + $config = get_config('block_recentlyaccessedcourses'); return [ 'userid' => $USER->id, @@ -53,7 +54,8 @@ class main implements renderable, templatable { 'pagingbar' => [ 'next' => true, 'previous' => true - ] + ], + 'displaycategories' => !empty($config->displaycategories) ]; } } diff --git a/blocks/recentlyaccessedcourses/lang/en/block_recentlyaccessedcourses.php b/blocks/recentlyaccessedcourses/lang/en/block_recentlyaccessedcourses.php index 8a722478083..86e88c38c33 100644 --- a/blocks/recentlyaccessedcourses/lang/en/block_recentlyaccessedcourses.php +++ b/blocks/recentlyaccessedcourses/lang/en/block_recentlyaccessedcourses.php @@ -20,7 +20,9 @@ * @copyright 2018 Victor Deniz * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ +$string['displaycategories'] = 'Display categories'; +$string['displaycategories_help'] = 'Display the course category on the recently accessed courses block items.'; $string['pluginname'] = 'Recently accessed courses'; $string['privacy:metadata'] = 'The Recently accessed courses block does not store any personal data.'; $string['recentlyaccessedcourses:myaddinstance'] = 'Add a new recently accessed courses block to Dashboard'; -$string['nocourses'] = 'No recent courses'; \ No newline at end of file +$string['nocourses'] = 'No recent courses'; diff --git a/blocks/recentlyaccessedcourses/settings.php b/blocks/recentlyaccessedcourses/settings.php new file mode 100644 index 00000000000..2e763433818 --- /dev/null +++ b/blocks/recentlyaccessedcourses/settings.php @@ -0,0 +1,34 @@ +. + +/** + * Settings for the recentlyaccessedcourses block + * + * @package block_recentlyaccessedcourses + * @copyright 2019 Mihail Geshoski + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +defined('MOODLE_INTERNAL') || die; + +if ($ADMIN->fulltree) { + // Display Course Categories on the recently accessed courses block items. + $settings->add(new admin_setting_configcheckbox( + 'block_recentlyaccessedcourses/displaycategories', + get_string('displaycategories', 'block_recentlyaccessedcourses'), + get_string('displaycategories_help', 'block_recentlyaccessedcourses'), + 1)); +} diff --git a/blocks/recentlyaccessedcourses/templates/course-card.mustache b/blocks/recentlyaccessedcourses/templates/course-card.mustache index 7b98a5eb203..c18f12438f1 100644 --- a/blocks/recentlyaccessedcourses/templates/course-card.mustache +++ b/blocks/recentlyaccessedcourses/templates/course-card.mustache @@ -35,10 +35,17 @@ {{< core_course/coursecard }} {{$coursecategory}} - - {{#str}}aria:coursecategory, core_course{{/str}} - - {{{coursecategory}}} + {{#showcoursecategory}} + + {{#str}}aria:coursecategory, core_course{{/str}} + + {{{coursecategory}}} + {{/showcoursecategory}} {{/coursecategory}} {{$coursename}} {{{fullname}}} {{/coursename}} + {{$divider}} + {{#showcoursecategory}} +
|
+ {{/showcoursecategory}} + {{/divider}} {{/ core_course/coursecard }} diff --git a/blocks/recentlyaccessedcourses/templates/main.mustache b/blocks/recentlyaccessedcourses/templates/main.mustache index 84e64d532eb..1a072606902 100644 --- a/blocks/recentlyaccessedcourses/templates/main.mustache +++ b/blocks/recentlyaccessedcourses/templates/main.mustache @@ -27,7 +27,7 @@ }}
+ data-userid="{{userid}}" data-displaycoursecategory="{{displaycategories}}">
{{> block_recentlyaccessedcourses/recentlyaccessedcourses-view }}
diff --git a/blocks/recentlyaccessedcourses/tests/behat/block_recentlyaccessedcourses_dashboard.feature b/blocks/recentlyaccessedcourses/tests/behat/block_recentlyaccessedcourses_dashboard.feature index 1361760cec8..731e1efc670 100644 --- a/blocks/recentlyaccessedcourses/tests/behat/block_recentlyaccessedcourses_dashboard.feature +++ b/blocks/recentlyaccessedcourses/tests/behat/block_recentlyaccessedcourses_dashboard.feature @@ -8,13 +8,16 @@ Feature: The recently accessed courses block allows users to easily access their Given the following "users" exist: | username | firstname | lastname | email | | student1 | Student | 1 | student1@example.com | + And the following "categories" exist: + | name | category | idnumber | + | Category 1 | 0 | CAT1 | And the following "courses" exist: - | fullname | shortname | - | Course 1 | C1 | - | Course 2 | C2 | - | Course 3 | C3 | - | Course 4 | C4 | - | Course 5 | C5 | + | fullname | shortname | category | + | Course 1 | C1 | 0 | + | Course 2 | C2 | 0 | + | Course 3 | C3 | 0 | + | Course 4 | C4 | CAT1 | + | Course 5 | C5 | 0 | And the following "course enrolments" exist: | user | course | role | | student1 | C1 | student | @@ -40,3 +43,43 @@ Feature: The recently accessed courses block allows users to easily access their And I should not see "Course 3" in the "Recently accessed courses" "block" And I should not see "Course 4" in the "Recently accessed courses" "block" And I should not see "Course 5" in the "Recently accessed courses" "block" + + Scenario: Show course category name + Given the following config values are set as admin: + | displaycategories | 1 | block_recentlyaccessedcourses | + And I log in as "student1" + And I am on "Course 1" course homepage + And I am on "Course 4" course homepage + And I follow "Dashboard" in the user menu + And I should see "Miscellaneous" in the "Recently accessed courses" "block" + And I should see "Category 1" in the "Recently accessed courses" "block" + + Scenario: Hide course category name + Given the following config values are set as admin: + | displaycategories | 0 | block_recentlyaccessedcourses | + And I log in as "student1" + And I am on "Course 1" course homepage + And I am on "Course 4" course homepage + And I follow "Dashboard" in the user menu + And I should not see "Miscellaneous" in the "Recently accessed courses" "block" + And I should not see "Category 1" in the "Recently accessed courses" "block" + + Scenario: Show short course name + Given the following config values are set as admin: + | courselistshortnames | 1 | + And I log in as "student1" + And I am on "Course 1" course homepage + And I am on "Course 4" course homepage + And I follow "Dashboard" in the user menu + And I should see "C1" in the "Recently accessed courses" "block" + And I should see "C4" in the "Recently accessed courses" "block" + + Scenario: Hide short course name + Given the following config values are set as admin: + | courselistshortnames | 0 | + And I log in as "student1" + And I am on "Course 1" course homepage + And I am on "Course 4" course homepage + And I follow "Dashboard" in the user menu + And I should not see "C1" in the "Recently accessed courses" "block" + And I should not see "C4" in the "Recently accessed courses" "block" diff --git a/blocks/recentlyaccessedcourses/upgrade.txt b/blocks/recentlyaccessedcourses/upgrade.txt index 2f6b9225310..97340542227 100644 --- a/blocks/recentlyaccessedcourses/upgrade.txt +++ b/blocks/recentlyaccessedcourses/upgrade.txt @@ -1,5 +1,10 @@ This file describes API changes in the recentlyaccessedcourses block code. +=== 3.8 === + +* New admin setting block_recentlyaccessedcourses/displaycategories which enables the recently accessed + courses block to display the course category. + === 3.7 === * The 'block/recentlyaccessedcourses:addinstance' capability has been removed. It has never been used in code. \ No newline at end of file diff --git a/blocks/recentlyaccessedcourses/version.php b/blocks/recentlyaccessedcourses/version.php index a05f8fb9ece..08dcbadd91d 100644 --- a/blocks/recentlyaccessedcourses/version.php +++ b/blocks/recentlyaccessedcourses/version.php @@ -22,6 +22,6 @@ */ defined('MOODLE_INTERNAL') || die(); -$plugin->version = 2019052000; // The current plugin version (Date: YYYYMMDDXX). +$plugin->version = 2019052001; // The current plugin version (Date: YYYYMMDDXX). $plugin->requires = 2019051100; // Requires this Moodle version. $plugin->component = 'block_recentlyaccessedcourses'; // Full name of the plugin (used for diagnostics). -- 2.17.1