Skip to content
Snippets Groups Projects
Commit e70f6eb0 authored by David Siegfried's avatar David Siegfried Committed by Jan-Hendrik Willms
Browse files

fix errors in cal-export, re #3832 

Merge request studip/studip!2696
parent a5d02f3c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
lib/classes/calendar/ICalendarExport.class.php
+ 43
− 45
View file @ e70f6eb0
...@@ -124,53 +124,53 @@ class ICalendarExport ...@@ -124,53 +124,53 @@ class ICalendarExport
} }
/** /**
* @param CalendarDate $date * @param CalendarDate | CourseExDate $date
* @return array * @return array
*/ */
public function prepareCalendarDate(CalendarDate $date): array public function prepareCalendarDate($date): array
{ {
$properties = return [
[ 'SUMMARY' => $date->title,
'SUMMARY' => $date->title, 'DESCRIPTION' => $date->description,
'DESCRIPTION' => $date->description, 'LOCATION' => $date->location,
'LOCATION' => $date->location, 'CATEGORIES' => $date->getCategoryAsString(),
'CATEGORIES' => $date->getCategoryAsString(), 'LAST-MODIFIED' => $date->chdate,
'LAST-MODIFIED' => $date->chdate, 'CREATED' => $date->mkdate,
'CREATED' => $date->mkdate, 'DTSTAMP' => $this->time,
'DTSTAMP' => $this->time, 'DTSTART' => $date->begin,
'DTSTART' => $date->begin, 'DTEND' => $date->end,
'DTEND' => $date->end, 'EXDATE' => implode(',', $date->exceptions->pluck('date')),
'EXDATE' => implode(',', $date->exceptions->pluck('date')), 'PRIORITY' => 5,
'PRIORITY' => 5, 'RRULE' => [
'RRULE' => [ 'type' => $date->repetition_type,
'type' => $date->repetition_type, 'offset' => $date->offset,
'offset' => $date->offset, 'interval' => $date->interval,
'interval' => $date->interval, 'days' => $date->days,
'days' => $date->days, 'count' => $date->number_of_dates,
'count' => $date->number_of_dates, 'expire' => $date->repetition_end,
'expire' => $date->repetition_end, 'month' => $date->month
'month' => $date->month ]
] ];
];
return $properties;
} }
public function prepareCourseDate(CourseDate $date): array /**
* @param CalendarDate | CourseExDate $date
* @return array
*/
public function prepareCourseDate($date): array
{ {
$properties = return [
[ 'SUMMARY' => $date->course->getFullName(),
'SUMMARY' => $date->course->getFullName(), 'DESCRIPTION' => '',
'DESCRIPTION' => '', 'LOCATION' => $date->getRoomName(),
'LOCATION' => $date->getRoomName(), 'CATEGORIES' => $GLOBALS['TERMIN_TYP'][$date->date_typ]['name'],
'CATEGORIES' => $GLOBALS['TERMIN_TYP'][$date->date_typ]['name'], 'LAST-MODIFIED' => $date->chdate,
'LAST-MODIFIED' => $date->chdate, 'CREATED' => $date->mkdate,
'CREATED' => $date->mkdate, 'DTSTAMP' => $this->time,
'DTSTAMP' => $this->time, 'DTSTART' => $date->date,
'DTSTART' => $date->date, 'DTEND' => $date->end_time,
'DTEND' => $date->end_time, 'PRIORITY' => ''
'PRIORITY' => '' ];
];
return $properties;
} }
/** /**
...@@ -600,14 +600,12 @@ class ICalendarExport ...@@ -600,14 +600,12 @@ class ICalendarExport
*/ */
private function getFacultyEmail(string $user_id): string private function getFacultyEmail(string $user_id): string
{ {
$stmt = DBManager::get()->prepare(' return DBManager::get()->fetchColumn('
SELECT `email` SELECT `email`
FROM `Institute` FROM `Institute`
LEFT JOIN `user_inst` USING(`institut_id`) LEFT JOIN `user_inst` USING(`institut_id`)
WHERE `Institute`.`Institut_id` = `fakultaets_id` WHERE `Institute`.`Institut_id` = `fakultaets_id`
AND `user_id` = ?'); AND `user_id` = ?', [$user_id]);
$stmt->execute([$user_id]);
return $stmt->fetchColumn();
} }
/** /**
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment