loviuz/openstamanager
loviuz/openstamanager
1
0
Fork 0
mirror of https://github.com/devcode-it/openstamanager.git synced 2025-02-16 19:40:44 +01:00
Code Issues Releases Activity

Aggiornamento a Fullcalendar 6

Browse Source
This commit is contained in:
loviuz 2023-01-23 23:10:52 +01:00
parent 6f13d42fce
commit 875ece7e53
5 changed files with 62 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gulpfile.js
View File

@ -53,7 +53,7 @@ const inquirer = require('inquirer');
const config = { const config = {
production: 'assets/dist', // Cartella di destinazione production: 'assets/dist', // Cartella di destinazione
development: 'assets/src', // Cartella dei file di personalizzazione development: 'assets/src', // Cartella dei file di personalizzazione
debug: false, debug: true,
nodeDirectory: './node_modules', // Percorso per node_modules nodeDirectory: './node_modules', // Percorso per node_modules
paths: { paths: {
js: 'js', js: 'js',
@ -62,7 +62,7 @@ const config = {
fonts: 'fonts' fonts: 'fonts'
}, },
babelOptions: { babelOptions: {
compact: true, compact: false,
presets: [ presets: [
['@babel/env', { ['@babel/env', {
modules: false modules: false
@ -98,7 +98,9 @@ const JS = gulp.parallel(() => {
'dropzone/dist/dropzone.js', 'dropzone/dist/dropzone.js',
'autonumeric/dist/autoNumeric.min.js', 'autonumeric/dist/autoNumeric.min.js',
'eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js', 'eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js',
'fullcalendar/dist/fullcalendar.js', 'fullcalendar-scheduler/index.global.js',
'@fullcalendar/moment/index.global.js',
'@fullcalendar/core/locales/it.global.js',
'geocomplete/jquery.geocomplete.js', 'geocomplete/jquery.geocomplete.js',
'inputmask/dist/min/jquery.inputmask.bundle.min.js', 'inputmask/dist/min/jquery.inputmask.bundle.min.js',
'jquery-form/src/jquery.form.js', 'jquery-form/src/jquery.form.js',
@ -161,7 +163,6 @@ const CSS = gulp.parallel(() => {
'dropzone/dist/dropzone.css', 'dropzone/dist/dropzone.css',
'eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css', 'eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css',
'font-awesome/css/font-awesome.min.css', 'font-awesome/css/font-awesome.min.css',
'fullcalendar/dist/fullcalendar.css',
'parsleyjs/src/parsley.css', 'parsleyjs/src/parsley.css',
'select2/dist/css/select2.min.css', 'select2/dist/css/select2.min.css',
'sweetalert2/dist/sweetalert2.css', 'sweetalert2/dist/sweetalert2.css',
@ -208,7 +209,6 @@ function srcCSS() {
const print = gulp.src([ const print = gulp.src([
config.development + '/' + config.paths.css + '/print/*.{css,scss,less,styl}', config.development + '/' + config.paths.css + '/print/*.{css,scss,less,styl}',
config.nodeDirectory + '/fullcalendar/fullcalendar.print.css',
], { ], {
allowEmpty: true allowEmpty: true
}) })

16
modules/dashboard/ajax.php
View File

@ -105,12 +105,14 @@ switch (filter('op')) {
$results[] = [ $results[] = [
'id' => $sessione['id'], 'id' => $sessione['id'],
'idintervento' => $sessione['idintervento'],
'idtecnico' => $sessione['idtecnico'],
'title' => (($sessione['is_completato']) ? '<i class="fa fa-lock" aria-hidden="true"></i>' : '').' '.(($sessione['have_attachments']) ? '<i class="fa fa-paperclip" aria-hidden="true"></i>' : '').($sessione['is_completato'] || $sessione['have_attachments'] ? '<br>' : '').'<b>Int. '.$sessione['codice'].'</b> '.$sessione['cliente'].'<br><b>'.tr('Tecnici').':</b> '.$sessione['nome_tecnico'], 'title' => (($sessione['is_completato']) ? '<i class="fa fa-lock" aria-hidden="true"></i>' : '').' '.(($sessione['have_attachments']) ? '<i class="fa fa-paperclip" aria-hidden="true"></i>' : '').($sessione['is_completato'] || $sessione['have_attachments'] ? '<br>' : '').'<b>Int. '.$sessione['codice'].'</b> '.$sessione['cliente'].'<br><b>'.tr('Tecnici').':</b> '.$sessione['nome_tecnico'],
'start' => $sessione['orario_inizio'], 'start' => $sessione['orario_inizio'],
'end' => $sessione['orario_fine'], 'end' => $sessione['orario_fine'],
'link' => base_path().'/editor.php?id_module='.$modulo_interventi->id.'&id_record='.$sessione['idintervento'], 'extendedProps' => [
'link' => base_path().'/editor.php?id_module='.$modulo_interventi->id.'&id_record='.$sessione['idintervento'],
'idintervento' => $sessione['idintervento'],
'idtecnico' => $sessione['idtecnico'],
],
'backgroundColor' => $backgroundcolor, 'backgroundColor' => $backgroundcolor,
'textColor' => color_inverse($backgroundcolor), 'textColor' => color_inverse($backgroundcolor),
'borderColor' => empty($bordercolor) ? '#FFFFFF' : $bordercolor, 'borderColor' => empty($bordercolor) ? '#FFFFFF' : $bordercolor,
@ -190,13 +192,15 @@ switch (filter('op')) {
foreach ($alldays as $evento) { foreach ($alldays as $evento) {
$results[] = [ $results[] = [
'id' => $modulo_eventi->id.'_'.$evento['id'], 'id' => $modulo_eventi->id.'_'.$evento['id'],
'idintervento' => $evento['id'],
'idtecnico' => '',
'title' => '<b>'.tr('Evento').':</b> '.$evento['nome'].'<br> 'title' => '<b>'.tr('Evento').':</b> '.$evento['nome'].'<br>
<b>'.tr('Festività').':</b> '.($evento['is_bank_holiday'] ? '<i class="fa fa-check text-success"></i>' : '<i class="fa fa-times text-danger"></i>'), <b>'.tr('Festività').':</b> '.($evento['is_bank_holiday'] ? '<i class="fa fa-check text-success"></i>' : '<i class="fa fa-times text-danger"></i>'),
'start' => $evento['data'], 'start' => $evento['data'],
'end' => $evento['data'], 'end' => $evento['data'],
'url' => base_path().'/editor.php?id_module='.$modulo_eventi->id.'&id_record='.$evento['id'], 'extendedProps' => [
'link' => base_path().'/editor.php?id_module='.$modulo_eventi->id.'&id_record='.$evento['id'],
'idintervento' => $evento['id'],
'idtecnico' => '',
],
'backgroundColor' => '#ffebcd', 'backgroundColor' => '#ffebcd',
'textColor' => color_inverse('#ffebcd'), 'textColor' => color_inverse('#ffebcd'),
'borderColor' => '#ffebcd', 'borderColor' => '#ffebcd',

90
modules/dashboard/edit.php
View File

@ -329,11 +329,11 @@ WHERE (SELECT COUNT(*) FROM in_interventi_tecnici WHERE in_interventi_tecnici.id
$vista = setting('Vista dashboard'); $vista = setting('Vista dashboard');
if ($vista == 'mese') { if ($vista == 'mese') {
$def = 'month'; $def = 'dayGridMonth';
} elseif ($vista == 'giorno') { } elseif ($vista == 'giorno') {
$def = 'agendaDay'; $def = 'timeGridWeek';
} elseif ($vista == 'settimana') { } elseif ($vista == 'settimana') {
$def = 'agendaWeek'; $def = 'listWeek';
} else { } else {
$def = 'listWeek'; $def = 'listWeek';
} }
@ -341,8 +341,8 @@ if ($vista == 'mese') {
$modulo_interventi = Modules::get('Interventi'); $modulo_interventi = Modules::get('Interventi');
echo ' echo '
<script type="text/javascript"> <script type="text/javascript">
globals.dashboard = { globals.dashboard = {
load_url: "'.$structure->fileurl('ajax.php').'?id_module='.$id_module.'", load_url: "'.$structure->fileurl('ajax.php').'?id_module='.$id_module.'",
style: "'.$def.'", style: "'.$def.'",
show_sunday: '.intval(setting('Visualizzare la domenica sul calendario')).', show_sunday: '.intval(setting('Visualizzare la domenica sul calendario')).',
@ -351,11 +351,6 @@ echo '
write_permission: '.intval($modulo_interventi->permission == 'rw').', write_permission: '.intval($modulo_interventi->permission == 'rw').',
tooltip: '.intval(setting('Utilizzare i tooltip sul calendario')).', tooltip: '.intval(setting('Utilizzare i tooltip sul calendario')).',
calendar: null, calendar: null,
/* timeFormat: {
hour: "2-digit",
minute: "2-digit",
hour12: false
}, */
timeFormat: "H:mm", timeFormat: "H:mm",
select: { select: {
title: "'.tr('Aggiungi intervento').'", title: "'.tr('Aggiungi intervento').'",
@ -445,7 +440,7 @@ echo '
session_set_array("dashboard,idstatiintervento", id).then(function () { session_set_array("dashboard,idstatiintervento", id).then(function () {
aggiorna_contatore("#dashboard_stati"); aggiorna_contatore("#dashboard_stati");
globals.dashboard.calendar.fullCalendar("refetchEvents"); //.refetchEvents() globals.dashboard.calendar.refetchEvents();
}); });
}); });
@ -455,7 +450,7 @@ echo '
session_set_array("dashboard,idtipiintervento", id).then(function () { session_set_array("dashboard,idtipiintervento", id).then(function () {
aggiorna_contatore("#dashboard_tipi"); aggiorna_contatore("#dashboard_tipi");
globals.dashboard.calendar.fullCalendar("refetchEvents"); //.refetchEvents() globals.dashboard.calendar.refetchEvents();
}); });
}); });
@ -465,7 +460,7 @@ echo '
session_set_array("dashboard,idtecnici", id).then(function () { session_set_array("dashboard,idtecnici", id).then(function () {
aggiorna_contatore("#dashboard_tecnici"); aggiorna_contatore("#dashboard_tecnici");
globals.dashboard.calendar.fullCalendar("refetchEvents"); //.refetchEvents() globals.dashboard.calendar.refetchEvents();
}); });
}); });
@ -475,7 +470,7 @@ echo '
session_set_array("dashboard,idzone", id).then(function () { session_set_array("dashboard,idzone", id).then(function () {
aggiorna_contatore("#dashboard_zone"); aggiorna_contatore("#dashboard_zone");
globals.dashboard.calendar.fullCalendar("refetchEvents"); //.refetchEvents() globals.dashboard.calendar.refetchEvents();
}); });
}); });
@ -509,23 +504,23 @@ echo '
var calendarElement = document.getElementById("calendar"); var calendarElement = document.getElementById("calendar");
var clickCnt = 0; var clickCnt = 0;
var calendar = $(calendarElement).fullCalendar({ var calendar = new FullCalendar.Calendar(calendarElement, {
/* plugins: [interactionPlugin, dayGridPlugin, timeGridPlugin], */ //plugins: [adaptivePlugin, momentPlugin, dayGridPlugin, timeGridPlugin],
/* locales: allLocales, */ /* locales: allLocales, */
locale: globals.locale, locale: globals.locale,
slotEventOverlap: false, slotEventOverlap: false,
schedulerLicenseKey: "GPL-My-Project-Is-Open-Source", schedulerLicenseKey: "GPL-My-Project-Is-Open-Source",
hiddenDays: globals.dashboard.show_sunday ? [] : [0], hiddenDays: globals.dashboard.show_sunday ? [] : [0],
header: { headerToolbar: {
left: "prev,next today", left: "prev,next today",
center: "title", center: "title",
right: "month,agendaWeek,agendaDay,listWeek" right: "dayGridMonth,timeGridWeek,listWeek"
}, },
timeFormat: globals.dashboard.timeFormat, timeFormat: globals.dashboard.timeFormat,
slotLabelFormat: globals.dashboard.timeFormat, slotLabelFormat: globals.dashboard.timeFormat,
slotDuration: "00:15:00", slotDuration: "00:15:00",
snapDuration: globals.snapDuration, snapDuration: globals.snapDuration,
defaultView: globals.dashboard.style, initialView: "dayGridMonth",
minTime: globals.dashboard.start_time, minTime: globals.dashboard.start_time,
maxTime: globals.dashboard.end_time, maxTime: globals.dashboard.end_time,
lazyFetching: true, lazyFetching: true,
@ -561,7 +556,7 @@ echo '
// Ricaricamento dei dati alla chiusura del modal // Ricaricamento dei dati alla chiusura del modal
$(this).remove(); $(this).remove();
$("#modals > div").on("hidden.bs.modal", function () { $("#modals > div").on("hidden.bs.modal", function () {
globals.dashboard.calendar.fullCalendar("refetchEvents"); //.refetchEvents() globals.dashboard.calendar.refetchEvents();
let mese = $("#mese-promemoria").val(); let mese = $("#mese-promemoria").val();
carica_interventi_da_pianificare(mese); carica_interventi_da_pianificare(mese);
@ -569,11 +564,11 @@ echo '
}, },
selectable: globals.dashboard.write_permission, selectable: globals.dashboard.write_permission,
select: function (start, end, allDay) { // info select: function (info) { // info
// let start = info.start; let start = info.start;
// let end = info.end; let end = info.end;
let intero_giorno = !start.hasTime() && !end.hasTime(); let intero_giorno = !start.hasTime && !end.hasTime;
if (intero_giorno !== true || globals.dashboard.informazioni_aggiuntive==0) { if (intero_giorno !== true || globals.dashboard.informazioni_aggiuntive==0) {
let data = moment(start).format("YYYY-MM-DD"); let data = moment(start).format("YYYY-MM-DD");
let data_fine = moment(end).format("YYYY-MM-DD"); let data_fine = moment(end).format("YYYY-MM-DD");
@ -581,7 +576,7 @@ echo '
let orario_fine = moment(end).format("HH:mm"); let orario_fine = moment(end).format("HH:mm");
// Fix selezione di un giorno avanti per vista mensile // Fix selezione di un giorno avanti per vista mensile
if (globals.dashboard.calendar.fullCalendar("getView").name == "month") { if (globals.dashboard.calendar.view == "dayGridMonth") {
data_fine = moment(end).subtract(1, "days").format("YYYY-MM-DD"); data_fine = moment(end).subtract(1, "days").format("YYYY-MM-DD");
} }
@ -590,8 +585,8 @@ echo '
}, },
editable: globals.dashboard.write_permission, editable: globals.dashboard.write_permission,
eventDrop: function (event, delta, revertFunc) {// info eventDrop: function (info) {// info
// let event = info.event; let event = info.event;
if (event.allDay !== true) { if (event.allDay !== true) {
let start = event.start; let start = event.start;
@ -599,7 +594,7 @@ echo '
$.post(globals.dashboard.load_url, { $.post(globals.dashboard.load_url, {
op: "modifica_intervento", op: "modifica_intervento",
id: event.id, id: event.id,
idintervento: event.idintervento, idintervento: event.extendedProps.idintervento,
timeStart: moment(start).format("YYYY-MM-DD HH:mm"), timeStart: moment(start).format("YYYY-MM-DD HH:mm"),
timeEnd: moment(end).format("YYYY-MM-DD HH:mm") timeEnd: moment(end).format("YYYY-MM-DD HH:mm")
}, function (data, responseType) { }, function (data, responseType) {
@ -612,22 +607,22 @@ echo '
} }
if (data !== "ok") { if (data !== "ok") {
revertFunc(); // info.revert(); info.revert();
} }
}); });
} else { } else {
revertFunc(); info.revert();
} }
}, },
eventResize: function (event, delta, revertFunc) { // info eventResize: function (info) {
// let event = info.event; let event = info.event;
let start = event.start; let start = event.start;
let end = (event.end!=null ? event.end : event.start); let end = (event.end!=null ? event.end : event.start);
$.post(globals.dashboard.load_url, { $.post(globals.dashboard.load_url, {
op: "modifica_intervento", op: "modifica_intervento",
id: event.id, id: event.id,
idintervento: event.idintervento, idintervento: event.extendedProps.idintervento,
timeStart: moment(start).format("YYYY-MM-DD HH:mm"), timeStart: moment(start).format("YYYY-MM-DD HH:mm"),
timeEnd: moment(end).format("YYYY-MM-DD HH:mm") timeEnd: moment(end).format("YYYY-MM-DD HH:mm")
}, function (data, responseType) { }, function (data, responseType) {
@ -640,7 +635,7 @@ echo '
} }
if (data !== "ok") { if (data !== "ok") {
revertFunc(); // info.revert(); info.revert();
} }
}); });
@ -649,9 +644,9 @@ echo '
if(isMobile() && setting('Utilizzare i tooltip sul calendario')){ if(isMobile() && setting('Utilizzare i tooltip sul calendario')){
echo ' echo '
eventClick: function(info) { eventClick: function(info) {
let link = info.link; let link = info.event.extendedProps.link;
let element = $(this); let element = $(this);
clickCnt++; clickCnt++;
if (clickCnt === 1) { if (clickCnt === 1) {
oneClickTimer = setTimeout(function() { oneClickTimer = setTimeout(function() {
clickCnt = 0; clickCnt = 0;
@ -666,18 +661,20 @@ if(isMobile() && setting('Utilizzare i tooltip sul calendario')){
}else{ }else{
echo ' echo '
eventClick: function(info) { eventClick: function(info) {
let link = info.link; info.jsEvent.preventDefault();
location.href = link; location.href = info.event.extendedProps.link;
},'; },';
} }
echo ' echo '
// eventPositioned: function (info) { eventContent: function (info) {
eventAfterRender: function (event, element) { return { html: "<div style=\"width:100%; background:" + info.event.backgroundColor + ";\">" + info.event.title + "</div>" };
// let event = info.event; },
// let element = $(info.el);
element.find(".fc-title, .fc-list-item-title").html(event.title); eventDidMount: function(info){
let id_record = event.idintervento; let element = $(info.el);
let id_record = info.event.extendedProps.idintervento;
if (globals.dashboard.tooltip == 1) { if (globals.dashboard.tooltip == 1) {
element.tooltipster({ element.tooltipster({
@ -700,7 +697,7 @@ echo '
$.post(globals.dashboard.load_url, { $.post(globals.dashboard.load_url, {
op: "tooltip_info", op: "tooltip_info",
id_record: id_record, id_record: id_record,
allDay: event.allDay, allDay: info.event.allDay,
}, function (data, response) { }, function (data, response) {
instance.content(data); instance.content(data);
@ -711,6 +708,7 @@ echo '
}); });
} }
}, },
events: { events: {
url: globals.dashboard.load_url + "&op=interventi_periodo", url: globals.dashboard.load_url + "&op=interventi_periodo",
type: "GET", type: "GET",
@ -720,7 +718,7 @@ echo '
} }
}); });
//calendar.render(); calendar.render();
globals.dashboard.calendar = calendar; globals.dashboard.calendar = calendar;
} }

3
package.json
View File

@ -2,6 +2,7 @@
"private": true, "private": true,
"main": "gulpfile.js", "main": "gulpfile.js",
"dependencies": { "dependencies": {
"@fullcalendar/moment": "^6.0.3",
"admin-lte": "^2.4.18", "admin-lte": "^2.4.18",
"autocompleter": "^6.1.1", "autocompleter": "^6.1.1",
"autonumeric": "^4.6.0", "autonumeric": "^4.6.0",
@ -20,7 +21,7 @@
"dropzone": "^5.7.2", "dropzone": "^5.7.2",
"eonasdan-bootstrap-datetimepicker": "^4.17.49", "eonasdan-bootstrap-datetimepicker": "^4.17.49",
"font-awesome": "^4.7.0", "font-awesome": "^4.7.0",
"fullcalendar": "^3.10.5", "fullcalendar-scheduler": "^6.0.3",
"geocomplete": "^1.7.0", "geocomplete": "^1.7.0",
"hotkeys-js": "^3.8.5", "hotkeys-js": "^3.8.5",
"html5sortable": "^0.13.2", "html5sortable": "^0.13.2",

2
src/App.php
View File

@ -63,7 +63,7 @@ class App
'i18n/parsleyjs/|lang|.min.js', 'i18n/parsleyjs/|lang|.min.js',
'i18n/select2/|lang|.min.js', 'i18n/select2/|lang|.min.js',
'i18n/moment/|lang|.min.js', 'i18n/moment/|lang|.min.js',
'i18n/fullcalendar/|lang|.min.js', 'i18n/@fullcalendar/|lang|.min.js',
], ],
]; ];