Merge pull request #210 from NilsRec/feature/fix-merge-report-and-axi…

…s-command 🐛 [MergeFieldsCommand] Fixed prop name
re-connect · May 14, 2024 · b01e330 · b01e330
2 parents f0d6d85 + c361b7b
commit b01e330
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -9,7 +9,9 @@ DEPLOYER      = $(BIN)/dep
 
 .PHONY        :
 
-cs: rector fix stan test
+cs: rector fix stan
+
+ci: rector fix stan test
 
 fixture:
 	@$(CONSOLE) doctrine:fixtures:load --env=test -n

diff --git a/client/src/Pages/Workshops/Components/WorkshopForm.tsx b/client/src/Pages/Workshops/Components/WorkshopForm.tsx
@@ -182,7 +182,7 @@ const WorkshopForm: React.FC<WorkshopFormProps> = ({workshop, onSubmit}) => {
             <FormTextField
               id='improvementAxis'
               value={values.improvementAxis}
-              label="Bolan global et axes d'amélioration"
+              label="Bilan global et axes d'amélioration"
               multiline={true}
               rows='4'
               handleChange={handleChange}

diff --git a/src/Command/MergeReportAndAxisCommand.php b/src/Command/MergeReportAndAxisCommand.php
@@ -29,7 +29,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         /** @var Workshop[] $workshopsWithReport */
         $workshopsWithReport = $this->repository->createQueryBuilder('w')
-            ->where('w.report IS NOT NULL')
+            ->where('w.globalReport IS NOT NULL')
             ->getQuery()
             ->getResult();