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

finish event pending and event pending style

Browse Source
This commit is contained in:
Tiavina 2025-03-06 10:30:23 +03:00
parent 59791c0bb5
commit 6090bfe69f
13 changed files with 42 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/css/global.scss
View File

@ -40,7 +40,7 @@ position: absolute;
top: 50%; top: 50%;
left: 0; left: 0;
width: 100%; width: 100%;
height: 0.5px; height: 0.3px;
background: rgb(23, 23, 23); background: rgb(23, 23, 23);
transform: translateY(-50%); transform: translateY(-50%);
} }

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

@ -1322,7 +1322,7 @@ function b(n) {
/******/ // This function allow to reference async chunks /******/ // This function allow to reference async chunks
/******/ __webpack_require__.u = (chunkId) => { /******/ __webpack_require__.u = (chunkId) => {
/******/ // return url for filenames based on template /******/ // 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":"31a7d4ece3cdde2d67f1","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":"55e669bcb78e07cd54cc","vendors-node_modules_nextcloud_vue-dashboard_dist_vue-dashboard_js-node_modules_css-loader_di-9e6f3d":"56b7e44c1982f74f69ca","src_models_rfcProps_js-src_services_caldavService_js-src_services_talkService_js-src_services-8a2790":"7cf71b4f92d5bbc180b4","src_store_index_js":"713aea39247328716a18","src_fullcalendar_eventSources_eventSourceFunction_js-src_utils_moment_js-data_image_svg_xml_3-b73258":"4ce418c90d4d8f993cea","dashboard-lazy":"a51e4becd0c10f90296c","vendors-node_modules_vue-material-design-icons_CalendarBlank_vue-node_modules_vue-material-de-e2c1f8":"1ec24b5ef07652c6dd39","vendors-node_modules_path-browserify_index_js-node_modules_nextcloud_dialogs_dist_chunks_Dial-e0595f":"7ec0cf6b65f5c745fa03","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":"31a7d4ece3cdde2d67f1","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":"55e669bcb78e07cd54cc","vendors-node_modules_nextcloud_vue-dashboard_dist_vue-dashboard_js-node_modules_css-loader_di-9e6f3d":"56b7e44c1982f74f69ca","src_models_rfcProps_js-src_services_caldavService_js-src_services_talkService_js-src_services-8a2790":"7cf71b4f92d5bbc180b4","src_store_index_js":"713aea39247328716a18","src_fullcalendar_eventSources_eventSourceFunction_js-src_utils_moment_js-data_image_svg_xml_3-b73258":"df931e59f3b6af7b8c1f","dashboard-lazy":"a51e4becd0c10f90296c","vendors-node_modules_vue-material-design-icons_CalendarBlank_vue-node_modules_vue-material-de-e2c1f8":"1ec24b5ef07652c6dd39","vendors-node_modules_path-browserify_index_js-node_modules_nextcloud_dialogs_dist_chunks_Dial-e0595f":"7ec0cf6b65f5c745fa03","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=67b0027ecb3dd084c6fb //# sourceMappingURL=calendar-dashboard.js.map?v=cfc88fb4997084b86df8

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

File diff suppressed because one or more lines are too long

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

@ -9362,6 +9362,8 @@ __webpack_require__.r(__webpack_exports__);
eventDidMount: info => { eventDidMount: info => {
if (info.event.extendedProps.isCalendarPending) { if (info.event.extendedProps.isCalendarPending) {
info.el.classList.add('pending-event'); info.el.classList.add('pending-event');
info.el.style.backgroundColor = info.event.backgroundColor;
info.el.style.color = info.event.textColor;
} }
}, },
noEventsDidMount: _fullcalendar_rendering_noEventsDidMount_js__WEBPACK_IMPORTED_MODULE_14__["default"], noEventsDidMount: _fullcalendar_rendering_noEventsDidMount_js__WEBPACK_IMPORTED_MODULE_14__["default"],
@ -26509,14 +26511,10 @@ function eventSourceFunction(calendarObjects, calendar, start, end, timezone) {
title += " (".concat(object.percent, "%)"); title += " (".concat(object.percent, "%)");
} }
} }
// console.log(calendarObject.dav.data);
// console.log(object._properties.get('ISCALENDARPENDING')[0]);
let isCalendarPending = false; let isCalendarPending = false;
console.log(object);
let objectProperties = object._properties.get('ISCALENDARPENDING'); let objectProperties = object._properties.get('ISCALENDARPENDING');
if (objectProperties && objectProperties.length > 0) { if (objectProperties && objectProperties.length > 0) {
isCalendarPending = objectProperties[0]._value; isCalendarPending = objectProperties[0]._value == "1" ? true : false;
} }
const fcEvent = { const fcEvent = {
id: [calendarObject.id, object.id].join('###'), id: [calendarObject.id, object.id].join('###'),
@ -26543,6 +26541,11 @@ function eventSourceFunction(calendarObjects, calendar, start, end, timezone) {
isCalendarPending: isCalendarPending isCalendarPending: isCalendarPending
} }
}; };
if (isCalendarPending) {
fcEvent.backgroundColor = calendar.color;
fcEvent.borderColor = calendar.color;
fcEvent.textColor = (0,_utils_color_js__WEBPACK_IMPORTED_MODULE_1__.generateTextColorForHex)(calendar.color);
}
if (object.color) { if (object.color) {
const customColor = (0,_utils_color_js__WEBPACK_IMPORTED_MODULE_1__.getHexForColorName)(object.color); const customColor = (0,_utils_color_js__WEBPACK_IMPORTED_MODULE_1__.getHexForColorName)(object.color);
if (customColor) { if (customColor) {
@ -58108,7 +58111,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, `@charset "UTF-8";
top: 50%; top: 50%;
left: 0; left: 0;
width: 100%; width: 100%;
height: 0.5px; height: 0.3px;
background: rgb(23, 23, 23); background: rgb(23, 23, 23);
transform: translateY(-50%); transform: translateY(-50%);
} }
@ -313471,4 +313474,4 @@ appointmentsConfigsStore.addInitialConfigs((0,_nextcloud_initial_state__WEBPACK_
/******/ })() /******/ })()
; ;
//# sourceMappingURL=calendar-main.js.map?v=c1270c074e93a8179868 //# sourceMappingURL=calendar-main.js.map?v=b9e2c8ccbd7d27f4b063

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

File diff suppressed because one or more lines are too long

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

@ -2785,7 +2785,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, `@charset "UTF-8";
top: 50%; top: 50%;
left: 0; left: 0;
width: 100%; width: 100%;
height: 0.5px; height: 0.3px;
background: rgb(23, 23, 23); background: rgb(23, 23, 23);
transform: translateY(-50%); transform: translateY(-50%);
} }
@ -8880,7 +8880,7 @@ window._registerCustomPickerElement = _;
/******/ // This function allow to reference async chunks /******/ // This function allow to reference async chunks
/******/ __webpack_require__.u = (chunkId) => { /******/ __webpack_require__.u = (chunkId) => {
/******/ // return url for filenames based on template /******/ // 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":"31a7d4ece3cdde2d67f1","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":"1ec24b5ef07652c6dd39","vendors-node_modules_axios_index_js-node_modules_vue-material-design-icons_CalendarBlankOutli-1d3065":"55e669bcb78e07cd54cc","vendors-node_modules_autosize_dist_autosize_esm_js-node_modules_html-entities_lib_index_js-no-4072c5":"7212b31e059bc10c256e","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":"4ce418c90d4d8f993cea","src_views_Calendar_vue-data_image_svg_xml_3csvg_20xmlns_27http_www_w3_org_2000_svg_27_20heigh-4a4254":"23c02fac45a076d7bd9c","vendors-node_modules_webdav_dist_web_index_js":"454da8f908d41b47c607","src_store_index_js":"713aea39247328716a18","vendors-node_modules_path-browserify_index_js-node_modules_nextcloud_dialogs_dist_chunks_Dial-e0595f":"7ec0cf6b65f5c745fa03","node_modules_nextcloud_dialogs_dist_legacy_mjs":"8be838e4c6e9aae56c87","vendors-node_modules_nextcloud_dialogs_dist_chunks_FilePicker-8ibBgPg__mjs":"ea54a36450de178d1141","public-calendar-subscription-picker":"2315e24e67ebf6e4b6db","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":"31a7d4ece3cdde2d67f1","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":"1ec24b5ef07652c6dd39","vendors-node_modules_axios_index_js-node_modules_vue-material-design-icons_CalendarBlankOutli-1d3065":"55e669bcb78e07cd54cc","vendors-node_modules_autosize_dist_autosize_esm_js-node_modules_html-entities_lib_index_js-no-4072c5":"7212b31e059bc10c256e","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":"df931e59f3b6af7b8c1f","src_views_Calendar_vue-data_image_svg_xml_3csvg_20xmlns_27http_www_w3_org_2000_svg_27_20heigh-4a4254":"2b57cce5d259d7e6d1d0","vendors-node_modules_webdav_dist_web_index_js":"454da8f908d41b47c607","src_store_index_js":"713aea39247328716a18","vendors-node_modules_path-browserify_index_js-node_modules_nextcloud_dialogs_dist_chunks_Dial-e0595f":"7ec0cf6b65f5c745fa03","node_modules_nextcloud_dialogs_dist_legacy_mjs":"8be838e4c6e9aae56c87","vendors-node_modules_nextcloud_dialogs_dist_chunks_FilePicker-8ibBgPg__mjs":"ea54a36450de178d1141","public-calendar-subscription-picker":"2315e24e67ebf6e4b6db","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=0588b4232bd51787ae0b //# sourceMappingURL=calendar-reference.js.map?v=4a07fd518e8bc80b0a1e

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

File diff suppressed because one or more lines are too long

13
calendar/js/calendar-src_fullcalendar_eventSources_eventSourceFunction_js-src_utils_moment_js-data_image_svg_xml_3-b73258.js
View File

@ -123,14 +123,10 @@ function eventSourceFunction(calendarObjects, calendar, start, end, timezone) {
title += " (".concat(object.percent, "%)"); title += " (".concat(object.percent, "%)");
} }
} }
// console.log(calendarObject.dav.data);
// console.log(object._properties.get('ISCALENDARPENDING')[0]);
let isCalendarPending = false; let isCalendarPending = false;
console.log(object);
let objectProperties = object._properties.get('ISCALENDARPENDING'); let objectProperties = object._properties.get('ISCALENDARPENDING');
if (objectProperties && objectProperties.length > 0) { if (objectProperties && objectProperties.length > 0) {
isCalendarPending = objectProperties[0]._value; isCalendarPending = objectProperties[0]._value == "1" ? true : false;
} }
const fcEvent = { const fcEvent = {
id: [calendarObject.id, object.id].join('###'), id: [calendarObject.id, object.id].join('###'),
@ -157,6 +153,11 @@ function eventSourceFunction(calendarObjects, calendar, start, end, timezone) {
isCalendarPending: isCalendarPending isCalendarPending: isCalendarPending
} }
}; };
if (isCalendarPending) {
fcEvent.backgroundColor = calendar.color;
fcEvent.borderColor = calendar.color;
fcEvent.textColor = (0,_utils_color_js__WEBPACK_IMPORTED_MODULE_1__.generateTextColorForHex)(calendar.color);
}
if (object.color) { if (object.color) {
const customColor = (0,_utils_color_js__WEBPACK_IMPORTED_MODULE_1__.getHexForColorName)(object.color); const customColor = (0,_utils_color_js__WEBPACK_IMPORTED_MODULE_1__.getHexForColorName)(object.color);
if (customColor) { if (customColor) {
@ -1042,4 +1043,4 @@ module.exports = "data:image/svg+xml,%3csvg%20xmlns=%27http://www.w3.org/2000/sv
/***/ }) /***/ })
}]); }]);
//# sourceMappingURL=calendar-src_fullcalendar_eventSources_eventSourceFunction_js-src_utils_moment_js-data_image_svg_xml_3-b73258.js.map?v=4ce418c90d4d8f993cea //# sourceMappingURL=calendar-src_fullcalendar_eventSources_eventSourceFunction_js-src_utils_moment_js-data_image_svg_xml_3-b73258.js.map?v=df931e59f3b6af7b8c1f

