loviuz/openstamanager
loviuz/openstamanager
1
0
Fork 0
mirror of https://github.com/devcode-it/openstamanager.git synced 2025-02-21 22:07:45 +01:00
Code Issues Releases Activity

Fix moment-timezone

Browse Source
This commit is contained in:
Luca 2023-03-28 18:48:42 +02:00
parent ab02070397
commit 1f53e2882d
4 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gulpfile.js
View File

@ -100,6 +100,7 @@ const JS = gulp.parallel(() => {
'eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js', 'eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js',
'fullcalendar-scheduler/index.global.js', 'fullcalendar-scheduler/index.global.js',
'@fullcalendar/moment/index.global.js', '@fullcalendar/moment/index.global.js',
'@fullcalendar/moment-timezone/index.global.js',
'@fullcalendar/core/locales/it.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',

10
modules/dashboard/ajax.php
View File

@ -484,12 +484,7 @@ switch (filter('op')) {
'id' => $evento['id'], 'id' => $evento['id'],
'title' => $evento['nome'], 'title' => $evento['nome'],
'start' => $evento['data'], 'start' => $evento['data'],
'end' => date('Y-m-d', strtotime($evento['data']. '+1 day')), //'end' => date('Y-m-d', strtotime($evento['data']. '+1 day')),
//'initialDate' => $evento['data'],
//'startRecur' => (($evento['is_recurring']) ? $evento['data'] : ''),
//'endRecur' => (($evento['is_recurring']) ? date('Y-m-d', strtotime($evento['data']. '+1 day')) : ''),
'display' => "background", 'display' => "background",
'allDay' => true, 'allDay' => true,
'overlap' => true, 'overlap' => true,
@ -498,8 +493,5 @@ switch (filter('op')) {
echo json_encode($results); echo json_encode($results);
break; break;
} }

10
modules/dashboard/edit.php
View File

@ -524,8 +524,8 @@ globals.dashboard = {
var clickCnt = 0; var clickCnt = 0;
var calendar = new FullCalendar.Calendar(calendarElement, { var calendar = new FullCalendar.Calendar(calendarElement, {
//plugins: [adaptivePlugin, momentPlugin, dayGridPlugin, timeGridPlugin],
/* locales: allLocales, */ /* locales: allLocales, */
timeZone: "Europe/Rome",
locale: globals.locale, locale: globals.locale,
slotEventOverlap: false, slotEventOverlap: false,
weekNumbers: true, weekNumbers: true,
@ -742,7 +742,7 @@ echo '
} }
}, },
eventSources: [ eventSources: [
{ {
url: globals.dashboard.load_url, url: globals.dashboard.load_url,
type: "POST", type: "POST",
@ -755,7 +755,6 @@ echo '
} }
}, },
{ {
url: globals.dashboard.load_url, url: globals.dashboard.load_url,
method: "POST", method: "POST",
extraParams: { extraParams: {
@ -765,10 +764,9 @@ echo '
failure: function () { failure: function () {
swal(globals.dashboard.genericError, globals.dashboard.error, "error"); swal(globals.dashboard.genericError, globals.dashboard.error, "error");
} }
} }
]
]
}); });
calendar.addEvent({ calendar.addEvent({

2
package.json
View File

@ -3,7 +3,7 @@
"main": "gulpfile.js", "main": "gulpfile.js",
"dependencies": { "dependencies": {
"@fullcalendar/moment": "^6.1.5", "@fullcalendar/moment": "^6.1.5",
"@fullcalendar/moment-timezone": "^6.1.5", "@fullcalendar/moment-timezone": "^5.11.4",
"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",