refactor: split the questionnaire into teamer and bus feedback

src/Controller/Administrative/Questionnaire/DetailController.php

@@ -5,12 +5,14 @@ namespace App\Controller\Administrative\Questionnaire;
 use App\Config\QuestionnaireCatalog;
 use App\Controller\Traits\ReturnUrlTrait;
 use App\Entity\QuestionnaireResponse;
+use App\Repository\QuestionnaireResponseRepository;
 use Symfony\Bridge\Doctrine\Attribute\MapEntity;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Routing\Requirement\Requirement;
 use Symfony\Component\Security\Http\Attribute\IsGranted;
 
 /**
@@ -23,10 +25,12 @@ class DetailController extends AbstractController
 
     public function __construct(
         private readonly QuestionnaireCatalog $catalog,
+        private readonly QuestionnaireResponseRepository $responseRepository,
     ) {
     }
 
-    #[Route('/administrative/questionnaire/{uuid}', name: 'app_administrative_questionnaire_detail')]
+    // the requirement keeps /administrative/questionnaire/list from being read as a uuid
+    #[Route('/administrative/questionnaire/{uuid}', name: 'app_administrative_questionnaire_detail', requirements: ['uuid' => Requirement::UUID])]
     #[IsGranted('ROLE_ADMINISTRATIVE')]
     public function index(
         #[MapEntity(mapping: ['uuid' => 'uuid'])]
@@ -38,9 +42,19 @@ class DetailController extends AbstractController
             throw new NotFoundHttpException();
         }
 
+        // the other questionnaire of the same placement, e.g. the bus feedback beside the teamer feedback
+        $siblings = array_filter(
+            $this->responseRepository->findByDisposition($response->getDisposition()),
+            static fn (QuestionnaireResponse $sibling): bool => $sibling !== $response && $sibling->isSubmitted(),
+        );
+
         return $this->render('administrative/questionnaire/detail.html.twig', [
             'definition' => $this->catalog->get($response->getQuestionnaire(), $response->getVersion()),
             'response' => $response,
+            'siblings' => array_map(fn (QuestionnaireResponse $sibling): array => [
+                'response' => $sibling,
+                'title' => $this->catalog->get($sibling->getQuestionnaire(), $sibling->getVersion())->title,
+            ], array_values($siblings)),
             'returnUrl' => $this->getReturnUrl($request, 'app_administrative_questionnaire_index'),
         ]);
     }

src/Controller/Administrative/Questionnaire/IndexController.php

@@ -13,8 +13,9 @@ use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Component\Security\Http\Attribute\IsGranted;
 
 /**
- * The submitted teamer questionnaires. Only administrative users read them: they rate the house
- * manager among others, so house managers are deliberately not let in.
+ * The submitted responses to one questionnaire, teamer or bus feedback. Only administrative users
+ * read them: they rate the house manager among others, so house managers are deliberately not
+ * let in.
  */
 class IndexController extends AbstractController
 {
@@ -26,14 +27,25 @@ class IndexController extends AbstractController
     ) {
     }
 
-    #[Route('/administrative/questionnaire', name: 'app_administrative_questionnaire_index')]
+    #[Route(
+        '/administrative/questionnaire/list/{questionnaire}',
+        name: 'app_administrative_questionnaire_index',
+        requirements: ['questionnaire' => '[a-z0-9_]+'],
+        defaults: ['questionnaire' => QuestionnaireCatalog::TEAMER_FEEDBACK],
+    )]
     #[IsGranted('ROLE_ADMINISTRATIVE')]
