'; $html .= $day['date']->format('d.m.Y').'
Termine außerhalb des Stundenrasters
'; foreach ($week['outside'] as $event) - $html .= $this->renderEvent($event, $type, true); + { + $html .= $this->renderEvent( + $event, + $type, + true, + $filters, + $this->getNearestHourNumber($event, $raster) + ); + } $html .= '';
- $html .= '';
+ $detailUrl = $this->buildDetailUrl($event, $type, $filters, $hourNumber);
+ $html .= 'encodeJavaScriptString($detailUrl).','
+ .$this->encodeJavaScriptString(self::DETAIL_WINDOW_NAME).','
+ .$this->encodeJavaScriptString(self::DETAIL_WINDOW_OPTIONS)
+ .');return false;';
+ $html .= ' href="'.$this->escape($detailUrl).'"';
+ $html .= ' target="'.self::DETAIL_WINDOW_NAME.'"';
+ $html .= ' onclick="'.$this->escape($onclick).'"';
+ }
+ $html .= '>';
if ($showDate)
$html .= $event['start']->format('d.m.Y H:i').'–'.$event['end']->format('H:i').'
'; $html .= $this->escape($event['title']); - if ($event['note'] !== '') - { - $html .= '.'skin/images/sticky.png').')
escape($event['note']).'" alt="">';
- }
- if (($type === 'lektor' || $type === 'verband') && $event['groups'] !== '')
- $html .= '
'.$this->escape($event['groups']); + if (($type === 'lektor' || $type === 'verband' || $type === 'ort') + && $event['groups'] !== '') + $html .= '
'.$this->renderLines($event['groups']); if ($type !== 'lektor' && $event['lecturers'] !== '') $html .= '
'.$this->renderLines($event['lecturers']); if ($event['location'] !== '') @@ -394,19 +457,107 @@ class LvPlanHTMLLib return $html.'
';
}
+ /**
+ * Builds the URL consumed by the legacy timetable detail popup.
+ */
+ private function buildDetailUrl(array $event, $type, array $filters, $hourNumber)
+ {
+ if ($hourNumber === null || !preg_match('/^\d+$/', (string)$hourNumber))
+ return null;
+
+ $uid = isset($filters['uid']) && $filters['uid'] !== ''
+ ? $filters['uid']
+ : getAuthUID();
+ $room = $type === 'ort' && isset($filters['ort_kurzbz'])
+ ? $filters['ort_kurzbz']
+ : $event['detail_ort_kurzbz'];
+ $parameters = array(
+ 'type' => $type,
+ 'datum' => $event['date'],
+ 'stunde' => (string)$hourNumber,
+ 'pers_uid' => $uid,
+ 'stg_kz' => isset($filters['stg_kz']) ? $filters['stg_kz'] : '',
+ 'sem' => isset($filters['sem']) ? $filters['sem'] : '',
+ 'ver' => isset($filters['ver']) && $filters['ver'] !== null
+ ? $filters['ver']
+ : '',
+ 'grp' => isset($filters['grp']) && $filters['grp'] !== null
+ ? $filters['grp']
+ : '',
+ 'ort_kurzbz' => $room
+ );
+
+ return $this->getAppRoot().'cis/private/lvplan/stpl_detail.php?'
+ .http_build_query($parameters, '', '&', PHP_QUERY_RFC3986);
+ }
+
+ /**
+ * Returns the hour whose configured start is closest to the event start.
+ */
+ private function getNearestHourNumber(array $event, array $raster)
+ {
+ if (empty($raster))
+ return null;
+
+ $eventStart = $this->timeToSeconds($event['start']->format('H:i:s'));
+ if ($eventStart === null)
+ return null;
+
+ $nearestNumber = null;
+ $nearestDistance = null;
+ foreach ($raster as $hour)
+ {
+ $distance = abs($eventStart - $hour['begin']);
+ if ($nearestDistance === null || $distance < $nearestDistance)
+ {
+ $nearestDistance = $distance;
+ $nearestNumber = $hour['number'];
+ }
+ }
+
+ return $nearestNumber;
+ }
+
private function getDocumentTitle($type, array $filters)
{
- if ($type === 'verband')
+ if ($type === 'ort')
{
- $title = 'Lehrverband: '.$filters['stg_kz'].'-'.$filters['sem'];
- if (isset($filters['ver']) && $filters['ver'] !== null)
- $title .= $filters['ver'];
- if (isset($filters['grp']) && $filters['grp'] !== null)
- $title .= $filters['grp'];
+ $title = 'Ort: '.$filters['ort_kurzbz'];
+ if (isset($filters['bezeichnung']) && $filters['bezeichnung'] !== '')
+ $title .= ' - '.$filters['bezeichnung'];
return $title;
}
- return ($type === 'lektor' ? 'Lektor: ' : 'Student: ').$filters['uid'];
+ if ($type === 'verband')
+ {
+ $studiengang = isset($filters['stg_kurzbz'])
+ && $filters['stg_kurzbz'] !== ''
+ ? $filters['stg_kurzbz']
+ : $filters['stg_kz'];
+ $title = 'Lehrverband: '.$studiengang.'-'.$filters['sem'];
+
+ if (isset($filters['ver']) && $filters['ver'] !== null)
+ $title .= $filters['ver'];
+ else
+ $title .= 0;
+
+ if (isset($filters['grp']) && $filters['grp'] !== null)
+ $title .= $filters['grp'];
+ else
+ $title .= 0;
+
+ return $title;
+ }
+
+ if ($type === 'lektor')
+ {
+ $name = isset($filters['full_name']) && $filters['full_name'] !== ''
+ ? $filters['full_name']
+ : $filters['uid'];
+ return 'Lektor: '.$name;
+ }
+
+ return 'Student: '.$filters['uid'];
}
private function getEventDateTime($event, $isoProperty, $dateProperty, $timeProperty)
@@ -508,6 +659,22 @@ class LvPlanHTMLLib
: '';
}
+ private function getFirstScalarValue($value)
+ {
+ if (is_scalar($value))
+ return (string)$value;
+ if (!is_array($value))
+ return '';
+
+ foreach ($value as $item)
+ {
+ if (is_scalar($item) && (string)$item !== '')
+ return (string)$item;
+ }
+
+ return '';
+ }
+
private function joinValue($value, $separator = ', ')
{
if (!is_array($value))
@@ -550,6 +717,14 @@ class LvPlanHTMLLib
return htmlspecialchars((string)$value, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
}
+ private function encodeJavaScriptString($value)
+ {
+ return json_encode(
+ (string)$value,
+ JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT
+ );
+ }
+
private function renderLines($value)
{
$lines = array_map('trim', explode(', ', (string)$value));
diff --git a/application/libraries/LvPlanICALLib.php b/application/libraries/LvPlanICALLib.php
index 081a0289e..1627e4eb8 100644
--- a/application/libraries/LvPlanICALLib.php
+++ b/application/libraries/LvPlanICALLib.php
@@ -30,16 +30,34 @@ class LvPlanICALLib
* @param string $uid User UID.
* @param int $begin First included date as Unix timestamp.
* @param int $ende Last included date as Unix timestamp.
- * @param string|null $type Timetable type (student or lektor).
+ * @param string|null $type Timetable type (student, lektor, ort or verband).
* @param int $version iCalendar major version (1 or 2).
+ * @param string|null $ortKurzbz Room identifier for room plans.
+ * @param array|null $verbandFilters Lehrverband filters.
* @return string
*/
- public function getContent($uid, $begin, $ende, $type = null, $version = 2)
- {
+ public function getContent(
+ $uid,
+ $begin,
+ $ende,
+ $type = null,
+ $version = 2,
+ $ortKurzbz = null,
+ $verbandFilters = null
+ ) {
if (!in_array($version, array(1, 2), true))
throw new InvalidArgumentException('Unsupported iCalendar version');
- if ($type !== null && !in_array($type, array('student', 'lektor'), true))
+ if ($type !== null && !in_array($type, array('student', 'lektor', 'ort', 'verband'), true))
throw new InvalidArgumentException('Unsupported timetable type');
+ if ($type === 'ort' && (!is_string($ortKurzbz) || $ortKurzbz === ''))
+ throw new InvalidArgumentException('Missing room timetable filter');
+ if ($type === 'verband'
+ && (!is_array($verbandFilters)
+ || !array_key_exists('stg_kz', $verbandFilters)
+ || !array_key_exists('sem', $verbandFilters)))
+ {
+ throw new InvalidArgumentException('Missing Lehrverband timetable filters');
+ }
$this->ci->load->library('KalenderLib', array('uid' => $uid));
@@ -58,7 +76,23 @@ class LvPlanICALLib
// KalenderLib uses an exclusive end date; $ende is inclusive here.
$endDate = date('Y-m-d', strtotime('+1 day', $ende));
- if ($isLecturer)
+ if ($type === 'verband')
+ {
+ $events = $this->ci->kalenderlib->getPlanForVerband(
+ $startDate,
+ $endDate,
+ $verbandFilters['stg_kz'],
+ $verbandFilters['sem'],
+ isset($verbandFilters['ver']) ? $verbandFilters['ver'] : null,
+ isset($verbandFilters['grp']) ? $verbandFilters['grp'] : null
+ );
+ }
+ elseif ($type === 'ort')
+ {
+ $events = $this->ci->kalenderlib
+ ->getPlanForRoom($startDate, $endDate, $ortKurzbz);
+ }
+ elseif ($isLecturer)
{
$events = $this->ci->kalenderlib
->getPlanForLecturerByLecturer($startDate, $endDate, $uid);
diff --git a/include/wochenplan.class.php b/include/wochenplan.class.php
index 5274beefb..aa6337d90 100644
--- a/include/wochenplan.class.php
+++ b/include/wochenplan.class.php
@@ -512,6 +512,69 @@ class wochenplan extends basis_db
$this->kal_link.='&pers_uid='.$this->pers_uid.'&ort_kurzbz='.$this->ort_kurzbz.'&stg_kz='.$this->stg_kz.'&sem='.$this->sem.'&ver='.$this->ver.'&grp='.$this->grp.'&gruppe_kurzbz='.$this->gruppe_kurzbz.'&lva='.$this->lva;
$kal_link_ws=$this->kal_link.'&begin='.$this->studiensemester_now->start.'&ende='.$this->studiensemester_now->ende;
$kal_link_ss=$this->kal_link.'&begin='.$this->studiensemester_next->start.'&ende='.$this->studiensemester_next->ende;
+ $kal_link_new_ws = null;
+ $kal_link_new_ss = null;
+ $kal_link_new_downloads = false;
+
+ // Build only the type-specific parameters accepted by the new endpoints.
+ if ($this->type == 'student' || $this->type == 'lektor')
+ {
+ $kal_link_new_downloads = true;
+ $kal_link_new_ws = http_build_query(array(
+ 'type' => $this->type,
+ 'pers_uid' => $this->pers_uid,
+ 'begin' => $this->studiensemester_now->start,
+ 'ende' => $this->studiensemester_now->ende
+ ), '', '&');
+ $kal_link_new_ss = http_build_query(array(
+ 'type' => $this->type,
+ 'pers_uid' => $this->pers_uid,
+ 'begin' => $this->studiensemester_next->start,
+ 'ende' => $this->studiensemester_next->ende
+ ), '', '&');
+ }
+ elseif ($this->type == 'ort' && $this->ort_kurzbz != '' && $this->ort_kurzbz != 'all')
+ {
+ $kal_link_new_downloads = true;
+ $kal_link_new_ws = http_build_query(array(
+ 'type' => $this->type,
+ 'pers_uid' => $this->pers_uid,
+ 'ort_kurzbz' => $this->ort_kurzbz,
+ 'begin' => $this->studiensemester_now->start,
+ 'ende' => $this->studiensemester_now->ende
+ ), '', '&');
+ $kal_link_new_ss = http_build_query(array(
+ 'type' => $this->type,
+ 'pers_uid' => $this->pers_uid,
+ 'ort_kurzbz' => $this->ort_kurzbz,
+ 'begin' => $this->studiensemester_next->start,
+ 'ende' => $this->studiensemester_next->ende
+ ), '', '&');
+ }
+ elseif ($this->type == 'verband')
+ {
+ $kal_link_new_downloads = true;
+ $kal_link_new_ws = http_build_query(array(
+ 'type' => $this->type,
+ 'pers_uid' => $this->pers_uid,
+ 'stg_kz' => $this->stg_kz,
+ 'sem' => $this->sem,
+ 'ver' => $this->ver,
+ 'grp' => $this->grp,
+ 'begin' => $this->studiensemester_now->start,
+ 'ende' => $this->studiensemester_now->ende
+ ), '', '&');
+ $kal_link_new_ss = http_build_query(array(
+ 'type' => $this->type,
+ 'pers_uid' => $this->pers_uid,
+ 'stg_kz' => $this->stg_kz,
+ 'sem' => $this->sem,
+ 'ver' => $this->ver,
+ 'grp' => $this->grp,
+ 'begin' => $this->studiensemester_next->start,
+ 'ende' => $this->studiensemester_next->ende
+ ), '', '&');
+ }
echo $this->crlf;
echo $this->studiensemester_now->name.''; $html .= $this->escape($event['title']); - if ($event['note'] !== '') - { - $html .= '
escape($event['note']).'" alt="">';
- }
- if (($type === 'lektor' || $type === 'verband') && $event['groups'] !== '')
- $html .= ''.$this->escape($event['groups']); + if (($type === 'lektor' || $type === 'verband' || $type === 'ort') + && $event['groups'] !== '') + $html .= '
'.$this->renderLines($event['groups']); if ($type !== 'lektor' && $event['lecturers'] !== '') $html .= '
'.$this->renderLines($event['lecturers']); if ($event['location'] !== '') @@ -394,19 +457,107 @@ class LvPlanHTMLLib return $html.'
'.$this->crlf; @@ -521,6 +584,19 @@ class wochenplan extends basis_db echo '
'.$this->crlf;
echo ' 
'.$this->crlf;
echo ' 
'.$this->crlf;
+ if ($kal_link_new_ws !== null)
+ {
+ echo ' '.$this->crlf; + echo ' HTML-new '.$this->crlf; + if ($kal_link_new_downloads) + { + echo ' excel-new '.$this->crlf; + echo ' CSV-new '.$this->crlf; + echo ' CSV-Outlook-new '.$this->crlf; + echo ' iCal1-new '.$this->crlf; + echo ' iCal2-new'.$this->crlf; + } + } echo '
'.$this->crlf; echo '
'.$this->crlf;
@@ -529,6 +605,19 @@ class wochenplan extends basis_db
echo ' 
'.$this->crlf;
echo ' 
'.$this->crlf;
echo ' 
'.$this->crlf;
+ if ($kal_link_new_ss !== null)
+ {
+ echo ' '.$this->crlf; + echo ' HTML-new '.$this->crlf; + if ($kal_link_new_downloads) + { + echo ' excel-new '.$this->crlf; + echo ' CSV-new '.$this->crlf; + echo ' CSV-Outlook-new '.$this->crlf; + echo ' iCal1-new '.$this->crlf; + echo ' iCal2-new'.$this->crlf; + } + } echo '