Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into sana

2022-03-06 22:06:26 +01:00 · 2022-03-06 22:06:26 +01:00 · 2dd153198e
commit 2dd153198e
parent 50d5794668 53408a220e
31 changed files with 252 additions and 213 deletions
--- a/src/app/pages/page-ajout-contact/page-ajout-contact.component.html
+++ b/src/app/pages/page-ajout-contact/page-ajout-contact.component.html
@ -1,7 +1,7 @@
 <app-header></app-header>
 <div class="row">
  <div class="col-md-auto">
-    <app-side-bar></app-side-bar>
+    <app-side-bar [backgroundColor]="'#5a1e63'"></app-side-bar>
  </div>
  <div class="ajoutContact-form text-center">
    <h3>Ajouter un contact</h3>
@ -87,53 +87,6 @@
          <label for="floatingInputfirstName">Adresse</label>
        </div>

-        <div class="form-floating">
-          <input
-            type="text"
-            class="form-control"
-            id="floatingInputTelephone"
-            placeholder=""
-            name="telephone"
-            formControlName="telephoneFc"
-          />
-          <label for="floatingInputfirstName">Téléphone</label>
-        </div>
-        <div class="form-floating">
-          <input
-            type="email"
-            class="form-control"
-            id="floatingInput"
-            placeholder=""
-            name="email"
-            formControlName="emailFc"
-          />
-          <label for="floatingInput">Adresse email</label>
-        </div>
-
-        <div class="form-floating">
-          <input
-            type="date"
-            class="form-control"
-            id="floatingInputdateNaissance"
-            placeholder=""
-            name="dateNaissance"
-            formControlName="dateNaissanceFc"
-          />
-          <label for="floatingInputfirstName">Date de naissance</label>
-        </div>
-
-        <div class="form-floating">
-          <input
-            type="text"
-            class="form-control"
-            id="floatingInputAdresse"
-            placeholder=""
-            name="adresse"
-            formControlName="adresseFc"
-          />
-          <label for="floatingInputfirstName">Adresse</label>
-        </div>
-
        <button
          class="w-100 btn btn-lg btn-secondary"
          type="submit"
@ -144,4 +97,5 @@
      </form>
    </main>
  </div>
+  <app-footer></app-footer>
 </div>
--- a/src/app/pages/page-ajout-contact/page-ajout-contact.component.ts
+++ b/src/app/pages/page-ajout-contact/page-ajout-contact.component.ts
@ -63,7 +63,7 @@ export class PageAjoutContactComponent implements OnInit {
      email: emailValue,
      dateNaissance: dateNaissanceValue,
      adresse: adresseValue,
-      team: { id: teamId }, // changer l'id quand la personne est logé => recuperer l'id de la team du membre
+      team: { id: teamId }, 
    };

    if (contact.nom !== '') {
--- 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>
--- 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},
--- a/src/app/pages/page-modifier-contact/page-modifier-contact.component.html
+++ b/src/app/pages/page-modifier-contact/page-modifier-contact.component.html
@ -1,7 +1,7 @@
 <app-header></app-header>
 <div class="row">
    <div class="col-md-auto">
-        <app-side-bar></app-side-bar>
+        <app-side-bar [backgroundColor]="'#5a1e63'"></app-side-bar>
    </div>

 <div class="modifContact-form text-center">
@ -11,7 +11,8 @@
            
            <div class="form-floating">
            <input type="color" class="form-control" id="floatingInputcouleur" placeholder="" name="couleur"
-            formControlName="couleurFc" value= "{{ listContactInfo.couleur }}">
+            formControlName="couleurFc" value= "{{ listContactInfo.couleur }}"
+            [(ngModel)]="listContactInfo.couleur">
            </div>

            <div class="form-floating">
@ -83,9 +84,10 @@

            <button class="w-100 btn btn-lg btn-secondary" 
                    type="submit" 
-                    [disabled]="modifContactForm.invalid">Valider</button>
+                    >Valider</button>

        </form>
    </main>
 </div>
+<app-footer></app-footer>
 </div> 
