Merge branch 'master' of https://github.com/turnitin/moodle-mod_turni…

…tintooltwo

CHANGELOG.md

@@ -1,3 +1,38 @@
+### :snowflake: Date:		2018-January-16
+### :snowflake: Release:	v2018011601
+
+#### :zap: What's new
+
+---
+
+#### Instant Similarity Reports for up to three resubmissions
+
+Feedback Studio allows students to view their Similarity Report results immediately! Students can now view their initial Similarity Report, then revise and resubmit their work up to three times, without having to wait 24 hours for an updated report. After three resubmissions have been made, the 24-hour report generation wait time will be restored. Instantaneous similarity results give students the formative support they need to master paraphrasing and citation conventions efficiently.
+
+> To enable resubmissions for students, you must correctly configure the assignment settings of a new or existing Moodle Direct V2 assignment.
+>
+> 1. Scroll to **Originality Report Options**.
+> 2. Under **Originality Report Generation and Submissions**, select **Generate reports immediately (students can resubmit until due date): After 3 resubmissions, reports generate after 24 hours**. [Read more](https://guides.turnitin.com/03_Integrations/Turnitin_Partner_Integrations/Moodle/03_Moodle_Direct_V2/03_Instructors/Creating_an_assignment#Similarity_Report_options).
+
+#### Genre-specific rubrics in Feedback Studio (North America only)
+
+Revision Assistant's genre-specific rubrics are now available in Feedback Studio for our North American users, designed with 6th - 12th graders in mind! K-12 instructors can assign new rubrics to their assignments to help their students master the art of argumentative, narrative, informative, and analytical writing. If you're actively using Revision Assistant and Feedback Studio together, you can now promote consistency in the classroom by adopting the same rubrics.
+
+> To use a new rubric for grading, you can attach it from within the assignment settings of a new or existing assignment.
+> 
+> 1. Scroll to **GradeMark options**.
+> 2. Under **Attach a rubric to this assignment**, select a new genre-specific rubric from the drop-down list. [Read more](https://guides.turnitin.com/03_Integrations/Turnitin_Partner_Integrations/Moodle/03_Moodle_Direct_V2/03_Instructors/Creating_an_assignment#GradeMark_options).
+> 
+> Alternatively, launch the rubric and grading form manager from the Moodle Direct V2 submission inbox, or alternatively, from within Feedback Studio.
+
+#### K-12 QuickMark sets in Feedback Studio (North America only)
+
+QuickMarks are Turnitin's most popular feedback tool among Feedback Studio instructors! But in finding that many of our default QuickMark sets failed to address the needs of our K-12 instructors and students, we've added two new sets to the Feedback Studio collection, available to our North American users! Our new drag-and-drop (and customizable!) comments will help instructors help their students to engage in revision, save time, and more importantly, achieve learning outcomes. [Read more](https://guides.turnitin.com/01_Manuals_and_Guides/Release_Notes/Turnitin_Release_Notes/Genre-specific_rubrics_in_Feedback_Studio).
+> 
+> To view and edit your new QuickMarks, launch the QuickMark manager from the Moodle Direct V2 submission inbox, or alternatively, from within Feedback Studio.
+
+---
+
 ### Date:       2017-November-23
 ### Release:    v2017112301
 

ajax.php

@@ -475,7 +475,13 @@
                 $turnitinclass = new turnitin_class($courseid);
             }
             $turnitinclass->read_class_from_tii();
-            $options = $options + $turnitinclass->sharedrubrics;
+			$sharedrubrics = $turnitinclass->sharedrubrics;
+
+			foreach ($sharedrubrics as $group => $grouprubrics) {
+				foreach ($grouprubrics as $rubricid => $rubricname) {
+					$options[$group][$rubricid] = $rubricname;
+				}
+			}
 
             // Get assignment details.
             if (!empty($assignmentid)) {
@@ -513,6 +519,7 @@
         } else {
             $options = array();
         }
+
         echo json_encode($options);
         break;
 

jquery/turnitintooltwo.js

@@ -543,7 +543,7 @@
         }
 
         // Show warning when changing the rubric linked to an assignment.
-        $('#id_rubric, #id_plagiarism_rubric').focus(function () {
+        $('#id_rubric, #id_plagiarism_rubric').mousedown(function () {
             if ($('input[name="instance"]').val() != '' && $('input[name="rubric_warning_seen"]').val() != 'Y') {
                 if (confirm(M.str.turnitintooltwo.changerubricwarning)) {
                     $('input[name="rubric_warning_seen"]').val('Y');
@@ -962,11 +962,29 @@
                     $($(rubricElementId)).empty();
                     var options = data;
                     $.each(options, function (i, val) {
-                        $($(rubricElementId)).append($('<option>', {
-                            value: i,
-                            text: val
-                        }));
+                        if (!$.isNumeric(i) && i !== "") {
+
+                            var optgroup = $('<optgroup>');
+                            optgroup.attr('label', i);
+
+                            $.each(val, function (j, rubric) {
+                                var option = $("<option></option>");
+                                option.val(j);
+                                option.text(rubric);
+
+                                optgroup.append(option);
+                            });
+
+                            $(rubricElementId).append(optgroup);
+
+                        } else {
+                            $($(rubricElementId)).append($('<option>', {
+                                value: i,
+                                text: val
+                            }));
+                        }
                     });
+
                     $(rubricElementId + ' option[value="' + currentRubric + '"]').attr("selected", "selected");
                 }
             });

lang/ar/turnitintooltwo.php

@@ -53,9 +53,9 @@
 $string['filetosubmit'] = 'الملف للارسال';
 $string['filetosubmit_help'] = 'عند إرسال ملف إلى جزء المهمة، استعرض جهازك لتحديد الملف الذي تود رفعه باستخدام هذا العنصر.';
 $string['fileupload'] = 'رفع الملف';
-$string['genduedate'] = 'قم بإنشاء التقارير في موعد الإستحقاق (يسمح بإعادة الإرسال حتى موعد الإستحقاق)';
-$string['genimmediately1'] = 'قم بتوليد التقارير فورا ( لا يسمح بإعادة التقديم)';
-$string['genimmediately2'] = 'قم بتوليد التقارير فورا ( يسمح بإعادة التقديم حتى تاريخ الاستحقاق)';
+$string['genduedate'] = 'إنشاء التقارير في تاريخ الاستحقاق (يمكن للطلاب إعادة الإرسال حتى تاريخ الاستحقاق)';
+$string['genimmediately1'] = 'إنشاء التقارير فورًا (لا يمكن للطلاب إعادة الإرسال)';
+$string['genimmediately2'] = 'إنشاء التقارير فورًا (يمكن للطلاب إعادة الإرسال حتى تاريخ الاستحقاق): بعد {$a->num_resubmissions} من عمليات إعادة إرسال، يتم إنشاء التقارير بعد {$a->num_hours} ساعات';
 $string['institutionalrepository'] = 'المستودعات المؤسسية (عند الاقتضاء)';
 $string['institutionalchecksettings'] = 'التحقق مقابل<br /> مستودع مؤسسي';
 $string['institutionalcheck'] = 'التحقق مقابل مستودع مؤسسي';
@@ -538,7 +538,6 @@
 $string['displaygradesas_help'] = 'يحدد هذا الخيار وضع العرض للعلامات. الخيارات هي عرض العلامات كنسبة مئوية أو ككسر، مثل 45/60.';
 $string['displaygradesasfraction'] = 'إظهار العلامات ككسر (مثل 89/100)';
 $string['displaygradesaspercent'] = 'إظهار العلامات كنسبة مئوية (مثل 89&#37;)';
-$string['genspeednote'] = 'ملحوظة: يستغرق إنشاء تقرير الأصالة لعمليات إعادة إرسال أربعة وعشرين ساعة.';
 $string['cronsubmittedsuccessfully'] = 'إرسال: تم إرسال{$a->title} (معرف TII: {$a->submissionid}) للمهمة {$a->assignmentname} على الدورة {$a->coursename} بنجاح إلى Turnitin.';
 $string['ppassignmentediterror'] = 'تعذر تحرير هذه الوحدة {$a->title} (معرف TII: {$a->assignmentid})، يُرجى الرجوع إلى سجلات واجهة برمجة التطبيقات (API) للحصول على مزيد من المعلومات.';
 $string['nombstringlibrary'] = 'لاستخدام هذا المكون يجب أن يكون الامتداد PHP mbstring مثبتًا في خادمك.';
@@ -564,3 +563,4 @@
 $string['diagnosticoptions_0'] = 'إيقاف التشغيل';
 $string['diagnosticoptions_1'] = 'قياسي';
 $string['diagnosticoptions_2'] = 'تصحيح الأخطاء';
+$string['reportgenspeed_resubmission'] = 'لقد أرسلت بالفعل مستندًا لهذه المهمة وتم إنشاء تقرير تشابه للإرسال. إذا اخترت إعادة إرسال المستند، فإن الإرسال السابق سيتم استبداله وسيتم إنشاء تقرير جديد. بعد {$a->num_resubmissions} من عمليات إعادة الإرسال، سينبغي الانتظار لمدة {$a->num_hours} من الساعات بعد إعادة الإرسال للاطلاع على تقرير تشابه جديد.';

lang/cs/turnitintooltwo.php

@@ -53,9 +53,9 @@
 $string['filetosubmit'] = 'Soubor k odevzdání';
 $string['filetosubmit_help'] = 'Při odevzdání souboru k části úkolu vyhledejte ve svém počítači pomocí tohoto formuláře patřičný soubor.';
 $string['fileupload'] = 'Nahrávání souboru';
-$string['genduedate'] = 'Generovat zprávy k termínu (opětovná odevzdání jsou povolena až do termínu)';
-$string['genimmediately1'] = 'Generovat zprávy bezprostředně (opětovná odevzdání nejsou povolena)';
-$string['genimmediately2'] = 'Generovat zprávy bezprostředně (opětovná odevzdání jsou povolena až do termínu)';
+$string['genduedate'] = 'Generovat zprávy k termínu dokončení (studenti mohou práci znovu odevzdat až do termínu dokončení)';
+$string['genimmediately1'] = 'Generovat zprávy bezprostředně (studenti nemohou práci znovu odevzdat)';
+$string['genimmediately2'] = 'Generovat zprávy bezprostředně (studenti mohou opakovaně odevzdávat až do termínu dokončení): Po {$a->num_resubmissions} opakovaných odevzdáních se zprávy generují po {$a->num_hours} hodinách';
 $string['institutionalrepository'] = 'Archiv instituce (v případě potřeby)';
 $string['institutionalchecksettings'] = 'Porovnat s<br />Archivem instituce';
 $string['institutionalcheck'] = 'Porovnat s Archivem instituce';
@@ -538,7 +538,6 @@
 $string['displaygradesas_help'] = 'Tato možnost nastaví režim zobrazení pro hodnocení. Možnosti se zobrazí jako procento nebo jako zlomek, tj. 45/60.';
 $string['displaygradesasfraction'] = 'Zobrazí známky jako zlomek (např. 89/100)';
 $string['displaygradesaspercent'] = 'Zobrazí známky jako procento (např. 89&#37;)';
-$string['genspeednote'] = 'Poznámka: Na generování zprávy originality pro opětovné odevzdání se vztahuje zpoždění dvaceti čtyř hodin.';
 $string['cronsubmittedsuccessfully'] = 'Odevzdání: {$a->title} (TII ID: {$a->submissionid}) pro přiřazení {$a->assignmentname} v kurzu {$a->coursename} bylo úspěšně odevzdáno do systému Turnitin.';
 $string['ppassignmentediterror'] = 'Modul: {$a->title} (TII ID: {$a->assignmentid}) nelze v systému Turnitin upravit. Další informace najdete v API protokolu.';
 $string['nombstringlibrary'] = 'Chcete-li použít tento plugin, budete muset mít na svém serveru nainstalované rozšíření PHP mbstring.';
@@ -564,3 +563,4 @@
 $string['diagnosticoptions_0'] = 'Vypnuto';
 $string['diagnosticoptions_1'] = 'Standardní';
 $string['diagnosticoptions_2'] = 'Ladění';
+$string['reportgenspeed_resubmission'] = 'Do tohoto úkolu jste již odevzdali práci a Zpráva o podobnosti pro ni byla vytvořena. Pokud se rozhodnete práci znovu odevzdat, dřívější odevzdání bude nahrazeno a bude vytvořena nová zpráva. Poté, co práci {$a->num_resubmissions}x opakovaně odevzdáte, budete muset na zobrazení nové Zprávy o podobnosti počkat {$a->num_hours} hodin.';

lang/de/turnitintooltwo.php

@@ -53,9 +53,9 @@
 $string['filetosubmit'] = 'Zu übermittelnde Datei';
 $string['filetosubmit_help'] = 'Wenn Sie eine Datei zu einem Aufgabenteil übermitteln möchten, durchsuchen Sie zum Hochladen der Datei Ihren Computer mithilfe dieses Formulars.';
 $string['fileupload'] = 'Dateiupload';
-$string['genduedate'] = 'Berichte am Fälligkeitsdatum erstellen (erneute Übermittlungen sind bis zum Fälligkeitsdatum zulässig)';
-$string['genimmediately1'] = 'Berichte sofort erstellen (erneute Übermittlungen sind nicht zulässig)';
-$string['genimmediately2'] = 'Berichte sofort erstellen (erneute Übermittlungen sind bis zum Fälligkeitsdatum zulässig)';
+$string['genduedate'] = 'Berichte am Fälligkeitsdatum erstellen (Studenten können Arbeiten bis zum Fälligkeitsdatum erneut übermitteln)';
+$string['genimmediately1'] = 'Berichte sofort erstellen (Studenten können Arbeiten nicht erneut übermitteln)';
+$string['genimmediately2'] = 'Berichte sofort erstellen (Studenten können Arbeiten bis zum Fälligkeitsdatum erneut übermitteln): Nach {$a->num_resubmissions} erneuten Übermittlungen werden Berichte erst nach {$a->num_hours} Stunden erstellt';
 $string['institutionalrepository'] = 'Institutions-Repository (wenn vorhanden)';
 $string['institutionalchecksettings'] = 'Mit dem Repository der<br />Institution abgleichen';
 $string['institutionalcheck'] = 'Mit dem Repository der Institution abgleichen';
@@ -538,7 +538,6 @@
 $string['displaygradesas_help'] = 'Mit dieser Option wir der Anzeigemodus für Noten festgelegt. Die Optionen sind die Anzeige als Prozentwert oder die Anzeige als Punktwert, z. B. 45/60.';
 $string['displaygradesasfraction'] = 'Noten als Punktwert anzeigen (z. B. 89/100)';
 $string['displaygradesaspercent'] = 'Noten als Prozentwert anzeigen (z. B. 89&#37;)';
-$string['genspeednote'] = 'Hinweis: Bei der Generierung eines Echtheitsberichts für erneute Übermittlungen kann eine Verzögerung von 24 Stunden auftreten.';
 $string['cronsubmittedsuccessfully'] = 'Übermittlung: {$a->title} (TII-ID: {$a->submissionid}) für die Aufgabe {$a->assignmentname} in Kurs {$a->coursename} wurde erfolgreich an Turnitin übermittelt.';
 $string['ppassignmentediterror'] = 'Modul {$a->title} (TII-ID: {$a->assignmentid}) konnte in Turnitin nicht bearbeitet werden; weitere Informationen finden Sie in Ihren API-Protokollen.';
 $string['nombstringlibrary'] = 'Zur Verwendung dieses Plug-ins muss auf Ihrem Server die PHP mbstring-Erweiterung installiert sein.';
@@ -563,4 +562,5 @@
 $string['tiidebugginglogs'] = 'Debuggen und Protokollieren';
 $string['diagnosticoptions_0'] = 'Aus';
 $string['diagnosticoptions_1'] = 'Standard';
-$string['diagnosticoptions_2'] = 'Debuggen';
+$string['diagnosticoptions_2'] = 'Debuggen';
+$string['reportgenspeed_resubmission'] = 'Sie haben bereits eine Arbeit zu dieser Aufgabe übermittelt, und ein Ähnlichkeitsbericht wurde für Ihre übermittelte Arbeit erstellt. Wenn Sie Ihre Arbeit erneut übermitteln möchten, wird Ihre frühere Arbeit ersetzt und ein neuer Bericht wird erstellt. Nach {$a->num_resubmissions} erneuten Übermittlungen müssen Sie {$a->num_hours} Stunden warten, bis ein neuer Ähnlichkeitsbericht angezeigt wird.';

lang/en/turnitintooltwo.php

@@ -53,9 +53,9 @@
 $string['filetosubmit'] = 'File to Submit';
 $string['filetosubmit_help'] = 'When submitting a file to an assignment part, browse your computer for the file to upload using this form element.';
 $string['fileupload'] = 'File Upload';
-$string['genduedate'] = 'Generate reports on due date (resubmissions are allowed until due date)';
-$string['genimmediately1'] = 'Generate reports immediately (resubmissions are not allowed)';
-$string['genimmediately2'] = 'Generate reports immediately (resubmissions are allowed until due date)';
+$string['genduedate'] = 'Generate reports on due date (students can resubmit until due date)';
+$string['genimmediately1'] = 'Generate reports immediately (students cannot resubmit)';
+$string['genimmediately2'] = 'Generate reports immediately (students can resubmit until due date): After {$a->num_resubmissions} resubmissions, reports generate after {$a->num_hours} hours';
 $string['institutionalrepository'] = 'Institutional Repository (Where Applicable)';
 $string['institutionalchecksettings'] = 'Check against<br />Institutional Repository';
 $string['institutionalcheck'] = 'Check against Institutional Repository';
@@ -539,7 +539,6 @@
 $string['displaygradesas_help'] = 'This option sets the display mode for grades the options are display as a percentage or display as a fraction ie 45/60.';
 $string['displaygradesasfraction'] = 'Show grades as Fraction (e.g. 89/100)';
 $string['displaygradesaspercent'] = 'Show grades as Percentage (e.g. 89&#37;)';
-$string['genspeednote'] = 'Note: Originality Report generation for resubmissions is subject to a twenty-four hour delay.';
 $string['cronsubmittedsuccessfully'] = 'Submission: {$a->title} (TII ID: {$a->submissionid}) for the assignment {$a->assignmentname} on the course {$a->coursename} was successfully submitted to Turnitin.';
 $string['ppassignmentediterror'] = 'Module {$a->title} (TII ID: {$a->assignmentid}) could not be edited on Turnitin, please consult your API logs for further information';
 $string['nombstringlibrary'] = 'To use this plugin you will need to have the PHP mbstring extension installed on your server.';
@@ -650,3 +649,4 @@
 $string['renew_assignment_dates'] = 'Use new assignment dates';
 $string['renew_assignment_dates_help'] = 'Select this option to use new assignment dates when resetting a course. The assignment start date will be set to the date and time of the course reset, while the due and post date will elapse seven days from now.<br/><br/>If you’d rather not use new assignment dates, that’s fine; Turnitin will use the course’s original assignment dates instead. However, any anonymous marking settings will not be carried over for assignments where the post date has passed.';
 $string['v1migrationearlyaccess'] = 'Early Access';
+$string['reportgenspeed_resubmission'] = 'You have already submitted a paper to this assignment and a Similarity Report was generated for your submission. If you choose to resubmit your paper, your earlier submission will be replaced and a new report will be generated. After {$a->num_resubmissions} resubmissions, you will need to wait {$a->num_hours} hours after a resubmission to see a new Similarity Report.';