Merge branch 'MDL-73697-master' of https://github.com/ferranrecio/moodle

This commit is contained in:
Andrew Nicols 2022-02-07 14:23:31 +08:00
commit d4d0e14fef
4 changed files with 28 additions and 3 deletions

View File

@ -138,6 +138,7 @@ class section implements renderable, templatable {
'summary' => $summary->export_for_template($output),
'availability' => $availability->export_for_template($output),
'restrictionlock' => !empty($thissection->availableinfo),
'highlightedlabel' => $format->get_section_highlighted_name(),
];
// Check if it is a stealth sections (orphaned).

View File

@ -26,6 +26,7 @@
"controlmenu": "[tools menu]",
"header": {
"name": "Section title",
"title": "<a href=\"http://moodle/course/view.php?id=5#section-0\">Section title</a>",
"url": "#",
"ishidden": true
},
@ -39,6 +40,7 @@
},
"id": 3,
"module": "forum",
"anchor": "activity-3",
"extraclasses": "newmessages"
}
},
@ -49,6 +51,7 @@
"hasname": "true"
},
"id": 4,
"anchor": "activity-4",
"module": "assign",
"extraclasses": ""
}
@ -76,7 +79,8 @@
"contentcollapsed": false,
"insertafter": true,
"numsections": 42,
"sitehome": false
"sitehome": false,
"highlightedlabel" : "Highlighted"
}
}}
<li id="section-{{num}}"

View File

@ -25,11 +25,12 @@
{
"highlighted" : "1",
"hiddenfromstudents" : "1",
"notavailable" : "0"
"notavailable" : "0",
"highlightedlabel" : "Highlighted"
}
}}
{{#highlighted}}
<span class="badge badge-pill badge-primary order-1" data-type="highlighted">{{#str}}highlighted{{/str}}</span>
<span class="badge badge-pill badge-primary order-1" data-type="highlighted">{{ highlightedlabel }}</span>
{{/highlighted}}
{{#hiddenfromstudents}}
<span class="badge badge-pill badge-warning order-2" data-type="hiddenfromstudents">{{#str}}hiddenfromstudents{{/str}}</span>

View File

@ -0,0 +1,19 @@
@format @format_weeks
Feature: The current week should be highlighted in the course.
In order to know which is the current week
As a user
I need to see the current week highlighted
Scenario: Highlight first week
Given the following "courses" exist:
| fullname | shortname | format | coursedisplay | numsections | startdate |
| Course 1 | C1 | weeks | 0 | 5 | ##today## |
When I am on the "C1" "Course" page logged in as "admin"
Then I should see "This week" in the "#section-1" "css_element"
Scenario: Highlight next week
Given the following "courses" exist:
| fullname | shortname | format | coursedisplay | numsections | startdate |
| Course 1 | C1 | weeks | 0 | 5 | ##monday last week## |
When I am on the "C1" "Course" page logged in as "admin"
Then I should see "This week" in the "#section-2" "css_element"