--- a/src/app/pages/page-repertoire/page-repertoire.component.html
+++ b/src/app/pages/page-repertoire/page-repertoire.component.html
@ -2,10 +2,10 @@

 <div class="row">
  <div class="col-md-auto">
-    <app-side-bar></app-side-bar>
+    <app-side-bar [backgroundColor]="'#5a1e63'"></app-side-bar>
  </div>

-  <div class="col compte text-center py-3 border">
+  <div class="col compte text-center py-3">
    <div>
      <button
        *ngIf="parent" 
@ -34,7 +34,7 @@
      <div class="row justify-content-evenly">
        <div class="col-4">
          <div
-            class="row my-3 d-flex justify-content-center flex-row"
+            class="row my-3 d-flex justify-content-center flex-row pointer"
            *ngFor="let personne of listContact"
            (click)="onClick(personne)"
          >
@ -58,4 +58,6 @@
      </div>
    </div>
  </div>
+
+  <app-footer></app-footer>
 </div>
--- a/src/app/pages/page-repertoire/page-repertoire.component.scss
+++ b/src/app/pages/page-repertoire/page-repertoire.component.scss
@ -31,4 +31,8 @@
 .h4 {
  color: black;
  font-weight: bold;
+}
+
+.pointer{
+  cursor: pointer;
 }
--- a/src/app/pages/page-support/page-support.component.html
+++ b/src/app/pages/page-support/page-support.component.html
@ -28,4 +28,5 @@
            <button type="button" class="btn btn-danger">Effacer</button>
        </div>
    </form>
-</div>
+</div>
+<app-footer></app-footer>
--- a/src/app/pages/page-to-do-list/page-to-do-list.component.html
+++ b/src/app/pages/page-to-do-list/page-to-do-list.component.html
@ -1,7 +1,7 @@
 <app-header></app-header>
 <div class="row">
  <div class="col-md-auto">
-    <app-side-bar></app-side-bar>
+    <app-side-bar [backgroundColor]="'#4E9E7B'"></app-side-bar>
  </div>
  <div class="col menu text-center">
    <h2>To-Do-List</h2>
@ -25,3 +25,5 @@
    </div>
  </div>
 </div>
+
+<app-footer></app-footer>
--- a/src/app/pages/page-to-do-list/page-to-do-list.component.ts
+++ b/src/app/pages/page-to-do-list/page-to-do-list.component.ts
@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { ToDoList } from 'src/app/models/to-do-list';
 import { TodoService } from 'src/app/services/todo.service';
-import { Team } from 'src/app/models/team';
+

@Component({
  selector: 'app-page-to-do-list',
@ -21,6 +21,7 @@ export class PageToDoListComponent implements OnInit {
  }

  ngOnInit(): void {
+    //récupère les todoLists existantes en fonctoin de l'id de la team en utilisant le service
    this.TodoService.getToDoListByTeamId()?.subscribe((listTodos: any) => {
      console.log(listTodos);
      this.listTodos = listTodos;
@ -28,23 +29,21 @@ export class PageToDoListComponent implements OnInit {
      this.idTodo = 0;
    });
  }
-  //Ajouter une todo List
+
+  //Ajouter une todo List si l'input contient un texte
  addTodoByTeamId() {
    const todoList: ToDoList = {
      nom: this.todoListTitle,
      taches: [],
      id: 0,
    };
-    this.TodoService.addTodoByTeamId(todoList)?.subscribe((resp) => {
-      console.log(todoList);
-      window.location.reload();
-    });
-  }
-
-  deleteTodo(id: number): void {
-    window.alert('La to-do-List a bien été supprimé!');
-    this.TodoService.deleteTodoById(id).subscribe((resp) => {
-      window.location.reload();
-    });
+    if (this.todoListTitle != '') {
+      this.TodoService.addTodoByTeamId(todoList)?.subscribe((resp) => {
+        console.log(todoList);
+        window.location.reload(); //rafraîchit l'aperçu
+      });
+    }else{
+    window.alert('Il faut saisir du texte'); // sinon msg d'erreur
+    }
  }
 }