This fixes many issues with the plugin

README.md

@@ -1,3 +1,8 @@
+Archived
+======================================================================
+Visit UCL Repo for latest commits
+https://github.com/ucl-isd/moodle-mod_coursework
+
 Coursework Activity
 ======================================================================
 Copyright University of London.

actions/ajax/datatable/grading.php

@@ -0,0 +1,39 @@
+<?php
+ob_start();
+require_once(dirname(__FILE__) . '/../../../../../config.php');
+
+global $CFG, $USER, $DB, $SESSION, $PAGE;
+
+$PAGE->set_context(context_system::instance());
+
+$group = required_param('group', PARAM_INT);
+$perpage = required_param('perpage', PARAM_INT);
+$sortby = required_param('sortby', PARAM_ALPHA);
+$sorthow = required_param('sorthow', PARAM_ALPHA);
+$courseworkid = required_param('courseworkid', PARAM_INT);
+$unallocated = optional_param('unallocated', false, PARAM_BOOL);
+
+// Grading report display options.
+$report_options = array();
+if ($unallocated) {
+    $report_options['unallocated'] = true;
+}
+
+$report_options['group'] = $group;
+$report_options['perpage'] = $perpage;
+$report_options['sortby'] = $sortby;
+$report_options['sorthow'] = $sorthow;
+$report_options['showsubmissiongrade'] = false;
+$report_options['showgradinggrade'] = false;
+$report_options['courseworkid'] = $courseworkid;
+$report_options['mode'] = \mod_coursework\grading_report::$MODE_GET_REMAIN_RECORDS;
+
+//$controller = new mod_coursework\controllers\grading_controller(['courseworkid' => $report_options, 'allocatableid' => $USER->id, 'allocatabletype' => $USER->id]);
+$controller = new mod_coursework\controllers\grading_controller([]);
+sleep(10);
+$table_html = $controller->get_remain_rows_grading_table($report_options);
+if (ob_get_contents()) {
+    ob_end_clean();
+}
+
+echo $table_html;

actions/ajax/deadline_extension/edit.php

@@ -0,0 +1,32 @@
+<?php
+
+require_once(dirname(__FILE__) . '/../../../../../config.php');
+
+global $CFG, $USER;
+$courseworkid = required_param('courseworkid', PARAM_INT);
+$allocatableid = optional_param('allocatableid', $USER->id, PARAM_INT);
+$allocatabletype = optional_param('allocatabletype', $USER->id, PARAM_ALPHANUMEXT);
+$requesttype = optional_param('requesttype', 'new', PARAM_ALPHANUMEXT);
+$id = optional_param('id', 0, PARAM_INT);
+$extra_information_text = optional_param('text', '', PARAM_RAW);
+$extra_information_format = optional_param('format', 1, PARAM_ALPHANUMEXT);
+$extended_deadline = optional_param('extended_deadline', 0, PARAM_ALPHANUMEXT);
+$pre_defined_reason = optional_param('pre_defined_reason', null, PARAM_ALPHANUMEXT);
+$submissionid = optional_param('submissionid', 0, PARAM_INT);
+$name = optional_param('name', 0, PARAM_ALPHANUMEXT);
+$params = array(
+    'courseworkid' => $courseworkid,
+    'allocatableid' => $allocatableid,
+    'allocatabletype' => $allocatabletype,
+);
+$controller = new mod_coursework\controllers\deadline_extensions_controller($params);
+
+$params['id'] = $id;
+$params['extra_information_text'] = $extra_information_text;
+$params['extra_information_format'] = $extra_information_format;
+$params['extended_deadline'] = strtotime($extended_deadline);
+$params['pre_defined_reason'] = $pre_defined_reason;
+$params['submissionid'] = $submissionid;
+$params['name'] = $name;
+
+$controller->ajax_edit_mitigation($params);

actions/ajax/deadline_extension/new.php

