Skip to content

Commit

Permalink
CTP-3703 wwwroot to JS
Browse files Browse the repository at this point in the history
  • Loading branch information
@watson8
watson8 committed Aug 28, 2024
1 parent 3024b55 commit f06134a
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 39 deletions.
17 changes: 8 additions & 9 deletions datatables/js/allocation_datatables.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@
*/


M.mod_coursework_datatables = {


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

M.mod_coursework_datatables = {

/**
* This is to set up the listeners etc for the page elements on the allocations page.
Expand Down Expand Up @@ -79,7 +78,7 @@ M.mod_coursework_datatables = {


$.ajax({
url: '/mod/coursework/actions/ajax/datatable/allocation.php',
url: wwwroot + '/mod/coursework/actions/ajax/datatable/allocation.php',
type: 'POST',
data: options
}).done(function(response) {
Expand Down Expand Up @@ -177,7 +176,7 @@ M.mod_coursework_datatables = {
var dropdown = $(this);

$.ajax({
url: '/mod/coursework/actions/update_allocated_assessor.php',
url: wwwroot + '/mod/coursework/actions/update_allocated_assessor.php',
type: 'POST',
data: allocationoptions
}).done(function (response) {
Expand Down Expand Up @@ -238,7 +237,7 @@ M.mod_coursework_datatables = {


$.ajax({
url: '/mod/coursework/actions/update_allocated_pinned.php',
url: wwwroot + '/mod/coursework/actions/update_allocated_pinned.php',
type: 'POST',
data: pinneddata
}).done(function (response) {
Expand Down Expand Up @@ -270,7 +269,7 @@ M.mod_coursework_datatables = {


$.ajax({
url: '/mod/coursework/actions/update_allocated_pinned.php',
url: wwwroot + '/mod/coursework/actions/update_allocated_pinned.php',
type: 'POST',
data: pinneddata
}).done(function (response) {
Expand Down Expand Up @@ -302,7 +301,7 @@ M.mod_coursework_datatables = {


$.ajax({
url: '/mod/coursework/actions/update_allocated_pinned.php',
url: wwwroot + '/mod/coursework/actions/update_allocated_pinned.php',
type: 'POST',
data: pinneddata
}).done(function (response) {
Expand Down Expand Up @@ -441,7 +440,7 @@ M.mod_coursework_datatables = {


$.ajax({
url: '/mod/coursework/actions/update_allocatable_in_sample.php',
url: wwwroot + '/mod/coursework/actions/update_allocatable_in_sample.php',
type: 'POST',
data: allocstablesampledata
}).done(function (response) {
Expand Down
8 changes: 3 additions & 5 deletions datatables/js/bulkplagiarismflag_datatables.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

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

M.mod_coursework_datatables = {




/**
* This is to set up the listeners etc for the page elements on the allocations page.
*/
Expand Down Expand Up @@ -62,7 +60,7 @@ console.log('calling datatables');


$.ajax({
url: '/mod/coursework/actions/ajax/datatable/bulkplagiarismflag.php',
url: wwwroot + '/mod/coursework/actions/ajax/datatable/bulkplagiarismflag.php',
type: 'POST',
data: options
}).done(function(response) {
Expand Down Expand Up @@ -208,7 +206,7 @@ console.log(datatable);


$.ajax({
url: '/mod/coursework/actions/update_allocatable_in_sample.php',
url: wwwroot + '/mod/coursework/actions/update_allocatable_in_sample.php',
type: 'POST',
data: allocstablesampledata
}).done(function (response) {
Expand Down
9 changes: 3 additions & 6 deletions datatables/js/datatables.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,9 @@ var display_suspended_gbl = 0;
var tableobject = 0;

$( document ).ready(function() {



var langmessage = JSON.parse($('#element_lang_messages').attr('data-lang'));

var base_url = window.location.origin + '/mod/coursework/datatables/js/';
const wwwroot = document.getElementById('mod-coursework-config').dataset.wwwroot
var base_url = wwwroot + '/mod/coursework/datatables/js/';

require.config({
paths: {
Expand Down Expand Up @@ -124,7 +121,7 @@ $( document ).ready(function() {
};

$.ajax({
url: '/mod/coursework/actions/ajax/datatable/grading.php',
url: wwwroot + '/mod/coursework/actions/ajax/datatable/grading.php',
type: 'POST',
data: params
}).done(function(response) {
Expand Down
16 changes: 9 additions & 7 deletions datatables/js/edit_datatables.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ function notification_init() {
// Init stuff ...
}

const wwwroot = document.getElementById('mod-coursework-config').dataset.wwwroot

/**
*
* @param row
Expand Down Expand Up @@ -142,7 +144,7 @@ $(document).ready(function () {
return 0;
}

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

Expand Down Expand Up @@ -237,7 +239,7 @@ $(document).ready(function () {
params.pre_defined_reason = $('#extension-reason-select').val();
params.requesttype = 'submit';
current_rowid = $('#button-id').val();
var url = datatables_lang_messages.url_root;
var url = wwwroot;
$.ajax({
type: "POST",
url: url + "/mod/coursework/actions/ajax/deadline_extension/submit.php",
Expand Down Expand Up @@ -587,7 +589,7 @@ $(document).ready(function () {
$('#extension-submissionid').val(data_params.submissionid);
$('#extension-name').val(data_name);
data_params.requesttype = 'edit';
var url = datatables_lang_messages.url_root;
var url = wwwroot;
$.ajax({
type: "GET",
url: url + "/mod/coursework/actions/ajax/deadline_extension/edit.php",
Expand Down Expand Up @@ -652,7 +654,7 @@ $(document).ready(function () {
$('#form-extension').find('textarea').val('');

if(data_time.is_have_deadline == '1') {
var url = datatables_lang_messages.url_root;
var url = wwwroot;
$.ajax({
type: "GET",
url: url + "/mod/coursework/actions/ajax/deadline_extension/new.php",
Expand Down Expand Up @@ -815,11 +817,11 @@ $(document).ready(function () {
var removefeedbackbutton = (button.attr('id') == 'id_removefeedbackbutton') ? 1 : 0;
var submitfeedbackbutton = (button.attr('id') == 'id_submitfeedbackbutton') ? 1 : 0;
var modal = $('#modal-grading');
var url = '/mod/coursework/actions/feedbacks/create.php';
var url = wwwroot + '/mod/coursework/actions/feedbacks/create.php';
var form_data = modal.find('form').serializeArray();
for (var i = 0, length = form_data.length; i < length; i++) {
if (form_data[i].name == 'feedbackid' && !isNaN(parseInt(form_data[i].value)) && form_data[i].value != '0') {
url = '/mod/coursework/actions/feedbacks/update.php';
url = wwwroot + '/mod/coursework/actions/feedbacks/update.php';
break;
}
}
Expand Down Expand Up @@ -876,7 +878,7 @@ $(document).ready(function () {
var removefeedbackbutton = (button.attr('id') == 'id_removefeedbackbutton') ? 1 : 0;
var submitfeedbackbutton = (button.attr('id') == 'id_submitfeedbackbutton') ? 1 : 0;
var modal = $('#modal-grading');
var url = '/mod/coursework/actions/feedbacks/update.php';
var url = wwwroot + '/mod/coursework/actions/feedbacks/update.php';
var form_data = modal.find('form').serializeArray();
var cell_type = modal.find('#cell_type').val();
update_feedback(form_data, url, cell_type, submitbutton, removefeedbackbutton, submitfeedbackbutton,1, button);
Expand Down
24 changes: 12 additions & 12 deletions view.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -529,20 +529,20 @@
$html .= $page_renderer->render_modal();
}
}
$PAGE->requires->jquery();
$PAGE->requires->css(new moodle_url('/mod/coursework/datatables/css/datatables.bootstrap.min.css'));
$PAGE->requires->css(new moodle_url('//mod/coursework/datatables/css/jquery.datetimepicker.css'));
$datatablesjsfiles = [
'datatables.js', 'edit_datatables.js',
// 'jquery-3.3.1.min.js', 'jquery.datatables.js', 'php-date-formatter.min.js',
];
foreach ($datatablesjsfiles as $datatablesjs) {
$PAGE->requires->js(new moodle_url("/mod/coursework/datatables/js/$datatablesjs"));
}

echo $OUTPUT->header();
echo $html;
echo '<script src="'.$CFG->wwwroot.'/mod/coursework/datatables/js/jquery-3.3.1.min.js"></script>
<link rel="stylesheet" type="text/css" href="'. $CFG->wwwroot .'/mod/coursework/datatables/css/datatables.bootstrap.min.css"/>
<link rel="stylesheet" type="text/css" href="'. $CFG->wwwroot .'/mod/coursework/datatables/css/jquery.datetimepicker.css"/>
<script src="'.$CFG->wwwroot.'/mod/coursework/datatables/js/jquery.datatables.js"></script>
<script src="'.$CFG->wwwroot.'/mod/coursework/datatables/js/datatables.js"></script>
<script src="'.$CFG->wwwroot.'/mod/coursework/datatables/js/php-date-formatter.min.js"></script>
<script src="'.$CFG->wwwroot.'/mod/coursework/datatables/js/edit_datatables.js"></script>
';

// $PAGE->requires->js('/mod/coursework/datatables/js/jquery-3.3.1.min.js');
// $PAGE->requires->js('/mod/coursework/datatables/js/jquery.datatables.js');
// Finish the page.
// Provide wwwroot to JS.
echo html_writer::div('', '', ['id' => 'mod-coursework-config', 'data-wwwroot' => $CFG->wwwroot]);
echo $OUTPUT->footer();

0 comments on commit f06134a

Please sign in to comment.