mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-12 03:52:16 +02:00
Code Issues Projects Releases Wiki Activity

MDL-81733 lesson: Support filters on lesson activity link

Browse Source
This commit is contained in:
Iñigo Zendegi 2024-05-03 08:01:44 +02:00
parent d32844ce29
commit c3386a497c
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mod/lesson/locallib.php
View File

@ -2299,8 +2299,10 @@ class lesson extends lesson_base {
$instancename = $DB->get_field($modname, 'name', array('id' => $module->instance));
if ($instancename) {
return html_writer::link(new moodle_url('/mod/'.$modname.'/view.php',
array('id' => $this->properties->activitylink)), get_string('activitylinkname',
'lesson', $instancename), array('class' => 'centerpadded lessonbutton standardbutton pr-3'));
['id' => $this->properties->activitylink]),
get_string('activitylinkname', 'lesson',
format_string($instancename, true, ['context' => $this->get_context()])),
['class' => 'centerpadded lessonbutton standardbutton pr-3']);
}
}
}

3
mod/lesson/mod_form.php
View File

@ -163,7 +163,8 @@ class mod_lesson_mod_form extends moodleform_mod {
if ($module = get_coursemodule_from_instance($mod->modname, $mod->instance, $COURSE->id)) {
// Exclude this lesson, if it's already been saved.
if (!isset($this->_cm->id) || $this->_cm->id != $mod->id) {
$modinstances[$mod->id] = $mod->modname.' - '.$module->name;
$modinstances[$mod->id] = get_string('pluginname', $mod->modname).' - '.
format_string($module->name, true, ['context' => $this->context]);
}
}
}

15
mod/lesson/tests/behat/lesson_navigation.feature
View File

@ -17,10 +17,13 @@ Feature: In a lesson activity, students can navigate through a series of pages i
| teacher1 | C1 | editingteacher |
| student1 | C1 | student |
And the following "activities" exist:
| activity | name | course | idnumber |
| lesson | Test lesson name | C1 | lesson1 |
| activity | name | course | idnumber |
| lesson | Test lesson name | C1 | lesson1 |
| page | <span class="multilang" lang="en">A page (EN)</span><span class="multilang" lang="eu">Orri bat (EU)</span> | C1 | PAGE1 |
Scenario: Student navigation with pages and questions
Given the "multilang" filter is "on"
And the "multilang" filter applies to "content and headings"
Given the following "mod_lesson > pages" exist:
| lesson | qtype | title | content |
| Test lesson name | content | First page name | First page contents |
@ -33,7 +36,11 @@ Feature: In a lesson activity, students can navigate through a series of pages i
| Second page name | Next page | | Next page | 0 |
| Hardest question ever | 2 | Correct answer | End of lesson | 1 |
| Hardest question ever | 1 | Incorrect answer | Second page name | 0 |
When I am on the "Test lesson name" "lesson activity" page logged in as student1
When I am on the "Test lesson name" "lesson activity editing" page logged in as teacher1
And I expand all fieldsets
And I set the field "Link to next activity" to "Page - A page (EN)"
And I press "Save and display"
And I am on the "Test lesson name" "lesson activity" page logged in as student1
Then I should see "First page contents"
And I press "Next page"
And I should see "Second page contents"
@ -60,6 +67,8 @@ Feature: In a lesson activity, students can navigate through a series of pages i
And I press "Continue"
And I should see "Congratulations - end of lesson reached"
And I should see "Your score is 0 (out of 1)."
And I should see "Go to A page (EN)"
And I should not see "Orri bat (EU)"
Scenario: Student reattempts a question until out of attempts
Given the following "mod_lesson > page" exist: