Merge pull request #618 from turnitin/develop

Release 2022032301

Author: dwinn

CHANGELOG.md

@@ -1,3 +1,20 @@
+### Date:       2022-March-23
+### Release:	2022032301
+
+#### :wrench: Fixes and enhancements
+
+#### Grader field previously not updating correctly - now resolved
+
+We’ve fixed an issue that was occasionally causing the grader field in Moodle assignments to not update correctly.
+
+#### Submission failure relating to Moodle Quiz items resolved
+
+A bug was discovered that was causing submissions to fail. This was found to be linked to Moodle Quiz items. This issue has been resolved.
+
+This fix was submitted as a pull request by [@nwp90](https://github.com/nwp90) on Github. Thanks, Nick!
+
+---
+
 ### Date:       2021-September-15
 ### Release:	2021091501
 
@@ -19,6 +36,8 @@ Thanks to Dan Marsden And Alex Morris for highlighting and providing a fix for t
 
 Previously, Test Connection wouldn’t work until the plugin was configured. This could potentially cause confusion with users assuming that as no error had been shown the connection must already be established. We’ve changed it so that the Test Connection feature will always look to see if a successful connection has been made when checking.
 
+---
+
 ### Date:       2021-August-13
 ### Release:	2021081301
 
@@ -27,6 +46,8 @@ Previously, Test Connection wouldn’t work until the plugin was configured. Thi
 #### Classes will create successfully 
 A bug potentially resulted in classes created in Moodle to not sync correctly when we tried to create them in Turnitin. We’ve fixed this problem and you will now be able to create classes again.
 
+---
+
 ### Date:       2021-June-08
 ### Release:	2021060801
 

lang/en/plagiarism_turnitin.php

@@ -260,6 +260,7 @@
 $string['errorcode10'] = 'This file has not been submitted to Turnitin because there is a problem creating the class in Turnitin which is preventing submissions, please consult your API logs for further information';
 $string['errorcode11'] = 'This file has not been submitted to Turnitin because it is missing data';
 $string['errorcode12'] = 'This file has not been submitted to Turnitin because it belongs to an assignment in which the course was deleted. Row ID: ({$a->id}) | Course Module ID: ({$a->cm}) | User ID: ({$a->userid})';
+$string['errorcode14'] = 'This file has not been submitted to Turnitin because the attempt it belongs to could not be found';
 $string['queued'] = 'Queued';
 $string['updatereportscores'] = 'Update Report Scores for Turnitin Plagiarism Plugin';
 $string['sendqueuedsubmissions'] = 'Send Queued Files from the Turnitin Plagiarism Plugin';

lib.php

@@ -1532,6 +1532,11 @@ private function update_grade($cm, $submission, $userid) {
 
                 if ($currentgrade) {
                     $grade->id = $currentgrade->id;
+
+                    if ($cm->modname == 'assign') {
+                        $grade->grader = $USER->id;
+                    }
+
                     $return = $DB->update_record($table, $grade);
                 } else {
                     $grade->userid = $userid;
@@ -3133,7 +3138,13 @@ function plagiarism_turnitin_send_queued_submissions() {
                 }
 
                 require_once($CFG->dirroot . '/mod/quiz/locallib.php');
-                $attempt = quiz_attempt::create($queueditem->itemid);
+                try {
+                    $attempt = quiz_attempt::create($queueditem->itemid);
+                } catch (Exception $e) {
+                    plagiarism_turnitin_activitylog(get_string('errorcode14', 'plagiarism_turnitin'), "PP_NO_ATTEMPT");
+                    $errorcode = 14;
+                    break;
+                }
                 foreach ($attempt->get_slots() as $slot) {
                     $qa = $attempt->get_question_attempt($slot);
                     if ($queueditem->identifier == sha1($qa->get_response_summary())) {

version.php

@@ -19,7 +19,7 @@
  * @copyright 2012 iParadigms LLC
  */
 
-$plugin->version = 2021091501;
+$plugin->version = 2022032301;
 $plugin->release = "3.5+";
 $plugin->requires = 2018051700;
 $plugin->component = 'plagiarism_turnitin';