From c361b7ba311cb6d683b5856d9682f1f1a60053dc Mon Sep 17 00:00:00 2001
From: NilsRec <nils.lapotre@reconnect.fr>
Date: Tue, 14 May 2024 11:02:21 +0200
Subject: [PATCH] =?UTF-8?q?:bug:=20[MergeFieldsCommand]=C2=A0Fixed=20prop?=
 =?UTF-8?q?=20name?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile                                               | 4 +++-
 client/src/Pages/Workshops/Components/WorkshopForm.tsx | 2 +-
 src/Command/MergeReportAndAxisCommand.php              | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 3abc60d..cae75cd 100644
--- 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
index 81f64d6..378d116 100644
--- 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
index d44f449..682bdf4 100644
--- 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();