Merge pull request #525 from turnitin/develop

Develop to master for release 2020070801

Author: CharlotteSpinks

CHANGELOG.md

@@ -1,3 +1,41 @@
+### Date:       2020-July-07
+### Release:	2020070801
+
+#### :zap: What's new
+
+---
+#### We now support Moodle 3.9
+
+You can find out more about Moodle 3.9 via Moodle's [release notes](https://docs.moodle.org/dev/Moodle_3.9_release_notes).
+
+
+#### Use Turnitin in a Moodle Quiz
+
+Turnitin will be usable as a part of a Moodle quiz when Moodle releases the feature. When enabled for your account, simply add an essay question as one of the quiz questions. A similarity report will be generated when the student submits the quiz. Track this release on the Moodle Tracker https://tracker.moodle.org/browse/MDL-32226).
+
+---
+
+#### :wrench: Fixes and enhancements
+
+#### Improved support for large class sizes
+
+When closing the Turnitin viewer, we’d refresh the page so any updates you applied to the assignment would be reflected in Moodle. However, this refresh caused unnecessary load when a class was particularly large. When we identify increased latency like this, we’ll deactivate automatic refreshes of the inbox and prompt you to refresh the inbox manually after grading.
+
+#### View shared rubrics when creating a Moodle assignment
+
+When creating a Moodle assignment it is possible to view all of your Turnitin Rubrics and attach one to a class from its creation. However, a bug had prevented any rubrics that had been shared with you from appearing in this list. You’ll now find them there and ready to be added to any future assignments you create. This fixes a known issue.
+
+#### General accessibility improvements
+
+We’ve made a few accessibility improvements to help ensure that all Turnitin users can use the plugin with the same high-quality experience. These include:
+
+- Made more elements accessible via tab navigation
+- You can launch the Turnitin viewer now by using the enter key on the appropriate element. 
+- Tools tips are available for various settings and readable by a screen reader or via keyboard navigation.
+- General improvements to the plugin configuration screen ensuring unique ARIA labels and logical tab order.
+
+---
+
 ### Date:       2019-December-17
 ### Release:	v2019121701
 

README.md

@@ -3,6 +3,8 @@ Turnitin Plagiarism plugin for Moodle
 
 Please be aware that the **Develop** branch should not be considered production ready, although it contains the latest fixes and features it may contain bugs. It should be avoided in favour of the **Master** branch which is the latest available branch that has been through the QA process. Please make any pull requests you would like to make to the develop branch.
 
