fixes #430

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')
         );
     }

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[] = [