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

Merge branch 'fixes/fix-talk-message' into staging

Browse Source
This commit is contained in:
Tiavina 2025-01-21 12:21:44 +03:00
commit 35eb6fe2d4
21 changed files with 84 additions and 76 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":"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_vue-material-design-icons_CalendarBlankOutline_vue-node_modules_nextclou-4adead":"702892edfb255629754c","vendors-node_modules_nextcloud_vue-dashboard_dist_vue-dashboard_js-node_modules_css-loader_di-9e6f3d":"bab844a8fb43e3701945","src_models_rfcProps_js-src_services_caldavService_js-src_services_talkService_js-src_services-8a2790":"7cf71b4f92d5bbc180b4","src_store_index_js":"4bebc5a151258d60d143","src_fullcalendar_eventSources_eventSourceFunction_js-src_utils_moment_js-data_image_svg_xml_3-b73258":"740a2859d1f364b508c1","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_vue-material-design-icons_CalendarBlankOutline_vue-node_modules_nextclou-4adead":"702892edfb255629754c","vendors-node_modules_nextcloud_vue-dashboard_dist_vue-dashboard_js-node_modules_css-loader_di-9e6f3d":"bab844a8fb43e3701945","src_models_rfcProps_js-src_services_caldavService_js-src_services_talkService_js-src_services-8a2790":"7cf71b4f92d5bbc180b4","src_store_index_js":"d9edf831af736ca9c1bd","src_fullcalendar_eventSources_eventSourceFunction_js-src_utils_moment_js-data_image_svg_xml_3-b73258":"740a2859d1f364b508c1","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=52306b26c2aeb446ddd7
//# sourceMappingURL=calendar-dashboard.js.map?v=cf2ea1a7ea73628025b8

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

File diff suppressed because one or more lines are too long

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

