Skip to content

Commit ccaee3d

Browse files
lucaboeschlucaboesch
committed
Fixing PHPUnit tests.
1 parent 708282d commit ccaee3d

15 files changed

+177
-262
lines changed

‎classes/forms/turnitin_setupform.class.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,10 @@ public function definition() {
135135
'plagiarism_turnitin'));
136136
$mform->setDefault('plagiarism_turnitin_enablepeermark', 1);
137137

138-
$mform->addElement('select', 'plagiarism_turnitin_useanon', get_string('turnitinuseanon', 'plagiarism_turnitin'), $ynoptions);
139-
$mform->addElement('static', 'plagiarism_turnitin_useanon_desc', null, get_string('turnitinuseanon_desc', 'plagiarism_turnitin'));
138+
$mform->addElement('select', 'plagiarism_turnitin_useanon', get_string('turnitinuseanon', 'plagiarism_turnitin'),
139+
$ynoptions);
140+
$mform->addElement('static', 'plagiarism_turnitin_useanon_desc', null,
141+
get_string('turnitinuseanon_desc', 'plagiarism_turnitin'));
140142

141143
$mform->addElement('select', 'plagiarism_turnitin_useerater', get_string('turnitinuseerater',
142144
'plagiarism_turnitin'), $ynoptions);

‎classes/turnitin_view.class.php

+4-56
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ public function add_elements_to_settings_form($mform, $course, $location = "acti
135135
$genparams = $plagiarismturnitin->plagiarism_get_report_gen_speed_params();
136136
$genoptions = [0 => get_string('reportgen_immediate_add_immediate', 'plagiarism_turnitin'),
137137
1 => get_string('reportgen_immediate_add_duedate', 'plagiarism_turnitin'),
138-
2 => get_string('reportgen_duedate_add_duedate', 'plagiarism_turnitin'));
139-
$excludetypeoptions = array( 0 => get_string('no'), 1 => get_string('excludewords', 'plagiarism_turnitin'),
138+
2 => get_string('reportgen_duedate_add_duedate', 'plagiarism_turnitin'), ];
139+
$excludetypeoptions = [0 => get_string('no'), 1 => get_string('excludewords', 'plagiarism_turnitin'),
140140
2 => get_string('excludepercent', 'plagiarism_turnitin'), ];
141141

142142
if ($location == "defaults") {
@@ -155,7 +155,8 @@ public function add_elements_to_settings_form($mform, $course, $location = "acti
155155
$PAGE->requires->js_call_amd('plagiarism_turnitin/new_quickmark', 'newQuickmarkLaunch');
156156
$PAGE->requires->js_call_amd('plagiarism_turnitin/new_rubric', 'newRubric');
157157
} else {
158-
// TODO: We can remove these when we no longer have to support Moodle versions 4.3 and below
158+
// phpcs:disable moodle.Commenting.TodoComment
159+
// TODO: We can remove these when we no longer have to support Moodle versions 4.3 and below.
159160
$PAGE->requires->js_call_amd('plagiarism_turnitin/peermark', 'peermarkLaunch');
160161
$PAGE->requires->js_call_amd('plagiarism_turnitin/quickmark', 'quickmarkLaunch');
161162
$PAGE->requires->js_call_amd('plagiarism_turnitin/rubric', 'rubric');
@@ -380,59 +381,6 @@ public function add_elements_to_settings_form($mform, $course, $location = "acti
380381
$mform->setType('plagiarism_rubric', PARAM_RAW);
381382
}
382383

383-
<<<<<<< HEAD
384-
=======
385-
if (!empty($config->plagiarism_turnitin_useerater)) {
386-
$handbookoptions = [
387-
1 => get_string('erater_handbook_advanced', 'plagiarism_turnitin'),
388-
2 => get_string('erater_handbook_highschool', 'plagiarism_turnitin'),
389-
3 => get_string('erater_handbook_middleschool', 'plagiarism_turnitin'),
390-
4 => get_string('erater_handbook_elementary', 'plagiarism_turnitin'),
391-
5 => get_string('erater_handbook_learners', 'plagiarism_turnitin'),
392-
];
393-
394-
$dictionaryoptions = [
395-
'en_US' => get_string('erater_dictionary_enus', 'plagiarism_turnitin'),
396-
'en_GB' => get_string('erater_dictionary_engb', 'plagiarism_turnitin'),
397-
'en' => get_string('erater_dictionary_en', 'plagiarism_turnitin'),
398-
];
399-
$mform->addElement('select', 'plagiarism_erater', get_string('erater', 'plagiarism_turnitin'), $options);
400-
$mform->setDefault('plagiarism_erater', 0);
401-
402-
$mform->addElement('select', 'plagiarism_erater_handbook', get_string('erater_handbook',
403-
'plagiarism_turnitin'),
404-
$handbookoptions);
405-
$mform->setDefault('plagiarism_erater_handbook', 2);
406-
$mform->disabledIf('plagiarism_erater_handbook', 'plagiarism_erater', 'eq', 0);
407-
408-
$mform->addElement('select', 'plagiarism_erater_dictionary', get_string('erater_dictionary',
409-
'plagiarism_turnitin'),
410-
$dictionaryoptions);
411-
$mform->setDefault('plagiarism_erater_dictionary', 'en_US');
412-
$mform->disabledIf('plagiarism_erater_dictionary', 'plagiarism_erater', 'eq', 0);
413-
414-
$mform->addElement('checkbox', 'plagiarism_erater_spelling', get_string('erater_categories',
415-
'plagiarism_turnitin'),
416-
" ".get_string('erater_spelling', 'plagiarism_turnitin'));
417-
$mform->disabledIf('plagiarism_erater_spelling', 'plagiarism_erater', 'eq', 0);
418-
419-
$mform->addElement('checkbox', 'plagiarism_erater_grammar', '', " ".get_string('erater_grammar',
420-
'plagiarism_turnitin'));
421-
$mform->disabledIf('plagiarism_erater_grammar', 'plagiarism_erater', 'eq', 0);
422-
423-
$mform->addElement('checkbox', 'plagiarism_erater_usage', '', " ".get_string('erater_usage',
424-
'plagiarism_turnitin'));
425-
$mform->disabledIf('plagiarism_erater_usage', 'plagiarism_erater', 'eq', 0);
426-
427-
$mform->addElement('checkbox', 'plagiarism_erater_mechanics', '', " ".
428-
get_string('erater_mechanics', 'plagiarism_turnitin'));
429-
$mform->disabledIf('plagiarism_erater_mechanics', 'plagiarism_erater', 'eq', 0);
430-
431-
$mform->addElement('checkbox', 'plagiarism_erater_style', '', " ".get_string('erater_style',
432-
'plagiarism_turnitin'));
433-
$mform->disabledIf('plagiarism_erater_style', 'plagiarism_erater', 'eq', 0);
434-
}
435-
436384
$mform->addElement('html', html_writer::tag('div', get_string('anonblindmarkingnote', 'plagiarism_turnitin'),
437385
['class' => 'tii_anonblindmarkingnote']));
438386

‎db/events.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
],
4848
[
4949
'eventname' => '\mod_assign\event\submission_removed',
50-
'callback' => 'plagiarism_turnitin_observer::assignsubmission_removed'
50+
'callback' => 'plagiarism_turnitin_observer::assignsubmission_removed',
5151
],
5252
[
5353
'eventname' => '\mod_coursework\event\assessable_uploaded',

0 commit comments

Comments
 (0)