diff --git a/tests/behat/advancedgrading_guide.feature b/tests/behat/advancedgrading_guide.feature index ecad567..2582f54 100755 --- a/tests/behat/advancedgrading_guide.feature +++ b/tests/behat/advancedgrading_guide.feature @@ -1,135 +1,136 @@ @report @report_advancedgrading @report_advancedgrading_guide @javascript Feature: Confirm advancedgrading report works for multiple submission of guide - In order to view view advanced grades with marking guide - Set blind marking, make an attempt and view report, make second submission and view report - Reveal student names and view report - Background: - Given the following config values are set as admin: - | enable_javascriptlayout | 0 | report_advancedgrading | - Scenario: Submit marking guide then grade,reset and grade again. - Given the following "users" exist: - | username | firstname | lastname | email | - | teacher1 | Teacher | 1 | teacher1@example.com | - | student1 | Student | 1 | student1@example.com | - And the following "courses" exist: - | fullname | shortname | format | - | Course 1 | C1 | topics | - And the following "course enrolments" exist: - | user | course | role | - | teacher1 | C1 | editingteacher | - | student1 | C1 | student | - - Given the following "activity" exists: - | activity | assign | - | name | Test assignment 1 | - | course | C1 | - | section | 1 | - | assignsubmission_file_enabled | 0 | - | assignsubmission_onlinetext_enabled | 1 | - | attemptreopenmethod | manual | - | blindmarking | 1 | - | assignfeedback_comments_enabled | 1 | - - And I am on the "Test assignment 1" "assign activity editing" page logged in as teacher1 - And I set the following fields to these values: - | Grading method | Marking guide | - And I press "Save and return to course" + In order to view view advanced grades with marking guide + Set blind marking, make an attempt and view report, make second submission and view report + + Reveal student names and view report + Background: + Given the following config values are set as admin: + | enable_javascriptlayout | 0 | report_advancedgrading | + Scenario: Submit marking guide then grade,reset and grade again. + Given the following "users" exist: + | username | firstname | lastname | email | + | teacher1 | Teacher | 1 | teacher1@example.com | + | student1 | Student | 1 | student1@example.com | + And the following "courses" exist: + | fullname | shortname | format | + | Course 1 | C1 | topics | + And the following "course enrolments" exist: + | user | course | role | + | teacher1 | C1 | editingteacher | + | student1 | C1 | student | + + Given the following "activity" exists: + | activity | assign | + | name | Test assignment 1 | + | course | C1 | + | section | 1 | + | assignsubmission_file_enabled | 0 | + | assignsubmission_onlinetext_enabled | 1 | + | maxattempts | 3 | + | attemptreopenmethod | manual | + | blindmarking | 1 | + | assignfeedback_comments_enabled | 1 | + + And I am on the "Test assignment 1" "assign activity editing" page logged in as teacher1 + And I set the following fields to these values: + | Grading method | Marking guide | + And I press "Save and return to course" # Defining a marking guide - When I go to "Test assignment 1" advanced grading definition page - And I change window size to "large" - - And I set the following fields to these values: - | Name | Assignment 1 marking guide | - | Description | Marking guide test description | - And I define the following marking guide: - | Criterion name | Description for students | Description for markers | Maximum score | - | Guide criterion A | Guide A description for students | Guide A description for markers | 30 | - | Guide criterion B | Guide B description for students | Guide B description for markers | 30 | - | Guide criterion C | Guide C description for students | Guide C description for markers | 40 | - And I press "Save marking guide and make it ready" - - When I am on the "Test assignment 1" "assign activity" page - And I navigate to "Marking guide breakdown report" in current page administration - - And I wait until the page is ready + When I go to "Test assignment 1" advanced grading definition page + And I change window size to "large" + + And I set the following fields to these values: + | Name | Assignment 1 marking guide | + | Description | Marking guide test description | + And I define the following marking guide: + | Criterion name | Description for students | Description for markers | Maximum score | + | Guide criterion A | Guide A description for students | Guide A description for markers | 30 | + | Guide criterion B | Guide B description for students | Guide B description for markers | 30 | + | Guide criterion C | Guide C description for students | Guide C description for markers | 40 | + And I press "Save marking guide and make it ready" + + When I am on the "Test assignment 1" "assign activity" page + And I navigate to "Marking guide breakdown report" in current page administration + + And I wait until the page is ready # And I should see "No marked submissions found" - And I log out - And I log in as "student1" - And I am on "Course 1" course homepage - And I click on "Test assignment 1" "link" - And I click on "Add submission" "button" - And I set the field "Online text" to "First response" - And I click on "Save changes" "button" - And I log out + And I log out + And I log in as "student1" + And I am on "Course 1" course homepage + And I click on "Test assignment 1" "link" + And I click on "Add submission" "button" + And I set the field "Online text" to "First response" + And I click on "Save changes" "button" + And I log out # Admin can see the real student name even when blind marking is on - And I log in as "admin" - And I am on "Course 1" course homepage with editing mode on - And I go to "Student 1" "Test assignment 1" activity advanced grading page - And I grade by filling the marking guide with: - | Guide criterion A | 25 | Very good | - | Guide criterion B | 20 | | - | Guide criterion C | 35 | Nice! | - And I press "Save changes" - And I complete the advanced grading form with these values: - | Feedback comments | In general... work harder... | - And I am on "Course 1" course homepage with editing mode on - And I am on the "Test assignment 1" "assign activity" page - And I navigate to "Marking guide breakdown report" in current page administration + And I log in as "admin" + And I am on "Course 1" course homepage with editing mode on + And I go to "Student 1" "Test assignment 1" activity advanced grading page + And I grade by filling the marking guide with: + | Guide criterion A | 25 | Very good | + | Guide criterion B | 20 | | + | Guide criterion C | 35 | Nice! | + And I press "Save changes" + And I complete the advanced grading form with these values: + | Feedback comments | In general... work harder... | + And I am on "Course 1" course homepage with editing mode on + And I am on the "Test assignment 1" "assign activity" page + And I navigate to "Marking guide breakdown report" in current page administration # Blind marking is enabled so I should not see the student name - And I should not see "student1" - And I should see "80.00" - And I should see "35.00" - - And I go to "Student 1" "Test assignment 1" activity advanced grading page - And I set the following fields to these values: - | Allow another attempt | 1 | - And I save the advanced grading form - And I am on "Course 1" course homepage - - When I am on the "Test assignment 1" "assign activity" page - And I navigate to "Marking guide breakdown report" in current page administration - And I wait until the page is ready - # And I should see "No marked submissions found" - - And I log out - And I log in as "student1" - And I am on "Course 1" course homepage - And I click on "Test assignment 1" "link" - - And I click on "Add a new attempt" "button" - And I set the field "Online text" to "Second response" - And I click on "Save changes" "button" - And I log out - - And I log in as "admin" - And I am on "Course 1" course homepage with editing mode on - - And I go to "Student 1" "Test assignment 1" activity advanced grading page - And I grade by filling the marking guide with: - | Guide criterion A | 30 | Excellent | - | Guide criterion B | 30 | Awesome | - | Guide criterion C | 39 | Outstanding! | - And I press "Save changes" - And I complete the advanced grading form with these values: - | Feedback comments | A great improvement on the first submission | - And I am on "Course 1" course homepage - When I am on the "Test assignment 1" "assign activity" page - And I navigate to "Marking guide breakdown report" in current page administration - And I wait until the page is ready - - And I should see "99.00" - And I should see "Awesome" - - And I am on "Course 1" course homepage - When I am on the "Test assignment 1" "assign activity" page - And I follow "View all submissions" - And I select "Reveal student identities" from the "Grading action" singleselect - And I press "Continue" - - And I am on "Course 1" course homepage - When I am on the "Test assignment 1" "assign activity" page - And I navigate to "Marking guide breakdown report" in current page administration - And I should see "student1" - And I should see "Awesome" + And I should not see "student1" + And I should see "80.00" + And I should see "35.00" + + And I go to "Student 1" "Test assignment 1" activity advanced grading page + And I set the following fields to these values: + | Allow another attempt | 1 | + And I save the advanced grading form + And I am on "Course 1" course homepage + + When I am on the "Test assignment 1" "assign activity" page + And I navigate to "Marking guide breakdown report" in current page administration + And I wait until the page is ready + + And I log out + And I log in as "student1" + And I am on "Course 1" course homepage + And I click on "Test assignment 1" "link" + + And I click on "Add a new attempt" "button" + And I set the field "Online text" to "Second response" + And I click on "Save changes" "button" + And I log out + + And I log in as "admin" + And I am on "Course 1" course homepage with editing mode on + + And I go to "Student 1" "Test assignment 1" activity advanced grading page + And I grade by filling the marking guide with: + | Guide criterion A | 30 | Excellent | + | Guide criterion B | 30 | Awesome | + | Guide criterion C | 39 | Outstanding! | + And I press "Save changes" + And I complete the advanced grading form with these values: + | Feedback comments | A great improvement on the first submission | + And I am on "Course 1" course homepage + When I am on the "Test assignment 1" "assign activity" page + And I navigate to "Marking guide breakdown report" in current page administration + And I wait until the page is ready + + And I should see "99.00" + And I should see "Awesome" + + And I am on "Course 1" course homepage + When I am on the "Test assignment 1" "assign activity" page + And I follow "Submissions" + And I choose the "Reveal student identities" item in the "Actions" action menu + And I press "Continue" + + And I am on "Course 1" course homepage + When I am on the "Test assignment 1" "assign activity" page + And I navigate to "Marking guide breakdown report" in current page administration + And I should see "student1" + And I should see "Awesome" diff --git a/version.php b/version.php index 5d79af2..e8c4466 100755 --- a/version.php +++ b/version.php @@ -24,12 +24,11 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ - defined('MOODLE_INTERNAL') || die; $plugin->version = 2024081900; // The current plugin version (Date: YYYYMMDDXX). -$plugin->requires = 2021051715; // Moodle 3.11. -$plugin->release = '1.0'; -$plugin->supported = [311, 404]; -$plugin->maturity = MATURITY_BETA; +$plugin->requires = 2022040100; // Moodle 4.0. +$plugin->release = '1.41'; +$plugin->supported = [400, 405]; +$plugin->maturity = MATURITY_STABLE; $plugin->component = 'report_advancedgrading'; // Full name of the plugin (used for diagnostics).