✨ [Workshops] Setup workshop form to add new fields

re-connect · May 3, 2024 · de566db · de566db
1 parent 50cb844
commit de566db
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 15 deletions.
diff --git a/client/src/Pages/Workshops/Components/Card.tsx b/client/src/Pages/Workshops/Components/Card.tsx
@@ -60,7 +60,7 @@ const WorkshopCard = ({workshop}: any) => (
         Types de participants : <ChipList list={workshop.participantKinds} dropdownKind="participantKinds"/>
       </div>
       <div>
-        Tranches d&#39âge : <ChipList list={workshop.ageBreakpoints} dropdownKind="ageBreakpoints"/>
+        Tranches d'âge : <ChipList list={workshop.ageBreakpoints} dropdownKind="ageBreakpoints"/>
       </div>
       <div>
         Outils utilisés : <ChipList list={workshop.usedEquipments} dropdownKind="usedEquipments"/>
@@ -70,11 +70,23 @@ const WorkshopCard = ({workshop}: any) => (
       </div>
       <br/>
       <Typography variant="subtitle1">
-        Bilan global et axes d&#39amélioration :
+        Bilan global et axes d'amélioration :
       </Typography>
       <Typography variant="body2" style={{whiteSpace: "pre-line"}}>
         {workshop.improvementAxis}
       </Typography>
+      <Typography variant="subtitle1">
+        Proposition de modification (évolution d'une fonctionnalité, d'un site...) :
+      </Typography>
+      <Typography variant="body2" style={{whiteSpace: "pre-line"}}>
+        {workshop.updateProposal}
+      </Typography>
+      <Typography variant="subtitle1">
+        Proposition d'ajout (nouvelles ressources, exercices, thématiques...) :
+      </Typography>
+      <Typography variant="body2" style={{whiteSpace: "pre-line"}}>
+        {workshop.addProposal}
+      </Typography>
       {!workshop.usedVault ? null : (
         <div>
           <br/>

diff --git a/client/src/Pages/Workshops/Components/WorkshopForm.tsx b/client/src/Pages/Workshops/Components/WorkshopForm.tsx
@@ -188,6 +188,22 @@ const WorkshopForm: React.FC<WorkshopFormProps> = ({workshop, onSubmit}) => {
               handleChange={handleChange}
             />
           </FormRow>
+          <FormRow>
+            <FormTextField
+              id='updateProposal'
+              value={values.updateProposal}
+              label="Proposition de modification (évolution d'une fonctionnalité, d'un site...)"
+              handleChange={handleChange}
+            />
+          </FormRow>
+          <FormRow>
+            <FormTextField
+              id='addProposal'
+              value={values.addProposal}
+              label="Proposition d'ajout (nouvelles ressources, exercices, thématiques...)"
+              handleChange={handleChange}
+            />
+          </FormRow>
           <FormRow>
             <FormControlLabel
               control={

diff --git a/client/src/Types/Workshops.ts b/client/src/Types/Workshops.ts
@@ -26,6 +26,8 @@ export interface WorkshopInterface extends Entity {
   usedVault?: boolean;
   attendees?: string;
   improvementAxis?: string;
+  updateProposal?: string;
+  addProposal?: string;
   duration?: Duration;
   participantKinds?: ParticipantKind[];
   equipmentSuppliers?: EquipmentSupplier[];

diff --git a/src/Entity/Center.php b/src/Entity/Center.php
@@ -97,7 +97,7 @@ public function getName(): ?string
         return $this->name;
     }
 
-    public function setName(string $name = null): void
+    public function setName(?string $name = null): void
     {
         $this->name = $name;
     }

diff --git a/src/Entity/Permanence.php b/src/Entity/Permanence.php
@@ -158,7 +158,7 @@ public function getCenter(): ?Center
         return $this->center;
     }
 
-    public function setCenter(Center $center = null): void
+    public function setCenter(?Center $center = null): void
     {
         $this->center = $center;
     }
@@ -168,7 +168,7 @@ public function getHours(): ?int
         return $this->hours;
     }
 
-    public function setHours(int $hours = null): void
+    public function setHours(?int $hours = null): void
     {
         $this->hours = $hours;
     }
@@ -178,7 +178,7 @@ public function getNbPros(): ?int
         return $this->nbPros;
     }
 
-    public function setNbPros(int $nbPros = null): void
+    public function setNbPros(?int $nbPros = null): void
     {
         $this->nbPros = $nbPros;
     }
@@ -188,7 +188,7 @@ public function getNbProAccounts(): ?int
         return $this->nbProAccounts;
     }
 
-    public function setNbProAccounts(int $nbProAccounts = null): void
+    public function setNbProAccounts(?int $nbProAccounts = null): void
     {
         $this->nbProAccounts = $nbProAccounts;
     }
@@ -198,7 +198,7 @@ public function getNbBeneficiaries(): ?int
         return $this->nbBeneficiaries;
     }
 
-    public function setNbBeneficiaries(int $nbBeneficiaries = null): void
+    public function setNbBeneficiaries(?int $nbBeneficiaries = null): void
     {
         $this->nbBeneficiaries = $nbBeneficiaries;
     }
@@ -208,7 +208,7 @@ public function getNbBeneficiariesAccounts(): ?int
         return $this->nbBeneficiariesAccounts;
     }
 
-    public function setNbBeneficiariesAccounts(int $nbBeneficiariesAccounts = null): void
+    public function setNbBeneficiariesAccounts(?int $nbBeneficiariesAccounts = null): void
     {
         $this->nbBeneficiariesAccounts = $nbBeneficiariesAccounts;
     }
@@ -218,7 +218,7 @@ public function getNbStoredDocs(): ?int
         return $this->nbStoredDocs;
     }
 
-    public function setNbStoredDocs(int $nbStoredDocs = null): void
+    public function setNbStoredDocs(?int $nbStoredDocs = null): void
     {
         $this->nbStoredDocs = $nbStoredDocs;
     }
@@ -228,7 +228,7 @@ public function getBeneficiariesNotes(): ?string
         return $this->beneficiariesNotes;
     }
 
-    public function setBeneficiariesNotes(string $beneficiariesNotes = null): void
+    public function setBeneficiariesNotes(?string $beneficiariesNotes = null): void
     {
         $this->beneficiariesNotes = $beneficiariesNotes;
     }
@@ -238,7 +238,7 @@ public function getProNotes(): ?string
         return $this->proNotes;
     }
 
-    public function setProNotes(string $proNotes = null): void
+    public function setProNotes(?string $proNotes = null): void
     {
         $this->proNotes = $proNotes;
     }
@@ -248,7 +248,7 @@ public function getReconnectNotes(): ?string
         return $this->reconnectNotes;
     }
 
-    public function setReconnectNotes(string $reconnectNotes = null): void
+    public function setReconnectNotes(?string $reconnectNotes = null): void
     {
         $this->reconnectNotes = $reconnectNotes;
     }
@@ -258,7 +258,7 @@ public function getAttendees(): ?string
         return $this->attendees;
     }
 
-    public function setAttendees(string $attendees = null): void
+    public function setAttendees(?string $attendees = null): void
     {
         $this->attendees = $attendees;
     }

diff --git a/src/Filter/AssociationFilter.php b/src/Filter/AssociationFilter.php
@@ -16,7 +16,7 @@ class AssociationFilter implements FilterInterface
     /** @var array<string> */
     private array $associations;
 
-    public static function new(string $propertyName, string $label = null): self
+    public static function new(string $propertyName, ?string $label = null): self
     {
         $properties = explode('.', $propertyName);