-    public function index(Request $request): Response
+    public function index(string $questionnaire, Request $request): Response
     {
+        $keys = $this->catalog->keys();
+
+        if (!in_array($questionnaire, $keys, true)) {
+            throw $this->createNotFoundException(sprintf('No questionnaire "%s"', $questionnaire));
+        }
+
         $filterDto = $this->filterHandler->getFilterSettings();
 
         $pagination = $this->paginator->paginate(
-            $this->responseRepository->getListQuery(QuestionnaireCatalog::TEAMER_ASSIGNMENT, $filterDto),
+            $this->responseRepository->getListQuery($questionnaire, $filterDto),
             $request->query->getInt('page', 1),
             $request->query->getInt('limit', 50),
             [
@@ -43,7 +55,9 @@ class IndexController extends AbstractController
         );
 
         return $this->render('administrative/questionnaire/index.html.twig', [
-            'definition' => $this->catalog->get(QuestionnaireCatalog::TEAMER_ASSIGNMENT),
+            'definition' => $this->catalog->get($questionnaire),
+            // for switching between the questionnaires
+            'definitions' => array_map($this->catalog->get(...), $keys),
             'pagination' => $pagination,
             'filterDto' => $filterDto,
         ]);

src/Controller/Administrative/Questionnaire/TestController.php

@@ -5,8 +5,8 @@ namespace App\Controller\Administrative\Questionnaire;
 use App\Config\QuestionnaireCatalog;
 use App\Controller\Traits\ReturnUrlTrait;
 use App\Entity\Assignment;
-use App\Enum\QuestionnaireFlag;
 use App\Form\QuestionnaireType;
+use App\Model\Questionnaire\Definition;
 use Symfony\Bridge\Doctrine\Attribute\MapEntity;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
@@ -15,10 +15,11 @@ use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Component\Security\Http\Attribute\IsGranted;
 
 /**
- * The teamer questionnaire as a teamer gets it, for trying out on any assignment - before or after
- * the trip, placed or not. It shows the assignment's own variant, with or without the bus
- * sections; ?bus_escort=1 or 0 tries the other one. Nothing is saved: "Absenden" shows the answers
- * as they would be stored, "Entwurf speichern" just keeps them in the form.
+ * The questionnaires as a teamer gets them, for trying out on any assignment - before or after the
+ * trip, placed or not. It shows what a placement on this assignment gets - the teamer feedback,
+ * and the bus feedback too for a bus escort; ?bus_escort=1 or 0 tries the other case. Nothing is
+ * saved: "Absenden" shows the answers as they would be stored, "Entwurf speichern" just keeps them
+ * in the form.
  */
 class TestController extends AbstractController
 {
@@ -39,12 +40,13 @@ class TestController extends AbstractController
         $busEscort = $request->query->has('bus_escort')
             ? $request->query->getBoolean('bus_escort')
             : $assignment->hasBusEscort();
-        $definition = $this->catalog
-            ->get(QuestionnaireCatalog::TEAMER_ASSIGNMENT)
-            ->forFlags($busEscort ? [QuestionnaireFlag::BUS_ESCORT] : [])
-        ;
+        $definitions = [$this->catalog->get(QuestionnaireCatalog::TEAMER_FEEDBACK)];
 
-        $form = $this->createForm(QuestionnaireType::class, [], ['definition' => $definition]);
+        if ($busEscort) {
+            $definitions[] = $this->catalog->get(QuestionnaireCatalog::BUS_FEEDBACK);
+        }
+
+        $form = $this->createForm(QuestionnaireType::class, [], ['definitions' => $definitions]);
         $form->handleRequest($request);
 
         $submitted = null;
@@ -52,7 +54,10 @@ class TestController extends AbstractController
 
         if ($form->isSubmitted() && $form->isValid()) {
             if (QuestionnaireType::isFinal($form)) {
-                $submitted = $definition->withoutHiddenAnswers($form->getData());
+                $submitted = array_map(static fn (Definition $definition): array => [
+                    'definition' => $definition,
+                    'answers' => $definition->withoutHiddenAnswers($form->getData()[$definition->key] ?? []),
+                ], $definitions);
             } else {
                 $draft = true;
             }
@@ -60,7 +65,6 @@ class TestController extends AbstractController
 
         return $this->render('administrative/questionnaire/test.html.twig', [
             'assignment' => $assignment,
-            'definition' => $definition,
             'form' => $form,
             'submitted' => $submitted,
             'draft' => $draft,