slambert/Thanasoft-Hytha
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '21cff0faf91c5e6e346618a2fe48faa5cd263ac7' into staging

Browse Source
This commit is contained in:
Narindra ezway 2025-03-11 16:50:32 +03:00
commit c0a681e525
12 changed files with 44 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/js/calendar-dashboard.js
View File

@ -1322,7 +1322,7 @@ function b(n) {
/******/ // This function allow to reference async chunks
/******/ __webpack_require__.u = (chunkId) => {
/******/ // return url for filenames based on template
/******/ return "calendar-" + chunkId + ".js?v=" + {"vendors-node_modules_nextcloud_capabilities_dist_index_js-node_modules_nextcloud_vue-select_d-877981":"3a2ab5c12f0771c82ad1","vendors-node_modules_vue_dist_vue_runtime_esm_js":"7e3171593bdc0f62040b","vendors-node_modules_nextcloud_cdav-library_dist_dist_js-node_modules_nextcloud_logger_dist_i-36c16b":"c3b3db23da041c717fc1","vendors-node_modules_webdav_dist_web_index_js":"454da8f908d41b47c607","vendors-node_modules_axios_index_js-node_modules_vue-material-design-icons_CalendarBlankOutli-1d3065":"88354dc01b19c1f3f2fe","vendors-node_modules_nextcloud_vue-dashboard_dist_vue-dashboard_js-node_modules_css-loader_di-9e6f3d":"94406568c4140a6ddece","src_models_rfcProps_js-src_services_caldavService_js-src_services_talkService_js-src_services-8a2790":"7cf71b4f92d5bbc180b4","src_store_index_js":"9676b305963c286b748b","src_fullcalendar_eventSources_eventSourceFunction_js-src_utils_moment_js-data_image_svg_xml_3-b73258":"7910aecb675dcdfa620c","dashboard-lazy":"41ca77d834f6e319b2e6","vendors-node_modules_vue-material-design-icons_CalendarBlank_vue-node_modules_vue-material-de-e2c1f8":"b90524c103590fa7a133","vendors-node_modules_path-browserify_index_js-node_modules_nextcloud_dialogs_dist_chunks_Dial-e0595f":"214ba50739254b654bf4","node_modules_nextcloud_dialogs_dist_legacy_mjs":"8be838e4c6e9aae56c87","vendors-node_modules_nextcloud_dialogs_dist_chunks_FilePicker-8ibBgPg__mjs":"ea54a36450de178d1141","vendors-node_modules_moment_locale_af_js-node_modules_moment_locale_ar-dz_js-node_modules_mom-582c96":"ce1bed825f57dd1d117a","node_modules_moment_locale_sync_recursive_":"4bc2c39c5e0ff182c2e3"}[chunkId] + "";
/******/ return "calendar-" + chunkId + ".js?v=" + {"vendors-node_modules_nextcloud_capabilities_dist_index_js-node_modules_nextcloud_vue-select_d-877981":"3a2ab5c12f0771c82ad1","vendors-node_modules_vue_dist_vue_runtime_esm_js":"7e3171593bdc0f62040b","vendors-node_modules_nextcloud_cdav-library_dist_dist_js-node_modules_nextcloud_logger_dist_i-36c16b":"c3b3db23da041c717fc1","vendors-node_modules_webdav_dist_web_index_js":"454da8f908d41b47c607","vendors-node_modules_axios_index_js-node_modules_vue-material-design-icons_CalendarBlankOutli-1d3065":"88354dc01b19c1f3f2fe","vendors-node_modules_nextcloud_vue-dashboard_dist_vue-dashboard_js-node_modules_css-loader_di-9e6f3d":"94406568c4140a6ddece","src_models_rfcProps_js-src_services_caldavService_js-src_services_talkService_js-src_services-8a2790":"7cf71b4f92d5bbc180b4","src_store_index_js":"106f054b5df5c6ea6a4d","src_fullcalendar_eventSources_eventSourceFunction_js-src_utils_moment_js-data_image_svg_xml_3-b73258":"7910aecb675dcdfa620c","dashboard-lazy":"41ca77d834f6e319b2e6","vendors-node_modules_vue-material-design-icons_CalendarBlank_vue-node_modules_vue-material-de-e2c1f8":"b90524c103590fa7a133","vendors-node_modules_path-browserify_index_js-node_modules_nextcloud_dialogs_dist_chunks_Dial-e0595f":"214ba50739254b654bf4","node_modules_nextcloud_dialogs_dist_legacy_mjs":"8be838e4c6e9aae56c87","vendors-node_modules_nextcloud_dialogs_dist_chunks_FilePicker-8ibBgPg__mjs":"ea54a36450de178d1141","vendors-node_modules_moment_locale_af_js-node_modules_moment_locale_ar-dz_js-node_modules_mom-582c96":"ce1bed825f57dd1d117a","node_modules_moment_locale_sync_recursive_":"4bc2c39c5e0ff182c2e3"}[chunkId] + "";
/******/ };
/******/ })();
/******/
@ -1580,4 +1580,4 @@ document.addEventListener('DOMContentLoaded', function () {
/******/ })()
;
//# sourceMappingURL=calendar-dashboard.js.map?v=349d50a5c0e81d351e0d
//# sourceMappingURL=calendar-dashboard.js.map?v=8eb4cfd67b72b2e93b51

