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 
Calender Update

See merge request fronk/thetool!1719
This commit is contained in:
Daniel Spitzer
2025-09-07 19:39:30 +00:00
parent b87afb9534 a41aaf9088
commit 2fbbc8a078
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/Calendar/CalendarModel.php
View File

@@ -270,6 +270,10 @@ class CalendarModel
$recurrence = json_decode($data['recurrence'], true);
$rrule_events = json_decode($data['rrule_events'], true);
foreach ($rrule_events as $key => $value) {
if ($r->visibleCancellation === "0" && (str_starts_with(trim($value['subject']), "Abgesagt:") || str_starts_with(trim($value['subject']), "Abgesage:") || str_starts_with(trim($value['subject']), "Canceled:"))) {
unset($rrule_events[$key]);
continue;
}
$rrule_events[$key]['start'] = self::convertToSummertime(strtotime($value['start']));
$rrule_events[$key]['end'] = self::convertToSummertime(strtotime($value['end']));
}
@@ -914,7 +918,7 @@ WHERE `TimerecordingCategory`.`hourday`!='1' AND `TimerecordingCategory`.`hourda
$allday = 0;
} else {
$start = $start + 7200;
$originalend= $end + 7200;
$originalend = $end + 7200;
$end = $end + 7200 + 86400;
}
if ($reminder == 'NULL') {