Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge v2024091101 #22

Open
wants to merge 74 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
1eff5a5
consolidate inclusion paths under ./sdk
eviweb Sep 29, 2016
a654b7e
fix missing slashes in sdk inclusion paths
eviweb Nov 24, 2016
f3a749e
Fix undefined coursetype
aspark21 May 31, 2022
7992bc4
Fixes Error when trying to restore #634
glepod Mar 24, 2023
73f9d61
fixed optional parameter before required parameter issue with show_fo…
Nov 27, 2023
e22a69a
fix get_pseudo_lastname to not override the record it just received, …
Nov 26, 2018
9d3dd91
using current() on objects is deprecated, casting array type to solve…
Jun 18, 2024
fb1a740
passing null to is_nan() is deprecated, checking isset before will fix
Jun 18, 2024
3a5f0fd
fix first last name sorting issue in assignments table
Jun 25, 2024
7edd1fa
fix tii logo in submissions grid
Jun 25, 2024
cbb1e9a
fix warning, rename methods
Jul 10, 2024
dc4cba2
INT-20016: ensuring intro is saved in our db to facilitate assignment…
TurnitinPaulina Jul 10, 2024
fefb108
Merge pull request #731 from turnitin/fic/logo_assignment_table
andrii-ilin Jul 11, 2024
70dc327
Merge pull request #734 from turnitin/fix/clear_warnings
andrii-ilin Jul 11, 2024
f4cb476
Merge pull request #730 from turnitin/fix/assignments_table_sort
andrii-ilin Jul 16, 2024
eaae280
Revert "fix first last name sorting issue in assignments table"
Jul 23, 2024
95b71e1
fix sorting in assignment table
Jul 23, 2024
cbf733d
Merge pull request #736 from turnitin/fix/assignments_table_sort
andrii-ilin Jul 23, 2024
1c5d3cd
add hidden first name sorting column, render similarity score correct
Jul 23, 2024
c235e29
Merge pull request #737 from turnitin/fix/assignments_table_sort
andrii-ilin Jul 23, 2024
0d17a75
fix student view table
Jul 24, 2024
d2826a0
Merge pull request #738 from turnitin/fix/assignments_table_sort
andrii-ilin Jul 24, 2024
a6490b4
Merge pull request #695 from junpataleta/MDL-78806-page-title
jack-tii Jul 25, 2024
dfca423
Merge pull request #703 from opitz/fixed_parameter_order
jack-tii Jul 25, 2024
4baf38e
Merge pull request #728 from opitz/fix_deprecated_function_usages
jack-tii Jul 25, 2024
944c939
Merge pull request #653 from aspark21/patch-3
jack-tii Jul 25, 2024
6daf9a1
fix multipart assignment view
Jul 25, 2024
ddcbf64
Abort definition() if called from a completion page
Dec 20, 2023
f5f3f84
CTP-2397 : now explicitely creating stdClass before assigning values
Jul 10, 2023
96186b9
forcing array type before using current()
May 7, 2024
ee5e027
replaced deprecated function print_error()
Dec 5, 2023
9e436b2
Merge pull request #746 from ucl-isd/object
jack-tii Jul 25, 2024
74a2b37
Merge pull request #748 from ucl-isd/print_error
jack-tii Jul 26, 2024
e3267c8
Merge pull request #707 from ucl-isd/fix_behat_test
jack-tii Jul 26, 2024
c0fbd3c
Merge pull request #742 from turnitin/fix/assignments_table_sort
andrii-ilin Jul 26, 2024
ad6cf12
Merge pull request #744 from ucl-isd/backup_error
jack-tii Jul 26, 2024
0f843a2
Merge pull request #710 from TomoTsuyuki/issue709
jack-tii Jul 29, 2024
555a48c
Fix unit test
jack-tii Jul 29, 2024
0b31ef8
Merge pull request #751 from turnitin/Fix-Unit-Test
jack-tii Jul 29, 2024
04bf5cb
Merge pull request #675 from glepod/fix-restore-assignment-end-date
jack-tii Jul 29, 2024
97fdd35
Fix undefined variable $user
jack-tii Jul 29, 2024
8820d1e
Replace deprecated coursecatlib.php
jack-tii Jul 29, 2024
528dbe3
Fix division by zero error
jack-tii Jul 30, 2024
cbce599
Merge pull request #233 from eviweb/fix-sdk-paths
jack-tii Jul 30, 2024
1c35d80
Merge pull request #754 from turnitin/Division-by-zero
jack-tii Jul 30, 2024
81737b0
Respect 'Allowed file types' option
jack-tii Jul 30, 2024
d48b928
Formatting
jack-tii Jul 30, 2024
035c887
More formatting
jack-tii Jul 30, 2024
9ba7032
Add return type for __doRequest
jack-tii Jul 30, 2024
fda5b00
Follow PP list of accepted types
jack-tii Jul 30, 2024
32925e6
Add hwpx to accepted file types
jack-tii Jul 30, 2024
5ebc738
Merge pull request #756 from turnitin/add-return-type
jack-tii Jul 30, 2024
a73553a
Merge pull request #755 from turnitin/allowed-file-types
jack-tii Jul 30, 2024
aeec01f
Merge pull request #753 from turnitin/Coursecat-Deprecated
jack-tii Jul 30, 2024
2801a5c
Merge pull request #752 from turnitin/Suspended-User-Checks
jack-tii Jul 30, 2024
19aedd5
Release notes v2024080101
jack-tii Aug 1, 2024
d7b03e6
Merge pull request #757 from turnitin/release-notes-aug-1st
jack-tii Aug 1, 2024
5b7a2b0
Merge pull request #758 from turnitin/develop
jack-tii Aug 1, 2024
de2d3e3
Bump version number
jack-tii Aug 1, 2024
8b8f159
Merge pull request #759 from turnitin/bump-version
jack-tii Aug 1, 2024
f5eaa20
Merge pull request #760 from turnitin/develop
jack-tii Aug 1, 2024
59d2b7a
Add null check in data dump
jack-tii Aug 6, 2024
760778e
Merge pull request #761 from turnitin/Null-Check
jack-tii Aug 6, 2024
5941c81
Merge pull request #735 from turnitin/feature/Saving_Intro_For_Assign…
TurnitinPaulina Sep 2, 2024
a703c7e
Rename js modules
jack-tii Sep 10, 2024
69dcfed
Merge pull request #763 from turnitin/update-js-modules
jack-tii Sep 10, 2024
e33b4e9
Release notes + version bump
jack-tii Sep 11, 2024
ea5c0a1
Update required Moodle version
jack-tii Sep 11, 2024
c372af7
Typo
jack-tii Sep 11, 2024
0918178
Merge pull request #764 from turnitin/release-2024-09-11
jack-tii Sep 11, 2024
259e6eb
Date format should be month first
jack-tii Sep 11, 2024
d827c73
Merge pull request #765 from turnitin/release-2024-09-11
jack-tii Sep 11, 2024
9b0d78e
Merge pull request #766 from turnitin/develop
jack-tii Sep 11, 2024
d463f3a
Merge remote-tracking branch 'upstream/master' into merge-v2024091101
petersistrom Feb 20, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 53 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,60 @@
### Date: 2024-September-11
### Release: v2024091101

