L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-44304-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE

Browse Source
This commit is contained in:
Marina Glancy
2014-09-08 12:58:41 +08:00
parent ddadff9655 168b3cb523
commit 84ddbba784
2 changed files with 73 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/feedback/editpdf/locallib.php
+1 -1
View File
@@ -58,7 +58,7 @@ class assign_feedback_editpdf extends assign_feedback_plugin {
*/
public function get_widget($userid, $grade, $readonly) {
$attempt = -1;
if ($grade) {
if ($grade && $grade->attemptnumber) {
$attempt = $grade->attemptnumber;
} else {
$grade = $this->assignment->get_user_grade($userid, true);
mod/assign/feedback/editpdf/tests/behat/annotate_pdf.feature
+72
View File
@@ -66,3 +66,75 @@ Feature: In an assignment, teacher can annotate PDF files during grading
And I click on "Close" "button"
And I press "Save changes"
And I should see "The grade changes were saved"
@javascript
Scenario: Submit a PDF file as a student in a team and annotate the PDF as a teacher
Given ghostscript is installed
And the following "courses" exist:
| fullname | shortname | category | groupmode |
| Course 1 | C1 | 0 | 1 |
And the following "users" exist:
| username | firstname | lastname | email |
| teacher1 | Teacher | 1 | teacher1@asd.com |
| student1 | Student | 1 | student1@asd.com |
| student2 | Student | 2 | student2@asd.com |
| student3 | Student | 3 | student3@asd.com |
| student4 | Student | 4 | student4@asd.com |
And the following "course enrolments" exist:
| user | course | role |
| teacher1 | C1 | editingteacher |
| student1 | C1 | student |
| student2 | C1 | student |
| student3 | C1 | student |
| student4 | C1 | student |
And the following "groups" exist:
| name | course | idnumber |
| G1 | C1 | G1 |
| G2 | C1 | G2 |
And the following "groupings" exist:
| name | course | idnumber |
| G1 | C1 | G1 |
And the following "group members" exist:
| user | group |
| student1 | G1 |
| student2 | G1 |
| student3 | G2 |
| student4 | G2 |
And the following "grouping groups" exist:
| grouping | group |
| G1 | G1 |
| G1 | G2 |
And I log in as "teacher1"
And I follow "Course 1"
And I turn editing mode on
And I add a "Assignment" to section "1" and I fill the form with:
| Assignment name | Test assignment name |
| Description | Submit your PDF file |
| assignsubmission_file_enabled | 1 |
| Maximum number of uploaded files | 2 |
| Students submit in groups | Yes |
| Grouping for student groups | G1 |
And I log out
When I log in as "student1"
And I follow "Course 1"
And I follow "Test assignment name"
And I press "Add submission"
And I upload "mod/assign/feedback/editpdf/tests/fixtures/submission.pdf" file to "File submissions" filemanager
And I press "Save changes"
Then I should see "Submitted for grading"
And I should see "submission.pdf"
And I should see "Not graded"
And I log out
And I log in as "teacher1"
And I follow "Course 1"
And I follow "Test assignment name"
And I follow "View/grade all submissions"
And I click on "Grade" "link" in the "Student 2" "table_row"
And I follow "Launch PDF editor..."
And I click on ".linebutton" "css_element"
And I drag ".drawingcanvas" "css_element" and I drop it in ".assignfeedback_editpdf_widget" "css_element"
And I click on "Close" "button"
And I press "Save changes"
And I should see "The grade changes were saved"
And I press "Continue"
And I should see "View annotated PDF..." in the "Student 1" "table_row"