root/THANASOFT-HFC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'staging' into fixes/fix-calandar-pending-btn

Browse Source
This commit is contained in:
Narindra ezway 2025-03-11 16:00:25 +03:00
commit 9e30ba5699
15 changed files with 43 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
calendar/js/calendar-main.js
View File

@ -9360,11 +9360,7 @@ __webpack_require__.r(__webpack_exports__);
// Rendering
dayHeaderDidMount: _fullcalendar_rendering_dayHeaderDidMount_js__WEBPACK_IMPORTED_MODULE_11__["default"],
eventDidMount: info => {
if (info.event.extendedProps.isCalendarPending) {
info.el.classList.add('pending-event');
info.el.style.backgroundColor = info.event.backgroundColor;
info.el.style.color = info.event.textColor;
}
this.addPendinEventClass(info);
},
noEventsDidMount: _fullcalendar_rendering_noEventsDidMount_js__WEBPACK_IMPORTED_MODULE_14__["default"],
eventOrder: ['start', '-duration', 'allDay', _fullcalendar_rendering_eventOrder_js__WEBPACK_IMPORTED_MODULE_13__["default"]],
@ -9510,7 +9506,14 @@ __webpack_require__.r(__webpack_exports__);
initialView
});
}
}, 5000)
}, 5000),
addPendinEventClass(info) {
if (info.event.extendedProps.isCalendarPending) {
info.el.classList.add('pending-event');
info.el.style.backgroundColor = info.event.backgroundColor;
info.el.style.color = info.event.textColor;
}
}
}
});
@ -16548,7 +16551,7 @@ __webpack_require__.r(__webpack_exports__);
}
this.isViewing = true;
try {
await this.save(false);
await this.savePendingCalendar(false);
this.requiresActionOnRouteLeave = false;
} catch (error) {
this.isViewing = false;
@ -16841,7 +16844,7 @@ __webpack_require__.r(__webpack_exports__);
}
this.isViewing = true;
try {
await this.save(false);
await this.savePendingCalendar(false);
this.requiresActionOnRouteLeave = false;
} catch (error) {
this.isViewing = false;

17
calendar/js/calendar-src_views_Calendar_vue-data_image_svg_xml_3csvg_20xmlns_27http_www_w3_org_2000_svg_27_20heigh-4a4254.js
View File

@ -4332,11 +4332,7 @@ __webpack_require__.r(__webpack_exports__);
// Rendering
dayHeaderDidMount: _fullcalendar_rendering_dayHeaderDidMount_js__WEBPACK_IMPORTED_MODULE_11__["default"],
eventDidMount: info => {
if (info.event.extendedProps.isCalendarPending) {
info.el.classList.add('pending-event');
info.el.style.backgroundColor = info.event.backgroundColor;
info.el.style.color = info.event.textColor;
}
this.addPendinEventClass(info);
},
noEventsDidMount: _fullcalendar_rendering_noEventsDidMount_js__WEBPACK_IMPORTED_MODULE_14__["default"],
eventOrder: ['start', '-duration', 'allDay', _fullcalendar_rendering_eventOrder_js__WEBPACK_IMPORTED_MODULE_13__["default"]],
@ -4482,7 +4478,14 @@ __webpack_require__.r(__webpack_exports__);
initialView
});
}
}, 5000)
}, 5000),
addPendinEventClass(info) {
if (info.event.extendedProps.isCalendarPending) {
info.el.classList.add('pending-event');
info.el.style.backgroundColor = info.event.backgroundColor;
info.el.style.color = info.event.textColor;
}
}
}
});
@ -8358,7 +8361,7 @@ __webpack_require__.r(__webpack_exports__);
}
this.isViewing = true;
try {
await this.save(false);
await this.savePendingCalendar(false);
this.requiresActionOnRouteLeave = false;
} catch (error) {
this.isViewing = false;

13
calendar/src/components/CalendarGrid.vue
View File

@ -140,11 +140,7 @@ export default {
// Rendering
dayHeaderDidMount,
eventDidMount : (info) => {
if (info.event.extendedProps.isCalendarPending) {
info.el.classList.add('pending-event');
info.el.style.backgroundColor = info.event.backgroundColor;
info.el.style.color = info.event.textColor;
}
this.addPendinEventClass(info);
},
noEventsDidMount,
eventOrder: ['start', '-duration', 'allDay', eventOrder],
@ -308,6 +304,13 @@ export default {
this.$store.dispatch('setInitialView', { initialView })
}
}, 5000),
addPendinEventClass(info){
if (info.event.extendedProps.isCalendarPending) {
info.el.classList.add('pending-event');
info.el.style.backgroundColor = info.event.backgroundColor;
info.el.style.color = info.event.textColor;
}
}
},
}
</script>

2
calendar/src/mixins/EditorMixin.js
View File

@ -573,6 +573,8 @@ export default {
setPendingCalendar(isPending = true) {
this.calendarObjectInstance.eventComponent.isCalendarPending = isPending
this.calendarObjectInstance.isCalendarPending = isPending
},
async savePendingCalendar(thisAndAllFuture = false) {
if (!this.calendarObject) {

1
calendar/src/store/calendarObjectInstance.js
View File

@ -1744,7 +1744,6 @@ const actions = {
if (isForkedItem && eventComponent.canCreateRecurrenceExceptions()) {
[original, fork] = eventComponent.createRecurrenceException(thisAndAllFuture)
}
await dispatch('updateCalendarObject', { calendarObject })
if (original !== null && fork !== null && original.root !== fork.root) {

2
calendar/src/views/EditSidebar.vue
View File

@ -752,7 +752,7 @@ export default {
this.isViewing = true;
try {
await this.save(false);
await this.savePendingCalendar(false);
this.requiresActionOnRouteLeave = false;
} catch (error) {
this.isViewing = false;

2
calendar/src/views/EditSimple.vue
View File

@ -540,7 +540,7 @@ export default {
this.isViewing = true;
try {
await this.save(false);
await this.savePendingCalendar(false);
this.requiresActionOnRouteLeave = false;
} catch (error) {
this.isViewing = false;