Update Laravel to 7.0

This commit is contained in:
George Frederick "Buzz" Beurling
2020-06-20 17:03:30 -04:00
parent f104c1b61b
commit 8866cafd31
57 changed files with 8739 additions and 2281 deletions

View File

@@ -4,6 +4,7 @@ var eventType;
var editorMode = 'schedule';
function initEditor(event_id = 1, mode = 'schedule')
{
let isLoad = $.Deferred();
let editor = $('#editor');
editorMode = mode;
eventType = null;
@@ -24,8 +25,27 @@ function initEditor(event_id = 1, mode = 'schedule')
nbOfPeriode = eventType['schedule_model']['periodes'].length;
updateWidth();
editor.html(getTemplate(eventType['schedule_model']));
if (mode == 'eventType')
$('.richeditor').trumbowyg({
lang: 'fr',
btns: [
['viewHTML'],
['emoji'],
['undo', 'redo'], // Only supported in Blink browsers
['strong', 'em', 'del'],
['superscript', 'subscript'],
['fontfamily'],
['fontsize'],
['foreColor', 'backColor'],
['link'],
['insertImage'],
['justifyLeft', 'justifyCenter', 'justifyRight', 'justifyFull'],
['unorderedList', 'orderedList'],
['horizontalRule'],
['removeformat'],
['fullscreen']
]
});
if (mode == 'eventType' || mode == 'schedule-add')
{
let scheduleModel = eventType['schedule_model'];
if (scheduleModel['default_value'])
@@ -39,11 +59,32 @@ function initEditor(event_id = 1, mode = 'schedule')
});
});
}
$('.no-mandatory').removeAttr('required')
if (mode != 'schedule-add')
{
$('.scheduleInput').removeAttr('required')
}
}
if (mode == 'schedule-add')
{
$('.datetimepicker').datetimepicker({
icons: {
time: "fa fa-clock-o",
date: "fa fa-calendar",
up: "fa fa-chevron-up",
down: "fa fa-chevron-down",
previous: 'fa fa-chevron-left',
next: 'fa fa-chevron-right',
today: 'fa fa-screenshot',
clear: 'fa fa-trash',
close: 'fa fa-remove'
}
});
}
initAutoComplete("AutoCompleteUser");
initAutoCompleteOCOM('AutoCompleteOCOM');
isLoad.resolve();
});
return isLoad.promise();
}
function updateWidth()
@@ -167,6 +208,14 @@ function getPeriode(id,periode,niveaux) {
function getCourse(level_id,periode_id)
{
let isCourse = "";
if (eventType['schedule_model']['default_value'])
{
if(eventType['schedule_model']['default_value'][periode_id][level_id]['use_course'] != null)
{
isCourse = "required";
}
}
level_id++;
periode_id++;
return '<div id="container-'+level_id+'-'+periode_id+'" niveau="'+level_id+'" periode="'+periode_id+'" class="col m-0 border-bottom border-right scheduleEditor-course">\n' +
@@ -191,14 +240,13 @@ function getCourse(level_id,periode_id)
' <div class="row pt-2">\n' +
' <div class="col-12 d-none" id="descContainer'+level_id+'-'+periode_id+'">\n' +
' <div class="form-group">\n' +
' <label for="exampleFormControlTextarea1">Description de la période</label>\n' +
' <textarea class="form-control" id="desc_n'+level_id+'_p'+periode_id+' name="desc_n'+level_id+'_p'+periode_id+' no-mandatory" id="exampleFormControlTextarea1" rows="2"></textarea>\n' +
' <textarea class="form-control scheduleInput" id="desc_n'+level_id+'_p'+periode_id+'" name="desc_n'+level_id+'_p'+periode_id+'" rows="2" placeholder="Description de la période"></textarea>\n' +
' </div>\n' +
' </div>\n' +
' <div class="col-6 mb-1" id="OCOMContainer'+level_id+'-'+periode_id+'">\n' +
' <div class="form-group label-floating">\n' +
' <div class="autocomplete">\n' +
' <input type="text" placeholder="OCOM du cours" id="ocom_n'+level_id+'_p'+periode_id+'" name="ocom_n'+level_id+'_p'+periode_id+'" class="form-control AutoCompleteOCOM no-mandatory" aria-describedby="nameHelp" autocomplete="off" required onblur="updateCourseName(\''+level_id+'\',\''+periode_id+'\')">\n' +
' <input type="text" placeholder="OCOM du cours" id="ocom_n'+level_id+'_p'+periode_id+'" name="ocom_n'+level_id+'_p'+periode_id+'" class="form-control AutoCompleteOCOM scheduleInput" aria-describedby="nameHelp" autocomplete="off" '+isCourse+' onblur="updateCourseName(\''+level_id+'\',\''+periode_id+'\')">\n' +
' </div>\n' +
' <span class="form-control-feedback">\n' +
' <i class="material-icons">done</i>\n' +
@@ -207,7 +255,7 @@ function getCourse(level_id,periode_id)
' </div>\n' +
' <div class="col-6" id="nameContainer'+level_id+'-'+periode_id+'">\n' +
' <div class="form-group label-floating">\n' +
' <input type="text" placeholder="Nom du cours" id="name_n'+level_id+'_p'+periode_id+'" name="name_n'+level_id+'_p'+periode_id+'" class="form-control no-mandatory" required />\n' +
' <input type="text" placeholder="Nom du cours" id="name_n'+level_id+'_p'+periode_id+'" name="name_n'+level_id+'_p'+periode_id+'" class="form-control scheduleInput" '+isCourse+' />\n' +
' <span class="form-control-feedback">\n' +
' <i class="material-icons">clear</i>\n' +
' </span>\n' +
@@ -215,7 +263,7 @@ function getCourse(level_id,periode_id)
' </div>\n' +
' <div class="col-6 mb-1">\n' +
' <div class="form-group label-floating">\n' +
' <input type="text" placeholder="Lieu du cours" id="location_n'+level_id+'_p'+periode_id+'" name="location_n'+level_id+'_p'+periode_id+'" class="form-control no-mandatory" required/>\n' +
' <input type="text" placeholder="Lieu du cours" id="location_n'+level_id+'_p'+periode_id+'" name="location_n'+level_id+'_p'+periode_id+'" class="form-control scheduleInput" '+isCourse+'/>\n' +
' <span class="form-control-feedback">\n' +
' <i class="material-icons">done</i>\n' +
' </span>\n' +
@@ -224,7 +272,7 @@ function getCourse(level_id,periode_id)
' <div class="col-6">\n' +
' <div class="form-group label-floating">\n' +
' <div class="autocomplete">\n' +
' <input type="text" placeholder="Nom de l\'instructeur" id="instruc_n'+level_id+'_p'+periode_id+'" name="instruc_n'+level_id+'_p'+periode_id+'" class="form-control AutoCompleteUser no-mandatory" aria-describedby="nameHelp" autocomplete="off" required>\n' +
' <input type="text" placeholder="Nom de l\'instructeur" id="instruc_n'+level_id+'_p'+periode_id+'" name="instruc_n'+level_id+'_p'+periode_id+'" class="form-control AutoCompleteUser scheduleInput" aria-describedby="nameHelp" autocomplete="off" '+isCourse+'>\n' +
' </div>\n' +
' <span class="form-control-feedback">\n' +
' <i class="material-icons">done</i>\n' +
@@ -288,7 +336,7 @@ function addLevel()
initAutoCompleteOCOM('AutoCompleteOCOM');
if (editorMode == 'eventType')
{
$('.no-mandatory').removeAttr('required')
$('.scheduleInput').removeAttr('required')
}
}
@@ -310,7 +358,7 @@ function addPeriode()
initAutoCompleteOCOM('AutoCompleteOCOM');
if (editorMode == 'eventType')
{
$('.no-mandatory').removeAttr('required')
$('.scheduleInput').removeAttr('required')
}
}
@@ -323,6 +371,9 @@ function selectCourseMode(mode, niveau, periode)
$('#isDoneContainer'+niveau+'-'+periode).addClass('d-flex');
$('#OCOMContainer'+niveau+'-'+periode).removeClass('d-none');
$('#nameContainer'+niveau+'-'+periode).removeClass('d-none');
$('#ocom_n'+niveau+'_p'+periode).prop('required',true);
$('#name_n'+niveau+'_p'+periode).prop('required',true);
$('#instruc_n'+niveau+'_p'+periode).prop('required',true);
$('#modeSwitchC'+niveau+'-'+periode).addClass('active');
$('#modeSwitchO'+niveau+'-'+periode).removeClass('active');
$('#use_course_n'+niveau+'_p'+periode).prop("checked", true);
@@ -334,6 +385,9 @@ function selectCourseMode(mode, niveau, periode)
$('#isDoneContainer'+niveau+'-'+periode).removeClass('d-flex');
$('#OCOMContainer'+niveau+'-'+periode).addClass('d-none');
$('#nameContainer'+niveau+'-'+periode).addClass('d-none');
$('#ocom_n'+niveau+'_p'+periode).removeAttr('required');
$('#name_n'+niveau+'_p'+periode).removeAttr('required');
$('#instruc_n'+niveau+'_p'+periode).prop('required',true);
$('#modeSwitchC'+niveau+'-'+periode).removeClass('active');
$('#modeSwitchO'+niveau+'-'+periode).addClass('active');
$('#use_course_n'+niveau+'_p'+periode).prop("checked", false);
@@ -390,4 +444,150 @@ function updateCourseName(niveau, periode) {
})
}
}, 100);
}
function loadEventType(date,id = 1)
{
if ($('#type'))
{
id = $('#type').val();
}
initEditor(id,'schedule-add').done(function () {
if (eventType['is_mandatory'] == 1)
{
$('#is_mandatory').prop('checked',true);
}
else
{
$('#is_mandatory').removeAttr('checked');
}
if (eventType['use_schedule'] == 1)
{
$('#use_schedule').prop('checked',true);
switchUseSchedule();
}
else
{
$('#use_schedule').removeAttr('checked');
switchUseSchedule();
}
if (eventType['use_weekly_msg'] == 1)
{
$('#use_weekly_msg').prop('checked',true);
switchUseWeeklyMsg();
}
else
{
$('#use_weekly_msg').removeAttr('checked');
switchUseWeeklyMsg();
}
let begin_time = $('#begin_time');
begin_time.data("DateTimePicker").destroy();
begin_time.datetimepicker({
icons: {
time: "fa fa-clock-o",
date: "fa fa-calendar",
up: "fa fa-chevron-up",
down: "fa fa-chevron-down",
previous: 'fa fa-chevron-left',
next: 'fa fa-chevron-right',
today: 'fa fa-screenshot',
clear: 'fa fa-trash',
close: 'fa fa-remove'
},
date: new Date(moment(date+" "+eventType['begin_time']))
});
let end_time = $('#end_time');
end_time.data("DateTimePicker").destroy();
end_time.datetimepicker({
icons: {
time: "fa fa-clock-o",
date: "fa fa-calendar",
up: "fa fa-chevron-up",
down: "fa fa-chevron-down",
previous: 'fa fa-chevron-left',
next: 'fa fa-chevron-right',
today: 'fa fa-screenshot',
clear: 'fa fa-trash',
close: 'fa fa-remove'
},
date: new Date(moment(date+" "+eventType['end_time']))
});
let weekly_msg_publication_time = $('#weekly_msg_publication_time');
weekly_msg_publication_time.data("DateTimePicker").destroy();
if (eventType['weekly_msg_publication_time'].match(/\d+/) != null || eventType['weekly_msg_publication_time'].match(/\d+/) != null)
{
weekly_msg_publication_time.datetimepicker({
icons: {
time: "fa fa-clock-o",
date: "fa fa-calendar",
up: "fa fa-chevron-up",
down: "fa fa-chevron-down",
previous: 'fa fa-chevron-left',
next: 'fa fa-chevron-right',
today: 'fa fa-screenshot',
clear: 'fa fa-trash',
close: 'fa fa-remove'
},
date: new Date(moment(date+" "+eventType['begin_time']).subtract(
eventType['weekly_msg_publication_time'].match(/\d+/)[0],
eventType['weekly_msg_publication_time'].match(/[a-z]+/)[0]
))
});
}
else
{
weekly_msg_publication_time.datetimepicker({
icons: {
time: "fa fa-clock-o",
date: "fa fa-calendar",
up: "fa fa-chevron-up",
down: "fa fa-chevron-down",
previous: 'fa fa-chevron-left',
next: 'fa fa-chevron-right',
today: 'fa fa-screenshot',
clear: 'fa fa-trash',
close: 'fa fa-remove'
},
date: new Date(moment(date+" "+eventType['begin_time']).subtract(1,'days'))
});
}
$('#location').val(eventType['location']);
$('#name').val(eventType['name']);
$('#admin_desc').trumbowyg('html', eventType['admin_desc']);
$('#calendar_color').val(eventType['calendar_color']);
pickr.setColor(eventType['calendar_color']);
$('#calendar_icon').val(eventType['calendar_icon']);
$('#calendar_icon_display').removeAttr('class');
$('#calendar_icon_display').addClass(eventType['calendar_icon']);
})
}
function switchUseSchedule()
{
if($('#use_schedule').is(":checked"))
{
$('#collschedule').removeClass('d-none');
$('.scheduleInput').removeAttr('disabled')
}
else
{
$('#collschedule').addClass('d-none');
$('.scheduleInput').prop('disabled',true)
}
}
function switchUseWeeklyMsg()
{
if($('#use_weekly_msg').is(":checked"))
{
$('#collmessagedelasemaine').removeClass('d-none');
}
else
{
$('#collmessagedelasemaine').addClass('d-none');
}
}