@@ -0,0 +1,32 @@
+<?php
+
+require_once(dirname(__FILE__) . '/../../../../../config.php');
+
+global $CFG, $USER;
+$courseworkid = required_param('courseworkid', PARAM_INT);
+$allocatableid = optional_param('allocatableid', $USER->id, PARAM_INT);
+$allocatabletype = optional_param('allocatabletype', $USER->id, PARAM_ALPHANUMEXT);
+$requesttype = optional_param('requesttype', 'new', PARAM_ALPHANUMEXT);
+$id = optional_param('id', 0, PARAM_INT);
+$extra_information_text = optional_param('text', '', PARAM_RAW);
+$extra_information_format = optional_param('format', 1, PARAM_ALPHANUMEXT);
+$extended_deadline = optional_param('extended_deadline', 0, PARAM_ALPHANUMEXT);
+$pre_defined_reason = optional_param('pre_defined_reason', null, PARAM_ALPHANUMEXT);
+$submissionid = optional_param('submissionid', 0, PARAM_INT);
+$name = optional_param('name', 0, PARAM_ALPHANUMEXT);
+$params = array(
+    'courseworkid' => $courseworkid,
+    'allocatableid' => $allocatableid,
+    'allocatabletype' => $allocatabletype,
+);
+$controller = new mod_coursework\controllers\deadline_extensions_controller($params);
+
+$params['id'] = $id;
+$params['extra_information_text'] = $extra_information_text;
+$params['extra_information_format'] = $extra_information_format;
+$params['extended_deadline'] = strtotime($extended_deadline);
+$params['pre_defined_reason'] = $pre_defined_reason;
+$params['submissionid'] = $submissionid;
+$params['name'] = $name;
+
+$controller->ajax_new_mitigation($params);

actions/ajax/deadline_extension/submit.php

@@ -0,0 +1,33 @@
+<?php
+
+require_once(dirname(__FILE__) . '/../../../../../config.php');
+
+global $CFG, $USER;
+$courseworkid = required_param('courseworkid', PARAM_INT);
+$allocatableid = optional_param('allocatableid', $USER->id, PARAM_INT);
+$allocatabletype = optional_param('allocatabletype', $USER->id, PARAM_ALPHANUMEXT);
+$requesttype = optional_param('requesttype', 'new', PARAM_ALPHANUMEXT);
+$id = optional_param('id', 0, PARAM_INT);
+$extra_information_text = optional_param('text', '', PARAM_RAW);
+$extra_information_format = optional_param('format', 1, PARAM_ALPHANUMEXT);
+$extended_deadline = optional_param('extended_deadline', 0, PARAM_ALPHANUMEXT);
+$pre_defined_reason = optional_param('pre_defined_reason', null, PARAM_ALPHANUMEXT);
+$submissionid = optional_param('submissionid', 0, PARAM_INT);
+$name = optional_param('name', 0, PARAM_ALPHANUMEXT);
+$params = array(
+    'courseworkid' => $courseworkid,
+    'allocatableid' => $allocatableid,
+    'allocatabletype' => $allocatabletype,
+);
+$controller = new mod_coursework\controllers\deadline_extensions_controller($params);
+
+$params['id'] = $id;
+$params['extra_information_text'] = $extra_information_text;
+$params['extra_information_format'] = $extra_information_format;
+$params['extended_deadline'] = strtotime($extended_deadline);
+$params['pre_defined_reason'] = $pre_defined_reason;
+$params['submissionid'] = $submissionid;
+$params['name'] = $name;
+
+$controller->ajax_submit_mitigation($params);
+

actions/feedbacks/create.php

@@ -14,13 +14,20 @@
 $assessorid = optional_param('assessorid', $USER->id, PARAM_INT);
 $stage_identifier = optional_param('stage_identifier', '', PARAM_ALPHANUMEXT);
 $finalised = !!optional_param('submitbutton', 0, PARAM_TEXT);
+$ajax = optional_param('ajax', 0, PARAM_INT);
 
 $params = array(
     'submissionid' => $submissionid,
     'isfinalgrade' => $isfinalgrade,
     'assessorid' => $assessorid,
     'stage_identifier' => $stage_identifier,
     'finalised' => $finalised,
+    'ajax' => $ajax,
 );
+
+if ($ajax) {
+    $params['cell_type'] = required_param('cell_type', PARAM_TEXT);
+}
+
 $controller = new mod_coursework\controllers\feedback_controller($params);
 $controller->create_feedback();

actions/feedbacks/edit.php

@@ -27,9 +27,11 @@
 
 
 $feedbackid = optional_param('feedbackid', 0, PARAM_INT);
+$ajax = optional_param('ajax', 0, PARAM_INT);
 
 $params = array(
     'feedbackid' => $feedbackid,
+    'ajax' => $ajax
 );
 $controller = new mod_coursework\controllers\feedback_controller($params);
 $controller->edit_feedback();

actions/feedbacks/new.php

@@ -30,13 +30,15 @@
 $feedbackid = optional_param('feedbackid', 0, PARAM_INT);
 $assessorid = optional_param('assessorid', $USER->id, PARAM_INT);
 $stage_identifier = optional_param('stage_identifier', 'uh-oh',  PARAM_RAW);
+$ajax = optional_param('ajax', 0,  PARAM_INT);
 
 $params = array(
     'submissionid' => $submissionid,
     'cmid' => $cmid,
     'feedbackid' => $feedbackid,
     'assessorid' => $assessorid,
     'stage_identifier' => $stage_identifier,
+    'ajax' => $ajax,
 );
 $controller = new mod_coursework\controllers\feedback_controller($params);