2
calendar/js/calendar-dashboard.js.map
View File

File diff suppressed because one or more lines are too long

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

@ -9380,7 +9380,14 @@ __webpack_require__.r(__webpack_exports__);
// Timezones:
timeZone: this.timezoneId,
// Disable jumping in week view and day view when clicking on any event using the simple editor
scrollTimeReset: false
scrollTimeReset: false,
eventClassNames: arg => {
let classes = [];
if (arg.event.extendedProps.isCalendarPending) {
classes.push('pending-event');
}
return classes;
}
};
},
eventSources() {
@ -9509,7 +9516,6 @@ __webpack_require__.r(__webpack_exports__);
}, 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;
}
@ -23970,7 +23976,7 @@ var render = function render() {
class: {
"save-buttons--grow": _vm.growHorizontally
}
}, [!_vm.isCalendarPending ? _c("NcButton", {
}, [!_vm.isCalendarPending && !_vm.isReadOnly ? _c("NcButton", {
class: "d-flex w-max-content",
on: {
click: _vm.saveAsPendingCalendarEvent
@ -59854,11 +59860,9 @@ var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBP
// Module
___CSS_LOADER_EXPORT___.push([module.id, `.save-buttons[data-v-8f0b8a9c] {
display: flex;
justify-content: end;
gap: 5px;
}
.save-buttons--grow[data-v-8f0b8a9c] {
flex-wrap: wrap;
justify-content: center;
}
.save-buttons--grow button[data-v-8f0b8a9c] {
flex: 1 fit-content;
@ -313550,4 +313554,4 @@ appointmentsConfigsStore.addInitialConfigs((0,_nextcloud_initial_state__WEBPACK_
/******/ })()
;
//# sourceMappingURL=calendar-main.js.map?v=a36eee205b3a9db56472
//# sourceMappingURL=calendar-main.js.map?v=fcfb5fd70d5e779d1a10

2
calendar/js/calendar-main.js.map
View File

File diff suppressed because one or more lines are too long

4
calendar/js/calendar-reference.js
View File

@ -8880,7 +8880,7 @@ window._registerCustomPickerElement = _;
/******/ // This function allow to reference async chunks
/******/ __webpack_require__.u = (chunkId) => {
/******/ // return url for filenames based on template
/******/ return "calendar-" + chunkId + ".js?v=" + {"vendors-node_modules_vue_dist_vue_runtime_esm_js":"7e3171593bdc0f62040b","vendors-node_modules_nextcloud_capabilities_dist_index_js-node_modules_nextcloud_vue-select_d-877981":"3a2ab5c12f0771c82ad1","vendors-node_modules_nextcloud_cdav-library_dist_dist_js-node_modules_nextcloud_logger_dist_i-36c16b":"c3b3db23da041c717fc1","vendors-node_modules_vue-material-design-icons_CalendarBlank_vue-node_modules_vue-material-de-e2c1f8":"b90524c103590fa7a133","vendors-node_modules_axios_index_js-node_modules_vue-material-design-icons_CalendarBlankOutli-1d3065":"88354dc01b19c1f3f2fe","vendors-node_modules_autosize_dist_autosize_esm_js-node_modules_html-entities_lib_index_js-no-4072c5":"1d12f5e341e36b0fcd1d","src_models_rfcProps_js-src_services_caldavService_js-src_services_talkService_js-src_services-8a2790":"7cf71b4f92d5bbc180b4","src_fullcalendar_eventSources_eventSourceFunction_js-src_utils_moment_js-data_image_svg_xml_3-b73258":"7910aecb675dcdfa620c","src_views_Calendar_vue-data_image_svg_xml_3csvg_20xmlns_27http_www_w3_org_2000_svg_27_20heigh-4a4254":"8b44a8dca72f653e70b2","vendors-node_modules_webdav_dist_web_index_js":"454da8f908d41b47c607","src_store_index_js":"9676b305963c286b748b","vendors-node_modules_path-browserify_index_js-node_modules_nextcloud_dialogs_dist_chunks_Dial-e0595f":"214ba50739254b654bf4","node_modules_nextcloud_dialogs_dist_legacy_mjs":"8be838e4c6e9aae56c87","vendors-node_modules_nextcloud_dialogs_dist_chunks_FilePicker-8ibBgPg__mjs":"ea54a36450de178d1141","public-calendar-subscription-picker":"5cfd324844c891720a08","vendors-node_modules_moment_locale_af_js-node_modules_moment_locale_ar-dz_js-node_modules_mom-582c96":"ce1bed825f57dd1d117a","node_modules_moment_locale_sync_recursive_":"4bc2c39c5e0ff182c2e3"}[chunkId] + "";
/******/ return "calendar-" + chunkId + ".js?v=" + {"vendors-node_modules_vue_dist_vue_runtime_esm_js":"7e3171593bdc0f62040b","vendors-node_modules_nextcloud_capabilities_dist_index_js-node_modules_nextcloud_vue-select_d-877981":"3a2ab5c12f0771c82ad1","vendors-node_modules_nextcloud_cdav-library_dist_dist_js-node_modules_nextcloud_logger_dist_i-36c16b":"c3b3db23da041c717fc1","vendors-node_modules_vue-material-design-icons_CalendarBlank_vue-node_modules_vue-material-de-e2c1f8":"b90524c103590fa7a133","vendors-node_modules_axios_index_js-node_modules_vue-material-design-icons_CalendarBlankOutli-1d3065":"88354dc01b19c1f3f2fe","vendors-node_modules_autosize_dist_autosize_esm_js-node_modules_html-entities_lib_index_js-no-4072c5":"1d12f5e341e36b0fcd1d","src_models_rfcProps_js-src_services_caldavService_js-src_services_talkService_js-src_services-8a2790":"7cf71b4f92d5bbc180b4","src_fullcalendar_eventSources_eventSourceFunction_js-src_utils_moment_js-data_image_svg_xml_3-b73258":"7910aecb675dcdfa620c","src_views_Calendar_vue-data_image_svg_xml_3csvg_20xmlns_27http_www_w3_org_2000_svg_27_20heigh-4a4254":"1fe216f15f7f1e1b4253","vendors-node_modules_webdav_dist_web_index_js":"454da8f908d41b47c607","src_store_index_js":"106f054b5df5c6ea6a4d","vendors-node_modules_path-browserify_index_js-node_modules_nextcloud_dialogs_dist_chunks_Dial-e0595f":"214ba50739254b654bf4","node_modules_nextcloud_dialogs_dist_legacy_mjs":"8be838e4c6e9aae56c87","vendors-node_modules_nextcloud_dialogs_dist_chunks_FilePicker-8ibBgPg__mjs":"ea54a36450de178d1141","public-calendar-subscription-picker":"5cfd324844c891720a08","vendors-node_modules_moment_locale_af_js-node_modules_moment_locale_ar-dz_js-node_modules_mom-582c96":"ce1bed825f57dd1d117a","node_modules_moment_locale_sync_recursive_":"4bc2c39c5e0ff182c2e3"}[chunkId] + "";
/******/ };
/******/ })();
/******/
@ -9130,4 +9130,4 @@ __webpack_require__.p = (0,_nextcloud_router__WEBPACK_IMPORTED_MODULE_1__.linkTo
/******/ })()
;
//# sourceMappingURL=calendar-reference.js.map?v=41137bb0b6ba342967a4
//# sourceMappingURL=calendar-reference.js.map?v=1c787d9ce4c34a58f775

2
calendar/js/calendar-reference.js.map
View File

File diff suppressed because one or more lines are too long

2
calendar/js/calendar-src_store_index_js.js
View File

@ -8278,4 +8278,4 @@ function getLinkToConfig(key) {
/***/ })
}]);
//# sourceMappingURL=calendar-src_store_index_js.js.map?v=9676b305963c286b748b
//# sourceMappingURL=calendar-src_store_index_js.js.map?v=106f054b5df5c6ea6a4d

2
calendar/js/calendar-src_store_index_js.js.map
View File

File diff suppressed because one or more lines are too long

18
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

@ -4352,7 +4352,14 @@ __webpack_require__.r(__webpack_exports__);
// Timezones:
timeZone: this.timezoneId,
// Disable jumping in week view and day view when clicking on any event using the simple editor
scrollTimeReset: false
scrollTimeReset: false,
eventClassNames: arg => {
let classes = [];
if (arg.event.extendedProps.isCalendarPending) {
classes.push('pending-event');
}
return classes;
}
};
},
eventSources() {
@ -4481,7 +4488,6 @@ __webpack_require__.r(__webpack_exports__);
}, 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;
}
@ -13785,7 +13791,7 @@ var render = function render() {
class: {
"save-buttons--grow": _vm.growHorizontally
}
}, [!_vm.isCalendarPending ? _c("NcButton", {
}, [!_vm.isCalendarPending && !_vm.isReadOnly ? _c("NcButton", {
class: "d-flex w-max-content",
on: {
click: _vm.saveAsPendingCalendarEvent
@ -20896,11 +20902,9 @@ var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBP
// Module
___CSS_LOADER_EXPORT___.push([module.id, `.save-buttons[data-v-8f0b8a9c] {
display: flex;
justify-content: end;
gap: 5px;
}
.save-buttons--grow[data-v-8f0b8a9c] {
flex-wrap: wrap;
justify-content: center;
}
.save-buttons--grow button[data-v-8f0b8a9c] {
flex: 1 fit-content;
@ -28073,4 +28077,4 @@ module.exports = "data:image/svg+xml,%3csvg%20xmlns=%27http://www.w3.org/2000/sv
/***/ })
}]);
//# sourceMappingURL=calendar-src_views_Calendar_vue-data_image_svg_xml_3csvg_20xmlns_27http_www_w3_org_2000_svg_27_20heigh-4a4254.js.map?v=8b44a8dca72f653e70b2
//# sourceMappingURL=calendar-src_views_Calendar_vue-data_image_svg_xml_3csvg_20xmlns_27http_www_w3_org_2000_svg_27_20heigh-4a4254.js.map?v=1fe216f15f7f1e1b4253

2
calendar/js/calendar-src_views_Calendar_vue-data_image_svg_xml_3csvg_20xmlns_27http_www_w3_org_2000_svg_27_20heigh-4a4254.js.map
View File

File diff suppressed because one or more lines are too long

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

@ -161,6 +161,13 @@ export default {
timeZone: this.timezoneId,
// Disable jumping in week view and day view when clicking on any event using the simple editor
scrollTimeReset: false,
eventClassNames: (arg) => {
let classes = [];
if (arg.event.extendedProps.isCalendarPending) {
classes.push('pending-event');
}
return classes;
},
}
},
eventSources() {
@ -306,7 +313,6 @@ export default {
}, 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;
}

9
calendar/src/components/Editor/SaveButtons.vue
View File

@ -24,7 +24,7 @@
<template>
<div class="save-buttons" :class="{ 'save-buttons--grow': growHorizontally }">
<NcButton
v-if="!isCalendarPending"
v-if="!isCalendarPending && !isReadOnly"
@click="saveAsPendingCalendarEvent"
:class="'d-flex w-max-content'"
>
@ -152,17 +152,18 @@ export default {
</script>
<style lang="scss" scoped>
.save-buttons {
display: flex;
justify-content: end;
gap: 5px;
flex-wrap: wrap;
justify-content: center;
&--grow {
flex-wrap: wrap;
button {
flex: 1 fit-content;
}
}
}
</style>