Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'spidev' into 'master'

Browse Source 
Kalender Update

See merge request fronk/thetool!1325
This commit is contained in:
Daniel Spitzer
2025-05-13 14:26:36 +00:00
parent a45815ac68 d5c5d4306a
commit cb5ea23858
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/pages/Calendar/View.js
+10 -4
View File
@@ -71,7 +71,7 @@ document.addEventListener('DOMContentLoaded', function () {
});
$.post(requestUrl, {visibleCalendars: visibleCalendars}, function (data) {
$.post(requestUrl, {visibleCalendars: visibleCalendars,visibleCancellation:1}, function (data) {
}, 'json').done(function (json) {
if (json.success == true) {
@@ -1504,13 +1504,13 @@ $(document).ready(function () {
customer_info_text: customer_info_text,
customer_info_type: customer_info_type,
customer_info_type_text: customer_info_type_text,
customer_info_check:customer_info_check,
customer_info_check: customer_info_check,
title: title
}, function (data) {
}).done(function (data) {
});
$('#EventModal').modal('hide');
$('#EventModal').modal('hide');
}
});
@@ -2508,6 +2508,7 @@ $(document).ready(function () {
let checkbox = $(".calendar-check");
let calendarFilter = $('.btn-light-search');
let visibleCalendars = [];
let visibleCancellation = 0;
let visibleCalendarTypes = [];
let mycalendar_id = $('#calendar-id').data('calendarid');
visibleCalendars.push(0);
@@ -2519,13 +2520,18 @@ $(document).ready(function () {
calendarFilter.each(function () {
if (!$(this).hasClass('top-search-filter')) {
visibleCalendarTypes.push($(this).data('ctype'));
if ($(this).data('eventcancelled')) {
visibleCancellation = 1;
}
}
});
$.post(requestUrl, {
visibleCalendars: visibleCalendars,
visibleCalendarTypes: visibleCalendarTypes
visibleCalendarTypes: visibleCalendarTypes,
visibleCancellation: visibleCancellation
}, function (data) {
}, 'json').done(function (json) {