Skip to content
Snippets Groups Projects
Commit fb3184b6 authored by André Noack's avatar André Noack
Browse files

Resolve #3716 "Erweiterung des Raumbuchungsexports"

Closes #3716

Merge request studip/studip!2584
parent c25db6aa
Branches
No related tags found
No related merge requests found
...@@ -327,12 +327,15 @@ class Resources_ExportController extends AuthenticatedController ...@@ -327,12 +327,15 @@ class Resources_ExportController extends AuthenticatedController
$booking_data = [ $booking_data = [
[ [
_('Datum'),
_('Beginn'), _('Beginn'),
_('Ende'), _('Ende'),
_('Wochentag'),
_('Rüstzeit'), _('Rüstzeit'),
_('Raumname'), _('Raumname'),
_('Buchungstyp'), _('Buchungstyp'),
_('Beschreibung'), _('Beschreibung'),
_('geplante Teilnehmendenzahl'),
_('Buchende Person'), _('Buchende Person'),
_('Belegende Person(en)'), _('Belegende Person(en)'),
_('Interner Kommentar') _('Interner Kommentar')
...@@ -389,15 +392,19 @@ class Resources_ExportController extends AuthenticatedController ...@@ -389,15 +392,19 @@ class Resources_ExportController extends AuthenticatedController
continue; continue;
} }
$description = $booking->description; $description = $booking->description;
$turnout = 0;
if (!$booking->isSimpleBooking()) { if (!$booking->isSimpleBooking()) {
$course = $booking->assigned_course_date->course; $course = $booking->assigned_course_date->course;
if ($course instanceof Course) { if ($course instanceof Course) {
$description = $course->getFullName(); $description = $course->getFullName();
$turnout = $course->admission_turnout;
} }
} }
$booking_data[] = [ $booking_data[] = [
date('d.m.Y H:i', ($interval->begin + $booking->preparation_time)), date('d.m.Y', $interval->begin),
date('d.m.Y H:i', $interval->end), date('H:i', $interval->begin + $booking->preparation_time),
date('H:i', $interval->end),
strftime('%a', $interval->begin),
sprintf( sprintf(
_('%u min.'), _('%u min.'),
intval($booking->preparation_time / 60) intval($booking->preparation_time / 60)
...@@ -417,6 +424,7 @@ class Resources_ExportController extends AuthenticatedController ...@@ -417,6 +424,7 @@ class Resources_ExportController extends AuthenticatedController
) )
), ),
$description, $description,
$turnout,
$booking->booking_user ? $booking->booking_user->getFullName() : '', $booking->booking_user ? $booking->booking_user->getFullName() : '',
implode(', ', $booking->getAssignedUsers()), implode(', ', $booking->getAssignedUsers()),
$booking->internal_comment $booking->internal_comment
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment