Merge branch 'MDL-32232-master' of https://github.com/lucaboesch/moodle

This commit is contained in:
David Monllao 2018-07-03 13:59:57 +02:00
commit 3a0e92cd6a
12 changed files with 33 additions and 33 deletions

View File

@ -440,7 +440,7 @@ class mod_lesson_renderer extends plugin_renderer_base {
foreach ($links as $link) {
$options[$link['type']] = $link['name'];
}
$options[0] = get_string('question', 'lesson');
$options[0] = get_string('addaquestionpage', 'lesson');
$addpageurl = new moodle_url('/mod/lesson/editpage.php', array('id'=>$this->page->cm->id, 'pageid'=>$page->id, 'sesskey'=>sesskey()));
$addpageselect = new single_select($addpageurl, 'qtype', $options, null, array(''=>get_string('addanewpage', 'lesson').'...'), 'addpageafter'.$page->id);

View File

@ -33,7 +33,7 @@ Feature: Teachers can review student progress on all lessons in a course by view
| id_answer_editor_0 | Next page |
| id_jumpto_0 | Next page |
And I press "Save page"
And I select "Question" from the "qtype" singleselect
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "True/false"
And I press "Add a question page"
And I set the following fields to these values:
@ -60,7 +60,7 @@ Feature: Teachers can review student progress on all lessons in a course by view
| id_answer_editor_0 | Next page |
| id_jumpto_0 | Next page |
And I press "Save page"
And I select "Question" from the "qtype" singleselect
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "True/false"
And I press "Add a question page"
And I set the following fields to these values:
@ -106,7 +106,7 @@ Feature: Teachers can review student progress on all lessons in a course by view
| id_answer_editor_0 | Next page |
| id_jumpto_0 | Next page |
And I press "Save page"
And I select "Question" from the "qtype" singleselect
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "True/false"
And I press "Add a question page"
And I set the following fields to these values:
@ -119,7 +119,7 @@ Feature: Teachers can review student progress on all lessons in a course by view
| id_response_editor_1 | Wrong |
| id_jumpto_1 | This page |
And I press "Save page"
And I select "Question" from the "qtype" singleselect
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "True/false"
And I press "Add a question page"
And I set the following fields to these values:

View File

@ -32,7 +32,7 @@ branch table contents
| id_answer_editor_1 | Previous page |
| id_jumpto_1 | Previous page |
And I press "Save page"
And I select "Question" from the "qtype" singleselect
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "Numerical"
And I press "Add a question page"
And I set the following fields to these values:

View File

@ -28,7 +28,7 @@ Feature: In a lesson activity, if custom scoring is not enabled, student should
| id_answer_editor_0 | Next page |
| id_jumpto_0 | Next page |
And I press "Save page"
And I select "Question" from the "qtype" singleselect
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "Numerical"
And I press "Add a question page"
And I set the following fields to these values:

View File

@ -49,7 +49,7 @@ Feature: In Dashboard, teacher can see the number of student attempts to lessons
| id_response_editor_1 | Wrong |
| id_jumpto_1 | This page |
And I press "Save page"
And I select "Question" from the "qtype" singleselect
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "True/false"
And I press "Add a question page"
And I set the following fields to these values:

View File

@ -33,7 +33,7 @@ Feature: Teachers can review student progress on all lessons in a course by view
| id_answer_editor_0 | Next page |
| id_jumpto_0 | Next page |
And I press "Save page"
And I select "Question" from the "qtype" singleselect
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "True/false"
And I press "Add a question page"
And I set the following fields to these values:
@ -60,7 +60,7 @@ Feature: Teachers can review student progress on all lessons in a course by view
| id_answer_editor_0 | Next page |
| id_jumpto_0 | Next page |
And I press "Save page"
And I select "Question" from the "qtype" singleselect
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "True/false"
And I press "Add a question page"
And I set the following fields to these values:
@ -104,7 +104,7 @@ Feature: Teachers can review student progress on all lessons in a course by view
| id_answer_editor_0 | Next page |
| id_jumpto_0 | Next page |
And I press "Save page"
And I select "Question" from the "qtype" singleselect
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "True/false"
And I press "Add a question page"
And I set the following fields to these values:

View File

@ -41,7 +41,7 @@ Feature: In a lesson activity, students can not re-attempt a question more than
| id_answer_editor_1 | Next page |
| id_jumpto_1 | Next page |
And I press "Save page"
And I select "Question" from the "qtype" singleselect
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "True/false"
And I press "Add a question page"
And I set the following fields to these values:
@ -63,7 +63,7 @@ Feature: In a lesson activity, students can not re-attempt a question more than
| id_answer_editor_1 | Next page |
| id_jumpto_1 | Next page |
And I press "Save page"
And I select "Question" from the "qtype" singleselect
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "True/false"
And I press "Add a question page"
And I set the following fields to these values:
@ -76,7 +76,7 @@ Feature: In a lesson activity, students can not re-attempt a question more than
| id_response_editor_1 | Wrong |
| id_jumpto_1 | This page |
And I press "Save page"
And I select "Question" from the "qtype" singleselect
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "True/false"
And I press "Add a question page"
And I set the following fields to these values:

View File

@ -34,7 +34,7 @@ Feature: In a lesson activity, teachers can review student attempts
| id_answer_editor_0 | Next page |
| id_jumpto_0 | Next page |
And I press "Save page"
And I select "Question" from the "qtype" singleselect
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "True/false"
And I press "Add a question page"
And I set the following fields to these values:
@ -47,7 +47,7 @@ Feature: In a lesson activity, teachers can review student attempts
| id_response_editor_1 | Wrong |
| id_jumpto_1 | This page |
And I press "Save page"
And I select "Question" from the "qtype" singleselect
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "True/false"
And I press "Add a question page"
And I set the following fields to these values:

View File

@ -42,7 +42,7 @@ Feature: In a lesson activity, students can review the answers they gave to ques
| id_response_editor_1 | Incorrect answer |
| id_jumpto_1 | This page |
And I press "Save page"
And I select "Question" from the "qtype" singleselect
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "True/false"
And I press "Add a question page"
And I set the following fields to these values:

View File

@ -37,7 +37,7 @@ Feature: In Dashboard, a student can see their current status on all lessons wit
| id_response_editor_1 | Wrong |
| id_jumpto_1 | This page |
And I press "Save page"
And I select "Question" from the "qtype" singleselect
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "True/false"
And I press "Add a question page"
And I set the following fields to these values:
@ -85,7 +85,7 @@ Feature: In Dashboard, a student can see their current status on all lessons wit
| id_response_editor_1 | Wrong |
| id_jumpto_1 | This page |
And I press "Save page"
And I select "Question" from the "qtype" singleselect
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "True/false"
And I press "Add a question page"
And I set the following fields to these values:
@ -190,7 +190,7 @@ Feature: In Dashboard, a student can see their current status on all lessons wit
| id_response_editor_1 | Wrong |
| id_jumpto_1 | This page |
And I press "Save page"
And I select "Question" from the "qtype" singleselect
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "True/false"
And I press "Add a question page"
And I set the following fields to these values:
@ -256,7 +256,7 @@ Feature: In Dashboard, a student can see their current status on all lessons wit
| id_response_editor_1 | Wrong |
| id_jumpto_1 | This page |
And I press "Save page"
And I select "Question" from the "qtype" singleselect
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "True/false"
And I press "Add a question page"
And I set the following fields to these values:
@ -336,7 +336,7 @@ Feature: In Dashboard, a student can see their current status on all lessons wit
| id_answer_editor_0 | True |
| id_answer_editor_1 | False |
And I press "Save page"
And I select "Question" from the "qtype" singleselect
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "True/false"
And I press "Add a question page"
And I set the following fields to these values:

View File

@ -32,7 +32,7 @@ Feature: In a lesson activity a student should
| id_answer_editor_0 | Next page |
| id_jumpto_0 | Next page |
And I press "Save page"
And I select "Question" from the "qtype" singleselect
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "True/false"
And I press "Add a question page"
And I set the following fields to these values:
@ -45,7 +45,7 @@ Feature: In a lesson activity a student should
| id_response_editor_1 | Wrong |
| id_jumpto_1 | This page |
And I press "Save page"
And I select "Question" from the "qtype" singleselect
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "True/false"
And I press "Add a question page"
And I set the following fields to these values:
@ -194,7 +194,7 @@ Feature: In a lesson activity a student should
| id_response_editor_1 | Wrong |
| id_jumpto_1 | This page |
And I press "Save page"
And I select "Question" from the "qtype" singleselect
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "True/false"
And I press "Add a question page"
And I set the following fields to these values:
@ -214,7 +214,7 @@ Feature: In a lesson activity a student should
| id_answer_editor_0 | Next page |
| id_jumpto_0 | Next page |
And I press "Save page"
And I select "Question" from the "qtype" singleselect
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "True/false"
And I press "Add a question page"
And I set the following fields to these values:
@ -227,7 +227,7 @@ Feature: In a lesson activity a student should
| id_response_editor_1 | Wrong |
| id_jumpto_1 | This page |
And I press "Save page"
And I select "Question" from the "qtype" singleselect
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "True/false"
And I press "Add a question page"
And I set the following fields to these values:
@ -240,7 +240,7 @@ Feature: In a lesson activity a student should
| id_response_editor_1 | Wrong |
| id_jumpto_1 | This page |
And I press "Save page"
And I select "Question" from the "qtype" singleselect
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "True/false"
And I press "Add a question page"
And I set the following fields to these values:
@ -323,7 +323,7 @@ Feature: In a lesson activity a student should
| id_response_editor_1 | Wrong |
| id_jumpto_1 | This page |
And I press "Save page"
And I select "Question" from the "qtype" singleselect
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "True/false"
And I press "Add a question page"
And I set the following fields to these values:
@ -336,7 +336,7 @@ Feature: In a lesson activity a student should
| id_response_editor_1 | Wrong |
| id_jumpto_1 | This page |
And I press "Save page"
And I select "Question" from the "qtype" singleselect
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "True/false"
And I press "Add a question page"
And I set the following fields to these values:
@ -349,7 +349,7 @@ Feature: In a lesson activity a student should
| id_response_editor_1 | Wrong |
| id_jumpto_1 | This page |
And I press "Save page"
And I select "Question" from the "qtype" singleselect
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "True/false"
And I press "Add a question page"
And I set the following fields to these values:
@ -362,7 +362,7 @@ Feature: In a lesson activity a student should
| id_response_editor_1 | Wrong |
| id_jumpto_1 | This page |
And I press "Save page"
And I select "Question" from the "qtype" singleselect
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "True/false"
And I press "Add a question page"
And I set the following fields to these values:

View File

@ -53,7 +53,7 @@ Feature: In a lesson activity, teacher can add embedded images in questions answ
And I set the field "Describe this image for someone who cannot see it" to "It's the logo"
And I click on "Save image" "button"
And I press "Save page"
And I set the field "qtype" to "Question"
And I set the field "qtype" to "Add a question page"
And I set the field "Select a question type" to "True/false"
And I press "Add a question page"
And I set the following fields to these values: