/moodle mirrored from git://git.moodle.org/moodle.git

Permalink
Browse files

Merge branch 'MDL-60858-master' of git://github.com/ryanwyllie/moodle

  • Loading branch information...
@dmonllao
dmonllao committed Dec 18, 2017
2 parents f41e177 + e236dc1 commit 3bcf2d2895b20f993a20acfe5281e6040b9bf1e3
View file
4 mod/feedback/lang/en/feedback.php
@@ -46,7 +46,7 @@
$string['captchanotset'] = 'Captcha hasn\'t been set.';
$string['closebeforeopen'] = 'You have specified an end date before the start date.';
$string['completed_feedbacks'] = 'Submitted answers';
$string['complete_the_form'] = 'Answer the questions...';
$string['complete_the_form'] = 'Answer the questions';
$string['completed'] = 'Completed';
$string['completedon'] = 'Completed on {$a}';
$string['completionsubmit'] = 'View as completed if the feedback is submitted';
@@ -55,7 +55,7 @@
$string['confirmdeleteitem'] = 'Are you sure you want to delete this element?';
$string['confirmdeletetemplate'] = 'Are you sure you want to delete this template?';
$string['confirmusetemplate'] = 'Are you sure you want to use this template?';
$string['continue_the_form'] = 'Continue answering the questions...';
$string['continue_the_form'] = 'Continue answering the questions';
$string['count_of_nums'] = 'Count of numbers';
$string['courseid'] = 'courseid';
$string['creating_templates'] = 'Save these questions as a new template';
View file
24 mod/feedback/tests/behat/anonymous.feature
@@ -40,7 +40,7 @@ Feature: Anonymous feedback
Scenario: Guests can see anonymous feedback on front page but can not complete
When I follow "Site feedback"
Then I should not see "Answer the questions..."
Then I should not see "Answer the questions"
And I follow "Preview"
And I should see "Do you like our site?"
And I press "Continue"
@@ -52,7 +52,7 @@ Feature: Anonymous feedback
And I follow "Preview"
And I should see "Do you like our site?"
And I press "Continue"
And I follow "Answer the questions..."
And I follow "Answer the questions"
And I should see "Do you like our site?"
And I set the following fields to these values:
| Yes | 1 |
@@ -73,7 +73,7 @@ Feature: Anonymous feedback
And I follow "Preview"
And I should see "Do you like our site?"
And I press "Continue"
And I follow "Answer the questions..."
And I follow "Answer the questions"
And I should see "Do you like our site?"
And I set the following fields to these values:
| Yes | 1 |
@@ -85,7 +85,7 @@ Feature: Anonymous feedback
And I follow "Preview"
And I should see "Do you like our site?"
And I press "Continue"
And I follow "Answer the questions..."
And I follow "Answer the questions"
And I set the following fields to these values:
| No | 1 |
And I press "Submit your answers"
@@ -118,7 +118,7 @@ Feature: Anonymous feedback
And I follow "Preview"
And I should see "Do you like our site?"
And I press "Continue"
And I follow "Answer the questions..."
And I follow "Answer the questions"
And I should see "Do you like our site?"
And I set the following fields to these values:
| Yes | 1 |
@@ -139,7 +139,7 @@ Feature: Anonymous feedback
And I follow "Preview"
And I should see "Do you like our site?"
And I press "Continue"
And I follow "Answer the questions..."
And I follow "Answer the questions"
And I should see "Do you like our site?"
And I set the following fields to these values:
| Yes | 1 |
@@ -150,7 +150,7 @@ Feature: Anonymous feedback
And I follow "Preview"
And I should see "Do you like our site?"
And I press "Continue"
And I follow "Answer the questions..."
And I follow "Answer the questions"
And I should see "Do you like our site?"
And I set the following fields to these values:
| No | 1 |
@@ -192,7 +192,7 @@ Feature: Anonymous feedback
And I follow "Preview"
Then I should see "Do you like this course?"
And I press "Continue"
And I follow "Answer the questions..."
And I follow "Answer the questions"
And I should see "Do you like this course?"
And I set the following fields to these values:
| Yes | 1 |
@@ -204,7 +204,7 @@ Feature: Anonymous feedback
And I follow "Preview"
And I should see "Do you like this course?"
And I press "Continue"
And I follow "Answer the questions..."
And I follow "Answer the questions"
And I should see "Do you like this course?"
And I set the following fields to these values:
| No | 1 |
@@ -224,7 +224,7 @@ Feature: Anonymous feedback
And I follow "Preview"
And I should see "Do you like this course?"
And I press "Continue"
And I should not see "Answer the questions..."
And I should not see "Answer the questions"
And I navigate to "Show responses" in current page administration
And I should not see "Username"
And I should see "Anonymous entries (2)"
@@ -262,7 +262,7 @@ Feature: Anonymous feedback
When I log in as "user1"
And I am on "Course 1" course homepage
And I follow "Course feedback"
And I follow "Answer the questions..."
And I follow "Answer the questions"
And I set the following fields to these values:
| this is a short text answer | anontext |
And I press "Submit your answers"
@@ -280,7 +280,7 @@ Feature: Anonymous feedback
When I log in as "user1"
And I am on "Course 1" course homepage
And I follow "Course feedback"
And I follow "Answer the questions..."
And I follow "Answer the questions"
And I set the following fields to these values:
| this is a short text answer | usertext |
And I press "Submit your answers"
View file
18 mod/feedback/tests/behat/coursemapping.feature
@@ -74,7 +74,7 @@ Feature: Mapping courses in a feedback
And I log in as "user1"
And I am on site homepage
And I follow "Course feedback"
And I follow "Answer the questions..."
And I follow "Answer the questions"
And I should see "Acceptance test site" in the ".feedback_form" "css_element"
And I set the following fields to these values:
| option a | 1 |
@@ -83,7 +83,7 @@ Feature: Mapping courses in a feedback
And I press "Continue"
And I am on "Course 1" course homepage
And I click on "Course feedback" "link" in the "Feedback" "block"
And I follow "Answer the questions..."
And I follow "Answer the questions"
And I should not see "Acceptance test site" in the ".feedback_form" "css_element"
And I should see "C1" in the ".feedback_form" "css_element"
And I set the following fields to these values:
@@ -92,12 +92,12 @@ Feature: Mapping courses in a feedback
And I press "Submit your answers"
And I press "Continue"
And I click on "Course feedback" "link" in the "Feedback" "block"
And I should not see "Answer the questions..."
And I should not see "Answer the questions"
And I log out
And I log in as "user2"
And I am on "Course 1" course homepage
And I click on "Course feedback" "link" in the "Feedback" "block"
And I follow "Answer the questions..."
And I follow "Answer the questions"
And I should not see "Acceptance test site" in the ".feedback_form" "css_element"
And I should see "C1" in the ".feedback_form" "css_element"
And I set the following fields to these values:
@@ -150,15 +150,15 @@ Feature: Mapping courses in a feedback
And I am on site homepage
And I follow "Course feedback"
And I should see "You can only access this feedback from a course"
And I should not see "Answer the questions..."
And I should not see "Answer the questions"
And I am on "Course 1" course homepage
And "Feedback" "block" should not exist
And I should not see "Course feedback"
And I am on "Course 2" course homepage
And I click on "Course feedback" "link" in the "Feedback" "block"
And I follow "Answer the questions..."
And I follow "Answer the questions"
And I should not see "Acceptance test site" in the ".feedback_form" "css_element"
And I should see "C2" in the ".feedback_form" "css_element"
And I set the following fields to these values:
@@ -167,12 +167,12 @@ Feature: Mapping courses in a feedback
And I press "Submit your answers"
And I press "Continue"
And I click on "Course feedback" "link" in the "Feedback" "block"
And I should not see "Answer the questions..."
And I should not see "Answer the questions"
And I log out
And I log in as "user2"
And I am on "Course 2" course homepage
And I click on "Course feedback" "link" in the "Feedback" "block"
And I follow "Answer the questions..."
And I follow "Answer the questions"
And I should not see "Acceptance test site" in the ".feedback_form" "css_element"
And I should see "C2" in the ".feedback_form" "css_element"
And I set the following fields to these values:
@@ -184,7 +184,7 @@ Feature: Mapping courses in a feedback
And I log in as "user3"
And I am on "Course 3" course homepage
And I click on "Course feedback" "link" in the "Feedback" "block"
And I follow "Answer the questions..."
And I follow "Answer the questions"
And I should not see "Acceptance test site" in the ".feedback_form" "css_element"
And I should see "C3" in the ".feedback_form" "css_element"
And I set the following fields to these values:
View file
12 mod/feedback/tests/behat/multichoice.feature
@@ -59,7 +59,7 @@ Feature: Testing multichoice questions in feedback
And I log in as "student1"
And I am on "Course 1" course homepage
And I follow "Learning experience"
And I follow "Answer the questions..."
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 |
@@ -126,7 +126,7 @@ Feature: Testing multichoice questions in feedback
And I log in as "student2"
And I am on "Course 1" course homepage
And I follow "Learning experience"
And I follow "Answer the questions..."
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"
@@ -203,7 +203,7 @@ Feature: Testing multichoice questions in feedback
And I log in as "student1"
And I am on "Course 1" course homepage
And I follow "Learning experience"
And I follow "Answer the questions..."
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:
@@ -268,7 +268,7 @@ Feature: Testing multichoice questions in feedback
And I log in as "student2"
And I am on "Course 1" course homepage
And I follow "Learning experience"
And I follow "Answer the questions..."
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"
@@ -345,7 +345,7 @@ Feature: Testing multichoice questions in feedback
And I log in as "student1"
And I am on "Course 1" course homepage
And I follow "Learning experience"
And I follow "Answer the questions..."
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 |
@@ -393,7 +393,7 @@ Feature: Testing multichoice questions in feedback
And I log in as "student2"
And I am on "Course 1" course homepage
And I follow "Learning experience"
And I follow "Answer the questions..."
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"
View file
4 mod/feedback/tests/behat/multipleattempt.feature
@@ -41,7 +41,7 @@ Feature: Non anonymous feedback with multiple submissions
And I log in as "user1"
And I am on "Course 1" course homepage
And I follow "Course feedback"
And I follow "Answer the questions..."
And I follow "Answer the questions"
And I set the following fields to these values:
| first | 111 |
And I press "Next"
@@ -52,7 +52,7 @@ Feature: Non anonymous feedback with multiple submissions
And I log in as "user1"
And I am on "Course 1" course homepage
And I follow "Course feedback"
And I follow "Answer the questions..."
And I follow "Answer the questions"
Then the field "first" matches value "111"
And I press "Next"
And the field "second" matches value "222"
View file
14 mod/feedback/tests/behat/non_anonymous.feature
@@ -40,7 +40,7 @@ Feature: Non anonymous feedback
Scenario: Guests can see non anonymous feedback on front page but can not complete
When I follow "Site feedback"
Then I should not see "Answer the questions..."
Then I should not see "Answer the questions"
And I follow "Preview"
And I should see "Do you like our site?"
And I press "Continue"
@@ -52,7 +52,7 @@ Feature: Non anonymous feedback
And I follow "Preview"
And I should see "Do you like our site?"
And I press "Continue"
And I follow "Answer the questions..."
And I follow "Answer the questions"
And I should see "Do you like our site?"
And I set the following fields to these values:
| Yes of course | 1 |
@@ -70,7 +70,7 @@ Feature: Non anonymous feedback
And I log in as "user1"
And I am on site homepage
When I follow "Site feedback"
And I follow "Answer the questions..."
And I follow "Answer the questions"
And I should see "Do you like our site?"
And I set the following fields to these values:
| Yes of course | 1 |
@@ -79,7 +79,7 @@ Feature: Non anonymous feedback
And I log in as "user2"
And I am on site homepage
When I follow "Site feedback"
And I follow "Answer the questions..."
And I follow "Answer the questions"
And I set the following fields to these values:
| Not at all | 1 |
And I press "Submit your answers"
@@ -122,7 +122,7 @@ Feature: Non anonymous feedback
And I log in as "user1"
And I am on "Course 1" course homepage
And I follow "Course feedback"
And I follow "Answer the questions..."
And I follow "Answer the questions"
And I should see "Do you like this course?"
And I set the following fields to these values:
| Yes of course | 1 |
@@ -131,7 +131,7 @@ Feature: Non anonymous feedback
And I log in as "user2"
And I am on "Course 1" course homepage
And I follow "Course feedback"
And I follow "Answer the questions..."
And I follow "Answer the questions"
And I should see "Do you like this course?"
And I set the following fields to these values:
| Not at all | 1 |
@@ -151,7 +151,7 @@ Feature: Non anonymous feedback
And I follow "Preview"
And I should see "Do you like this course?"
And I press "Continue"
And I should not see "Answer the questions..."
And I should not see "Answer the questions"
And I navigate to "Show responses" in current page administration
And I should see "Non anonymous entries (2)"
And I should not see "Anonymous"
View file
4 mod/feedback/tests/behat/question_types.feature
@@ -69,7 +69,7 @@ Feature: Test creating different types of feedback questions for anonymous feedb
And I log in as "student1"
And I am on "Course 1" course homepage
And I follow "Learning experience"
And I follow "Answer the questions..."
And I follow "Answer the questions"
And I set the following fields to these values:
| this is a longer text answer | my long answer |
| option b | 1 |
@@ -84,7 +84,7 @@ Feature: Test creating different types of feedback questions for anonymous feedb
And I log in as "student2"
And I am on "Course 1" course homepage
And I follow "Learning experience"
And I follow "Answer the questions..."
And I follow "Answer the questions"
And I set the following fields to these values:
| this is a longer text answer | lots of feedbacks |
| option a | 1 |
View file
4 mod/feedback/tests/behat/question_types_non_anon.feature
@@ -73,7 +73,7 @@ Feature: Test creating different types of feedback questions for non-anonymous f
And I log in as "student1"
And I am on "Course 1" course homepage
And I follow "Learning experience"
And I follow "Answer the questions..."
And I follow "Answer the questions"
And I set the following fields to these values:
| this is a longer text answer | my long answer |
| option b | 1 |
@@ -88,7 +88,7 @@ Feature: Test creating different types of feedback questions for non-anonymous f
And I log in as "student2"
And I am on "Course 1" course homepage
And I follow "Learning experience"
And I follow "Answer the questions..."
And I follow "Answer the questions"
And I set the following fields to these values:
| this is a longer text answer | lots of feedbacks |
| option a | 1 |
View file
2 mod/feedback/view.php
@@ -139,7 +139,7 @@
} else {
$label = get_string('complete_the_form', 'feedback');
}
echo html_writer::div(html_writer::link($completeurl, $label), 'complete-feedback');
echo html_writer::div(html_writer::link($completeurl, $label, array('class' => 'btn btn-default')), 'complete-feedback');
} else {
// Feedback was already submitted.
echo $OUTPUT->notification(get_string('this_feedback_is_already_submitted', 'feedback'));

0 comments on commit 3bcf2d2

Please sign in to comment.