+For running behat tests in Moodle 3.9 and above, please use the behat_39+ branch. There are some deprecated form settings methods in Moodle that throw warnings during behat test runs causing failures, unfortunately this is the only way around this issue as we don't want have different plugin branches per Moodle version. 
+
 To see what has changed in recent versions of the plagiarism plugin, see the [CHANGELOG](https://github.com/turnitin/moodle-plagiarism_turnitin/blob/master/CHANGELOG.md).
 
 If you would like to contribute to the plugin please see our [CONTRIBUTIONS](https://github.com/turnitin/moodle-plagiarism_turnitin/blob/master/CONTRIBUTIONS.md) page.
@@ -12,14 +14,17 @@ If you are having issues, please consult our [TROUBLE SHOOTING](https://github.c
 Installation
 ------------
 
-Before installing this plugin firstly make sure you are logged in as an Administrator and that you are using Moodle 3.1 or higher.
+Before installing this plugin firstly make sure you are logged in as an Administrator and that you are using Moodle 3.5 or higher.
 
 The Plagiarism Plugin can be used within the following Moodle modules:
 
 - Assignments
 - Forums
+- Quiz *
 - Workshops
 
+\* This is currently only essay type answers and is also reliant on Moodle merging [this code patch](https://github.com/moodle/moodle/commit/7a8e3ec4b13408d18734ab46bdb03b2da55f317d) into their core offering. For more information see: [MDL-32226](https://tracker.moodle.org/browse/MDL-32226).
+
 To install, you need to copy all the files into the plagiarism/turnitin directory in your Moodle installation. You should then go to `"Site Administration" > "Notifications"` where you should follow the on screen instructions.
 
 Plagiarism plugins also need to be enabled before this plugin can be used. You can do this by going to `"Site Administration" > "Advanced Features"` and ticking the "Enable plagiarism plugins" box before saving.

ajax.php

@@ -372,7 +372,6 @@
 
         echo json_encode($options);
         break;
-
 }
 
 if (!empty($return)) {

amd/build/open_viewer.min.js

@@ -31,14 +31,7 @@ define(['jquery'], function($) {
                 for (var i = 0; i < classList.length; i++) {
                     if (classList[i].indexOf('grademark_') !== -1 && classList[i] != 'pp_grademark_open') {
                         var classStr = classList[i].split("_");
-                        var url = "";
-                        // URL must be stored in separate div on forums.
-                        if ($('.grademark_forum_launch_' + classStr[1]).length > 0) {
-                            url = $('.grademark_forum_launch_' + classStr[1]).html();
-                        } else {
-                            url = $(this).attr("id");
-                        }
-                        that.openDV("grademark", classStr[1], classStr[2], url);
+                        that.openDV("grademark", classStr[1], classStr[2]);
                     }
                 }
             });
@@ -87,23 +80,29 @@ define(['jquery'], function($) {
                     that.checkDVClosed(submissionid, coursemoduleid, dvWindow);
                 }, 500);
             }
-         },
+        },
 
-         refreshScores: function(submission_id, coursemoduleid) {
-              $.ajax({
-                  type: "POST",
-                  url: M.cfg.wwwroot + "/plagiarism/turnitin/ajax.php",
-                  dataType: "json",
-                  data: {
-                      action: "update_grade",
-                      submission: submission_id,
-                      cmid: coursemoduleid,
-                      sesskey: M.cfg.sesskey
-                  },
-                  success: function() {
-                      window.location = window.location;
-                  }
-              });
-         }
+        refreshScores: function(submission_id, coursemoduleid) {
+            var refreshStartTime = new Date().getTime();
+            $.ajax({
+                type: "POST",
+                url: M.cfg.wwwroot + "/plagiarism/turnitin/ajax.php",
+                dataType: "json",
+                data: {
+                    action: "update_grade",
+                    submission: submission_id,
+                    cmid: coursemoduleid,
+                    sesskey: M.cfg.sesskey
+                },
+                success: function() {
+                    var requestDuration = new Date().getTime() - refreshStartTime;
+                    if (requestDuration < 3000) {
+                        window.location = window.location;
+                    } else {
+                        $('.turnitin_score_refresh_alert').show();
+                    }
+                }
+            });
+        }
     };
 });

amd/build/peermark.min.js

@@ -18,7 +18,8 @@ define(['jquery',
         return {
             peermarkLaunch: function() {
                 var that = this;
-                $('.peermark_manager_launch').on('click', function() {
+                $('.peermark_manager_launch').on('click', function(event) {
+                    event.preventDefault();
                     that.peermarkCreateModal(ModalPeermarkManagerLaunch.TYPE);
                 });
 

amd/build/quickmark.min.js

@@ -16,7 +16,8 @@ define(['jquery',
     function($, Templates, ModalFactory, ModalEvents, ModalQuickmarkLaunch) {
         return {
             quickmarkLaunch: function() {
-                $('.plagiarism_turnitin_quickmark_manager_launch').on('click', function () {
+                $('.plagiarism_turnitin_quickmark_manager_launch').on('click', function (event) {
+                    event.preventDefault();
                     ModalFactory.create({
                         type: ModalQuickmarkLaunch.TYPE,
                         templateContext: {

amd/build/rubric.min.js

@@ -36,17 +36,12 @@ define(['jquery',
                 });
             },
             rubricCreateModal: function(modalType) {
-                if ($('input[name="coursemodule"]').val()) {
-                    var cmid = $('input[name="coursemodule"]').val();
-                } else {
-                    var urlParams = new URLSearchParams(window.location.search);
-                    var cmid = urlParams.get('id');
-                }
+                var courseid = ($('input[name="course"]')) ? $('input[name="course"]').val() : 0;
 
                 ModalFactory.create({
                     type: modalType,
                     templateContext: {
-                        cmid: cmid,
+                        courseid: courseid,
                         wwwroot: M.cfg.wwwroot
                     },
                     large: true

amd/src/open_viewer.js

@@ -47,10 +47,7 @@ public function send_message($userid, $message, $courseid) {
         $eventdata->fullmessagehtml   = $message;
         $eventdata->smallmessage      = '';
         $eventdata->notification      = 1; // This is only set to 0 for personal messages between users.
-
-        if ($CFG->branch >= 32) {
-            $eventdata->courseid = $courseid;
-        }
+        $eventdata->courseid = $courseid;
 
         message_send($eventdata);
     }