Merge pull request #293 from turnitin/develop

Develop to master for release 2016011602

Author: jmcgettrick

CHANGELOG.md

@@ -1,3 +1,51 @@
+### :snowflake: Date:		2018-January-16
+### :snowflake: Release:	v2018011602
+
+### :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 **Turnitin plagiarism plugin settings**.
+> 2. Under **Report Generation Speed**, select **Generate reports immediately (students can resubmit until due date): After 3 resubmissions, reports generate after 24 hours**.
+
+#### 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 **Turnitin plagiarism plugin settings**.
+> 2. Under **Attach a rubric to this assignment**, select a new genre-specific rubric from the drop-down list.
+> 
+> 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, you can access the QuickMark manager from within the assignment settings of a new or existing assignment.
+>
+> 1. Scroll to Turnitin plagiarism plugin settings.
+> 2. Select Launch QuickMark manager to view and manage your new QuickMarks.
+>
+> Alternatively, launch the QuickMark manager from within in Feedback Studio.
+
+### :wrench: Fixes and enhancements
+
+#### Resubmissions now overwrite the previous submission
+
+When a student made a resubmission to Turnitin, their previous submission wasn't removed from the assignment inbox; this led to confusion for instructors, who weren't too sure which submission was the most up-to-date version. We've made sure that resubmissions now overwrite the existing submission.
+
+#### Students can submit their group work without access error issues
+
+Students have frustratingly been receiving unauthorized access errors when submitting group work, which caused some confusion. After uploading their submission and navigating to the View all submissions page, the student would witness the error. We've made a solid fix to stop this from happening! A big thanks to [@micaherne](https://github.com/micaherne) for this pull request.
+
+---
+
 ### Date:       2017-November-23
 ### Release:    v2017112302
 

classes/modules/turnitin_assign.class.php

@@ -62,6 +62,30 @@ public function set_content($linkarray, $cm) {
         return (empty($onlinetextdata->onlinetext)) ? '' : $onlinetextdata->onlinetext;
     }
 
