modified sprint report

itk-dev · Nov 29, 2023 · d0b9933 · d0b9933
1 parent 3e0bd19
commit d0b9933
Show file tree

Hide file tree

Showing 4 changed files with 235 additions and 161 deletions.
diff --git a/src/Controller/SprintReportController.php b/src/Controller/SprintReportController.php
@@ -43,7 +43,7 @@ public function index(Request $request): Response
         $projectChoices = [];
 
         foreach ($projects as $project) {
-            $projectChoices[$project->name] = $project->key;
+            $projectChoices[$project->name] = $project->id;
         }
 
         // Override projectId with element with choices.
@@ -67,16 +67,17 @@ public function index(Request $request): Response
 
         if (!empty($requestData['projectId'])) {
             $project = $this->apiService->getProject($requestData['projectId']);
+            $milestones = $this->apiService->getProjectMilestones($requestData['projectId']);
 
-            $versionChoices = [];
-            foreach ($project->versions as $version) {
-                $versionChoices[$version->name] = $version->id;
+            $milestoneChoices = [];
+            foreach ($milestones as $milestone) {
+                $milestoneChoices[$milestone->headline] = $milestone->id;
             }
 
-            // Override versionId with element with choices.
-            $form->add('versionId', ChoiceType::class, [
+            // Override milestoneId with element with choices.
+            $form->add('milestoneId', ChoiceType::class, [
                 'placeholder' => 'sprint_report.select_an_option',
-                'choices' => $versionChoices,
+                'choices' => $milestoneChoices,
                 'required' => true,
                 'label' => 'sprint_report.select_version',
                 'label_attr' => ['class' => 'label'],
@@ -93,12 +94,12 @@ public function index(Request $request): Response
             $sprintReportFormData = $form->getData();
 
             $projectId = $form->get('projectId')->getData();
-            $versionId = $form->get('versionId')->getData();
+            $milestoneId = $form->get('milestoneId')->getData();
 
-            if (!empty($projectId) && !empty($versionId)) {
-                $reportData = $this->apiService->getSprintReportData($projectId, $versionId);
+            if (!empty($projectId) && !empty($milestoneId)) {
+                $reportData = $this->apiService->getSprintReportData($projectId, $milestoneId);
 
-                $budget = $this->sprintReportService->getBudget($projectId, $versionId);
+                $budget = $this->sprintReportService->getBudget($projectId, $milestoneId);
             }
         }
 

diff --git a/src/Form/SprintReportType.php b/src/Form/SprintReportType.php
@@ -24,7 +24,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                     'data-action' => 'sprint-report#submitFormProjectId',
                 ],
             ])
-            ->add('versionId', ChoiceType::class, [
+            ->add('milestoneId', ChoiceType::class, [
                 'placeholder' => 'sprint_report.select_an_option',
                 'required' => false,
                 'label' => 'sprint_report.select_version',

diff --git a/src/Service/ApiServiceInterface.php b/src/Service/ApiServiceInterface.php
@@ -30,6 +30,10 @@ public function getPermissionsList(): array;
 
     public function getProject($key): mixed;
 
+    public function getProjectMilestones($key): mixed;
+
+    public function getMilestone($key): mixed;
+
     public function createProject(array $data): ?string;
 
     public function createTimeTrackerCustomer(string $name, string $key): mixed;
@@ -57,7 +61,7 @@ public function getTicketsInSprint(string $sprintId): array;
 
     public function getPlanningData(): PlanningData;
 
-    public function getSprintReportData(string $projectId, string $versionId): SprintReportData;
+    public function getSprintReportData(string $projectId, string $milestoneId): SprintReportData;
 
     /**
      * @return array<ClientData>