diff --git a/app/controllers/resources/export.php b/app/controllers/resources/export.php index 0f85f71ba5918d36ff5bd72cc26c390f3df183d5..626563a89aa14c76083c69bea7da9987fb15a791 100644 --- a/app/controllers/resources/export.php +++ b/app/controllers/resources/export.php @@ -327,12 +327,15 @@ class Resources_ExportController extends AuthenticatedController $booking_data = [ [ + _('Datum'), _('Beginn'), _('Ende'), + _('Wochentag'), _('Rüstzeit'), _('Raumname'), _('Buchungstyp'), _('Beschreibung'), + _('geplante Teilnehmendenzahl'), _('Buchende Person'), _('Belegende Person(en)'), _('Interner Kommentar') @@ -389,15 +392,19 @@ class Resources_ExportController extends AuthenticatedController continue; } $description = $booking->description; + $turnout = 0; if (!$booking->isSimpleBooking()) { $course = $booking->assigned_course_date->course; if ($course instanceof Course) { $description = $course->getFullName(); + $turnout = $course->admission_turnout; } } $booking_data[] = [ - date('d.m.Y H:i', ($interval->begin + $booking->preparation_time)), - date('d.m.Y H:i', $interval->end), + date('d.m.Y', $interval->begin), + date('H:i', $interval->begin + $booking->preparation_time), + date('H:i', $interval->end), + strftime('%a', $interval->begin), sprintf( _('%u min.'), intval($booking->preparation_time / 60) @@ -417,6 +424,7 @@ class Resources_ExportController extends AuthenticatedController ) ), $description, + $turnout, $booking->booking_user ? $booking->booking_user->getFullName() : '', implode(', ', $booking->getAssignedUsers()), $booking->internal_comment