---

#### Database Dumps Fixed
Previously the Show Data Dump and Save Data Dump tabs would sometimes display an error. This is now functioning as expected.

#### Anonymous Marking Fixed
Some users encountered an issue where student first names would be shown while anonymous marking was enabled. This has now been fixed.

---

### Date: 2024-August-01
### Release: v2024080101

---

#### Icon Image Fixed
Previously when a file was submitted that did not meet the requirements for processing by Turnitin, an icon image would be displayed incorrectly. This has now been fixed.

#### Issue With Multiple Peermark Assignments
Previously when a Moodle Direct V2 assignment contained 2 or more Peermark assignments, there was an issue that stopped them from successfully opening. This has now been fixed.

#### Fixed Inbox Ordering On First Name
Previously when sorting submissions in the assignment inbox by first name, the order of the sorted items would be incorrect. This has now been resolved.

#### Error Logged While Creating Course
Previously there was a bug which would sometimes cause an error to be logged while creating a course. This has now been resolved.

#### PHP 8.1+ Deprecation Warnings
We have resolved several deprecation warnings that would be displayed when running under PHP 8.1+.

#### Issue With Bulk Editing of Completion Settings
Previously there was an error when editing completion settings in bulk that would prevent the page from loading. This has now been resolved.

#### Error Generating Pseudo Last Names
Previously when generating dummy lastnames for students for data privacy purposes, the process would fail if no last name was set. This has now been resolved.

#### Error when Max Grade Set To Zero
Previously when a single part of a multi-part assignment had its max grade set to zero, the percentage grade would fail to be calculated and an error message would be shown instead. This has now been resolved and grades are shown correctly.

#### Error when restoring a course
Previously when deleting and later restoring a course, the course restoration would fail if the course end date had already passed. This was because the start date was being set to be after the end date. In cases where this would occur, we now set the end date to today, which allows the course to be restored correctly.

#### Bug in student enrolment
There was previously a bug in student enrolment that meant that sometimes suspended users were being enrolled on courses when they should have been skipped. This has now been resolved.

#### Checks For Submission File Types
Previously we were missing a check for the file types of submissions. This meant that students could always submit files of any type, which would cause their submissions to become stuck in a pending state. This has now been resolved, and if the option is enabled, students can upload only files of supported types.

---

### Date: 2024-March-29
### Release: v2024032901

#### Export Buttons Fixed