2
calendar/js/calendar-src_fullcalendar_eventSources_eventSourceFunction_js-src_utils_moment_js-data_image_svg_xml_3-b73258.js.map
View File

File diff suppressed because one or more lines are too long

4
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

@ -4334,6 +4334,8 @@ __webpack_require__.r(__webpack_exports__);
eventDidMount: info => { eventDidMount: info => {
if (info.event.extendedProps.isCalendarPending) { if (info.event.extendedProps.isCalendarPending) {
info.el.classList.add('pending-event'); info.el.classList.add('pending-event');
info.el.style.backgroundColor = info.event.backgroundColor;
info.el.style.color = info.event.textColor;
} }
}, },
noEventsDidMount: _fullcalendar_rendering_noEventsDidMount_js__WEBPACK_IMPORTED_MODULE_14__["default"], noEventsDidMount: _fullcalendar_rendering_noEventsDidMount_js__WEBPACK_IMPORTED_MODULE_14__["default"],
@ -28008,4 +28010,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=23c02fac45a076d7bd9c //# sourceMappingURL=calendar-src_views_Calendar_vue-data_image_svg_xml_3csvg_20xmlns_27http_www_w3_org_2000_svg_27_20heigh-4a4254.js.map?v=2b57cce5d259d7e6d1d0

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

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

