#181: Added data provider choice to sprint report

itk-dev · Jan 4, 2024 · 4442457 · 4442457
1 parent ef7c95b
commit 4442457
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 43 deletions.
diff --git a/src/Controller/SprintReportController.php b/src/Controller/SprintReportController.php
@@ -2,6 +2,7 @@
 
 namespace App\Controller;
 
+use App\Entity\DataProvider;
 use App\Exception\UnsupportedDataProviderException;
 use App\Form\SprintReportType;
 use App\Interface\DataProviderServiceInterface;
@@ -11,6 +12,7 @@
 use App\Service\SprintReportService;
 use Mpdf\Mpdf;
 use Mpdf\MpdfException;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -22,8 +24,6 @@
 #[Route('/admin/sprint-report')]
 class SprintReportController extends AbstractController
 {
-    private DataProviderServiceInterface $service;
-
     /**
      * @throws UnsupportedDataProviderException
      */
@@ -32,11 +32,11 @@ public function __construct(
         private readonly DataProviderService $dataProviderService,
         private readonly DataProviderRepository $dataProviderRepository,
     ) {
-        // TODO: Data provider should be selectable.
-        $dataProvider = $this->dataProviderRepository->find(1);
-        $this->service = $this->dataProviderService->getService($dataProvider);
     }
 
+    /**
+     * @throws UnsupportedDataProviderException
+     */
     #[Route('/', name: 'app_sprint_report')]
     public function index(Request $request): Response
     {
@@ -50,25 +50,18 @@ public function index(Request $request): Response
             'csrf_protection' => false,
         ]);
 