+
+    /**
+     * Check if resubmissions in a Turnitin sense are allowed to an assignment.
+     *
+     * @param $assignid
+     */
+    public function is_resubmission_allowed($assignid, $reportgenspeed, $submissiontype, $attemptreopenmethod) {
+        global $DB;
+
+        // Get the maximum number of file submissions allowed.
+        $params = array('assignment' => $assignid,
+            'subtype' => 'assignsubmission',
+            'plugin' => 'file',
+            'name' => 'maxfilesubmissions');
+
+        $maxfilesubmissions = 0;
+        if ($result = $DB->get_record('assign_plugin_config', $params, 'value')) {
+            $maxfilesubmissions = $result->value;
+        }
+
+        return ($reportgenspeed > 0 && $attemptreopenmethod == ASSIGN_ATTEMPT_REOPEN_METHOD_NONE
+            && ($submissiontype == 'text_content' || $maxfilesubmissions == 1));
+    }
+
     public function get_onlinetext($userid, $cm) {
         global $DB;
 

classes/turnitin_class.class.php

@@ -63,8 +63,7 @@ public function read_class_from_tii() {
             $rubrics = $readclass->getSharedRubrics();
             $rubricarray = array();
             foreach ($rubrics as $rubric) {
-                $rubricarray[$rubric->getRubricId()] = $rubric->getRubricName()."
-                [".get_string('sharedrubric', 'plagiarism_turnitin')."]";
+                $rubricarray[$rubric->getRubricGroupName()][$rubric->getRubricId()] = $rubric->getRubricName();
             }
 
             $this->sharedrubrics = $rubricarray;

lang/ar/plagiarism_turnitin.php

@@ -62,9 +62,9 @@
 $string['erater_style'] = 'الأسلوب';
 $string['anonblindmarkingnote'] = 'ملحوظة: تم إزالة الإعداد المنفصل لوضع العلامات دون إظهار الأسماء بـ Turnitin. ستستخدم Turnitin إعداد وضع العلامات دون معرفة أسماء الطلاب التابع لـ Moodle لتحديد إعداد وضع العلامات دون إظهار الأسماء.';
 $string['transmatch'] = 'تطابق الترجمة';
-$string['genduedate'] = 'قم بإنشاء التقارير في موعد الاستحقاق (يسمح بإعادة الإرسال حتى موعد الإستحقاق)';
-$string['genimmediately1'] = 'قم بتوليد التقارير فورا ( لا يسمح بإعادة التقديم)';
-$string['genimmediately2'] = 'قم بتوليد التقارير فورا ( يسمح بإعادة التقديم حتى تاريخ الاستحقاق)';
+$string['genduedate'] = 'إنشاء التقارير في تاريخ الاستحقاق (يمكن للطلاب إعادة الإرسال حتى تاريخ الاستحقاق)';
+$string['genimmediately1'] = 'إنشاء التقارير فورًا (لا يمكن للطلاب إعادة الإرسال)';
+$string['genimmediately2'] = 'إنشاء التقارير فورًا (يمكن للطلاب إعادة الإرسال حتى تاريخ الاستحقاق): بعد {$a->num_resubmissions} من عمليات إعادة إرسال، يتم إنشاء التقارير بعد {$a->num_hours} ساعات';
 $string['launchquickmarkmanager'] = 'إطلاق معالج Quickmark';
 $string['launchpeermarkmanager'] = 'أطلق معالج Peermark';
 $string['studentreports'] = 'عرض تقارير الاصالة للطلبة';
@@ -85,7 +85,6 @@
 $string['journalcheck'] = 'فحص مقابل المجلات <br />والدوريات والمنشورات';
 $string['compareinstitution'] = 'مقارنة الملفات المسلمة مع المستندات المسلمة داخل هذه المؤسسة';
 $string['reportgenspeed'] = 'تقرير سرعة التكوين';
-$string['genspeednote'] = 'ملحوظة: يستغرق إنشاء تقرير الأصالة لعمليات إعادة إرسال أربعة وعشرين ساعة.';
 $string['locked_message'] = 'رسالة الإعدادات المغلقة';
 $string['locked_message_help'] = 'إذا كانت أي من الإعدادات مغلقة، تظهر هذه الرسالة للتعريف بالسبب.';
 $string['locked_message_default'] = 'تم إغلاق هذا الإعداد على مستوى الموقع';
@@ -95,6 +94,7 @@
 $string['turnitinppulapre'] = 'لإرسال ملف إلى Turnitin، عليك أولاً القبول باتفاقية ترخيص المستخدم النهائي، وباختيارك عدم القبول باتفاقية ترخيص المستخدم النهائي الخاصة بنا سنقوم بإرسال ملفك إلى Moodle فقط. انقر هنا للقبول.';
 $string['noscriptula'] = '"(لأن Javascript غير مفعل لديك سيتوجب عليك تحديث هذه الصفحة يدويًا قبل أن تتمكن من الإرسال و بعد الموافقة على اتفاقية المستخدم لـ Turnitin)"';
 $string['filedoesnotexist'] = 'تم حذف الملف';
+$string['reportgenspeed_resubmission'] = 'لقد أرسلت بالفعل مستندًا لهذه المهمة وتم إنشاء تقرير تشابه للإرسال. إذا اخترت إعادة إرسال المستند، فإن الإرسال السابق سيتم استبداله وسيتم إنشاء تقرير جديد. بعد {$a->num_resubmissions} من عمليات إعادة الإرسال، سينبغي الانتظار لمدة {$a->num_hours} من الساعات بعد إعادة الإرسال للاطلاع على تقرير تشابه جديد.';
 
 // Plugin settings.
 $string['config'] = 'التكوين';

lang/cs/plagiarism_turnitin.php

@@ -62,9 +62,9 @@
 $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['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['launchquickmarkmanager'] = 'Spustit Správce Quickmark';
 $string['launchpeermarkmanager'] = 'Spustit Správce Peermark';
 $string['studentreports'] = 'Zobrazit studentům zprávy o původnosti';
@@ -85,7 +85,6 @@
 $string['journalcheck'] = 'Porovnat s odbornými časopisy, <br />periodiky a publikacemi.';
 $string['compareinstitution'] = 'Porovnat odevzdané soubory s odevzdanými pracemi v rámci této instituce';
 $string['reportgenspeed'] = 'Rychlost generování zpráv';
-$string['genspeednote'] = 'Poznámka: Na generování zprávy originality pro opětovné odevzdání se vztahuje zpoždění dvaceti čtyř hodin.';
 $string['locked_message'] = 'Uzamčená zpráva';
 $string['locked_message_help'] = 'V případě uzamčení nastavení tato zpráva uvádí důvod.';
 $string['locked_message_default'] = 'Toto nastavení je uzamčeno na úrovni stránky';
@@ -95,6 +94,7 @@
 $string['turnitinppulapre'] = 'Chcete-li odevzdat soubor do služby Turnitin, musíte nejprve přijmout naši smlouvu EULA. Pokud se rozhodnete nepřijmout naši smlouvu EULA, bude váš soubor odevzdán pouze do Moodle. Kliknutím zde potvrďte.';
 $string['noscriptula'] = '(Jelikož nemáte zapnutý jazyk Javascript, budete muset tuto stránku ručně obnovit předtím, než budete moci provést odevzdání své práce, a to až po přijetí Podmínek pro uživatele Turnitin)';
 $string['filedoesnotexist'] = 'Soubor byl smazá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.';
 
 // Plugin settings.
 $string['config'] = 'Konfigurace';

lang/de/plagiarism_turnitin.php

@@ -62,9 +62,9 @@
 $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['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['launchquickmarkmanager'] = 'QuickMark-Manager starten';
 $string['launchpeermarkmanager'] = 'PeerMark-Manager starten';
 $string['studentreports'] = 'Studenten den Echtheitsbericht anzeigen';
@@ -85,7 +85,6 @@
 $string['journalcheck'] = 'Abgleich mit Zeitungen,<br />Periodika und anderen Publikationen';
 $string['compareinstitution'] = 'Eingereichte Dateien mit den an dieser Institution übermittelten Arbeiten vergleichen';
 $string['reportgenspeed'] = 'Geschwindigkeit beim Erstellen des Berichts';
-$string['genspeednote'] = 'Hinweis: Bei der Generierung eines Echtheitsberichts für erneute Übermittlungen kann eine Verzögerung von 24 Stunden auftreten.';
 $string['locked_message'] = 'Gesperrte Nachricht';
 $string['locked_message_help'] = 'Wenn Einstellungen gesperrt sind, wird in dieser Nachricht der Grund dafür angegeben.';
 $string['locked_message_default'] = 'Diese Einstellung ist auf Websiteebene gesperrt.';
@@ -95,6 +94,7 @@
 $string['turnitinppulapre'] = 'Vor der Übermittung einer Datei an Turnitin müssen Sie unsere EULA (Endbenutzer-Lizenzvereinbarung) akzeptieren. Wenn Sie die EULA nicht akzeptieren, wird Ihre Datei nur an Moodle übermittelt. Klicken Sie zum Akzeptieren hier.';
 $string['noscriptula'] = '(Da Sie Javascript nicht aktiviert haben, müssen Sie diese Seite manuell aktualisieren, ehe Sie nach dem Akzeptieren der Nutzungsbedingungen von Turnitin eine Übermittlung vornehmen können)';
 $string['filedoesnotexist'] = 'Datei wurde gelöscht';
+$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.';
 
 // Plugin settings.
 $string['config'] = 'Konfiguration';

lang/en/plagiarism_turnitin.php

@@ -61,9 +61,9 @@
 $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['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['launchquickmarkmanager'] = 'Launch Quickmark Manager';
 $string['launchpeermarkmanager'] = 'Launch Peermark Manager';
 $string['studentreports'] = 'Display Originality Reports to Students';
@@ -84,7 +84,6 @@
 $string['journalcheck'] = 'Check against journals,<br />periodicals and publications';
 $string['compareinstitution'] = 'Compare submitted files with papers submitted within this institution';
 $string['reportgenspeed'] = 'Report Generation Speed';
-$string['genspeednote'] = 'Note: Originality Report generation for resubmissions is subject to a twenty-four hour delay.';
 $string['locked_message'] = 'Locked message';
 $string['locked_message_help'] = 'If any settings are locked, this message is shown to say why.';
 $string['locked_message_default'] = 'This setting is locked at the site level';
@@ -94,6 +93,7 @@
 $string['turnitinppulapre'] = 'To submit a file to Turnitin you must first accept our EULA. Choosing to not accept our EULA will submit your file to Moodle only. Click here to accept.';
 $string['noscriptula'] = '(As you do not have javascript enabled you will have to manually refresh this page before you can make a submission after accepting the Turnitin User Agreement)';
 $string['filedoesnotexist'] = 'File has been deleted';
+$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.';
 
 // Plugin settings.
 $string['config'] = 'Configuration';