@ -141,7 +141,9 @@ export default {
dayHeaderDidMount, dayHeaderDidMount,
eventDidMount : (info) => { eventDidMount : (info) => {
if (info.event.extendedProps.isCalendarPending) { if (info.event.extendedProps.isCalendarPending) {
info.el.classList.add('pending-event'); info.el.classList.add('pending-event');
info.el.style.backgroundColor = info.event.backgroundColor;
info.el.style.color = info.event.textColor;
} }
}, },
noEventsDidMount, noEventsDidMount,

13
calendar/src/fullcalendar/eventSources/eventSourceFunction.js
View File

@ -24,7 +24,7 @@ import {
hexToRGB, hexToRGB,
isLight, isLight,
generateTextColorForHex, generateTextColorForHex,
getHexForColorName, getHexForColorName
} from '../../utils/color.js' } from '../../utils/color.js'
import logger from '../../utils/logger.js' import logger from '../../utils/logger.js'
import { getAllObjectsInTimeRange } from '../../utils/calendarObject.js' import { getAllObjectsInTimeRange } from '../../utils/calendarObject.js'
@ -119,13 +119,10 @@ export function eventSourceFunction(calendarObjects, calendar, start, end, timez
} }
} }
// console.log(calendarObject.dav.data);
// console.log(object._properties.get('ISCALENDARPENDING')[0]);
let isCalendarPending = false; let isCalendarPending = false;
console.log(object);
let objectProperties = object._properties.get('ISCALENDARPENDING'); let objectProperties = object._properties.get('ISCALENDARPENDING');
if (objectProperties && objectProperties.length > 0) { if (objectProperties && objectProperties.length > 0) {
isCalendarPending = objectProperties[0]._value; isCalendarPending = objectProperties[0]._value == "1" ? true : false;
} }
const fcEvent = { const fcEvent = {
@ -156,6 +153,12 @@ export function eventSourceFunction(calendarObjects, calendar, start, end, timez
}, },
} }
if(isCalendarPending){
fcEvent.backgroundColor = calendar.color
fcEvent.borderColor = calendar.color
fcEvent.textColor = generateTextColorForHex(calendar.color)
}
if (object.color) { if (object.color) {
const customColor = getHexForColorName(object.color) const customColor = getHexForColorName(object.color)
if (customColor) { if (customColor) {