-$controller->new_feedback();
+$controller->new_feedback();

actions/feedbacks/show.php

@@ -26,9 +26,12 @@
 global $CFG, $USER;
 
 $feedbackid = optional_param('feedbackid', 0, PARAM_INT);
+$ajax = optional_param('ajax', 0, PARAM_INT);
 
 $params = array(
     'feedbackid' => $feedbackid,
+    'ajax' => $ajax
+
 );
 $controller = new mod_coursework\controllers\feedback_controller($params);
 $controller->show_feedback();

actions/feedbacks/update.php

@@ -11,10 +11,21 @@
 
 $feedbackid = required_param('feedbackid', PARAM_INT);
 $finalised = !!optional_param('submitbutton', 0, PARAM_TEXT);
+$ajax = optional_param('ajax', 0, PARAM_INT);
+$remove = !!optional_param('removefeedbackbutton', 0, PARAM_TEXT);
+$confirm = optional_param('confirm', 0, PARAM_INT);
 
 $params = array(
     'feedbackid' => $feedbackid,
     'finalised' => $finalised,
+    'remove' => $remove,
+    'confirm' => $confirm,
+    'ajax' => $ajax
 );
+
+if ($ajax) {
+    $params['cell_type'] = required_param('cell_type', PARAM_TEXT);
+}
+
 $controller = new mod_coursework\controllers\feedback_controller($params);
 $controller->update_feedback();

actions/personal_deadline.php

@@ -2,24 +2,52 @@
 
 require_once(dirname(__FILE__) . '/../../../config.php');
 
-global $CFG, $USER;
+global $CFG, $USER, $PAGE, $DB;
+
+
 
 $courseworkid = required_param('courseworkid', PARAM_INT);
 $allocatableid_arr = optional_param_array('allocatableid_arr', false, PARAM_RAW);
 $allocatableid = optional_param('allocatableid', $USER->id, PARAM_RAW);
 $allocatabletype = optional_param('allocatabletype', $USER->id, PARAM_ALPHANUMEXT);
 $setpersonaldeadlinespage    =   optional_param('setpersonaldeadlinespage', 0, PARAM_INT);
 $multipleuserdeadlines  =   optional_param('multipleuserdeadlines', 0, PARAM_INT);
-
+$selectedtype  =   optional_param('selectedtype','date', PARAM_RAW);
+$personal_deadline_time = optional_param('personal_deadline_time',null,PARAM_RAW);
 
 $allocatableid  =   (!empty($allocatableid_arr))    ?   $allocatableid_arr  : $allocatableid  ;
 
+
+$coursework_db =   $DB->get_record('coursework',array('id'=>$courseworkid));
+
+$coursework     =   \mod_coursework\models\coursework::find($coursework_db);
+
+require_login($coursework->get_course(),false,$coursework->get_course_module());
+
 $params = array(
     'courseworkid' => $courseworkid,
     'allocatableid' => $allocatableid,
     'allocatabletype' => $allocatabletype,
     'setpersonaldeadlinespage'   => $setpersonaldeadlinespage,
     'multipleuserdeadlines'  =>  $multipleuserdeadlines
 );
-$controller = new mod_coursework\controllers\personal_deadlines_controller($params);
-$controller->new_personal_deadline();
+
+if ($selectedtype != 'unfinalise') {
+    $controller = new mod_coursework\controllers\personal_deadlines_controller($params);
+
+    if(!empty($personal_deadline_time)) {
+        $result = $controller->insert_update($personal_deadline_time);
+        echo json_encode($result);
+    } else {
+        $controller->new_personal_deadline();
+    }
+} else {
+
+    if (!has_capability('mod/coursework:revertfinalised', $PAGE->context)) {
+        $message = 'You do not have permission to revert submissions';
+        redirect($url, $message);
+    }
+
+    $controller =   new mod_coursework\controllers\submissions_controller($params);
+    $controller->unfinalise_submission();
+}

actions/upload_allocations.php

@@ -81,6 +81,9 @@
     $page_renderer = $PAGE->get_renderer('mod_coursework', 'page');
     echo $page_renderer->process_csv_upload($procsessingresults, $content, $csvtype);
 
+    $cache = \cache::make('mod_coursework', 'courseworkdata', ['id' => $coursework->id]);
+    $cache->purge();
+
 } else {
     $page_renderer = $PAGE->get_renderer('mod_coursework', 'page');
     echo $page_renderer->csv_upload($allocationsuploadform, $csvtype);