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

Kalender Update

Browse Source 
* Richtigstellung Calender Filter Events
This commit is contained in:
Daniel Spitzer
2025-05-13 20:00:11 +02:00
parent d73bec0375
commit 53c188955e
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/Calendar/CalendarModel.php
View File

@@ -207,12 +207,10 @@ class CalendarModel
if ($visibleCalendarTypes) {
$where .= " AND event_type IN (" . implode(",", $visibleCalendarTypes) . ")";
}
if ($r->visibleCancellation != 1) {
if ($r->visibleCancellation && $r->visibleCancellation != 1) {
$where .= " AND canceld = '0' ";
}
$sql = "SELECT `cal_events`.id,`cal_events`.categories, uuid, calendar_id, `cal_events`.user_id, start_time, end_time, timezone, all_day_event, `cal_events`.name,`cal_calendars`.name calendar_name, description, location, repeat_end_time, reminder, ctime,cname, mtime,mname, muser_id, busy, status, resource_event_id, private, rrule, `cal_events`.background, `cal_events`.files_folder_id, read_only, category_id, exception_for_event_id, recurrence_id, is_organizer,event_type,busy,recurrence,rrule_events FROM cal_events INNER JOIN `cal_calendars` ON (`cal_calendars`.`id`=`cal_events`.`calendar_id`) WHERE 1=1 $where ORDER BY start_time DESC";
$res = $dbcal->query($sql);

4
public/js/pages/Calendar/View.js
View File

@@ -1013,15 +1013,13 @@ if (typeof (EventSource) !== 'undefined') {
}
});
jsondata = JSON.parse(e.data);
jsondata.forEach(function (event) {
if (!visibleCalendars.includes(parseInt(event.calendar_id))) {
return;
}
if (visibleCalendarTypes.length > 0 && !visibleCalendarTypes.includes(parseInt(event.event_type))) {
if (visibleCalendarTypes.length > 0 && !visibleCalendarTypes.includes(parseInt(event.event_type)) && event.change_type != '3') {
return;
}
let cevent = calendar.getEventById(event.cal_events_id);
let rights = false;
let movable = false;