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

Merge branch 'features/feature-remove-previous-icon-on-calendar' into staging

Browse Source
This commit is contained in:
Tiavina 2025-01-09 15:56:59 +03:00
commit 368c0662ae
8 changed files with 101 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2906,9 +2906,15 @@ __webpack_require__.r(__webpack_exports__);
ViewModule: vue_material_design_icons_ViewModule_vue__WEBPACK_IMPORTED_MODULE_4__["default"],
ViewWeek: vue_material_design_icons_ViewWeek_vue__WEBPACK_IMPORTED_MODULE_5__["default"]
},
props: {
isAdmin: {
type: Boolean,
default: true
}
},
computed: {
views() {
return [{
let menus = [{
id: 'timeGridDay',
icon: 'ViewDay',
label: this.$t('calendar', 'Day')
@ -2916,19 +2922,24 @@ __webpack_require__.r(__webpack_exports__);
id: 'timeGridWeek',
icon: 'ViewWeek',
label: this.$t('calendar', 'Week')
}, {
id: 'dayGridMonth',
icon: 'ViewModule',
label: this.$t('calendar', 'Month')
}, {
id: 'multiMonthYear',
icon: 'ViewComfy',
label: this.$t('calendar', 'Year')
}, {
id: 'listMonth',
icon: 'ViewList',
label: this.$t('calendar', 'List')
}];
if (this.isAdmin) {
let additionalMenus = [{
id: 'dayGridMonth',
icon: 'ViewModule',
label: this.$t('calendar', 'Month')
}, {
id: 'multiMonthYear',
icon: 'ViewComfy',
label: this.$t('calendar', 'Year')
}, {
id: 'listMonth',
icon: 'ViewList',
label: this.$t('calendar', 'List')
}];
menus = menus.concat(additionalMenus);
}
return menus;
},
shortKeyConf() {
return {
@ -14265,7 +14276,11 @@ var render = function render() {
}
}), _vm._v(" "), _c("div", {
staticClass: "new-event-today-view-section"
}, [!_vm.isPublic ? _c("AppNavigationHeaderNewEvent") : _vm._e(), _vm._v(" "), _c("AppNavigationHeaderTodayButton"), _vm._v(" "), _c("AppNavigationHeaderViewMenu")], 1)], 1);
}, [!_vm.isPublic ? _c("AppNavigationHeaderNewEvent") : _vm._e(), _vm._v(" "), _c("AppNavigationHeaderTodayButton"), _vm._v(" "), _c("AppNavigationHeaderViewMenu", {
attrs: {
"is-admin": _vm.isAdmin
}
})], 1)], 1);
};
var staticRenderFns = [];
render._withStripped = true;
@ -310150,4 +310165,4 @@ appointmentsConfigsStore.addInitialConfigs((0,_nextcloud_initial_state__WEBPACK_
/******/ })()
;
//# sourceMappingURL=calendar-main.js.map?v=a363c92b823c419b9f39
//# sourceMappingURL=calendar-main.js.map?v=088a2687a9300a10e3ce

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":"3533c597c61a45709c85","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":"aa18371467d4d17269b3","vendors-node_modules_vue-material-design-icons_CalendarBlankOutline_vue-node_modules_nextclou-4adead":"e4ffc04ac1c7ab0c5950","vendors-node_modules_autosize_dist_autosize_esm_js-node_modules_html-entities_lib_index_js-no-4072c5":"60939d15b29e9da9693b","src_models_rfcProps_js-src_services_caldavService_js-src_services_talkService_js-src_services-8a2790":"94fac30d128df46a89a6","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":"99286664ee6bd9d7b154","vendors-node_modules_webdav_dist_web_index_js":"454da8f908d41b47c607","src_store_index_js":"8109663b3d3c7da4f760","vendors-node_modules_path-browserify_index_js-node_modules_nextcloud_dialogs_dist_chunks_Dial-e0595f":"6c303f18660c1428dc28","node_modules_nextcloud_dialogs_dist_legacy_mjs":"8be838e4c6e9aae56c87","vendors-node_modules_nextcloud_dialogs_dist_chunks_FilePicker-8ibBgPg__mjs":"ea54a36450de178d1141","public-calendar-subscription-picker":"4c85129ecec907c712f8","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":"3533c597c61a45709c85","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":"aa18371467d4d17269b3","vendors-node_modules_vue-material-design-icons_CalendarBlankOutline_vue-node_modules_nextclou-4adead":"e4ffc04ac1c7ab0c5950","vendors-node_modules_autosize_dist_autosize_esm_js-node_modules_html-entities_lib_index_js-no-4072c5":"60939d15b29e9da9693b","src_models_rfcProps_js-src_services_caldavService_js-src_services_talkService_js-src_services-8a2790":"94fac30d128df46a89a6","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":"0ef6bfb43d6b002c1bc6","vendors-node_modules_webdav_dist_web_index_js":"454da8f908d41b47c607","src_store_index_js":"8109663b3d3c7da4f760","vendors-node_modules_path-browserify_index_js-node_modules_nextcloud_dialogs_dist_chunks_Dial-e0595f":"6c303f18660c1428dc28","node_modules_nextcloud_dialogs_dist_legacy_mjs":"8be838e4c6e9aae56c87","vendors-node_modules_nextcloud_dialogs_dist_chunks_FilePicker-8ibBgPg__mjs":"ea54a36450de178d1141","public-calendar-subscription-picker":"4c85129ecec907c712f8","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=9026bcb01b3dbafc7c47
//# sourceMappingURL=calendar-reference.js.map?v=5a170b16d774e0018f75

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

