From 1d9bf75e59923e5e36deefc3c10419c02fd364b3 Mon Sep 17 00:00:00 2001
From: Hedi <hedi.mjid@gmail.com>
Date: Sat, 5 Mar 2022 10:45:23 +0100
Subject: [PATCH] fix formulaire

---
 .../page-ajout-evenements.component.html      | 72 +++++++++++++------
 .../page-ajout-evenements.component.ts        | 16 +++--
 2 files changed, 61 insertions(+), 27 deletions(-)

diff --git a/src/app/pages/page-ajout-evenements/page-ajout-evenements.component.html b/src/app/pages/page-ajout-evenements/page-ajout-evenements.component.html
index a65589c..4c68aa6 100644
--- a/src/app/pages/page-ajout-evenements/page-ajout-evenements.component.html
+++ b/src/app/pages/page-ajout-evenements/page-ajout-evenements.component.html
@@ -6,26 +6,56 @@
   </div>
   <div class="col-md-4 offset-md-4 text-center">
     <h2>Ajouter un évènement à l'agenda</h2>
-    <div class="text-center col-md-6 offset-md-3">
-        <main class="form-signup">
+    <div class="text-center col-md-7 offset-md-3">
+        <main class="form-ajout-evenement">
             <form  (ngSubmit)="onSubmit()" [formGroup]="eventForm">
-                <div class="form-floating">
-                    <input type="datetime-local" 
-                            class="form-control" 
-                            id="floatingInputDebut" 
-                            placeholder="" 
-                            name="start" 
-                            formControlName="startFc">
-                    <label for="floatingInputfirstName">Début</label>
+                <div class="row g-2">
+                  <div class="col-md">
+                    <div class="form-floating">
+                      <input type="date" 
+                              class="form-control" 
+                              id="floatingInputDebut" 
+                              placeholder="" 
+                              name="startDate" 
+                              formControlName="startDateFc">
+                      <label for="floatingInputfirstName">Date de début</label>
+                    </div>
+                  </div>
+                  <div class="col-md">
+                    <div class="form-floating">
+                      <input type="time" 
+                              class="form-control" 
+                              id="floatingInputDebut" 
+                              placeholder="" 
+                              name="startHour" 
+                              formControlName="startHourFc">
+                      <label for="floatingInputfirstName">Heure de début</label>
+                    </div>
+                  </div>
                 </div>
-                <div class="form-floating">
-                    <input type="datetime-local" 
-                            class="form-control" 
-                            id="floatingInputFin" 
-                            placeholder="" 
-                            name="end" 
-                            formControlName="endFc">
-                    <label for="floatingInputlastName">Fin</label>
+                <div class="row g-2">
+                  <div class="col-md">
+                    <div class="form-floating">
+                      <input type="date" 
+                              class="form-control" 
+                              id="floatingInputFin" 
+                              placeholder="" 
+                              name="endDate" 
+                              formControlName="endDateFc">
+                      <label for="floatingInputlastName">Date de fin</label>
+                    </div>
+                  </div>
+                  <div class="col-md">
+                    <div class="form-floating">
+                      <input type="time" 
+                              class="form-control" 
+                              id="floatingInputFin" 
+                              placeholder="" 
+                              name="endHour" 
+                              formControlName="endHourFc">
+                      <label for="floatingInputlastName">Heure de fin</label>
+                    </div>
+                  </div>
                 </div>
                 <div class="form-floating">
                     <input type="text" 
@@ -36,10 +66,10 @@
                             formControlName="textFc">
                     <label for="floatingInputlastName">Libelle</label>
                 </div>    
-                <button class="w-100 btn btn-lg btn-primary" 
+                <button class="btn btn-lg btn-primary" 
                         type="submit" 
-                        [disabled]="eventForm.invalid">Validation</button>
-    
+                        [disabled]="eventForm.invalid">Ajouter</button>
+                <a routerLink="../agenda" class="btn btn-lg btn-primary">Annuler</a>
             </form>
         </main>
     </div>
diff --git a/src/app/pages/page-ajout-evenements/page-ajout-evenements.component.ts b/src/app/pages/page-ajout-evenements/page-ajout-evenements.component.ts
index 68d53a1..3d06070 100644
--- a/src/app/pages/page-ajout-evenements/page-ajout-evenements.component.ts
+++ b/src/app/pages/page-ajout-evenements/page-ajout-evenements.component.ts
@@ -27,20 +27,24 @@ export class PageAjoutEvenementsComponent implements OnInit {
     this.teamId = this.tokenService.getCurrentTeamId();
     
     this.eventForm = new FormGroup({
-      startFc : new FormControl(''),
-      endFc : new FormControl(''),
+      startDateFc : new FormControl(''),
+      startHourFc : new FormControl(''),
+      endDateFc : new FormControl(''),
+      endHourFc : new FormControl(''),
       textFc : new FormControl('', [ Validators.required])
     })
   }
 
   public onSubmit(): void {
-    const startValue = this.eventForm.value['startFc'];
-    const endValue = this.eventForm.value['endFc'];
+    const startDateValue = this.eventForm.value['startDateFc'];
+    const startHourValue = this.eventForm.value['startHourFc'];
+    const endDateValue = this.eventForm.value['endDateFc'];
+    const endHourValue = this.eventForm.value['endHourFc'];
     const textValue = this.eventForm.value['textFc'];
 
     const event = {
-      start: startValue,
-      end: endValue,
+      start: startDateValue+'T'+startHourValue+':00',
+      end: endDateValue+'T'+endHourValue+':00',
       text: textValue,
       id:"",
       membre: {id:this.userId},