Merge pull request #713 from turnitin/develop

Release v2024020601

Author: ixiongtii

CHANGELOG.md

@@ -1,3 +1,15 @@
+### Date:       2024-February-06
+### Release:    v2024020601
+
+#### Anonymous Marking Fixed
+An issue has been resolved with anonymous marking, where previously when an instructor made a request to reveal a student’s name prior to the feedback release date, the required reason field for the early reveal was not actually being enforced. Instructors will now be required to fill in this field when deciding to reveal a student name early.
+
+#### Removed Summary Content in Moodle Direct V2 Assignment Inbox
+In versions 4.0+ of Moodle, the assignment summary content was being displayed twice in two separate locations. This update removes the display of the summary content from the Moodle Direct V2 inbox and it is now only displayed just above the inbox.
+
+#### Resolved Deprecated Warning Messages
+This release resolves the issue with deprecated SOAP warnings displaying in PHP 8+.
+
 ### Date:       2023-March-27
 ### Release:    v2023032701
 

ajax.php

@@ -569,15 +569,12 @@
             $turnitintooltwosubmission = new turnitintooltwo_submission($submissionid, "turnitin");
             if ($turnitintooltwosubmission->unanonymise_submission($reason)) {
                 if ($turnitintooltwosubmission->userid == 0) {
-
                     $tmpuser = new stdClass();
-                    $tmpuser->firstname = $turnitintooltwosubmission->nmfirstname;
-                    $tmpuser->lastname = $turnitintooltwosubmission->nmlastname;
-
+                    $tmpuser->firstname = $turnitintooltwosubmission->firstname;
+                    $tmpuser->lastname = $turnitintooltwosubmission->lastname;
                     $return["name"] = fullname($tmpuser);
                 } else {
-                    $user = new turnitintooltwo_user($turnitintooltwosubmission->userid);
-                    $return["name"] = fullname($user);
+                    $return["name"] = $turnitintooltwosubmission->fullname;
                 }
                 $return["status"] = "success";
                 $return["userid"] = $turnitintooltwosubmission->userid;

classes/v1migration/v1migration.php

@@ -550,7 +550,7 @@ private function log_success_migration_event($turnitintooltwoid, $course_id, $v1
     }
 
     /**
-     * Get assignments for migrated data table. Called from ajax.php via turnitintooltwo_extra-2023032701.min.js.
+     * Get assignments for migrated data table. Called from ajax.php via turnitintooltwo_extra-2024020601.min.js.
      *
      * @global type $DB
      * @return array return array of assignments to display

jquery/plugins.php

@@ -19,9 +19,9 @@
 $plugins = array(
     'turnitintooltwo-dataTables' => array('files' => array('jquery.dataTables.js', 'jquery.dataTables.css')),
     'turnitintooltwo-dataTables_plugins' => array('files' => array('jquery.dataTables.plugins.js')),
-    'turnitintooltwo-turnitintooltwo' => array('files' => array('turnitintooltwo-2023032701.min.js')),
-    'turnitintooltwo-turnitintooltwo_extra' => array('files' => array('turnitintooltwo_extra-2023032701.min.js')),
-    'turnitintooltwo-turnitintooltwo_settings' => array('files' => array('turnitintooltwo_settings-2023032701.min.js')),
+    'turnitintooltwo-turnitintooltwo' => array('files' => array('turnitintooltwo-2024020601.min.js')),
+    'turnitintooltwo-turnitintooltwo_extra' => array('files' => array('turnitintooltwo_extra-2024020601.min.js')),
+    'turnitintooltwo-turnitintooltwo_settings' => array('files' => array('turnitintooltwo_settings-2024020601.min.js')),
     'turnitintooltwo-datatables_columnfilter' => array('files' => array('jquery.dataTables.columnFilter.js')),
     'turnitintooltwo-cookie' => array('files' => array('jquery.cookie.js')),
     'turnitintooltwo-colorbox' => array('files' => array('jquery.colorbox.js', 'colorbox.css')),

jquery/turnitintooltwo-2023032701.min.js

@@ -1094,8 +1094,14 @@
                     }
                     $("#submission_id").html(submission_id);
                     $('#cboxLoadedContent .mod_turnitintooltwo_unanonymise_form').show();
-                    $('#id_reveal').unbind("click");
-                    $('#id_reveal').click(function () {
+                    $('#id_reveal').prop('disabled', true);
+
+                    $('#id_anonymous_reveal_reason').on('input', function() {
+                        var reason_text = $(this).val();
+                        $('#id_reveal').prop('disabled', reason_text === ''); // Enable/disable button based on textarea content
+                    });
+
+                    $('#id_reveal').on('click', function() {
                         $.ajax({
                             "dataType": 'json',
                             "type": "POST",
@@ -1158,10 +1164,10 @@
         // ZIP containing all files in original format.
         function initialiseZipDownloads(part_id) {
             // Unbind the event first to stop it being binded multiple times.
-            $('#tabs-' + part_id + ' .orig_zip_open, #tabs-' + part_id + ' .pdf_zip_open, #tabs-' + part_id + ' .xls_inbox_open').unbind("click");
+            $('#tabs-' + part_id + ' .orig_zip_open, #tabs-' + part_id + ' .pdf_zip_open, #tabs-' + part_id + ' .xls_inbox_open').off("click");
 
             // Open a spreadsheet or a zip file containing all the relevant data.
-            $('#tabs-' + part_id + ' .orig_zip_open, #tabs-' + part_id + ' .pdf_zip_open, #tabs-' + part_id + ' .xls_inbox_open').click(function () {
+            $('#tabs-' + part_id + ' .orig_zip_open, #tabs-' + part_id + ' .pdf_zip_open, #tabs-' + part_id + ' .xls_inbox_open').on(function () {
                 var idStr = $(this).attr("id").split("_");
                 downloadZipFile(idStr[0] + "_" + idStr[1], idStr[2]);
             });
@@ -1233,9 +1239,9 @@
 
         function initialiseHiddenZipDownloads(part_id) {
             // Unbind the event first to stop it being binded multiple times.
-            $('#tabs-' + part_id + ' .mod_turnitintooltwo_origchecked_zip_open').unbind("click");
+            $('#tabs-' + part_id + ' .mod_turnitintooltwo_origchecked_zip_open').off("click");
             // Seperate binder for hidden zip file link.
-            $('#tabs-' + part_id + ' .mod_turnitintooltwo_origchecked_zip_open').click(function () {
+            $('#tabs-' + part_id + ' .mod_turnitintooltwo_origchecked_zip_open').on(function () {
                 var idStr = $(this).attr("id").split("_");
                 downloadZipFile(idStr[0] + "_" + idStr[1], part_id);
                 return false;
@@ -1249,9 +1255,9 @@
             }
 
             // Unbind the event first to stop it being binded multiple times.
-            $(identifier).unbind("click");
+            $(identifier).off("click");
 
-            $(identifier).click(function () {
+            $(identifier).on(function () {
                 $(this).hide();
                 $(this).siblings('.fa-spinner').css("display", "inline-block").addClass('fa-lg');
                 var idStr = $(this).parent().attr("id").split("_");
@@ -1267,9 +1273,9 @@
             }
 
             // Unbind the event first to stop it being binded multiple times.
-            $(identifier).unbind("click");
+            $(identifier).off("click");
 
-            $(identifier).click(function () {
+            $(identifier).on(function () {
                 var idStr = $(this).attr("id").split("_");
                 // Don't open OR DV if score is pending.
                 if (!$(this).children('.score_colour').hasClass('score_colour_')) {
@@ -1419,7 +1425,7 @@
                     $('#tabs-' + part_id + ' .mod_turnitintooltwo_zip_downloads button').removeAttr("title");
                     initialiseHiddenZipDownloads(part_id);
                 } else {
-                    $('#tabs-' + part_id + ' .mod_turnitintooltwo_origchecked_zip_open').unbind('click');
+                    $('#tabs-' + part_id + ' .mod_turnitintooltwo_origchecked_zip_open').off('click');
                     $('#tabs-' + part_id + ' .mod_turnitintooltwo_zip_downloads button').prop("disabled", true);
                     $('#tabs-' + part_id + ' .mod_turnitintooltwo_zip_downloads button').prop("title", M.str.turnitintooltwo.download_button_warning);
                 }