Merge pull request #788 from turnitin/develop

Release v2024121901

CHANGELOG.md

@@ -1,3 +1,16 @@
+### Date:       2024-December-19
+### Release:    v2024121901
+
+---
+
+#### Removed ETS e-rater Service
+As we have now discontinued support for the ETS e-rater service, these settings have now been removed from the plugin.
+
+### Collusion Check Bug Fixed
+An issue was found which in some cases affected the order in which submissions would be indexed, leading to collusion checks potentially being carried out out of order. This has now been resolved.
+
+---
+
 ### Date:       2024-December-05
 ### Release:    v2024120501
 

classes/forms/turnitin_setupform.class.php

@@ -112,10 +112,6 @@ public function definition() {
         $mform->addElement('static', 'plagiarism_turnitin_enablepeermark_desc', null, get_string('turnitinenablepeermark_desc', 'plagiarism_turnitin'));
         $mform->setDefault('plagiarism_turnitin_enablepeermark', 1);
 
-        $mform->addElement('select', 'plagiarism_turnitin_useerater', get_string('turnitinuseerater', 'plagiarism_turnitin'), $ynoptions);
-        $mform->addElement('static', 'plagiarism_turnitin_useerater_desc', null, get_string('turnitinuseerater_desc', 'plagiarism_turnitin'));
-        $mform->setDefault('plagiarism_turnitin_useerater', 0);
-
         $mform->addElement('select', 'plagiarism_turnitin_useanon', get_string('turnitinuseanon', 'plagiarism_turnitin'), $ynoptions);
         $mform->addElement('static', 'plagiarism_turnitin_useanon_desc', null, get_string('turnitinuseanon_desc', 'plagiarism_turnitin'));
         $mform->setDefault('plagiarism_turnitin_useanon', 0);
@@ -242,7 +238,7 @@ public function save($data) {
         }
 
         $properties = array("accountid", "secretkey", "apiurl", "enablediagnostic", "usegrademark", "enablepeermark",
-            "useerater", "useanon", "transmatch", "repositoryoption", "agreement", "enablepseudo", "pseudofirstname",
+            "useanon", "transmatch", "repositoryoption", "agreement", "enablepseudo", "pseudofirstname",
             "pseudolastname", "lastnamegen", "pseudosalt", "pseudoemaildomain");
 
         foreach ($properties as $property) {

classes/turnitin_view.class.php

@@ -121,8 +121,8 @@ public function add_elements_to_settings_form($mform, $course, $location = "acti
         $options = array(0 => get_string('no'), 1 => get_string('yes'));
         $plagiarismturnitin = new plagiarism_plugin_turnitin();
         $genparams = $plagiarismturnitin->plagiarism_get_report_gen_speed_params();
-        $genoptions = array(1 => get_string('reportgen_immediate_add_immediate', 'plagiarism_turnitin'),
-                            0 => get_string('reportgen_immediate_add_duedate', 'plagiarism_turnitin'),
+        $genoptions = array(0 => get_string('reportgen_immediate_add_immediate', 'plagiarism_turnitin'),
+                            1 => get_string('reportgen_immediate_add_duedate', 'plagiarism_turnitin'),
                             2 => get_string('reportgen_duedate_add_duedate', 'plagiarism_turnitin'));
         $excludetypeoptions = array( 0 => get_string('no'), 1 => get_string('excludewords', 'plagiarism_turnitin'),
                             2 => get_string('excludepercent', 'plagiarism_turnitin'));
@@ -354,51 +354,6 @@ public function add_elements_to_settings_form($mform, $course, $location = "acti
                 $mform->setType('plagiarism_rubric', PARAM_RAW);
             }
 
-            if (!empty($config->plagiarism_turnitin_useerater)) {
-                $handbookoptions = array(
-                                            1 => get_string('erater_handbook_advanced', 'plagiarism_turnitin'),
-                                            2 => get_string('erater_handbook_highschool', 'plagiarism_turnitin'),
-                                            3 => get_string('erater_handbook_middleschool', 'plagiarism_turnitin'),
-                                            4 => get_string('erater_handbook_elementary', 'plagiarism_turnitin'),
-                                            5 => get_string('erater_handbook_learners', 'plagiarism_turnitin')
-                                        );
-
-                $dictionaryoptions = array(
-                                            'en_US' => get_string('erater_dictionary_enus', 'plagiarism_turnitin'),
-                                            'en_GB' => get_string('erater_dictionary_engb', 'plagiarism_turnitin'),
-                                            'en'    => get_string('erater_dictionary_en', 'plagiarism_turnitin')
-                                        );
-                $mform->addElement('select', 'plagiarism_erater', get_string('erater', 'plagiarism_turnitin'), $options);
-                $mform->setDefault('plagiarism_erater', 0);
-
-                $mform->addElement('select', 'plagiarism_erater_handbook', get_string('erater_handbook', 'plagiarism_turnitin'),
-                                                $handbookoptions);
-                $mform->setDefault('plagiarism_erater_handbook', 2);
-                $mform->disabledIf('plagiarism_erater_handbook', 'plagiarism_erater', 'eq', 0);
-
-                $mform->addElement('select', 'plagiarism_erater_dictionary', get_string('erater_dictionary', 'plagiarism_turnitin'),
-                                                $dictionaryoptions);
-                $mform->setDefault('plagiarism_erater_dictionary', 'en_US');
-                $mform->disabledIf('plagiarism_erater_dictionary', 'plagiarism_erater', 'eq', 0);
-
-                $mform->addElement('checkbox', 'plagiarism_erater_spelling', get_string('erater_categories', 'plagiarism_turnitin'),
-                                                " ".get_string('erater_spelling', 'plagiarism_turnitin'));
-                $mform->disabledIf('plagiarism_erater_spelling', 'plagiarism_erater', 'eq', 0);
-
-                $mform->addElement('checkbox', 'plagiarism_erater_grammar', '', " ".get_string('erater_grammar', 'plagiarism_turnitin'));
-                $mform->disabledIf('plagiarism_erater_grammar', 'plagiarism_erater', 'eq', 0);
-
-                $mform->addElement('checkbox', 'plagiarism_erater_usage', '', " ".get_string('erater_usage', 'plagiarism_turnitin'));
-                $mform->disabledIf('plagiarism_erater_usage', 'plagiarism_erater', 'eq', 0);
-
-                $mform->addElement('checkbox', 'plagiarism_erater_mechanics', '', " ".
-                                                get_string('erater_mechanics', 'plagiarism_turnitin'));
-                $mform->disabledIf('plagiarism_erater_mechanics', 'plagiarism_erater', 'eq', 0);
-
-                $mform->addElement('checkbox', 'plagiarism_erater_style', '', " ".get_string('erater_style', 'plagiarism_turnitin'));
-                $mform->disabledIf('plagiarism_erater_style', 'plagiarism_erater', 'eq', 0);
-            }
-
             $mform->addElement('html', html_writer::tag('div', get_string('anonblindmarkingnote', 'plagiarism_turnitin'),
                                                                                 array('class' => 'tii_anonblindmarkingnote')));
 

db/upgrade.php

@@ -305,7 +305,7 @@ function xmldb_plagiarism_turnitin_upgrade($oldversion) {
             $data = get_config('turnitintooltwo');
 
             $properties = array("accountid", "secretkey", "apiurl", "enablediagnostic", "usegrademark",
-                "enablepeermark", "useerater", "transmatch", "repositoryoption", "agreement", "enablepseudo", "pseudofirstname",
+                "enablepeermark", "transmatch", "repositoryoption", "agreement", "enablepseudo", "pseudofirstname",
                 "pseudolastname", "lastnamegen", "pseudosalt", "pseudoemaildomain", "useanon");
 
             foreach ($properties as $property) {

lang/ar/plagiarism_turnitin.php

@@ -42,23 +42,6 @@
 $string['attachrubric'] = 'إلحاق باب أجوبة قياسية لهذه المهمة';
 $string['launchrubricmanager'] = 'أطلق معالج الأجوبة القياسية';
 $string['attachrubricnote'] = 'ملاحظة: سيكون بمقدور الطلاب مشاهدة المعايير القياسية الملحقة و محتوياتها قبل القيام بالتسليم.';
-$string['erater_handbook_advanced'] = 'متقدم';
-$string['erater_handbook_highschool'] = 'المدرسة الاعداية';
-$string['erater_handbook_middleschool'] = 'المدرسة المتوسطة';
-$string['erater_handbook_elementary'] = 'المدرسة الابتدائية';
-$string['erater_handbook_learners'] = 'المتعلمين الانكليز';
-$string['erater_dictionary_enus'] = 'القواميس الانكليزية الامريكية';
-$string['erater_dictionary_engb'] = 'القواميس الانكليزية البريطانية';
-$string['erater_dictionary_en'] = 'كلا من القواميس الانكليزية الامريكية والبريطانية';
-$string['erater'] = 'تمكين الملاحظات النحوية';
-$string['erater_handbook'] = 'كتيب النحو';
-$string['erater_dictionary'] = 'القاموس';
-$string['erater_categories'] = 'فئات الملاحظات';
-$string['erater_spelling'] = 'الاملاء';
-$string['erater_grammar'] = 'القواعد';
-$string['erater_usage'] = 'الاستخدام';
-$string['erater_mechanics'] = 'الميكانيك';
-$string['erater_style'] = 'الأسلوب';
 $string['anonblindmarkingnote'] = 'ملحوظة: تم إزالة الإعداد المنفصل لوضع العلامات دون إظهار الأسماء بـ Turnitin. ستستخدم Turnitin إعداد وضع العلامات دون معرفة أسماء الطلاب التابع لـ Moodle لتحديد إعداد وضع العلامات دون إظهار الأسماء.';
 $string['transmatch'] = 'تطابق الترجمة';
 $string["reportgen_immediate_add_immediate"] = "إنشاء التقارير على الفور. سيتم إضافة التسليمات إلى المستودع على الفور (إذا تم تعيين المستودع).";
@@ -212,8 +195,6 @@
 $string['turnitinusegrademark_desc'] = 'اختر ما اذا كنت ستستخدم GradeMark عند تقييم الإرسالات.<br /><i>(هذا متوفر فقط للمستخدمين الذين يكون لديهم GradeMark مكونًا في حساباتهم)</i>';
 $string['turnitinenablepeermark'] = 'مكن مهام Peermark';
 $string['turnitinenablepeermark_desc'] = 'اختر ما اذا كنت ستسمح بإنشاء Peermark للمهام.<br/><i>(هذا متوفر فقط للمستخدمين الذين يكون لديهم Peermark مكونًا في حساباتهم)</i>';
-$string['turnitinuseerater'] = 'تمكين الملاحظات النحوية';
-$string['turnitinuseerater_desc'] = 'اختر ما إذا كان يمكن للملفات المرسلة أن تتلقى تدقيقًا نحويًا.<br /><i>(يجب أيضًا تمكين الملاحظات النحوية في حساب Turnitin الخاص بك)</i>';
 $string['transmatch_desc'] = 'تحديد ما اذا سيتوفر تطابق الترجمة كإعداد على شاشة إنشاء المهام.<br /><i>(تمكين هذا الإعداد فقط اذا كان تطابق الترجمة مفعلاً في حساب Turnitin)</i>';
 $string['repositoryoptions_0'] = 'تمكين خيارات مستودعات المدرس القياسية';
 $string['repositoryoptions_1'] = 'تمكين خيارات المستودع الموسعة للمدرب';

lang/cs/plagiarism_turnitin.php

@@ -42,23 +42,6 @@
 $string['attachrubric'] = 'Přiložit rubriku k zadání';
 $string['launchrubricmanager'] = 'Spustit Správce rubrik';
 $string['attachrubricnote'] = 'Poznámka: studenti si budou moci před odevzdáním prohlížet přiložené rubriky a jejich obsah.';
-$string['erater_handbook_advanced'] = 'Pokročilý';
-$string['erater_handbook_highschool'] = 'Střední škola';
-$string['erater_handbook_middleschool'] = '2. stupeň';
-$string['erater_handbook_elementary'] = 'Základní škola';
-$string['erater_handbook_learners'] = 'Studenti angličtiny';
-$string['erater_dictionary_enus'] = 'Slovník americké angličtiny';
-$string['erater_dictionary_engb'] = 'Slovník britské angličtiny';
-$string['erater_dictionary_en'] = 'Slovníky americké i britské angličtiny';
-$string['erater'] = 'Povolit gramatickou zpětnou vazbu';
-$string['erater_handbook'] = 'Gramatická příručka';
-$string['erater_dictionary'] = 'Slovník';
-$string['erater_categories'] = 'Kategorie zpětné vazby';
-$string['erater_spelling'] = 'Pravopis';
-$string['erater_grammar'] = 'Gramatika';
-$string['erater_usage'] = 'Použití';
-$string['erater_mechanics'] = 'Mechanika';
-$string['erater_style'] = 'Styl';
 $string['anonblindmarkingnote'] = 'Poznámka: Samostatné nastavení anonymního označení Turnitin bylo odstraněno. Turnitin bude používat nastavení zaslepeného označení Moodle k určení anonymního nastavení označení.';
 $string['transmatch'] = 'Přeložená shoda';
 $string["reportgen_immediate_add_immediate"] = "Generujte zprávy okamžitě. Odevzdání budou okamžitě přidána do úložiště (pokud je úložiště nastaveno).";
@@ -212,8 +195,6 @@
 $string['turnitinusegrademark_desc'] = 'Zvolte, zda má být při hodnocení odevzdaných prací použit systém GradeMark.<br /><i>(Tato možnost je dostupná, pouze pokud máte na svém účtu nakonfigurován systém GradeMark)</i>';
 $string['turnitinenablepeermark'] = 'Povolit úkoly Peermark';
 $string['turnitinenablepeermark_desc'] = 'Zvolte, zda má být povoleno vytvoření úkolů Peermark<br/><i>(Tato možnost je dostupná pouze pro účty, které mají nakonfigurovánu funkci Peermark)</i>';
-$string['turnitinuseerater'] = 'Povolit gramatickou zpětnou vazbu';
-$string['turnitinuseerater_desc'] = 'Zvolte v případě, že odeslané soubory mohou projít kontrolou gramatiky.<br /><i>(Gramatická zpětná vazba musí také být povolena na vašem účtu Turnitin)</i>';
 $string['transmatch_desc'] = 'Stanoví, zda bude Přeložená shoda dostupná jako možnost nastavení na obrazovce nastavení úkolu.<br /><i>(Povolte tuto možnost pouze tehdy, pokud je Přeložená shoda povolena na vašem Turnitin účtu)</i>';
 $string['repositoryoptions_0'] = 'Dát instruktorovi standardní volby archivu';
 $string['repositoryoptions_1'] = 'Aktivovat instruktorské rozšířené možnosti archivu';

lang/de/plagiarism_turnitin.php

@@ -42,23 +42,6 @@
 $string['attachrubric'] = 'Dieser Aufgabe eine Rubrik anhängen';
 $string['launchrubricmanager'] = 'Rubrikmanager starten';
 $string['attachrubricnote'] = 'Hinweis: Studenten können angehängte Rubriken und deren Inhalt vor dem Übermitteln aufrufen.';
-$string['erater_handbook_advanced'] = 'Erweitert';
-$string['erater_handbook_highschool'] = 'Oberstufe';
-$string['erater_handbook_middleschool'] = 'Mittelstufe';
-$string['erater_handbook_elementary'] = 'Grundschule';
-$string['erater_handbook_learners'] = 'Englisch Lernende';
-$string['erater_dictionary_enus'] = 'US-amerikanisches Englisch-Lexikon';
-$string['erater_dictionary_engb'] = 'Britisches Englisch-Lexikon';
-$string['erater_dictionary_en'] = 'Britisches und US-amerikanisches Englisch-Lexikon';
-$string['erater'] = 'Feedback zur Grammatik aktivieren';
-$string['erater_handbook'] = 'Grammatikhandbuch';
-$string['erater_dictionary'] = 'Wörterbuch';
-$string['erater_categories'] = 'Feedback-Kategorien';
-$string['erater_spelling'] = 'Rechtschreibung';
-$string['erater_grammar'] = 'Grammatik';
-$string['erater_usage'] = 'Gebrauch';
-$string['erater_mechanics'] = 'Funktionsweise';
-$string['erater_style'] = 'Stil';
 $string['anonblindmarkingnote'] = 'Hinweis: Die separate Turnitin-Einstellung für anonyme Benotung wurde entfernt. Turnitin legt die Einstellung für anonymes Benoten anhand der Moodle-Einstellung für Blindbewertung fest.';
 $string['transmatch'] = 'Übersetzte Übereinstimmung';
 $string["reportgen_immediate_add_immediate"] = "Erstellen Sie Berichte unverzüglich. Die Einreichungen werden sofort zum Repository hinzugefügt (sofern ein Repository festgelegt wurde).";
@@ -212,8 +195,6 @@
 $string['turnitinusegrademark_desc'] = 'Legen Sie fest, ob GradeMark zum Benoten von Übermittlungen verwendet wird.<br /><i>(Diese Option ist nur für Benutzer verfügbar, die GradeMark für ihren Account konfiguriert haben.)</i>';
 $string['turnitinenablepeermark'] = 'PeerMark-Anleitungen aktivieren';
 $string['turnitinenablepeermark_desc'] = 'Legen Sie fest, ob das Erstellen von PeerMark-Aufgaben zulässig ist.<br/><i>(Diese Option ist nur für Benutzer verfügbar, die PeerMark für ihren Account konfiguriert haben.)</i>';
-$string['turnitinuseerater'] = 'Feedback zur Grammatik aktivieren';
-$string['turnitinuseerater_desc'] = 'Wählen Sie aus, ob die eingereichten Dateien auf Grammatik geprüft werden können.<br /><i>(Feedback zur Grammatik muss in Ihrem Turnitin-Account aktiviert werden.)</i>';
 $string['transmatch_desc'] = 'Legt fest, ob die Einstellung „Übersetzte Übereinstimmung“ auf dem Einrichtungsbildschirm einer Aufgabe verfügbar ist.<br /><i>(Aktivieren Sie diese Option nur, wenn übersetzte Übereinstimmungen in Ihrem Turnitin-Account aktiviert sind.)</i>';
 $string['repositoryoptions_0'] = 'Standardmäßige Repository-Optionen für Lehrkräfte aktivieren';
 $string['repositoryoptions_1'] = 'Erweiterte Ablageoptionen für Lehrkräfte aktivieren';

lang/en/plagiarism_turnitin.php

@@ -45,23 +45,6 @@
 $string['attachrubric'] = 'Attach a rubric to this assignment';
 $string['launchrubricmanager'] = 'Launch Rubric Manager';
 $string['attachrubricnote'] = 'Note: students will be able to view attached rubrics and their content prior to submitting.';
-$string['erater_handbook_advanced'] = 'Advanced';
-$string['erater_handbook_highschool'] = 'High School';
-$string['erater_handbook_middleschool'] = 'Middle School';
-$string['erater_handbook_elementary'] = 'Elementary School';
-$string['erater_handbook_learners'] = 'English Learners';
-$string['erater_dictionary_enus'] = 'US English Dictionary';
-$string['erater_dictionary_engb'] = 'UK English Dictionary';
-$string['erater_dictionary_en'] = 'Both US and UK English Dictionaries';
-$string['erater'] = 'Enable grammar check';
-$string['erater_handbook'] = 'Grammar Handbook';
-$string['erater_dictionary'] = 'Dictionary';
-$string['erater_categories'] = 'Feedback Categories';
-$string['erater_spelling'] = 'Spelling';
-$string['erater_grammar'] = 'Grammar';
-$string['erater_usage'] = 'Usage';
-$string['erater_mechanics'] = 'Mechanics';
-$string['erater_style'] = 'Style';
 $string['anonblindmarkingnote'] = 'Note: The separate Turnitin anonymous marking setting has been removed. Turnitin will use Moodle\'s blind marking setting to determine the anonymous marking setting.';
 $string['transmatch'] = 'Translated Matching';
 $string["reportgen_immediate_add_immediate"] = "Generate reports immediately. Submissions will be added to the repository immediately (if repository is set).";
@@ -146,8 +129,6 @@
 $string['turnitinusegrademark_desc'] = 'Choose whether to use GradeMark to grade submissions.<br /><i>(This is only available to those that have GradeMark configured for their account)</i>';
 $string['turnitinenablepeermark'] = 'Enable Peermark Assignments';
 $string['turnitinenablepeermark_desc'] = 'Choose whether to allow the creation of Peermark Assignments<br/><i>(This is only available to those that have Peermark configured for their account)</i>';
-$string['turnitinuseerater'] = 'Enable grammar feedback';
-$string['turnitinuseerater_desc'] = 'Choose if submitted files can receive a grammar check. <br /><i>(Grammar feedback must also be enabled on your Turnitin account)</i>';
 $string['transmatch_desc'] = 'Determines whether Translated Matching will be available as a setting on the assignment set up screen.<br /><i>(Enable this option only if Translated Matching is enabled on your Turnitin account)</i>';
 $string['repositoryoptions_0'] = 'Enable instructor standard repository options';
 $string['repositoryoptions_1'] = 'Enable instructor expanded repository options';