diff --git a/app/controllers/consultation/admin.php b/app/controllers/consultation/admin.php index b8f2b95964d2fe74929ced03e2889cbb95b2f4a2..37cb36431e7920869b950c2efac47d8cf148bdfb 100644 --- a/app/controllers/consultation/admin.php +++ b/app/controllers/consultation/admin.php @@ -803,12 +803,12 @@ class Consultation_AdminController extends ConsultationController $export = $sidebar->addWidget(new ExportWidget()); $export->addLink( _('Anmeldungen exportieren'), - $this->url_for('consultation/export/bookings'), + $this->url_for('consultation/export/bookings', $action === 'expired'), Icon::create('file-excel+export') ); $export->addLink( _('Alle Termine exportieren'), - $this->url_for('consultation/export/all'), + $this->url_for('consultation/export/all', $action === 'expired'), Icon::create('file-excel+export') ); } diff --git a/app/controllers/consultation/export.php b/app/controllers/consultation/export.php index 109f2f25b5fed6fb34c06b238a67e5cb8e67048b..d66d08d159fa7416f68f99a71e1f14f5777a81b1 100644 --- a/app/controllers/consultation/export.php +++ b/app/controllers/consultation/export.php @@ -19,7 +19,7 @@ class Consultation_ExportController extends ConsultationController } } - public function bookings_action() + public function bookings_action(bool $expired = false) { $csv = []; $csv[] = [ @@ -32,7 +32,7 @@ class Consultation_ExportController extends ConsultationController _('Grund'), ]; - $blocks = ConsultationBlock::findByRange($this->range, 'ORDER BY start ASC'); + $blocks = ConsultationBlock::findByRange($this->range, 'ORDER BY start ASC', $expired); foreach ($blocks as $block) { foreach ($block->slots as $slot) { foreach ($slot->bookings as $booking) { @@ -52,7 +52,7 @@ class Consultation_ExportController extends ConsultationController $this->render_csv($csv, 'Terminvergabe-Anmeldungen-' . date('Ymd') . '.csv'); } - public function all_action() + public function all_action(bool $expired = false) { $csv = []; $csv[] = [ @@ -65,7 +65,7 @@ class Consultation_ExportController extends ConsultationController _('Grund'), ]; - $blocks = ConsultationBlock::findByRange($this->range, 'ORDER BY start ASC'); + $blocks = ConsultationBlock::findByRange($this->range, 'ORDER BY start ASC', $expired); foreach ($blocks as $block) { foreach ($block->slots as $slot) { $csv[] = [