mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-20 07:30:01 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-20304-master' of git://github.com/danpoltawski/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2015-01-06 10:37:10 +08:00
commit fc8925206e
3 changed files with 104 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod/lesson/lib.php
View File

@ -430,11 +430,11 @@ function lesson_grade_item_update($lesson, $grades=null) {
$params = array('itemname'=>$lesson->name);
}
if ($lesson->grade > 0) {
if (!$lesson->practice and $lesson->grade > 0) {
$params['gradetype'] = GRADE_TYPE_VALUE;
$params['grademax'] = $lesson->grade;
$params['grademin'] = 0;
} else if ($lesson->grade < 0) {
} else if (!$lesson->practice and $lesson->grade < 0) {
$params['gradetype'] = GRADE_TYPE_SCALE;
$params['scaleid'] = -$lesson->grade;

97
mod/lesson/tests/behat/lesson_practice.feature Normal file
View File

@ -0,0 +1,97 @@
@mod @mod_lesson
Feature: Practice mode in a lesson activity
In order to improve my students understanding of a subject
As a teacher
I need to be able to set ungraded practice lesson activites
Background:
Given the following "users" exist:
| username | firstname | lastname | email |
| teacher1 | Teacher | 1 | teacher1@asd.com |
| student1 | Student | 1 | student1@asd.com |
And the following "courses" exist:
| fullname | shortname | category |
| Course 1 | C1 | 0 |
And the following "course enrolments" exist:
| user | course | role |
| teacher1 | C1 | editingteacher |
| student1 | C1 | student |
And I log in as "teacher1"
And I follow "Course 1"
And I turn editing mode on
# Setup a basic lesson, we'll adjust it in the scenarios later.
And I add a "Lesson" to section "1" and I fill the form with:
| Name | Test lesson name |
| Description | Lesson description |
And I follow "Test lesson name"
And I follow "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:
| Page title | True or False |
| Page contents | Paper is made from trees. |
| id_answer_editor_0 | True |
| id_answer_editor_1 | False |
And I press "Save page"
@javascript
Scenario: Non-practice lesson records grades in the gradebook
Given I follow "Test lesson name"
And I navigate to "Edit settings" node in "Lesson administration"
And I set the following fields to these values:
| Name | Non-practice lesson |
| Description | This lesson will affect your course grade |
| Practice lesson | No |
And I press "Save and display"
And I log out
When I log in as "student1"
And I follow "Course 1"
And I follow "Non-practice lesson"
And I set the following fields to these values:
| True | 1 |
And I press "Submit"
Then I should see "View grades"
And I navigate to "Grades" node in "Course administration"
And I should see "Non-practice lesson"
@javascript
Scenario: Practice lesson doesn't record grades in the gradebook
Given I follow "Test lesson name"
And I navigate to "Edit settings" node in "Lesson administration"
And I set the following fields to these values:
| Name | Practice lesson |
| Description | This lesson will NOT affect your course grade |
| Practice lesson | Yes |
And I press "Save and display"
And I log out
When I log in as "student1"
And I follow "Course 1"
And I follow "Practice lesson"
And I set the following fields to these values:
| True | 1 |
And I press "Submit"
Then I should not see "View grades"
And I navigate to "Grades" node in "Course administration"
And I should not see "Practice lesson"
# TODO: uncomment this when MDL-48631 is resolved.
#@javascript
#Scenario: Practice lesson with scale doesn't record grades in the gradebook
# Given I follow "Test lesson name"
# And I navigate to "Edit settings" node in "Lesson administration"
# And I set the following fields to these values:
# | Name | Practice lesson with scale |
# | Description | This lesson will NOT affect your course grade |
# | Practice lesson | Yes |
# | Type | Scale |
# And I press "Save and display"
# And I log out
# When I log in as "student1"
# And I follow "Course 1"
# And I follow "Practice lesson with scale"
# And I set the following fields to these values:
# | True | 1 |
# And I press "Submit"
# Then I should not see "View grades"
# And I navigate to "Grades" node in "Course administration"
# And I should not see "Practice lesson with scale"

7
mod/lesson/view.php
View File

@ -584,8 +584,11 @@ if ($pageid != LESSON_EOL) {
$url = new moodle_url('/course/view.php', array('id'=>$course->id));
$lessoncontent .= html_writer::link($url, get_string('returnto', 'lesson', format_string($course->fullname, true)), array('class'=>'centerpadded lessonbutton standardbutton'));
$url = new moodle_url('/grade/index.php', array('id'=>$course->id));
$lessoncontent .= html_writer::link($url, get_string('viewgrades', 'lesson'), array('class'=>'centerpadded lessonbutton standardbutton'));
if (!$lesson->practice) {
$url = new moodle_url('/grade/index.php', array('id' => $course->id));
$lessoncontent .= html_writer::link($url, get_string('viewgrades', 'lesson'),
array('class' => 'centerpadded lessonbutton standardbutton'));
}
lesson_add_fake_blocks($PAGE, $cm, $lesson, $timer);
echo $lessonoutput->header($lesson, $cm, $currenttab, $extraeditbuttons, $lessonpageid, get_string("congratulations", "lesson"));