-        $projectCollection = $this->service->getSprintReportProjects();
-
-        $projectChoices = [];
-
-        foreach ($projectCollection->projects as $project) {
-            $projectChoices[$project->name] = $project->id;
-        }
-
-        // Override projectId with element with choices.
-        $form->add('projectId', ChoiceType::class, [
-            'placeholder' => 'sprint_report.select_an_option',
-            'choices' => $projectChoices,
-            'required' => true,
-            'label' => 'sprint_report.select_project',
+        $form->add('dataProvider', EntityType::class, [
+            'class' => DataProvider::class,
+            'required' => false,
+            'label' => 'sprint_report.data_provider',
             'label_attr' => ['class' => 'label'],
+            'row_attr' => ['class' => 'form-row'],
             'attr' => [
-                'data-sprint-report-target' => 'project',
                 'data-action' => 'sprint-report#submitFormProjectId',
+                'class' => 'form-element',
             ],
+            'help' => 'sprint_report.data_provider_helptext',
+            'choices' => $this->dataProviderRepository->findAll(),
         ]);
 
         $requestData = $request->query->all();
@@ -77,26 +70,56 @@ public function index(Request $request): Response
             $requestData = $requestData['sprint_report'];
         }
 
-        if (!empty($requestData['projectId'])) {
-            $versionCollection = $this->service->getSprintReportProjectVersions($requestData['projectId']);
+        if (!empty($requestData['dataProvider'])) {
+            $dataProvider = $this->dataProviderRepository->find($requestData['dataProvider']);
+            $service = $this->dataProviderService->getService($dataProvider);
+
+            $projectCollection = $service->getSprintReportProjects();
+
+            $projectChoices = [];
 
-            $versionChoices = [];
-            foreach ($versionCollection->versions as $version) {
-                $versionChoices[$version->headline] = $version->id;
+            foreach ($projectCollection->projects as $project) {
+                $projectChoices[$project->name] = $project->id;
             }
 
-            // Override versionId with element with choices.
-            $form->add('versionId', ChoiceType::class, [
+            // Override projectId with element with choices.
+            $form->add('projectId', ChoiceType::class, [
                 'placeholder' => 'sprint_report.select_an_option',
-                'choices' => $versionChoices,
-                'required' => true,
-                'label' => 'sprint_report.select_version',
+                'choices' => $projectChoices,
+                'required' => false,
+                'label' => 'sprint_report.select_project',
                 'label_attr' => ['class' => 'label'],
+                'row_attr' => ['class' => 'form-row form-choices'],
                 'attr' => [
-                    'data-sprint-report-target' => 'version',
-                    'data-action' => 'sprint-report#submitForm',
+                    'data-sprint-report-target' => 'project',
+                    'data-action' => 'sprint-report#submitFormProjectId',
+                    'data-choices-target' => 'choices',
                 ],
             ]);
+
+            if (!empty($requestData['projectId'])) {
+                $versionCollection = $service->getSprintReportProjectVersions($requestData['projectId']);
+
+                $versionChoices = [];
+                foreach ($versionCollection->versions as $version) {
+                    $versionChoices[$version->headline] = $version->id;
+                }
+
+                // Override versionId with element with choices.
+                $form->add('versionId', ChoiceType::class, [
+                    'placeholder' => 'sprint_report.select_an_option',
+                    'choices' => $versionChoices,
+                    'required' => true,
+                    'label' => 'sprint_report.select_version',
+                    'label_attr' => ['class' => 'label'],
+                    'row_attr' => ['class' => 'form-row form-choices'],
+                    'attr' => [
+                        'data-choices-target' => 'choices',
+                        'data-sprint-report-target' => 'version',
+                        'data-action' => 'sprint-report#submitForm',
+                    ],
+                ]);
+            }
         }
 
         $form->handleRequest($request);
@@ -106,9 +129,12 @@ public function index(Request $request): Response
 
             $projectId = $form->get('projectId')->getData();
             $versionId = $form->get('versionId')->getData();
+            $dataProvider = $form->get('dataProvider')->getData();
+
+            if (!empty($projectId) && !empty($versionId) && !empty($dataProvider)) {
+                $service = $this->dataProviderService->getService($dataProvider);
 
-            if (!empty($projectId) && !empty($versionId)) {
-                $reportData = $this->service->getSprintReportData($projectId, $versionId);
+                $reportData = $service->getSprintReportData($projectId, $versionId);
 
                 $budget = $this->sprintReportService->getBudget($projectId, $versionId);
             }

diff --git a/src/Entity/DataProvider.php b/src/Entity/DataProvider.php
@@ -97,4 +97,9 @@ public function setEnableAccountSync(bool $enableAccountSync): static
 
         return $this;
     }
+
+    public function __toString(): string
+    {
+        return $this->getName();
+    }
 }
diff --git a/src/Form/SprintReportType.php b/src/Form/SprintReportType.php
@@ -13,6 +13,7 @@ class SprintReportType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
+            ->add('dataProvider')
             ->add('projectId', ChoiceType::class, [
                 'placeholder' => 'sprint_report.select_an_option',
                 'required' => true,

diff --git a/src/Model/SprintReport/SprintReportFormData.php b/src/Model/SprintReport/SprintReportFormData.php
@@ -2,8 +2,11 @@
 
 namespace App\Model\SprintReport;
 
+use App\Entity\DataProvider;
+
 class SprintReportFormData
 {
+    public DataProvider $dataProvider;
     public string $projectId;
     public string $versionId;
 }
diff --git a/templates/sprint_report/index.html.twig b/templates/sprint_report/index.html.twig
@@ -28,4 +28,4 @@
             {% endif %}
         </div>
     </div>
-{% endblock %}
+{% endblock %}
diff --git a/translations/messages.da.yaml b/translations/messages.da.yaml
@@ -56,6 +56,8 @@ create_project_submitted:
     text: For at knytte projektet til dit team skal du følge linket herunder og klikke "Add Project Link" under "Links to Projects", find og vælg dit nye projekt på listen.
 
 sprint_report:
+  data_provider_helptext: ''
+  data_provider: 'Vælg datakilde'
   select_project: Vælg projekt
   select_version: Vælg version
   select_an_option: Vælg en mulighed
@@ -90,19 +92,19 @@ sprint_report:
 
 navigation:
   home: Forside
-  create_project: Projektopretter
-  invoices: Faktura
-  planning: Planlægning
-  sprint_report: Sprintrapport
+  create_project: 'Projektopretter'
+  invoices: 'Faktura'
+  planning: 'Planlægning'
+  sprint_report: 'Sprintrapport'
   title: 'Economics'
-  accounts: Konto
+  accounts: 'Konto'
   project_billing: 'Projektfakturering'
   projects: 'Projekter'
 
 planning:
-  title: Planlægning
-  assignees: Brugere
-  projects: Projekter
+  title: 'Planlægning'
+  assignees: 'Brugere'
+  projects: 'Projekter'
   hidden-entries: 'Skjulte brugere'
 
 invoices: