removed obsoleted import IST from CSV

Author: Lung

src/AbstractController.php

@@ -48,19 +48,18 @@ abstract class AbstractController
     protected function flashRegistrationCloseResult(RegistrationCloseResult $result): void
     {
         foreach ($result->warnings as $warning) {
-            $this->flashMessages->warning($this->translator->trans($warning['key'], $warning['params']));
+            $this->flashMessages->warning($warning['key'], $warning['params']);
         }
     }
 
     protected function flashPaymentResult(PaymentResult $result): void
     {
         foreach ($result->messages as $message) {
-            $translatedText = $this->translator->trans($message->translationKey, $message->translationParams);
             match ($message->severity) {
-                PaymentMessageSeverity::Info => $this->flashMessages->info($translatedText),
-                PaymentMessageSeverity::Success => $this->flashMessages->success($translatedText),
-                PaymentMessageSeverity::Warning => $this->flashMessages->warning($translatedText),
-                PaymentMessageSeverity::Error => $this->flashMessages->error($translatedText),
+                PaymentMessageSeverity::Info => $this->flashMessages->info($message->translationKey, $message->translationParams),
+                PaymentMessageSeverity::Success => $this->flashMessages->success($message->translationKey, $message->translationParams),
+                PaymentMessageSeverity::Warning => $this->flashMessages->warning($message->translationKey, $message->translationParams),
+                PaymentMessageSeverity::Error => $this->flashMessages->error($message->translationKey, $message->translationParams),
             };
         }
     }

src/Application/CsvParser.php

@@ -346,9 +346,6 @@ public function addRoutesInto(App $app): App
 
                     });
 
-                    $app->post('/import/ist', AdminController::class . '::importIstFromSrs')
-                        ->setName('admin-import-ist');
-
                     $app->group('/organizing-team', function (RouteCollectorProxy $app) {
                         $app->get('', AdminController::class . '::showOrganizingTeam')
                             ->setName('admin-organizing-team');

src/Application/Route.php

@@ -348,7 +348,7 @@ public function __construct()
      */
     public function getAllItems(): array
     {
-        return [
+        $items = [
             $this->contingent,
             $this->patrolName,
             $this->firstName,
@@ -357,10 +357,6 @@ public function getAllItems(): array
             $this->gender,
             $this->birthDate,
             $this->birthPlace,
-            $this->parentalConsent,
-            $this->hospitalConsent,
-            $this->childWorkCert,
-            $this->adultEventCert,
             $this->idNumber,
             $this->address,
             $this->country,
@@ -382,8 +378,16 @@ public function getAllItems(): array
             $this->skills,
             $this->preferredPosition,
             $this->printedHandbook,
+            $this->parentalConsent,
+            $this->hospitalConsent,
+            $this->childWorkCert,
+            $this->adultEventCert,
             $this->notes,
         ];
+
+        usort($items, fn (ContentArbiterItem $a, ContentArbiterItem $b) => $a->order <=> $b->order);
+
+        return $items;
     }
 
     /**

src/Event/AbstractContentArbiter.php

@@ -67,6 +67,7 @@ public function getTranslationFilePaths(): array
         ];
     }
 
+    #[\Override]
     public function getContentArbiterIst(): ContentArbiterIst
     {
         $ca = parent::getContentArbiterIst();
@@ -89,6 +90,7 @@ public function getContentArbiterIst(): ContentArbiterIst
         return $ca;
     }
 
+    #[\Override]
     public function getContentArbiterPatrolLeader(): ContentArbiterPatrolLeader
     {
         $ca = parent::getContentArbiterPatrolLeader();
@@ -107,6 +109,7 @@ public function getContentArbiterPatrolLeader(): ContentArbiterPatrolLeader
         return $ca;
     }
 
+    #[\Override]
     public function getContentArbiterPatrolParticipant(): ContentArbiterPatrolParticipant
     {
         $ca = parent::getContentArbiterPatrolParticipant();

src/Event/EventType/Aqua/EventTypeAqua.php

@@ -166,6 +166,7 @@ public function getTranslationFilePaths(): array
         ];
     }
 
+    #[\Override]
     public function getContentArbiterIst(): ContentArbiterIst
     {
         $ca = parent::getContentArbiterIst();
@@ -187,6 +188,7 @@ public function getContentArbiterIst(): ContentArbiterIst
         return $ca;
     }
 
+    #[\Override]
     public function getContentArbiterPatrolLeader(): ContentArbiterPatrolLeader
     {
         $ca = parent::getContentArbiterPatrolLeader();
@@ -208,6 +210,7 @@ public function getContentArbiterPatrolLeader(): ContentArbiterPatrolLeader
         return $ca;
     }
 
+    #[\Override]
     public function getContentArbiterPatrolParticipant(): ContentArbiterPatrolParticipant
     {
         $ca = parent::getContentArbiterPatrolParticipant();

src/Event/EventType/Cej/EventTypeCej.php

@@ -196,11 +196,6 @@ public function showFoodStats(): bool
         return true;
     }
 
-    public function showIstImport(): bool
-    {
-        return false;
-    }
-
     public function isUnlockExpiredButtonAllowed(): bool
     {
         return false;

src/Event/EventType/EventType.php

@@ -42,6 +42,7 @@ public function getPrice(Participant $participant): int
         return $price;
     }
 
+    #[\Override]
     public function getContentArbiterIst(): ContentArbiterIst
     {
         $caIst = parent::getContentArbiterIst();
@@ -56,6 +57,7 @@ public function getContentArbiterIst(): ContentArbiterIst
         return $caIst;
     }
 
+    #[\Override]
     public function getContentArbiterPatrolLeader(): ContentArbiterPatrolLeader
     {
         $caPl = parent::getContentArbiterPatrolLeader();
@@ -69,6 +71,7 @@ public function getContentArbiterPatrolLeader(): ContentArbiterPatrolLeader
         return $caPl;
     }
 
+    #[\Override]
     public function getContentArbiterPatrolParticipant(): ContentArbiterPatrolParticipant
     {
         $caPp = parent::getContentArbiterPatrolParticipant();
@@ -82,6 +85,7 @@ public function getContentArbiterPatrolParticipant(): ContentArbiterPatrolPartic
         return $caPp;
     }
 
+    #[\Override]
     public function getContentArbiterGuest(): ContentArbiterGuest
     {
         $caGuest = parent::getContentArbiterGuest();

src/Event/EventType/Jj/EventTypeJj.php

@@ -33,6 +33,7 @@ public function getPrice(Participant $participant): int
         };
     }
 
+    #[\Override]
     public function getContentArbiterIst(): ContentArbiterIst
     {
         $caIst = parent::getContentArbiterIst();
@@ -48,6 +49,7 @@ public function getContentArbiterIst(): ContentArbiterIst
         return $caIst;
     }
 
+    #[\Override]
     public function getContentArbiterPatrolLeader(): ContentArbiterPatrolLeader
     {
         $caPl = parent::getContentArbiterPatrolLeader();
@@ -60,6 +62,7 @@ public function getContentArbiterPatrolLeader(): ContentArbiterPatrolLeader
         return $caPl;
     }
 
+    #[\Override]
     public function getContentArbiterPatrolParticipant(): ContentArbiterPatrolParticipant
     {
         $caPp = parent::getContentArbiterPatrolParticipant();

src/Event/EventType/Navigamus/EventTypeNavigamus.php

@@ -10,6 +10,7 @@
 
 class EventTypeNsj extends EventType
 {
+    #[\Override]
     public function getContentArbiterIst(): ContentArbiterIst
     {
         $ca = new ContentArbiterIst();