@ -2597,7 +2597,7 @@ __webpack_require__.r(__webpack_exports__);
type: Boolean,
required: true
},
isAdmin: {
canAccessPreviousEvent: {
type: Boolean,
default: true
}
@ -2647,7 +2647,7 @@ __webpack_require__.r(__webpack_exports__);
type: Boolean,
default: false
},
isAdmin: {
canAccessPreviousEvent: {
type: Boolean,
default: true
}
@ -2662,7 +2662,7 @@ __webpack_require__.r(__webpack_exports__);
locale: state => state.settings.momentLocale
}),
minimumDate() {
return this.isAdmin ? new Date(this.$store.state.davRestrictions.minimumDate) : new Date();
return this.canAccessPreviousEvent ? new Date(this.$store.state.davRestrictions.minimumDate) : new Date();
},
selectedDate() {
var _this$$route$params$f, _this$$route$params;
@ -2907,7 +2907,7 @@ __webpack_require__.r(__webpack_exports__);
ViewWeek: vue_material_design_icons_ViewWeek_vue__WEBPACK_IMPORTED_MODULE_5__["default"]
},
props: {
isAdmin: {
canAccessPreviousEvent: {
type: Boolean,
default: true
}
@ -2923,7 +2923,7 @@ __webpack_require__.r(__webpack_exports__);
icon: 'ViewWeek',
label: this.$t('calendar', 'Week')
}];
if (this.isAdmin) {
if (this.canAccessPreviousEvent) {
let additionalMenus = [{
id: 'dayGridMonth',
icon: 'ViewModule',
@ -4979,7 +4979,7 @@ __webpack_require__.r(__webpack_exports__);
type: Boolean,
default: false
},
isAdmin: {
canAccessPreviousEvent: {
type: Boolean,
default: true
}
@ -6827,7 +6827,7 @@ __webpack_require__.r(__webpack_exports__);
type: Boolean,
default: false
},
isAdmin: {
canAccessPreviousEvent: {
type: Boolean,
default: true
},
@ -6867,7 +6867,7 @@ __webpack_require__.r(__webpack_exports__);
_this$$route2,
_this = this;
let defaultView = 'dayGridMonth';
if (this.isAdmin === false) {
if (this.canAccessPreviousEvent === false) {
defaultView = 'timeGridWeek';
}
return {
@ -13363,7 +13363,7 @@ __webpack_require__.r(__webpack_exports__);
timezoneId: 'getResolvedTimezone',
hasTrashBin: 'hasTrashBin',
currentUserPrincipal: 'getCurrentUserPrincipal',
isAdmin: 'userRole/isAdmin'
canAccessPreviousEvent: 'userRole/canAccessPreviousEvent'
}),
...(0,vuex__WEBPACK_IMPORTED_MODULE_21__.mapState)({
eventLimit: state => state.settings.eventLimit,
@ -14280,13 +14280,13 @@ var render = function render() {
staticClass: "app-navigation-header"
}, [_c("AppNavigationHeaderDatePicker", {
attrs: {
"is-admin": _vm.isAdmin
"can-access-previous-event": _vm.canAccessPreviousEvent
}
}), _vm._v(" "), _c("div", {
staticClass: "new-event-today-view-section"
}, [!_vm.isPublic ? _c("AppNavigationHeaderNewEvent") : _vm._e(), _vm._v(" "), _c("AppNavigationHeaderTodayButton"), _vm._v(" "), _c("AppNavigationHeaderViewMenu", {
attrs: {
"is-admin": _vm.isAdmin
"can-access-previous-event": _vm.canAccessPreviousEvent
}
})], 1)], 1);
};
@ -14313,7 +14313,7 @@ var render = function render() {
_c = _vm._self._c;
return _c("div", {
staticClass: "datepicker-button-section"
}, [!_vm.isWidget && _vm.isAdmin ? _c("NcButton", {
}, [!_vm.isWidget && _vm.canAccessPreviousEvent ? _c("NcButton", {
directives: [{
name: "shortkey",
rawName: "v-shortkey",
@ -16383,7 +16383,7 @@ var render = function render() {
}, [_c("AppNavigationHeaderDatePicker", {
attrs: {
"is-widget": _vm.isWidget,
"is-admin": _vm.isAdmin
"can-access-previous-event": _vm.canAccessPreviousEvent
}
}), _vm._v(" "), !_vm.isWidget ? _c("AppNavigationHeaderTodayButton") : _vm._e()], 1), _vm._v(" "), _c("div", {
class: _vm.isWidget ? "widget-header__views-section" : "embed-header__views-section"
@ -21740,13 +21740,13 @@ var render = function render() {
}, [!_vm.showEmptyCalendarScreen ? _c("EmbedTopNavigation", {
attrs: {
"is-widget": true,
"is-admin": _vm.isAdmin
"can-access-previous-event": _vm.canAccessPreviousEvent
}
}) : _vm._e(), _vm._v(" "), !_vm.showEmptyCalendarScreen ? _c("CalendarGrid", {
ref: "calendarGridWidget",
attrs: {
"is-widget": _vm.isWidget,
"is-admin": _vm.isAdmin,
"can-access-previous-event": _vm.canAccessPreviousEvent,
"is-authenticated-user": _vm.isAuthenticatedUser
}
}) : _c("EmptyCalendar"), _vm._v(" "), _vm.showWidgetEventDetails ? _c("EditSimple", {
@ -21804,7 +21804,7 @@ var render = function render() {
}, [_c("AppNavigationHeader", {
attrs: {
"is-public": !_vm.isAuthenticatedUser,
"is-admin": _vm.isAdmin
"can-access-previous-event": _vm.canAccessPreviousEvent
}
})], 1) : _vm._e(), _vm._v(" "), _vm.isEmbedded ? _c("EmbedTopNavigation", {
attrs: {
@ -21812,7 +21812,7 @@ var render = function render() {
}
}) : _vm._e(), _vm._v(" "), _c("AppContent", [!_vm.showEmptyCalendarScreen ? _c("CalendarGrid", {
attrs: {
"is-admin": _vm.isAdmin,
"can-access-previous-event": _vm.canAccessPreviousEvent,
"is-authenticated-user": _vm.isAuthenticatedUser
}
}) : _c("EmptyCalendar")], 1), _vm._v(" "), _c("router-view")], 1);
@ -36764,7 +36764,8 @@ const actions = {
}
};
const getters = {
isAdmin: state => state.roles.includes("admin")
isAdmin: state => state.roles.includes("admin"),
canAccessPreviousEvent: state => state.roles.includes("Ligne") == false && state.roles.includes("ligne") == false
};
/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({
namespaced: true,
@ -310266,4 +310267,4 @@ appointmentsConfigsStore.addInitialConfigs((0,_nextcloud_initial_state__WEBPACK_
/******/ })()
;
//# sourceMappingURL=calendar-main.js.map?v=fef4cd62fb51ae00ab22
//# sourceMappingURL=calendar-main.js.map?v=8e70e2cac7d8f813ec81

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

@ -8865,7 +8865,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":"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_vue-material-design-icons_CalendarBlankOutline_vue-node_modules_nextclou-4adead":"702892edfb255629754c","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":"740a2859d1f364b508c1","src_views_Calendar_vue-data_image_svg_xml_3csvg_20xmlns_27http_www_w3_org_2000_svg_27_20heigh-4a4254":"1317bcd8b7f411e32076","vendors-node_modules_webdav_dist_web_index_js":"454da8f908d41b47c607","src_store_index_js":"4bebc5a151258d60d143","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_vue-material-design-icons_CalendarBlankOutline_vue-node_modules_nextclou-4adead":"702892edfb255629754c","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":"740a2859d1f364b508c1","src_views_Calendar_vue-data_image_svg_xml_3csvg_20xmlns_27http_www_w3_org_2000_svg_27_20heigh-4a4254":"b772f2fa794015e69dde","vendors-node_modules_webdav_dist_web_index_js":"454da8f908d41b47c607","src_store_index_js":"d9edf831af736ca9c1bd","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] + "";
/******/ };
/******/ })();
/******/
@ -9115,4 +9115,4 @@ __webpack_require__.p = (0,_nextcloud_router__WEBPACK_IMPORTED_MODULE_1__.linkTo
/******/ })()
;
//# sourceMappingURL=calendar-reference.js.map?v=07dc402faa5eddb9e604
//# sourceMappingURL=calendar-reference.js.map?v=663f4eed1f55d2c4714c

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

File diff suppressed because one or more lines are too long

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

@ -7819,7 +7819,8 @@ const actions = {
}
};
const getters = {
isAdmin: state => state.roles.includes("admin")
isAdmin: state => state.roles.includes("admin"),
canAccessPreviousEvent: state => state.roles.includes("Ligne") == false && state.roles.includes("ligne") == false
};
/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({
namespaced: true,
@ -8215,4 +8216,4 @@ function getLinkToConfig(key) {
/***/ })
}]);
//# sourceMappingURL=calendar-src_store_index_js.js.map?v=4bebc5a151258d60d143
//# sourceMappingURL=calendar-src_store_index_js.js.map?v=d9edf831af736ca9c1bd

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

File diff suppressed because one or more lines are too long

36
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

@ -32,7 +32,7 @@ __webpack_require__.r(__webpack_exports__);
type: Boolean,
required: true
},
isAdmin: {
canAccessPreviousEvent: {
type: Boolean,
default: true
}
@ -82,7 +82,7 @@ __webpack_require__.r(__webpack_exports__);
type: Boolean,
default: false
},
isAdmin: {
canAccessPreviousEvent: {
type: Boolean,
default: true
}
@ -97,7 +97,7 @@ __webpack_require__.r(__webpack_exports__);
locale: state => state.settings.momentLocale
}),
minimumDate() {
return this.isAdmin ? new Date(this.$store.state.davRestrictions.minimumDate) : new Date();
return this.canAccessPreviousEvent ? new Date(this.$store.state.davRestrictions.minimumDate) : new Date();
},
selectedDate() {
var _this$$route$params$f, _this$$route$params;
@ -342,7 +342,7 @@ __webpack_require__.r(__webpack_exports__);
ViewWeek: vue_material_design_icons_ViewWeek_vue__WEBPACK_IMPORTED_MODULE_5__["default"]
},
props: {
isAdmin: {
canAccessPreviousEvent: {
type: Boolean,
default: true
}
@ -358,7 +358,7 @@ __webpack_require__.r(__webpack_exports__);
icon: 'ViewWeek',
label: this.$t('calendar', 'Week')
}];
if (this.isAdmin) {
if (this.canAccessPreviousEvent) {
let additionalMenus = [{
id: 'dayGridMonth',
icon: 'ViewModule',
@ -2414,7 +2414,7 @@ __webpack_require__.r(__webpack_exports__);
type: Boolean,
default: false
},
isAdmin: {
canAccessPreviousEvent: {
type: Boolean,
default: true
}
@ -4262,7 +4262,7 @@ __webpack_require__.r(__webpack_exports__);
type: Boolean,
default: false
},
isAdmin: {
canAccessPreviousEvent: {
type: Boolean,
default: true
},
@ -4302,7 +4302,7 @@ __webpack_require__.r(__webpack_exports__);
_this$$route2,
_this = this;
let defaultView = 'dayGridMonth';
if (this.isAdmin === false) {
if (this.canAccessPreviousEvent === false) {
defaultView = 'timeGridWeek';
}
return {
@ -7795,7 +7795,7 @@ __webpack_require__.r(__webpack_exports__);
timezoneId: 'getResolvedTimezone',
hasTrashBin: 'hasTrashBin',
currentUserPrincipal: 'getCurrentUserPrincipal',
isAdmin: 'userRole/isAdmin'
canAccessPreviousEvent: 'userRole/canAccessPreviousEvent'
}),
...(0,vuex__WEBPACK_IMPORTED_MODULE_21__.mapState)({
eventLimit: state => state.settings.eventLimit,
@ -8285,13 +8285,13 @@ var render = function render() {
staticClass: "app-navigation-header"
}, [_c("AppNavigationHeaderDatePicker", {
attrs: {
"is-admin": _vm.isAdmin
"can-access-previous-event": _vm.canAccessPreviousEvent
}
}), _vm._v(" "), _c("div", {
staticClass: "new-event-today-view-section"
}, [!_vm.isPublic ? _c("AppNavigationHeaderNewEvent") : _vm._e(), _vm._v(" "), _c("AppNavigationHeaderTodayButton"), _vm._v(" "), _c("AppNavigationHeaderViewMenu", {
attrs: {
"is-admin": _vm.isAdmin
"can-access-previous-event": _vm.canAccessPreviousEvent
}
})], 1)], 1);
};
@ -8318,7 +8318,7 @@ var render = function render() {
_c = _vm._self._c;
return _c("div", {
staticClass: "datepicker-button-section"
}, [!_vm.isWidget && _vm.isAdmin ? _c("NcButton", {
}, [!_vm.isWidget && _vm.canAccessPreviousEvent ? _c("NcButton", {
directives: [{
name: "shortkey",
rawName: "v-shortkey",
@ -10388,7 +10388,7 @@ var render = function render() {
}, [_c("AppNavigationHeaderDatePicker", {
attrs: {
"is-widget": _vm.isWidget,
"is-admin": _vm.isAdmin
"can-access-previous-event": _vm.canAccessPreviousEvent
}
}), _vm._v(" "), !_vm.isWidget ? _c("AppNavigationHeaderTodayButton") : _vm._e()], 1), _vm._v(" "), _c("div", {
class: _vm.isWidget ? "widget-header__views-section" : "embed-header__views-section"
@ -14028,13 +14028,13 @@ var render = function render() {
}, [!_vm.showEmptyCalendarScreen ? _c("EmbedTopNavigation", {
attrs: {
"is-widget": true,
"is-admin": _vm.isAdmin
"can-access-previous-event": _vm.canAccessPreviousEvent
}
}) : _vm._e(), _vm._v(" "), !_vm.showEmptyCalendarScreen ? _c("CalendarGrid", {
ref: "calendarGridWidget",
attrs: {
"is-widget": _vm.isWidget,
"is-admin": _vm.isAdmin,
"can-access-previous-event": _vm.canAccessPreviousEvent,
"is-authenticated-user": _vm.isAuthenticatedUser
}
}) : _c("EmptyCalendar"), _vm._v(" "), _vm.showWidgetEventDetails ? _c("EditSimple", {
@ -14092,7 +14092,7 @@ var render = function render() {
}, [_c("AppNavigationHeader", {
attrs: {
"is-public": !_vm.isAuthenticatedUser,
"is-admin": _vm.isAdmin
"can-access-previous-event": _vm.canAccessPreviousEvent
}
})], 1) : _vm._e(), _vm._v(" "), _vm.isEmbedded ? _c("EmbedTopNavigation", {
attrs: {
@ -14100,7 +14100,7 @@ var render = function render() {
}
}) : _vm._e(), _vm._v(" "), _c("AppContent", [!_vm.showEmptyCalendarScreen ? _c("CalendarGrid", {
attrs: {
"is-admin": _vm.isAdmin,
"can-access-previous-event": _vm.canAccessPreviousEvent,
"is-authenticated-user": _vm.isAuthenticatedUser
}
}) : _c("EmptyCalendar")], 1), _vm._v(" "), _c("router-view")], 1);
@ -27411,4 +27411,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=1317bcd8b7f411e32076
//# sourceMappingURL=calendar-src_views_Calendar_vue-data_image_svg_xml_3csvg_20xmlns_27http_www_w3_org_2000_svg_27_20heigh-4a4254.js.map?v=b772f2fa794015e69dde

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

6
calendar/src/components/AppNavigation/AppNavigationHeader.vue
View File

@ -21,11 +21,11 @@
<template>
<header class="app-navigation-header">
<AppNavigationHeaderDatePicker :is-admin="isAdmin" />
<AppNavigationHeaderDatePicker :can-access-previous-event="canAccessPreviousEvent" />
<div class="new-event-today-view-section">
<AppNavigationHeaderNewEvent v-if="!isPublic" />
<AppNavigationHeaderTodayButton />
<AppNavigationHeaderViewMenu :is-admin="isAdmin" />
<AppNavigationHeaderViewMenu :can-access-previous-event="canAccessPreviousEvent" />
</div>
</header>
</template>
@ -49,7 +49,7 @@ export default {
type: Boolean,
required: true,
},
isAdmin: {
canAccessPreviousEvent: {
type: Boolean,
default: true,
}

6
calendar/src/components/AppNavigation/AppNavigationHeader/AppNavigationHeaderDatePicker.vue
View File

@ -22,7 +22,7 @@
<template>
<div class="datepicker-button-section">
<NcButton v-if="!isWidget && isAdmin"
<NcButton v-if="!isWidget && canAccessPreviousEvent"
v-shortkey="previousShortKeyConf"
:aria-label="previousLabel"
class="datepicker-button-section__previous button"
@ -92,7 +92,7 @@ export default {
type: Boolean,
default: false,
},
isAdmin: {
canAccessPreviousEvent: {
type: Boolean,
default: true,
},
@ -107,7 +107,7 @@ export default {
locale: (state) => state.settings.momentLocale,
}),
minimumDate(){
return this.isAdmin ? new Date(this.$store.state.davRestrictions.minimumDate) : new Date()
return this.canAccessPreviousEvent ? new Date(this.$store.state.davRestrictions.minimumDate) : new Date()
},
selectedDate() {
if (this.isWidget) {

4
calendar/src/components/AppNavigation/AppNavigationHeader/AppNavigationHeaderViewMenu.vue
View File

@ -64,7 +64,7 @@ export default {
ViewWeek,
},
props: {
isAdmin: {
canAccessPreviousEvent: {
type: Boolean,
default: true,
}
@ -82,7 +82,7 @@ export default {
label: this.$t('calendar', 'Week'),
}
];
if(this.isAdmin){
if(this.canAccessPreviousEvent){
let additionalMenus =
[{
id: 'dayGridMonth',

4
calendar/src/components/AppNavigation/EmbedTopNavigation.vue
View File

@ -1,7 +1,7 @@
<template>
<header :id="isWidget? 'widget-header' :'embed-header'" role="banner">
<div :class="isWidget?'widget-header__date-section' :'embed-header__date-section'">
<AppNavigationHeaderDatePicker :is-widget="isWidget" :is-admin="isAdmin" />
<AppNavigationHeaderDatePicker :is-widget="isWidget" :can-access-previous-event="canAccessPreviousEvent" />
<AppNavigationHeaderTodayButton v-if="!isWidget" />
</div>
<div :class="isWidget?'widget-header__views-section' :'embed-header__views-section'">
@ -79,7 +79,7 @@ export default {
type: Boolean,
default: false,
},
isAdmin: {
canAccessPreviousEvent: {
type: Boolean,
default: true,
},

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

@ -77,7 +77,7 @@ export default {
type: Boolean,
default: false,
},
isAdmin: {
canAccessPreviousEvent: {
type: Boolean,
default: true,
},
@ -112,7 +112,7 @@ export default {
}),
options() {
let defaultView = 'dayGridMonth';
if(this.isAdmin === false){
if(this.canAccessPreviousEvent === false){
defaultView = 'timeGridWeek'
}
return {

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

@ -22,6 +22,7 @@ const state = {
const getters = {
isAdmin: (state) => state.roles.includes("admin"),
canAccessPreviousEvent: (state) => (state.roles.includes("Ligne") == false) && (state.roles.includes("ligne") == false),
};
export default {

10
calendar/src/views/Calendar.vue
View File

@ -22,12 +22,12 @@
<template>
<div v-if="isWidget" class="calendar-Widget calendar-Widget-Custom">
<EmbedTopNavigation v-if="!showEmptyCalendarScreen" :is-widget="true" :is-admin="isAdmin" />
<EmbedTopNavigation v-if="!showEmptyCalendarScreen" :is-widget="true" :can-access-previous-event="canAccessPreviousEvent"/>
<CalendarGrid v-if="!showEmptyCalendarScreen"
ref="calendarGridWidget"
:is-widget="isWidget"
:is-admin="isAdmin"
:can-access-previous-event="canAccessPreviousEvent"
:is-authenticated-user="isAuthenticatedUser" />
<EmptyCalendar v-else />
@ -40,7 +40,7 @@
<NcContent v-else app-name="calendar calendar-custom" :class="classNames">
<AppNavigation v-if="!isWidget &&!isEmbedded && !showEmptyCalendarScreen">
<!-- Date Picker, View Buttons, Today Button -->
<AppNavigationHeader :is-public="!isAuthenticatedUser" :is-admin="isAdmin" />
<AppNavigationHeader :is-public="!isAuthenticatedUser" :can-access-previous-event="canAccessPreviousEvent" />
<template #list>
<AppNavigationSpacer />
@ -69,7 +69,7 @@
<EmbedTopNavigation v-if="isEmbedded" :is-admin="false" />
<AppContent>
<CalendarGrid v-if="!showEmptyCalendarScreen"
:is-admin="isAdmin"
:can-access-previous-event="canAccessPreviousEvent"
:is-authenticated-user="isAuthenticatedUser" />
<EmptyCalendar v-else />
</AppContent>
@ -166,7 +166,7 @@ export default {
timezoneId: 'getResolvedTimezone',
hasTrashBin: 'hasTrashBin',
currentUserPrincipal: 'getCurrentUserPrincipal',
isAdmin: 'userRole/isAdmin'
canAccessPreviousEvent: 'userRole/canAccessPreviousEvent'
}),
...mapState({
eventLimit: state => state.settings.eventLimit,

1
gestion/lib/Constants/BddConstant.php
View File

@ -8,4 +8,5 @@ abstract class BddConstant
const DEFAULT_TABLE_PREFIX = "*PREFIX*";
const DEFAULT_CLIENT_GROUP_NAME = "Nom du groupe";
const DEFAULT_ADMIN_ID_NEXTCLOUD = 'admin';
const DEFAULT_ADMIN_APP_ID_NEXTCLOUD = "Johann";
}

12
gestion/lib/Db/Bdd.php
View File

@ -3199,9 +3199,9 @@ class Bdd {
if(empty($devisProducts)){
return "";
}
$productMessage = ". SOINS A FAIRE : ";
$productMessage = ". ACTE A FAIRE : ";
foreach($devisProducts as $product){
$productMessage.= html_entity_decode($product->produit_reference)." ".html_entity_decode($product->produit_description). "(".$product->quantite."), ";
$productMessage.= html_entity_decode($product->produit_reference). "(".$product->quantite."), ";
}
$productMessage = trim( $productMessage );
$productMessage = rtrim($productMessage,",");
@ -3216,7 +3216,7 @@ class Bdd {
}
$devisDate = new Datetime($devis->date);
$devisDate = $devisDate->format('d/m/Y');
$message = "NOUVEAUX SOINS: ";
$message = "NOUVEL INTERVENTION: ";
$message .= html_entity_decode($devis->nom_defunt) . ' ';
$message .= 'le '.$devisDate. ' ';
$message .= 'à '.$devis->startTime. ' ';
@ -3224,7 +3224,11 @@ class Bdd {
$productMessage = $this->getDevisTalkRoomProductSectionMessage($devis->products);
$message .= $productMessage;
$message .= ". COMMENTAIRES: ".html_entity_decode($devis->comment);
$comment = "aucun";
if(strtolower($devis->comment) != "commentaire" && $devis->comment != ""){
$comment = html_entity_decode($devis->comment);
}
$message .= ". COMMENTAIRES: ".$comment;
return $message;
}

6
gestion/lib/Db/TalkDb.php
View File

@ -160,12 +160,12 @@ class TalkDb {
}
public function createDevisTalkRoomAndReturnDevisTalkRoom($idNextCloud,$token){
$roomName = '["'.$idNextCloud.'","'.BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD.'"]';
$roomName = '["'.$idNextCloud.'","'.BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD.'"]';
$this->createDevisTalkRoom($roomName,$token);
$room = $this->getDevisTalkRoomByName($roomName);
$attendees = [
$idNextCloud,
BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD
BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD
];
$this->createDevisTalkRoomAttendeesByActors($attendees,$room['id']);
return $room;
@ -195,7 +195,7 @@ class TalkDb {
public function createDevisTalkRoomMessageAndReturnMessage($roomId,$message){
$this->createDevisTalkRoomMessage(
BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD,
BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD,
$message,
self::DEVIS_TALK_ROOM_VERB_COMMENT,
$roomId,

8
gestion/lib/Service/TalkService.php
View File

@ -49,8 +49,8 @@ class TalkService {
}
private function getUserDevisTalkRoomNames($idNextCloud){
$roomNamesCreatedByUser = '["'.$idNextCloud.'","'.BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD.'"]';
$roomNamesCreatedByAdmin = '["'.BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD.'","'.$idNextCloud.'"]';
$roomNamesCreatedByUser = '["'.$idNextCloud.'","'.BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD.'"]';
$roomNamesCreatedByAdmin = '["'.BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD.'","'.$idNextCloud.'"]';
return [
"createdByUser" => $roomNamesCreatedByUser,
"createdByAdmin" => $roomNamesCreatedByAdmin
@ -69,7 +69,7 @@ class TalkService {
}
public function sendDevisTalkNotifications(string $message,string $idNextcloud){
if($idNextcloud === BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD){
if($idNextcloud === BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD || $idNextcloud === BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD){
return true;
}
$roomNames = $this->getUserDevisTalkRoomNames($idNextcloud);
@ -80,7 +80,7 @@ class TalkService {
}
$devisMessage = $this->talkDb->createDevisTalkRoomMessageAndReturnMessage($room['id'],$message);
$this->talkDb->updateRoomLastMessage($room['id'],$devisMessage['id']);
$this->talkDb->setAttendeeLastReadMessage($room['id'],$devisMessage['id'],BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD);
$this->talkDb->setAttendeeLastReadMessage($room['id'],$devisMessage['id'],BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD);
return true;
}