The export buttons along with the individual submission refresh and download buttons and the bulk submission download buttons are now functioning as expected.

### Date: 2024-February-06
Expand Down
1 change: 1 addition & 0 deletions backup/moodle2/restore_turnitintooltwo_stepslib.php
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ protected function process_turnitintooltwo_submissions($data) {

// Create TII User Account Details.
if (!$tiiuser = $DB->get_record('turnitintooltwo_users', array('turnitin_uid' => $data->tiiuserid))) {
$tiiuser = new stdClass();
$tiiuser->userid = $data->userid;
$tiiuser->turnitin_uid = $data->tiiuserid;
$DB->insert_record('turnitintooltwo_users', $tiiuser);
Expand Down
2 changes: 1 addition & 1 deletion classes/v1migration/v1migration.php
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ private function log_success_migration_event($turnitintooltwoid, $course_id, $v1
}

/**
* Get assignments for migrated data table. Called from ajax.php via turnitintooltwo_extra-2024032901.min.js.
* Get assignments for migrated data table. Called from ajax.php via turnitintooltwo_extra-2024100901.min.js.
*
* @global type $DB
* @return array return array of assignments to display
Expand Down
10 changes: 1 addition & 9 deletions extras.php
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,7 @@

$output .= $OUTPUT->box($coursesearchform, 'generalbox', 'course_search_options');

$displaylist = array();
$parentlist = array();
require_once($CFG->dirroot."/course/lib.php");
if (file_exists($CFG->libdir.'/coursecatlib.php')) {
require_once($CFG->libdir.'/coursecatlib.php');
$displaylist = coursecat::make_categories_list('');
} else {
make_categories_list($displaylist, $parentlist, '');
}
$displaylist = core_course_category::make_categories_list('');

$categoryselectlabel = html_writer::label(get_string('selectcoursecategory', 'turnitintooltwo'), 'create_course_category');
$categoryselect = html_writer::select($displaylist, 'create_course_category', '', array(),
Expand Down
6 changes: 3 additions & 3 deletions jquery/plugins.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
$plugins = array(
'turnitintooltwo-dataTables' => array('files' => array('jquery.dataTables.js', 'jquery.dataTables.css')),
'turnitintooltwo-dataTables_plugins' => array('files' => array('jquery.dataTables.plugins.js')),
'turnitintooltwo-turnitintooltwo' => array('files' => array('turnitintooltwo-2024032901.min.js')),
'turnitintooltwo-turnitintooltwo_extra' => array('files' => array('turnitintooltwo_extra-2024032901.min.js')),
'turnitintooltwo-turnitintooltwo_settings' => array('files' => array('turnitintooltwo_settings-2024032901.min.js')),
'turnitintooltwo-turnitintooltwo' => array('files' => array('turnitintooltwo-2024100901.min.js')),
'turnitintooltwo-turnitintooltwo_extra' => array('files' => array('turnitintooltwo_extra-2024100901.min.js')),
'turnitintooltwo-turnitintooltwo_settings' => array('files' => array('turnitintooltwo_settings-2024100901.min.js')),
'turnitintooltwo-datatables_columnfilter' => array('files' => array('jquery.dataTables.columnFilter.js')),
'turnitintooltwo-cookie' => array('files' => array('jquery.cookie.js')),
'turnitintooltwo-colorbox' => array('files' => array('jquery.colorbox.js', 'colorbox.css')),
Expand Down
1 change: 0 additions & 1 deletion jquery/turnitintooltwo-2024032901.min.js

This file was deleted.

1 change: 0 additions & 1 deletion jquery/turnitintooltwo-2024032901.min.js.map

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@
if (i == 3) {
submissionsDataTableColumns.push({ "sType": "string", "bSortable": false });
visibleCols.push(true);
// last name as index 2, make it hidden
} else if (i == 2) {
submissionsDataTableColumns.push({ "sType": "string", "bSortable": false, "bVisible": false });
visibleCols.push(false);
Expand All @@ -308,6 +309,10 @@
} else if ((i == 13 && showOrigReport) || (i == 12 && !showOrigReport)) {
submissionsDataTableColumns.push({ "sClass": "right" });
visibleCols.push(true);
// first name index noOfColumns - 1 in ordinar and multipart assignments, make it hidden
} else if (i == noOfColumns - 1) {
submissionsDataTableColumns.push({ "sType": "string", "bSortable": false, "bVisible": false });
visibleCols.push(false);
} else if (i == 1 || ((i >= 9 && !showOrigReport && !useGradeMark)
|| (i >= 11 && ((!showOrigReport && useGradeMark) || (showOrigReport && !useGradeMark)))
|| (i >= 13 && showOrigReport && useGradeMark))) {
Expand Down
1 change: 1 addition & 0 deletions jquery/turnitintooltwo-2024100901.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions jquery/turnitintooltwo-2024100901.min.js.map

Large diffs are not rendered by default.

Loading