mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 12:45:04 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-MDL-53588-master' of https://github.com/marinaglancy/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2016-04-05 09:36:16 +08:00
commit 1d51dedb77
4 changed files with 449 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mod/feedback/db/upgrade.php
View File

@ -57,5 +57,20 @@ function xmldb_feedback_upgrade($oldversion) {
upgrade_mod_savepoint(true, 2016031600, 'feedback');
}
if ($oldversion < 2016040100) {
// In order to keep the previous "Analysis" results unchanged,
// set all multiple-answer multiplechoice questions as "Do not analyse empty submits"="Yes"
// because prior to this date this setting did not work.
$sql = "UPDATE {feedback_item} SET options = " . $DB->sql_concat('?', 'options') .
" WHERE typ = ? AND presentation LIKE ? AND options NOT LIKE ?";
$params = array('i', 'multichoice', 'c%', '%i%');
$DB->execute($sql, $params);
// Feedback savepoint reached.
upgrade_mod_savepoint(true, 2016040100, 'feedback');
}
return true;
}

14
mod/feedback/item/multichoice/lib.php
View File

@ -370,7 +370,7 @@ class feedback_item_multichoice extends feedback_item_base {
</span>
<span class="feedback_item_radiolabel_<?php echo $hv.'_'.$align;?>">
<label for="<?php echo $item->typ . '_' . $item->id.'_xxx';?>">
<?php print_string('not_selected', 'feedback');?>&nbsp;
<?php print_string('not_selected', 'feedback');?>
</label>
</span>
</li>
@ -480,7 +480,7 @@ class feedback_item_multichoice extends feedback_item_base {
</span>
<span class="feedback_item_radiolabel_<?php echo $hv.'_'.$align;?>">
<label for="<?php echo $item->typ.'_'.$item->id.'_xxx';?>">
<?php print_string('not_selected', 'feedback');?>&nbsp;
<?php print_string('not_selected', 'feedback');?>
</label>
</span>
</li>
@ -586,7 +586,7 @@ class feedback_item_multichoice extends feedback_item_base {
return true;
}
if (empty($value) OR !is_array($value) OR $value[0] == '' OR $value[0] == 0) {
if (empty($value) OR !is_array($value) OR !array_filter($value)) {
return false;
}
@ -596,7 +596,7 @@ class feedback_item_multichoice extends feedback_item_base {
public function create_value($data) {
$vallist = $data;
if (is_array($vallist)) {
$vallist = array_unique($vallist);
$vallist = array_unique(array_filter($vallist));
}
return trim($this->item_array_to_string($vallist));
}
@ -675,6 +675,9 @@ class feedback_item_multichoice extends feedback_item_base {
if (!is_array($value)) {
return $value;
}
if (empty($value)) {
return '0';
}
$retval = '';
$arrvals = array_values($value);
$arrvals = clean_param_array($arrvals, PARAM_INT); //prevent sql-injection
@ -750,6 +753,8 @@ class feedback_item_multichoice extends feedback_item_base {
$index = 1;
$checked = '';
$inputname = $item->typ. '_' . $item->id;
echo '<input type="hidden" name="'.$inputname.'[]" value="0" />';
foreach ($presentation as $check) {
foreach ($values as $val) {
if ($val == $index) {
@ -759,7 +764,6 @@ class feedback_item_multichoice extends feedback_item_base {
$checked = '';
}
}
$inputname = $item->typ. '_' . $item->id;
$inputid = $item->typ. '_' . $item->id.'_'.$index;
?>
<li class="feedback_item_check_<?php echo $hv.'_'.$align;?>">

424
mod/feedback/tests/behat/multichoice.feature Normal file
View File

@ -0,0 +1,424 @@
@mod @mod_feedback
Feature: Testing multichoice questions in feedback
In order to create feedbacks
As a teacher
I need to be able to create different types of multichoice questions
Background:
Given the following "users" exist:
| username | firstname | lastname |
| teacher1 | Teacher | 1 |
| student1 | Student | 1 |
| student2 | Student | 2 |
And the following "courses" exist:
| fullname | shortname |
| Course 1 | C1 |
And the following "course enrolments" exist:
| user | course | role |
| teacher1 | C1 | editingteacher |
| student1 | C1 | student |
| student2 | C1 | student |
And I log in as "admin"
And I navigate to "Manage activities" node in "Site administration > Plugins > Activity modules"
And I click on "Show" "link" in the "Feedback" "table_row"
And I log out
And the following "activities" exist:
| activity | name | course | idnumber |
| feedback | Learning experience | C1 | feedback0 |
When I log in as "teacher1"
And I follow "Course 1"
And I follow "Learning experience"
And I follow "Edit questions"
@javascript
Scenario: Non-rated single-answer multiple choice questions in feedback
And I add a "Multiple choice" question to the feedback with:
| Question | this is a multiple choice 1 |
| Label | multichoice1 |
| Multiple choice type | Multiple choice - single answer |
| Multiple choice values | option a\noption b\noption c |
And I add a "Label" question to the feedback with:
| Contents | this is the first page of the feedback |
And I select "Add a page break" from the "Add question" singleselect
And I add a "Multiple choice" question to the feedback with:
| Question | this is a multiple choice 2 |
| Label | multichoice2 |
| Multiple choice type | Multiple choice - single answer |
| Multiple choice values | option d\noption e\noption f |
| Required | 1 |
And I add a "Label" question to the feedback with:
| Contents | this is the second page of the feedback |
And I select "Add a page break" from the "Add question" singleselect
And I add a "Multiple choice" question to the feedback with:
| Question | this is a multiple choice 3 |
| Label | multichoice3 |
| Multiple choice type | Multiple choice - single answer |
| Multiple choice values | option g\noption h\noption i |
| Hide the "Not selected" option | Yes |
| Dependence item | multichoice2 |
| Dependence value | option d |
And I add a "Label" question to the feedback with:
| Contents | this is the third page of the feedback |
And I log out
And I log in as "student1"
And I follow "Course 1"
And I follow "Learning experience"
And I follow "Answer the questions..."
# Examine the first page, select nothing, go to the next page
Then the following fields match these values:
| Not selected | 1 |
| option a | 0 |
| option b | 0 |
| option c | 0 |
And "Previous page" "button" should not exist
And "Submit your answers" "button" should not exist
And I should see "this is the first page of the feedback"
And I should not see "this is the second page of the feedback"
And I should not see "this is the third page of the feedback"
And I press "Next page"
# Examine the second page, select nothing, try to go to the next page
And I should see "Not selected"
And the following fields match these values:
| Not selected | 1 |
| option d | 0 |
| option e | 0 |
| option f | 0 |
And "Previous page" "button" should exist
And "Submit your answers" "button" should not exist
And I should not see "this is the first page of the feedback"
And I should see "this is the second page of the feedback"
And I should not see "this is the third page of the feedback"
And I press "Next page"
# We are still on the second page because the field is required
And I should see "Saving failed because missing or false values" in the ".error" "css_element"
And I should see "this is the second page of the feedback"
And I set the field "option e" to "1"
And the following fields match these values:
| Not selected | 0 |
| option d | 0 |
| option e | 1 |
| option f | 0 |
And I press "Next page"
# Now we are on the third page, element is not shown because of wrong dependency.
And I should see "this is the third page of the feedback"
And I should not see "this is a multiple choice 3"
# Go back, check that values are preserved and change the option to enable dependency.
And I press "Previous page"
And the following fields match these values:
| Not selected | 0 |
| option d | 0 |
| option e | 1 |
| option f | 0 |
And I set the field "option d" to "1"
And I press "Next page"
# Now third page contains all items.
And I should see "this is a multiple choice 3"
And I should see "this is the third page of the feedback"
And I should not see "Not selected"
And the following fields match these values:
| option g | 0 |
| option h | 0 |
| option i | 0 |
And "Previous page" "button" should exist
And "Next page" "button" should not exist
And "Submit your answers" "button" should exist
And I set the field "option i" to "1"
And I press "Submit your answers"
And I log out
# Student 2 tries to trick - he answers the third question and then
# goes back and changes dependency question. Analysis should not show this answer!
And I log in as "student2"
And I follow "Course 1"
And I follow "Learning experience"
And I follow "Answer the questions..."
And I set the field "option a" to "1"
And I press "Next page"
And I set the field "option d" to "1"
And I press "Next page"
And I set the field "option g" to "1"
And I press "Previous page"
And I set the field "option f" to "1"
And I press "Next page"
And I press "Submit your answers"
And I log out
# Login as teacher and check analysis
And I log in as "teacher1"
And I follow "Course 1"
And I follow "Learning experience"
And I follow "Analysis"
And I should see "Submitted answers: 2"
And I should see "Questions: 3"
And I should see "1 (50.00 %)" in the "option a:" "table_row"
And I should not see "%" in the "option b:" "table_row"
And I should not see "%" in the "option c:" "table_row"
And I should see "1 (50.00 %)" in the "option d:" "table_row"
And I should not see "%" in the "option e:" "table_row"
And I should see "1 (50.00 %)" in the "option f:" "table_row"
And I should not see "%" in the "option g:" "table_row"
And I should not see "%" in the "option h:" "table_row"
And I should see "1 (100.00 %)" in the "option i:" "table_row"
# Change the settings so we don't analyse empty submits
And I follow "Edit questions"
And I click on "Edit question" "link" in the "//li[contains(@class, 'feedback_itemlist') and contains(.,'multichoice1')]" "xpath_element"
And I set the field "Do not analyse empty submits" to "Yes"
And I press "Save changes to question"
And I follow "Analysis"
And I should see "1 (100.00 %)" in the "option a:" "table_row"
And I should not see "%" in the "option b:" "table_row"
And I should not see "%" in the "option c:" "table_row"
And I log out
Scenario: Non-rated multiple-answers multiple choice questions in feedback
# Create a feedback with three pages, required and dependent questions.
And I add a "Multiple choice" question to the feedback with:
| Question | this is a multiple choice 1 |
| Label | multichoice1 |
| Multiple choice type | Multiple choice - multiple answers |
| Multiple choice values | option a\noption b\noption c |
And I add a "Label" question to the feedback with:
| Contents | this is the first page of the feedback |
And I select "Add a page break" from the "Add question" singleselect
And I add a "Multiple choice" question to the feedback with:
| Question | this is a multiple choice 2 |
| Label | multichoice2 |
| Multiple choice type | Multiple choice - multiple answers |
| Multiple choice values | option d\noption e\noption f |
| Required | 1 |
And I add a "Label" question to the feedback with:
| Contents | this is the second page of the feedback |
And I select "Add a page break" from the "Add question" singleselect
And I add a "Multiple choice" question to the feedback with:
| Question | this is a multiple choice 3 |
| Label | multichoice3 |
| Multiple choice type | Multiple choice - multiple answers |
| Multiple choice values | option g\noption h\noption i |
| Dependence item | multichoice2 |
| Dependence value | option d |
And I add a "Label" question to the feedback with:
| Contents | this is the third page of the feedback |
And I log out
# Login as the first student.
And I log in as "student1"
And I follow "Course 1"
And I follow "Learning experience"
And I follow "Answer the questions..."
# Examine the first page, select nothing, go to the next page
And I should not see "Not selected"
And the following fields match these values:
| option a | 0 |
| option b | 0 |
| option c | 0 |
And "Previous page" "button" should not exist
And "Submit your answers" "button" should not exist
And I should see "this is the first page of the feedback"
And I should not see "this is the second page of the feedback"
And I should not see "this is the third page of the feedback"
And I press "Next page"
# Examine the second page, select nothing, try to go to the next page
Then I should not see "Not selected"
And the following fields match these values:
| option d | 0 |
| option e | 0 |
| option f | 0 |
And "Previous page" "button" should exist
And "Submit your answers" "button" should not exist
And I should not see "this is the first page of the feedback"
And I should see "this is the second page of the feedback"
And I should not see "this is the third page of the feedback"
And I press "Next page"
# We are still on the second page because the field is required
And I should see "Saving failed because missing or false values" in the ".error" "css_element"
And I should see "this is the second page of the feedback"
And I set the field "option e" to "1"
And I set the field "option f" to "1"
And the following fields match these values:
| option d | 0 |
| option e | 1 |
| option f | 1 |
And I press "Next page"
# Now we are on the third page, element is not shown because of wrong dependency.
And I should see "this is the third page of the feedback"
And I should not see "this is a multiple choice 3"
# Go back, check that values are preserved and change the option to enable dependency.
And I press "Previous page"
And the following fields match these values:
| option d | 0 |
| option e | 1 |
| option f | 1 |
And I set the field "option d" to "1"
And I set the field "option e" to "0"
And I press "Next page"
# Now third page contains all items.
And I should see "this is a multiple choice 3"
And I should see "this is the third page of the feedback"
And the following fields match these values:
| option g | 0 |
| option h | 0 |
| option i | 0 |
And "Previous page" "button" should exist
And "Next page" "button" should not exist
And "Submit your answers" "button" should exist
And I set the field "option i" to "1"
And I press "Submit your answers"
And I log out
# Student 2 tries to trick - he answers the third question and then
# goes back and changes dependency question. Analysis should not show this answer!
And I log in as "student2"
And I follow "Course 1"
And I follow "Learning experience"
And I follow "Answer the questions..."
And I set the field "option a" to "1"
And I set the field "option b" to "1"
And I press "Next page"
And I set the field "option d" to "1"
And I press "Next page"
And I set the field "option g" to "1"
And I press "Previous page"
And I set the field "option d" to "0"
And I set the field "option f" to "1"
And I press "Next page"
And I press "Submit your answers"
And I log out
# Login as teacher and check analysis
And I log in as "teacher1"
And I follow "Course 1"
And I follow "Learning experience"
And I follow "Analysis"
And I should see "Submitted answers: 2"
And I should see "Questions: 3"
And I should see "1 (50.00 %)" in the "option a:" "table_row"
And I should see "1 (50.00 %)" in the "option b:" "table_row"
And I should not see "%" in the "option c:" "table_row"
And I should see "1 (50.00 %)" in the "option d:" "table_row"
And I should not see "%" in the "option e:" "table_row"
And I should see "2 (100.00 %)" in the "option f:" "table_row"
And I should not see "%" in the "option g:" "table_row"
And I should not see "%" in the "option h:" "table_row"
And I should see "1 (100.00 %)" in the "option i:" "table_row"
# Change the settings so we don't analyse empty submits
And I follow "Edit questions"
And I click on "Edit question" "link" in the "//li[contains(@class, 'feedback_itemlist') and contains(.,'multichoice1')]" "xpath_element"
And I set the field "Do not analyse empty submits" to "Yes"
And I press "Save changes to question"
And I follow "Analysis"
And I should see "1 (100.00 %)" in the "option a:" "table_row"
And I should see "1 (100.00 %)" in the "option b:" "table_row"
And I should not see "%" in the "option c:" "table_row"
And I log out
Scenario: Non-rated single-answer dropdown multiple choice questions in feedback
And I add a "Multiple choice" question to the feedback with:
| Question | this is a multiple choice 1 |
| Label | multichoice1 |
| Multiple choice type | Multiple choice - single answer allowed (dropdownlist) |
| Multiple choice values | option a\noption b\noption c |
And I add a "Label" question to the feedback with:
| Contents | this is the first page of the feedback |
And I select "Add a page break" from the "Add question" singleselect
And I add a "Multiple choice" question to the feedback with:
| Question | this is a multiple choice 2 |
| Label | multichoice2 |
| Multiple choice type | Multiple choice - single answer allowed (dropdownlist) |
| Multiple choice values | option d\noption e\noption f |
| Required | 1 |
And I add a "Label" question to the feedback with:
| Contents | this is the second page of the feedback |
And I select "Add a page break" from the "Add question" singleselect
And I add a "Multiple choice" question to the feedback with:
| Question | this is a multiple choice 3 |
| Label | multichoice3 |
| Multiple choice type | Multiple choice - single answer allowed (dropdownlist) |
| Multiple choice values | option g\noption h\noption i |
| Dependence item | multichoice2 |
| Dependence value | option d |
And I add a "Label" question to the feedback with:
| Contents | this is the third page of the feedback |
And I log out
And I log in as "student1"
And I follow "Course 1"
And I follow "Learning experience"
And I follow "Answer the questions..."
# Examine the first page, select nothing, go to the next page
Then the following fields match these values:
| this is a multiple choice 1 | 0 |
And "Previous page" "button" should not exist
And "Submit your answers" "button" should not exist
And I should see "this is the first page of the feedback"
And I should not see "this is the second page of the feedback"
And I should not see "this is the third page of the feedback"
And I press "Next page"
# Examine the second page, select nothing, try to go to the next page
And the following fields match these values:
| this is a multiple choice 2 | 0 |
And "Previous page" "button" should exist
And "Submit your answers" "button" should not exist
And I should not see "this is the first page of the feedback"
And I should see "this is the second page of the feedback"
And I should not see "this is the third page of the feedback"
And I press "Next page"
# We are still on the second page because the field is required
And I should see "Saving failed because missing or false values" in the ".error" "css_element"
And I should see "this is the second page of the feedback"
And I set the field "this is a multiple choice 2" to "option e"
And I press "Next page"
# Now we are on the third page, element is not shown because of wrong dependency.
And I should see "this is the third page of the feedback"
And I should not see "this is a multiple choice 3"
# Go back, check that values are preserved and change the option to enable dependency.
And I press "Previous page"
And the following fields match these values:
| this is a multiple choice 2 | option e |
And I set the field "this is a multiple choice 2" to "option d"
And I press "Next page"
# Now third page contains all items.
And I should see "this is the third page of the feedback"
And the following fields match these values:
| this is a multiple choice 3 | 0 |
And "Previous page" "button" should exist
And "Next page" "button" should not exist
And "Submit your answers" "button" should exist
And I set the field "this is a multiple choice 3" to "option i"
And I press "Submit your answers"
And I log out
# Student 2 tries to trick - he answers the third question and then
# goes back and changes dependency question. Analysis should not show this answer!
And I log in as "student2"
And I follow "Course 1"
And I follow "Learning experience"
And I follow "Answer the questions..."
And I set the field "this is a multiple choice 1" to "option a"
And I press "Next page"
And I set the field "this is a multiple choice 2" to "option d"
And I press "Next page"
And I set the field "this is a multiple choice 3" to "option g"
And I press "Previous page"
And I set the field "this is a multiple choice 2" to "option f"
And I press "Next page"
And I press "Submit your answers"
And I log out
# Login as teacher and check analysis
And I log in as "teacher1"
And I follow "Course 1"
And I follow "Learning experience"
And I follow "Analysis"
And I should see "Submitted answers: 2"
And I should see "Questions: 3"
And I should see "1 (50.00 %)" in the "option a:" "table_row"
And I should not see "%" in the "option b:" "table_row"
And I should not see "%" in the "option c:" "table_row"
And I should see "1 (50.00 %)" in the "option d:" "table_row"
And I should not see "%" in the "option e:" "table_row"
And I should see "1 (50.00 %)" in the "option f:" "table_row"
And I should not see "%" in the "option g:" "table_row"
And I should not see "%" in the "option h:" "table_row"
And I should see "1 (100.00 %)" in the "option i:" "table_row"
# Change the settings so we don't analyse empty submits
And I follow "Edit questions"
And I click on "Edit question" "link" in the "//li[contains(@class, 'feedback_itemlist') and contains(.,'multichoice1')]" "xpath_element"
And I set the field "Do not analyse empty submits" to "Yes"
And I press "Save changes to question"
And I follow "Analysis"
And I should see "1 (100.00 %)" in the "option a:" "table_row"
And I should not see "%" in the "option b:" "table_row"
And I should not see "%" in the "option c:" "table_row"
And I log out

2
mod/feedback/version.php
View File

@ -24,7 +24,7 @@
defined('MOODLE_INTERNAL') || die();
$plugin->version = 2016031600; // The current module version (Date: YYYYMMDDXX)
$plugin->version = 2016040100; // The current module version (Date: YYYYMMDDXX)
$plugin->requires = 2015111000; // Requires this Moodle version
$plugin->component = 'mod_feedback'; // Full name of the plugin (used for diagnostics)
$plugin->cron = 0;