File diff suppressed because one or more lines are too long

45
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

@ -341,9 +341,15 @@ __webpack_require__.r(__webpack_exports__);
ViewModule: vue_material_design_icons_ViewModule_vue__WEBPACK_IMPORTED_MODULE_4__["default"],
ViewWeek: vue_material_design_icons_ViewWeek_vue__WEBPACK_IMPORTED_MODULE_5__["default"]
},
props: {
isAdmin: {
type: Boolean,
default: true
}
},
computed: {
views() {
return [{
let menus = [{
id: 'timeGridDay',
icon: 'ViewDay',
label: this.$t('calendar', 'Day')
@ -351,19 +357,24 @@ __webpack_require__.r(__webpack_exports__);
id: 'timeGridWeek',
icon: 'ViewWeek',
label: this.$t('calendar', 'Week')
}, {
id: 'dayGridMonth',
icon: 'ViewModule',
label: this.$t('calendar', 'Month')
}, {
id: 'multiMonthYear',
icon: 'ViewComfy',
label: this.$t('calendar', 'Year')
}, {
id: 'listMonth',
icon: 'ViewList',
label: this.$t('calendar', 'List')
}];
if (this.isAdmin) {
let additionalMenus = [{
id: 'dayGridMonth',
icon: 'ViewModule',
label: this.$t('calendar', 'Month')
}, {
id: 'multiMonthYear',
icon: 'ViewComfy',
label: this.$t('calendar', 'Year')
}, {
id: 'listMonth',
icon: 'ViewList',
label: this.$t('calendar', 'List')
}];
menus = menus.concat(additionalMenus);
}
return menus;
},
shortKeyConf() {
return {
@ -8270,7 +8281,11 @@ var render = function render() {
}
}), _vm._v(" "), _c("div", {
staticClass: "new-event-today-view-section"
}, [!_vm.isPublic ? _c("AppNavigationHeaderNewEvent") : _vm._e(), _vm._v(" "), _c("AppNavigationHeaderTodayButton"), _vm._v(" "), _c("AppNavigationHeaderViewMenu")], 1)], 1);
}, [!_vm.isPublic ? _c("AppNavigationHeaderNewEvent") : _vm._e(), _vm._v(" "), _c("AppNavigationHeaderTodayButton"), _vm._v(" "), _c("AppNavigationHeaderViewMenu", {
attrs: {
"is-admin": _vm.isAdmin
}
})], 1)], 1);
};
var staticRenderFns = [];
render._withStripped = true;
@ -27351,4 +27366,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=99286664ee6bd9d7b154
//# sourceMappingURL=calendar-src_views_Calendar_vue-data_image_svg_xml_3csvg_20xmlns_27http_www_w3_org_2000_svg_27_20heigh-4a4254.js.map?v=0ef6bfb43d6b002c1bc6

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

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

@ -25,7 +25,7 @@
<div class="new-event-today-view-section">
<AppNavigationHeaderNewEvent v-if="!isPublic" />
<AppNavigationHeaderTodayButton />
<AppNavigationHeaderViewMenu />
<AppNavigationHeaderViewMenu :is-admin="isAdmin" />
</div>
</header>
</template>

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

@ -63,29 +63,43 @@ export default {
ViewModule,
ViewWeek,
},
props: {
isAdmin: {
type: Boolean,
default: true,
}
},
computed: {
views() {
return [{
id: 'timeGridDay',
icon: 'ViewDay',
label: this.$t('calendar', 'Day'),
}, {
id: 'timeGridWeek',
icon: 'ViewWeek',
label: this.$t('calendar', 'Week'),
}, {
id: 'dayGridMonth',
icon: 'ViewModule',
label: this.$t('calendar', 'Month'),
}, {
id: 'multiMonthYear',
icon: 'ViewComfy',
label: this.$t('calendar', 'Year'),
}, {
id: 'listMonth',
icon: 'ViewList',
label: this.$t('calendar', 'List'),
}]
let menus = [
{
id: 'timeGridDay',
icon: 'ViewDay',
label: this.$t('calendar', 'Day'),
}, {
id: 'timeGridWeek',
icon: 'ViewWeek',
label: this.$t('calendar', 'Week'),
}
];
if(this.isAdmin){
let additionalMenus =
[{
id: 'dayGridMonth',
icon: 'ViewModule',
label: this.$t('calendar', 'Month'),
}, {
id: 'multiMonthYear',
icon: 'ViewComfy',
label: this.$t('calendar', 'Year'),
}, {
id: 'listMonth',
icon: 'ViewList',
label: this.$t('calendar', 'List'),
}];
menus = menus.concat(additionalMenus)
}
return menus;
},
shortKeyConf() {
return {