Skip to content

Commit 3a7331f

Browse files
watson8watson8
committed
CTP-3703 wwwroot to JS
1 parent 3024b55 commit 3a7331f

File tree

5 files changed

+37
-36
lines changed

5 files changed

+37
-36
lines changed

‎datatables/js/allocation_datatables.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
*/
99

1010

11-
M.mod_coursework_datatables = {
12-
13-
11+
const wwwroot = document.getElementById('mod-coursework-config').dataset.wwwroot;
1412

13+
M.mod_coursework_datatables = {
14+
1515

1616
/**
1717
* This is to set up the listeners etc for the page elements on the allocations page.
@@ -79,7 +79,7 @@ M.mod_coursework_datatables = {
7979

8080

8181
$.ajax({
82-
url: '/mod/coursework/actions/ajax/datatable/allocation.php',
82+
url: wwwroot + '/mod/coursework/actions/ajax/datatable/allocation.php',
8383
type: 'POST',
8484
data: options
8585
}).done(function(response) {
@@ -177,7 +177,7 @@ M.mod_coursework_datatables = {
177177
var dropdown = $(this);
178178

179179
$.ajax({
180-
url: '/mod/coursework/actions/update_allocated_assessor.php',
180+
url: wwwroot + '/mod/coursework/actions/update_allocated_assessor.php',
181181
type: 'POST',
182182
data: allocationoptions
183183
}).done(function (response) {
@@ -238,7 +238,7 @@ M.mod_coursework_datatables = {
238238

239239

240240
$.ajax({
241-
url: '/mod/coursework/actions/update_allocated_pinned.php',
241+
url: wwwroot + '/mod/coursework/actions/update_allocated_pinned.php',
242242
type: 'POST',
243243
data: pinneddata
244244
}).done(function (response) {
@@ -270,7 +270,7 @@ M.mod_coursework_datatables = {
270270

271271

272272
$.ajax({
273-
url: '/mod/coursework/actions/update_allocated_pinned.php',
273+
url: wwwroot + '/mod/coursework/actions/update_allocated_pinned.php',
274274
type: 'POST',
275275
data: pinneddata
276276
}).done(function (response) {
@@ -302,7 +302,7 @@ M.mod_coursework_datatables = {
302302

303303

304304
$.ajax({
305-
url: '/mod/coursework/actions/update_allocated_pinned.php',
305+
url: wwwroot + '/mod/coursework/actions/update_allocated_pinned.php',
306306
type: 'POST',
307307
data: pinneddata
308308
}).done(function (response) {
@@ -441,7 +441,7 @@ M.mod_coursework_datatables = {
441441

442442

443443
$.ajax({
444-
url: '/mod/coursework/actions/update_allocatable_in_sample.php',
444+
url: wwwroot + '/mod/coursework/actions/update_allocatable_in_sample.php',
445445
type: 'POST',
446446
data: allocstablesampledata
447447
}).done(function (response) {

‎datatables/js/bulkplagiarismflag_datatables.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
88
*/
99

10+
const wwwroot = document.getElementById('mod-coursework-config').dataset.wwwroot;
1011

1112
M.mod_coursework_datatables = {
1213

@@ -62,7 +63,7 @@ console.log('calling datatables');
6263

6364

6465
$.ajax({
65-
url: '/mod/coursework/actions/ajax/datatable/bulkplagiarismflag.php',
66+
url: wwwroot + '/mod/coursework/actions/ajax/datatable/bulkplagiarismflag.php',
6667
type: 'POST',
6768
data: options
6869
}).done(function(response) {
@@ -208,7 +209,7 @@ console.log(datatable);
208209

209210

210211
$.ajax({
211-
url: '/mod/coursework/actions/update_allocatable_in_sample.php',
212+
url: wwwroot + '/mod/coursework/actions/update_allocatable_in_sample.php',
212213
type: 'POST',
213214
data: allocstablesampledata
214215
}).done(function (response) {

‎datatables/js/datatables.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,9 @@ var display_suspended_gbl = 0;
99
var tableobject = 0;
1010

1111
$( document ).ready(function() {
12-
13-
14-
1512
var langmessage = JSON.parse($('#element_lang_messages').attr('data-lang'));
16-
17-
var base_url = window.location.origin + '/mod/coursework/datatables/js/';
13+
const wwwroot = document.getElementById('mod-coursework-config').dataset.wwwroot
14+
var base_url = wwwroot + '/mod/coursework/datatables/js/';
1815

1916
require.config({
2017
paths: {
@@ -124,7 +121,7 @@ $( document ).ready(function() {
124121
};
125122

126123
$.ajax({
127-
url: '/mod/coursework/actions/ajax/datatable/grading.php',
124+
url: wwwroot + '/mod/coursework/actions/ajax/datatable/grading.php',
128125
type: 'POST',
129126
data: params
130127
}).done(function(response) {

‎datatables/js/edit_datatables.js

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ function notification_init() {
33
// Init stuff ...
44
}
55

6+
const wwwroot = document.getElementById('mod-coursework-config').dataset.wwwroot
7+
68
/**
79
*
810
* @param row
@@ -142,7 +144,7 @@ $(document).ready(function () {
142144
return 0;
143145
}
144146

145-
var url = datatables_lang_messages.url_root + "/mod/coursework/actions/personal_deadline.php";
147+
var url = wwwroot + "/mod/coursework/actions/personal_deadline.php";
146148
var param = JSON.parse(data_get);
147149
param.personal_deadline_time = value;
148150

@@ -237,7 +239,7 @@ $(document).ready(function () {
237239
params.pre_defined_reason = $('#extension-reason-select').val();
238240
params.requesttype = 'submit';
239241
current_rowid = $('#button-id').val();
240-
var url = datatables_lang_messages.url_root;
242+
var url = wwwroot;
241243
$.ajax({
242244
type: "POST",
243245
url: url + "/mod/coursework/actions/ajax/deadline_extension/submit.php",
@@ -587,7 +589,7 @@ $(document).ready(function () {
587589
$('#extension-submissionid').val(data_params.submissionid);
588590
$('#extension-name').val(data_name);
589591
data_params.requesttype = 'edit';
590-
var url = datatables_lang_messages.url_root;
592+
var url = wwwroot;
591593
$.ajax({
592594
type: "GET",
593595
url: url + "/mod/coursework/actions/ajax/deadline_extension/edit.php",
@@ -652,7 +654,7 @@ $(document).ready(function () {
652654
$('#form-extension').find('textarea').val('');
653655

654656
if(data_time.is_have_deadline == '1') {
655-
var url = datatables_lang_messages.url_root;
657+
var url = wwwroot;
656658
$.ajax({
657659
type: "GET",
658660
url: url + "/mod/coursework/actions/ajax/deadline_extension/new.php",
@@ -815,11 +817,12 @@ $(document).ready(function () {
815817
var removefeedbackbutton = (button.attr('id') == 'id_removefeedbackbutton') ? 1 : 0;
816818
var submitfeedbackbutton = (button.attr('id') == 'id_submitfeedbackbutton') ? 1 : 0;
817819
var modal = $('#modal-grading');
818-
var url = '/mod/coursework/actions/feedbacks/create.php';
820+
var url = wwwroot + '/mod/coursework/actions/feedbacks/create.php';
821+
console.log('ur', datatables_lang_messages, url)
819822
var form_data = modal.find('form').serializeArray();
820823
for (var i = 0, length = form_data.length; i < length; i++) {
821824
if (form_data[i].name == 'feedbackid' && !isNaN(parseInt(form_data[i].value)) && form_data[i].value != '0') {
822-
url = '/mod/coursework/actions/feedbacks/update.php';
825+
url = wwwroot + '/mod/coursework/actions/feedbacks/update.php';
823826
break;
824827
}
825828
}
@@ -876,7 +879,7 @@ $(document).ready(function () {
876879
var removefeedbackbutton = (button.attr('id') == 'id_removefeedbackbutton') ? 1 : 0;
877880
var submitfeedbackbutton = (button.attr('id') == 'id_submitfeedbackbutton') ? 1 : 0;
878881
var modal = $('#modal-grading');
879-
var url = '/mod/coursework/actions/feedbacks/update.php';
882+
var url = wwwroot + '/mod/coursework/actions/feedbacks/update.php';
880883
var form_data = modal.find('form').serializeArray();
881884
var cell_type = modal.find('#cell_type').val();
882885
update_feedback(form_data, url, cell_type, submitbutton, removefeedbackbutton, submitfeedbackbutton,1, button);

‎view.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -529,20 +529,20 @@
529529
$html .= $page_renderer->render_modal();
530530
}
531531
}
532+
$PAGE->requires->jquery();
533+
$PAGE->requires->css(new moodle_url('/mod/coursework/datatables/css/datatables.bootstrap.min.css'));
534+
$PAGE->requires->css(new moodle_url('//mod/coursework/datatables/css/jquery.datetimepicker.css'));
535+
$datatablesjsfiles = [
536+
'datatables.js', 'edit_datatables.js',
537+
// 'jquery-3.3.1.min.js', 'jquery.datatables.js', 'php-date-formatter.min.js',
538+
];
539+
foreach ($datatablesjsfiles as $datatablesjs) {
540+
$PAGE->requires->js(new moodle_url("/mod/coursework/datatables/js/$datatablesjs"));
541+
}
532542

533543
echo $OUTPUT->header();
534544
echo $html;
535-
echo '<script src="'.$CFG->wwwroot.'/mod/coursework/datatables/js/jquery-3.3.1.min.js"></script>
536-
<link rel="stylesheet" type="text/css" href="'. $CFG->wwwroot .'/mod/coursework/datatables/css/datatables.bootstrap.min.css"/>
537-
<link rel="stylesheet" type="text/css" href="'. $CFG->wwwroot .'/mod/coursework/datatables/css/jquery.datetimepicker.css"/>
538-
<script src="'.$CFG->wwwroot.'/mod/coursework/datatables/js/jquery.datatables.js"></script>
539-
<script src="'.$CFG->wwwroot.'/mod/coursework/datatables/js/datatables.js"></script>
540-
<script src="'.$CFG->wwwroot.'/mod/coursework/datatables/js/php-date-formatter.min.js"></script>
541-
<script src="'.$CFG->wwwroot.'/mod/coursework/datatables/js/edit_datatables.js"></script>
542-
';
543-
544-
// $PAGE->requires->js('/mod/coursework/datatables/js/jquery-3.3.1.min.js');
545-
// $PAGE->requires->js('/mod/coursework/datatables/js/jquery.datatables.js');
546-
// Finish the page.
545+
// Provide wwwroot to JS.
546+
echo html_writer::div('', '', ['id' => 'mod-coursework-config', 'data-wwwroot' => $CFG->wwwroot]);
547547
echo $OUTPUT->footer();
548548

0 commit comments

Comments
 (0)