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

Kalender

Browse Source 
Update:
* Suche wurde angepasst
This commit is contained in:
Daniel Spitzer
2024-12-08 19:00:06 +01:00
parent a6e087f8f1
commit 08f7a15bf1
2 changed files with 49 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
application/Calendar/CalendarModel.php
View File

@@ -43,6 +43,23 @@ class CalendarModel
public static $specialCalendarColors = array(997 => '#bd0000', 998 => '#8000A3', 999 => '#08769b');
public static function convertToSummertime($timestamp)
{
// Create a DateTime object from the Unix timestamp
$date = new DateTime();
$date->setTimestamp($timestamp);
// Set the timezone to Europe/Berlin
$date->setTimezone(new DateTimeZone('Europe/Berlin'));
if ($date->format('I') == 1) {
$cest = 7200;
} else {
$cest = 3600;
}
$unixtimestamp = $date->getTimestamp() + $cest;
// Format the date and time
return date('Y-m-d H:i:s', $unixtimestamp);
}
public static function replace_unicode_sequences($string)
{
@@ -96,16 +113,18 @@ class CalendarModel
$rows = array();
while ($data = $dbcal->fetch_array($res)) {
if ($data['location']) {
$searchName = $data['name'] . " @" . $data['location'];
} else {
$searchName = $data['name'];
if ($data['private'] != 1 || $data['calendar_id'] == $r->cal_id) {
if ($data['location']) {
$searchName = $data['name'] . " @" . $data['location'];
} else {
$searchName = $data['name'];
}
$id = $data['id'] . ";" . date("Y-m-d", $data['start_time']);
$rows[] = array(
'id' => $id,
'text' => $searchName . " (" . date("Y-m-d", $data['start_time']) . ")"
);
}
$id = $data['id'] . ";" . date("Y-m-d", $data['start_time']);
$rows[] = array(
'id' => $id,
'text' => $searchName . " (" . date("Y-m-d", $data['start_time']) . ")"
);
}
$json['incomplete_results'] = false;
$json['total_count'] = count($rows);
@@ -195,7 +214,11 @@ class CalendarModel
if ($data['recurrence']) {
$recurrence = json_decode($data['recurrence'], true);
$rrule_events= json_decode($data['rrule_events'], true);
$rrule_events = json_decode($data['rrule_events'], true);
foreach ($rrule_events as $key => $value) {
$rrule_events[$key]['start'] = self::convertToSummertime(strtotime($value['start']));
$rrule_events[$key]['end'] = self::convertToSummertime(strtotime($value['end']));
}
if ($rrulefreq[$recurrence['pattern']['type']]) {
unset ($byweekday);
$freq = $rrulefreq[$recurrence['pattern']['type']];
@@ -237,19 +260,19 @@ class CalendarModel
$txtcolor = "#000";
$colorCounter++;
}
$location=$data['location'];
$eventtype=$data['event_type'];
$description=$data['description'];
$location = $data['location'];
$eventtype = $data['event_type'];
$description = $data['description'];
if ($calenderRights[$data['calendar_id']]) {
$rights = $calenderRights[$data['calendar_id']];
$CalendarUsers[$data['calendar_id']] = $data['calendar_name'];
if ($data['private']==1 && $calendar[0]->go_calendar_id != $data['calendar_id']) {
if ($data['private'] == 1 && $calendar[0]->go_calendar_id != $data['calendar_id']) {
$name = "Privat";
$attachment = 0;
$attachmentLinks = "";
$location="";
$eventtype="1";
$description="";
$location = "";
$eventtype = "1";
$description = "";
}
$rows[] = array(
'id' => array('id' => $data['id']),
@@ -552,7 +575,7 @@ WHERE `TimerecordingCategory`.`hourday`!='1' AND `TimerecordingCategory`.`hourda
$busy = ($r->busy);
$users = ($r->users);
$attendees = ($r->attendees);
$privateflag=($r->privateflag);
$privateflag = ($r->privateflag);
foreach ($users as $key => $value) {
$user_id = $value;
}
@@ -750,7 +773,7 @@ WHERE `TimerecordingCategory`.`hourday`!='1' AND `TimerecordingCategory`.`hourda
$users = ($r->users);
$customer_info_reminder_check = 0;
$attendees = ($r->attendees);
$privateflag=($r->privateflag);
$privateflag = ($r->privateflag);
date_default_timezone_set('Europe/Berlin');
header('Content-Type: application/json');
foreach ($users as $key => $value) {

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

@@ -117,7 +117,7 @@ document.addEventListener('DOMContentLoaded', function () {
} else {
rights = false;
}
if (value.privateflag.privateflag == '1' && mycalendar_id!=value.calendar_id.calendar_id) {
if (value.privateflag.privateflag == '1' && mycalendar_id != value.calendar_id.calendar_id) {
rights = false;
}
@@ -843,7 +843,9 @@ if (typeof (EventSource) !== 'undefined') {
} else {
movable = false;
}
if (event.privateflag == '1' && mycalendar_id!=event.calendar_id_check) {
console.log(mycalendar_id);
console.log(event.calendar_id_check.calendar_id);
if (event.privateflag == '1' && mycalendar_id != event.calendar_id_check.calendar_id) {
rights = false;
movable = false;
@@ -1536,7 +1538,8 @@ $(document).ready(function () {
return {
q: params.term, // Der Suchbegriff
term: params.term, // Der Suchbegriff
calendars: visibleCalendars // Die dynamische Variable, die du hinzufügen möchtest
calendars: visibleCalendars, // Die dynamische Variable, die du hinzufügen möchtest
cal_id: $('#calendar-id').data('calendarid')
};
},
dataType: 'json',
@@ -1918,7 +1921,7 @@ Xinon GMbH`;
} else {
movable = false;
}
if (value.privateflag.privateflag == '1' && mycalendar_id!=value.calendar_id.calendar_id) {
if (value.privateflag.privateflag == '1' && mycalendar_id != value.calendar_id.calendar_id) {
rights = false;
movable = false;