diff --git a/build/npm/Plugins.js b/build/npm/Plugins.js
index 69239fd3c..c3a51d4b0 100644
--- a/build/npm/Plugins.js
+++ b/build/npm/Plugins.js
@@ -260,25 +260,9 @@ const Plugins = [
// Fullcalendar
{
- from: 'node_modules/@fullcalendar/core/',
+ from: 'node_modules/fullcalendar/',
to: 'plugins/fullcalendar'
},
- {
- from: 'node_modules/@fullcalendar/bootstrap/',
- to: 'plugins/fullcalendar-bootstrap'
- },
- {
- from: 'node_modules/@fullcalendar/daygrid/',
- to: 'plugins/fullcalendar-daygrid'
- },
- {
- from: 'node_modules/@fullcalendar/timegrid/',
- to: 'plugins/fullcalendar-timegrid'
- },
- {
- from: 'node_modules/@fullcalendar/interaction/',
- to: 'plugins/fullcalendar-interaction'
- },
// icheck bootstrap
{
from: 'node_modules/icheck-bootstrap/',
diff --git a/package-lock.json b/package-lock.json
index 8a5a6ad55..23c127384 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1200,67 +1200,6 @@
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.14.0.tgz",
"integrity": "sha512-OfdMsF+ZQgdKHP9jUbmDcRrP0eX90XXrsXIdyjLbkmSBzmMXPABB8eobUJtivaupucYaByz6WNe1PI1JuYm3qA=="
},
- "@fullcalendar/bootstrap": {
- "version": "5.3.1",
- "resolved": "https://registry.npmjs.org/@fullcalendar/bootstrap/-/bootstrap-5.3.1.tgz",
- "integrity": "sha512-RFh4NAUMfxvCYztU8IEFwRUT76ao5PYXVzuHsw4RLNVNTr8gandmOjXyQVKhGK4DLB0qnDBeeCwIkeyE7unXNQ==",
- "requires": {
- "@fullcalendar/common": "~5.3.1",
- "tslib": "^2.0.0"
- }
- },
- "@fullcalendar/common": {
- "version": "5.3.1",
- "resolved": "https://registry.npmjs.org/@fullcalendar/common/-/common-5.3.1.tgz",
- "integrity": "sha512-2PREEpiFQSDN5MNdoD/OkpJ+d7FPtN2TwTJMsuq3fTjmj3nM+utrxBmUr9a2F6WWW1X+xGU5nHQA52vhqIiQOQ==",
- "requires": {
- "tslib": "^2.0.0"
- }
- },
- "@fullcalendar/core": {
- "version": "4.4.2",
- "resolved": "https://registry.npmjs.org/@fullcalendar/core/-/core-4.4.2.tgz",
- "integrity": "sha512-vq7KQGuAJ1ieFG5tUqwxwUwmXYtblFOTjHaLAVHo6iEPB52mS7DS45VJfkhaQmX4+5/+BHRpg82G1qkuAINwtg=="
- },
- "@fullcalendar/daygrid": {
- "version": "5.3.2",
- "resolved": "https://registry.npmjs.org/@fullcalendar/daygrid/-/daygrid-5.3.2.tgz",
- "integrity": "sha512-BK+YIecF3q9d/+6lAnf6WiJEEs7Wpa/mu9gXpkEf8vn4nl2bicPHUwykg5dUMCBy7ADAkDoL7VuBVi0XBRtPYw==",
- "requires": {
- "@fullcalendar/common": "~5.3.1",
- "tslib": "^2.0.0"
- }
- },
- "@fullcalendar/interaction": {
- "version": "5.3.1",
- "resolved": "https://registry.npmjs.org/@fullcalendar/interaction/-/interaction-5.3.1.tgz",
- "integrity": "sha512-S1QAIazLQ7yBlUFyQbXzvXj36u39/G6H0qI2bUuQ4lY5VlUMGkiKZqb8oDHz1wE9/keuBL5CX2K/WTDGJ19Mng==",
- "requires": {
- "@fullcalendar/common": "~5.3.1",
- "tslib": "^2.0.0"
- }
- },
- "@fullcalendar/timegrid": {
- "version": "5.3.1",
- "resolved": "https://registry.npmjs.org/@fullcalendar/timegrid/-/timegrid-5.3.1.tgz",
- "integrity": "sha512-ahyJC/kybGip5pTLC4cpsEdnhDZb3Hg0F7LTD/VVK4GxzplDiI0ZaWACC4O22zmp1+7a40NUMIV0HLO3D5SV4A==",
- "requires": {
- "@fullcalendar/common": "~5.3.1",
- "@fullcalendar/daygrid": "~5.3.1",
- "tslib": "^2.0.0"
- },
- "dependencies": {
- "@fullcalendar/daygrid": {
- "version": "5.3.2",
- "resolved": "https://registry.npmjs.org/@fullcalendar/daygrid/-/daygrid-5.3.2.tgz",
- "integrity": "sha512-BK+YIecF3q9d/+6lAnf6WiJEEs7Wpa/mu9gXpkEf8vn4nl2bicPHUwykg5dUMCBy7ADAkDoL7VuBVi0XBRtPYw==",
- "requires": {
- "@fullcalendar/common": "~5.3.1",
- "tslib": "^2.0.0"
- }
- }
- }
- },
"@lgaitan/pace-progress": {
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/@lgaitan/pace-progress/-/pace-progress-1.0.7.tgz",
@@ -5369,6 +5308,11 @@
"rimraf": "2"
}
},
+ "fullcalendar": {
+ "version": "5.3.2",
+ "resolved": "https://registry.npmjs.org/fullcalendar/-/fullcalendar-5.3.2.tgz",
+ "integrity": "sha512-yoNPnz51so+nWV+Ge/X1NECsTy+viP6nhHgRql5U3WvV7XL09yDIWXSCcuEaU4C/0ZmpUApgZ+e7wvWB0TYwRA=="
+ },
"function-bind": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -11191,11 +11135,6 @@
}
}
},
- "tslib": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz",
- "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ=="
- },
"tunnel-agent": {
"version": "0.6.0",
"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
diff --git a/package.json b/package.json
index 4a06b76e5..2ec0788d7 100644
--- a/package.json
+++ b/package.json
@@ -68,11 +68,6 @@
},
"dependencies": {
"@fortawesome/fontawesome-free": "^5.14.0",
- "@fullcalendar/bootstrap": "^5.3.1",
- "@fullcalendar/core": "^4.4.2",
- "@fullcalendar/daygrid": "^5.3.2",
- "@fullcalendar/interaction": "^5.3.1",
- "@fullcalendar/timegrid": "^5.3.1",
"@lgaitan/pace-progress": "^1.0.7",
"@sweetalert2/theme-bootstrap-4": "^3.2.0",
"@ttskch/select2-bootstrap4-theme": "^1.4.0",
@@ -106,6 +101,7 @@
"flag-icon-css": "^3.5.0",
"flot": "^4.2.1",
"fs-extra": "^9.0.1",
+ "fullcalendar": "^5.3.2",
"icheck-bootstrap": "^3.0.1",
"inputmask": "^5.0.5",
"ion-rangeslider": "^2.3.1",
diff --git a/pages/calendar.html b/pages/calendar.html
index 294e8e0cc..6ec41568b 100644
--- a/pages/calendar.html
+++ b/pages/calendar.html
@@ -10,10 +10,7 @@
-
-
-
-
+
@@ -923,11 +920,7 @@
-
-
-
-
-
+
@@ -969,7 +962,7 @@
y = date.getFullYear()
var Calendar = FullCalendar.Calendar;
- var Draggable = FullCalendarInteraction.Draggable;
+ var Draggable = FullCalendar.Draggable;
var containerEl = document.getElementById('external-events');
var checkbox = document.getElementById('drop-remove');
@@ -991,15 +984,14 @@
});
var calendar = new Calendar(calendarEl, {
- plugins: [ 'bootstrap', 'interaction', 'dayGrid', 'timeGrid' ],
- header : {
+ headerToolbar: {
left : 'prev,next today',
center: 'title',
right : 'dayGridMonth,timeGridWeek,timeGridDay'
},
- 'themeSystem': 'bootstrap',
+ themeSystem: 'bootstrap',
//Random default events
- events : [
+ events: [
{
title : 'All Day Event',
start : new Date(y, m, 1),