From f8fccea02740d33a305b36dd74c62e9d401f5606 Mon Sep 17 00:00:00 2001 From: Sana EL HIRI Date: Fri, 4 Mar 2022 18:07:59 +0100 Subject: [PATCH 01/23] =?UTF-8?q?=20petites=20avanc=C3=A9es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../page-delete-member.component.html | 25 +++++++++- .../page-delete-member.component.scss | 49 +++++++++++++++++++ .../page-delete-member.component.ts | 11 ++++- src/app/services/membre.service.ts | 4 +- 4 files changed, 83 insertions(+), 6 deletions(-) diff --git a/src/app/pages/page-delete-member/page-delete-member.component.html b/src/app/pages/page-delete-member/page-delete-member.component.html index eca4658..85ce3ef 100644 --- a/src/app/pages/page-delete-member/page-delete-member.component.html +++ b/src/app/pages/page-delete-member/page-delete-member.component.html @@ -5,7 +5,28 @@
-

Supprimer ce membre

-
+
+

Êtes-vous sur de vouloir Supprimer ce compte ?

+
+ +
+
+ +
+
diff --git a/src/app/pages/page-delete-member/page-delete-member.component.scss b/src/app/pages/page-delete-member/page-delete-member.component.scss index e69de29..aae8fd4 100644 --- a/src/app/pages/page-delete-member/page-delete-member.component.scss +++ b/src/app/pages/page-delete-member/page-delete-member.component.scss @@ -0,0 +1,49 @@ +p{ + font-size: 30px; + margin-top: 20px; +} + +button{ + margin-top: 10px; +} + +.bouton-non { + margin-top: 5px; + margin-right: 5px; + border: 1px solid #7879F1 !important; + background-color: #7879F1; + height: 40px; + width: 450px; + text-align: center; +} + +.bouton-non:hover { + margin-top: 5px; + margin-right: 5px; + border: 1px solid #68d182 !important; + background-color: #68d182; + color: #fff; + height: 40px; + width: 450px; + text-align: center; +} + +.bouton-oui { + margin-top: 5px; + border: 1px solid #7879F1 !important; + background-color: #7879F1; + color: #fff; + height: 40px; + width: 450px; + text-align: center; +} + +.bouton-oui:hover { + margin-top: 5px; + border: 1px solid #bd4646 !important; + background-color: #bd4646; + color: #fff; + height: 40px; + width: 450px; + text-align: center; +} diff --git a/src/app/pages/page-delete-member/page-delete-member.component.ts b/src/app/pages/page-delete-member/page-delete-member.component.ts index aef0557..34b589f 100644 --- a/src/app/pages/page-delete-member/page-delete-member.component.ts +++ b/src/app/pages/page-delete-member/page-delete-member.component.ts @@ -1,4 +1,6 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, EventEmitter, OnInit, Output } from '@angular/core'; +import { MembreService } from 'src/app/services/membre.service'; +import { TokenService } from 'src/app/services/token.service'; @Component({ selector: 'app-page-delete-member', @@ -6,10 +8,15 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./page-delete-member.component.scss'] }) export class PageDeleteMemberComponent implements OnInit { + @Output() clickDelete = new EventEmitter(); + parent: boolean; - constructor() { } + constructor(private tokenService: TokenService, private membreService: MembreService) { + this.parent = false; + } ngOnInit(): void { } + } diff --git a/src/app/services/membre.service.ts b/src/app/services/membre.service.ts index 38d2567..105aa78 100644 --- a/src/app/services/membre.service.ts +++ b/src/app/services/membre.service.ts @@ -45,8 +45,8 @@ export class MembreService { } } - deleteMembre(membre: Membre): Observable { - return this.http.delete(`${this.apiUrl}/membres/delete/1`); + deleteMembre(membre: Membre): Observable{ + return this.http.delete(`${this.apiUrl}/membres/delete/${membre.id}`); } updateMembre(membre: Membre): Observable | void { From bb34a0cc7a555c2fd63aeb91448acb1402e848e4 Mon Sep 17 00:00:00 2001 From: cecilesimplon93 Date: Sat, 5 Mar 2022 19:53:33 +0100 Subject: [PATCH 02/23] finalisation du footer --- src/app/app.module.ts | 4 +++- src/app/components/footer/footer.component.html | 3 ++- src/app/components/footer/footer.component.scss | 5 +++++ src/app/components/humeur/humeur.component.html | 3 ++- src/app/pages/page-support/page-support.component.html | 3 ++- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 31e7e57..d40293d 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -41,6 +41,7 @@ import { HumeurComponent } from './components/humeur/humeur.component'; import { DeconnexionComponent } from './components/deconnexion/deconnexion.component'; import { AlertComponent } from './components/alert/alert.component'; import { PageAjoutEvenementsComponent } from './pages/page-ajout-evenements/page-ajout-evenements.component'; +import { PageSupportComponent } from './pages/page-support/page-support.component'; registerLocaleData(localeFr) @NgModule({ @@ -78,7 +79,8 @@ registerLocaleData(localeFr) DeconnexionComponent, HumeurComponent, AlertComponent, - PageAjoutEvenementsComponent + PageAjoutEvenementsComponent, + PageSupportComponent ], imports: [ BrowserModule, diff --git a/src/app/components/footer/footer.component.html b/src/app/components/footer/footer.component.html index 805a5ca..9cd0f94 100644 --- a/src/app/components/footer/footer.component.html +++ b/src/app/components/footer/footer.component.html @@ -8,5 +8,6 @@ To-Do-List Agenda Menus +Nous contacter + - \ No newline at end of file diff --git a/src/app/components/footer/footer.component.scss b/src/app/components/footer/footer.component.scss index 90d7840..82b82c8 100644 --- a/src/app/components/footer/footer.component.scss +++ b/src/app/components/footer/footer.component.scss @@ -7,4 +7,9 @@ font-size: smaller; .footer { margin-top: 20px; +} + +h3{ + color : blue; + font-size : 16px; } \ No newline at end of file diff --git a/src/app/components/humeur/humeur.component.html b/src/app/components/humeur/humeur.component.html index 02088d8..94fb3fe 100644 --- a/src/app/components/humeur/humeur.component.html +++ b/src/app/components/humeur/humeur.component.html @@ -19,4 +19,5 @@
-
\ No newline at end of file + + \ No newline at end of file diff --git a/src/app/pages/page-support/page-support.component.html b/src/app/pages/page-support/page-support.component.html index 7c20ea7..adbbb66 100644 --- a/src/app/pages/page-support/page-support.component.html +++ b/src/app/pages/page-support/page-support.component.html @@ -28,4 +28,5 @@ - \ No newline at end of file + + \ No newline at end of file From cca4e96f2bbe2cae193ba1f44581df615681669e Mon Sep 17 00:00:00 2001 From: HarmandI Date: Sat, 5 Mar 2022 20:22:10 +0100 Subject: [PATCH 03/23] bug : enregistre en base cocher toutes les taches --- .../to-do-list/to-do-list.component.ts | 20 +++++++++++-------- .../page-to-do-list.component.html | 2 +- .../page-to-do-list.component.ts | 4 ++-- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/app/components/to-do-list/to-do-list.component.ts b/src/app/components/to-do-list/to-do-list.component.ts index 09d58aa..0892eb3 100644 --- a/src/app/components/to-do-list/to-do-list.component.ts +++ b/src/app/components/to-do-list/to-do-list.component.ts @@ -3,7 +3,7 @@ import { Router } from '@angular/router'; import { Tache } from 'src/app/models/tache'; import { ToDoList } from 'src/app/models/to-do-list'; import { TodoService } from 'src/app/services/todo.service'; -import { TodoList } from 'src/app/todo-list'; + @Component({ selector: 'app-to-do-list', @@ -13,7 +13,6 @@ import { TodoList } from 'src/app/todo-list'; export class ToDoListComponent implements OnInit { @Input() todo!: ToDoList; public beforeEditCache: string; - //public todos: ToDoList[]; public todoTitle: string; public idTodo: number; public filter: string; @@ -24,7 +23,6 @@ export class ToDoListComponent implements OnInit { constructor(private TodoService: TodoService, private router: Router) { this.beforeEditCache = ''; - //this.todos = []; this.todoTitle = ''; this.idTodo = 0; this.filter = ''; @@ -37,8 +35,10 @@ export class ToDoListComponent implements OnInit { this.beforeEditCache = ''; this.casesRestantes = true; this.filter = 'tous'; - this.idTodo = 4; this.todoTitle = ''; + if (this.toDoRest()===0){ + this.masterSelected=true; + } } //supprimer la todoList en fonction de son id deleteTodo(id: number): void { @@ -81,7 +81,7 @@ export class ToDoListComponent implements OnInit { tache.editing = true; } - // modifier une tâche validation de l'input + // modifier une tâche validation de l'input + update check doneEdit(tache: Tache): void { if (tache.texte.trim().length === 0) { tache.texte = this.beforeEditCache; @@ -112,17 +112,21 @@ export class ToDoListComponent implements OnInit { return this.todo.taches.filter((tache: Tache) => !tache.etat).length; } - //Cocher toutes les tâches de la liste + //Vérifie si toutes les tâches de la liste sont cochées listComplete(): boolean { return this.todo.taches.filter((tache: Tache) => tache).length > 0; } - //cocher toutes les cases de la todoList + //cocher/décoche les éléments à partir de la case checkAll cocherAllTodoList(): void { for (var i = 0; i < this.todo.taches.length; i++) { this.todo.taches[i].etat = this.masterSelected; + this.TodoService.updateTache(this.todo.taches[i]).subscribe((resp) => { + console.log(this.todo.taches[i]); + + }); } - this.cocherAllTodoList(); + //this.cocherAllTodoList(); } casesQuiRestes(): boolean { diff --git 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 index 143367f..ea853ba 100644 --- 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 @@
- +

To-Do-List

diff --git 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 index a850dda..4333c0c 100644 --- 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', @@ -30,7 +30,7 @@ export class PageToDoListComponent implements OnInit { }); } - //Ajouter une todo List si l'input n'est pas vide + //Ajouter une todo List si l'input contient un texte addTodoByTeamId() { const todoList: ToDoList = { nom: this.todoListTitle, From b28fae62ebbc2650570d3004385609fef828ee7a Mon Sep 17 00:00:00 2001 From: Hedi Date: Sun, 6 Mar 2022 11:34:14 +0100 Subject: [PATCH 04/23] header: fix du probleme titre-logo --- .../components/header/header.component.html | 31 ++++++++++--------- .../components/header/header.component.scss | 20 +++++------- 2 files changed, 23 insertions(+), 28 deletions(-) diff --git a/src/app/components/header/header.component.html b/src/app/components/header/header.component.html index 7749b01..f5b1843 100644 --- a/src/app/components/header/header.component.html +++ b/src/app/components/header/header.component.html @@ -1,18 +1,19 @@ - \ No newline at end of file diff --git a/src/app/components/header/header.component.scss b/src/app/components/header/header.component.scss index 0f359a5..36654ad 100644 --- a/src/app/components/header/header.component.scss +++ b/src/app/components/header/header.component.scss @@ -1,7 +1,8 @@ +#img { + height:95px; +} + .navbar-brand { - position: relative; - margin-right: 70%; - font-family: Arial, Helvetica, sans-serif; font-weight: bold; font-size: 3rem; color: #5d5fef; @@ -24,13 +25,6 @@ a:active { color: #5d5fef; } -.navbar-nav { - height: 6rem; -} - -#img { - position: absolute; - max-width: 5%; - margin-left: 5%; - margin-top: 10px; -} +.container-fluid{ + width:90%; +} \ No newline at end of file From 297527cdbb92b0c805c910eb2b58914bf1a0f375 Mon Sep 17 00:00:00 2001 From: cecilesimplon93 Date: Sun, 6 Mar 2022 15:46:45 +0100 Subject: [PATCH 05/23] smileys avec bdd --- .../components/humeur/humeur.component.html | 7 ++- .../components/humeur/humeur.component.scss | 4 +- src/app/components/humeur/humeur.component.ts | 50 +++++++++++++++---- src/app/services/membre.service.ts | 12 +++++ 4 files changed, 62 insertions(+), 11 deletions(-) diff --git a/src/app/components/humeur/humeur.component.html b/src/app/components/humeur/humeur.component.html index 94fb3fe..1e0ced0 100644 --- a/src/app/components/humeur/humeur.component.html +++ b/src/app/components/humeur/humeur.component.html @@ -2,7 +2,12 @@

Mon humeur :

- + + diff --git a/src/app/components/humeur/humeur.component.scss b/src/app/components/humeur/humeur.component.scss index 8b89097..2ddd3eb 100644 --- a/src/app/components/humeur/humeur.component.scss +++ b/src/app/components/humeur/humeur.component.scss @@ -6,6 +6,7 @@ p>img { img { width: 50px; height: 50px; + margin: 8px; } .humeur { @@ -13,6 +14,7 @@ display: inline; } div { - background-color: #87AFC7; +width: 400px; +background-color: #87AFC7; text-align: center; } \ No newline at end of file diff --git a/src/app/components/humeur/humeur.component.ts b/src/app/components/humeur/humeur.component.ts index c4b2cd5..4dc25ec 100644 --- a/src/app/components/humeur/humeur.component.ts +++ b/src/app/components/humeur/humeur.component.ts @@ -1,4 +1,6 @@ import { Component, OnInit } from '@angular/core'; +import { MembreService } from 'src/app/services/membre.service'; +import { TokenService } from 'src/app/services/token.service'; @Component({ selector: 'app-humeur', @@ -6,10 +8,10 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./humeur.component.scss'] }) export class HumeurComponent implements OnInit { - - - monHumeurLien! : string[]; - monHumeurTitle! : string[] ; +monHumeurLien! : string[]; +monHumeurTitle! : string[] ; +isShow: boolean; +alert: any; tabHumeur= [ @@ -19,18 +21,48 @@ export class HumeurComponent implements OnInit { { title : "Je suis en colère", lien : "assets/images/emoticon-insulter.png"}, { title : "Je suis en joie", lien : "assets/images/emoticon-feter.png"} ] - constructor() { } + constructor(private membreService: MembreService, private tokenService: TokenService) { + this.isShow= false; + this.alert=""; + + } - ngOnInit(): void { } + ngOnInit(): void { + const userId = this.tokenService.getCurrentMembreId(); + this.membreService.getMembreId(userId).subscribe({ + next: result => { + this.monHumeurTitle= [this.tabHumeur[result.smiley].title]; + this.monHumeurLien= [this.tabHumeur[result.smiley].lien]; + // console.log("resultat smiley ", result.smiley); + } + }) + } onChoixHumeur(numero: number){ this.monHumeurTitle= [this.tabHumeur[numero].title]; this.monHumeurLien= [this.tabHumeur[numero].lien]; + this.membreService.updateHumeur(numero)?.subscribe( + { + next: result => { + this.alert={"type":"success", "content":"L'humeur a bien été modifiée"}; + this.isShow = true; + }, + error: err => { + this.alert={"type":"danger", "content":"Problème lors de la modification de l'humeur"}; + this.isShow = true; + }, + complete: () => console.log('DONE!') + } +); + console.log("humeur titre est : ", this.monHumeurTitle); console.log("humeur lien est : ", this.monHumeurLien); -console.log("index humeur est : ", numero ); - - +console.log("index humeur est : ", numero); } + +onClickCloseAlert(){ +this.isShow=!this.isShow; } + +} \ No newline at end of file diff --git a/src/app/services/membre.service.ts b/src/app/services/membre.service.ts index 38d2567..1943640 100644 --- a/src/app/services/membre.service.ts +++ b/src/app/services/membre.service.ts @@ -57,4 +57,16 @@ export class MembreService { this.router.navigate(['accueil']); } } + +updateHumeur(numero : number) : Observable | void { + const userId = this.tokenService.getCurrentMembreId(); + if (userId){ + return this.http.put(`${this.apiUrl}/membres/update/smiley/${userId}`, numero); +}else { + this.router.navigate(['accueil']); + } } + +} + + From b7e4e1ad1845ebe3b6d46b605044054dcd825c6d Mon Sep 17 00:00:00 2001 From: Sana EL HIRI Date: Sun, 6 Mar 2022 18:30:50 +0100 Subject: [PATCH 06/23] =?UTF-8?q?avanc=C3=A9es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../page-account/page-account.component.ts | 21 +++++++++++++++++++ .../page-delete-member.component.html | 3 +-- .../page-delete-member.component.ts | 17 +++++++++++++-- src/app/services/membre.service.ts | 4 ++-- 4 files changed, 39 insertions(+), 6 deletions(-) diff --git a/src/app/pages/page-account/page-account.component.ts b/src/app/pages/page-account/page-account.component.ts index 0814759..a368213 100644 --- a/src/app/pages/page-account/page-account.component.ts +++ b/src/app/pages/page-account/page-account.component.ts @@ -15,12 +15,14 @@ export class PageAccountComponent implements OnInit { public listMembres: any[]; currentUser: any; currentTeam: any; + parent: boolean; constructor(private membreService: MembreService, private teamService: TeamService, private tokenService: TokenService, private router: Router) { this.listMembres = []; + this.parent = false; } ngOnInit(): void { @@ -36,5 +38,24 @@ export class PageAccountComponent implements OnInit { this.membreService.getMembresByTeamId()?.subscribe((membres: any[]) => { this.listMembres = membres; }); + + /***Gestion des limatations en fonction du role (parent ou enfant) */ + const roleUser = this.tokenService.getRole(); + if(roleUser == "ROLE_PARENT"){ + this.parent = true; + } + } + + /** Méthode qui au click va supprimer un contact en faisant appel au service dédié dans Membre Service **/ + onClickDelete(membreId: number){ + this.membreService.deleteMembre(membreId).subscribe((resp) => { + if(membreId) { + this.listMembres.forEach(membreId => console.log(membreId)) + }else{ + window.alert("Le profil ne peut pas être supprimé!") + } + this.router.navigate(['compte/']); + }); + window.location.reload(); } } diff --git a/src/app/pages/page-delete-member/page-delete-member.component.html b/src/app/pages/page-delete-member/page-delete-member.component.html index 85ce3ef..df389ce 100644 --- a/src/app/pages/page-delete-member/page-delete-member.component.html +++ b/src/app/pages/page-delete-member/page-delete-member.component.html @@ -22,8 +22,7 @@ id = "bouton-ajout" type="button" class="btn btn-primary btn-lg bouton-oui" - - + (clickDelete)="onClickDelete($event)" >Oui, je souhaite supprimer ce compte
diff --git a/src/app/pages/page-delete-member/page-delete-member.component.ts b/src/app/pages/page-delete-member/page-delete-member.component.ts index 34b589f..e52310e 100644 --- a/src/app/pages/page-delete-member/page-delete-member.component.ts +++ b/src/app/pages/page-delete-member/page-delete-member.component.ts @@ -1,4 +1,6 @@ import { Component, EventEmitter, OnInit, Output } from '@angular/core'; +import { Router } from '@angular/router'; +import { Membre } from 'src/app/models/membre'; import { MembreService } from 'src/app/services/membre.service'; import { TokenService } from 'src/app/services/token.service'; @@ -11,12 +13,23 @@ export class PageDeleteMemberComponent implements OnInit { @Output() clickDelete = new EventEmitter(); parent: boolean; - constructor(private tokenService: TokenService, private membreService: MembreService) { - this.parent = false; + constructor(private membreService: MembreService, private tokenService: TokenService) { + this.parent = false; + } ngOnInit(): void { + const roleUser = this.tokenService.getRole(); + + if(roleUser == "ROLE_PARENT"){ + this.parent = true; + } + } + onClickDelete(membreId: any){ + window.alert("Le profil à bien été supprimé!") + this.clickDelete.emit(membreId); + } } diff --git a/src/app/services/membre.service.ts b/src/app/services/membre.service.ts index 105aa78..ff88d34 100644 --- a/src/app/services/membre.service.ts +++ b/src/app/services/membre.service.ts @@ -45,8 +45,8 @@ export class MembreService { } } - deleteMembre(membre: Membre): Observable{ - return this.http.delete(`${this.apiUrl}/membres/delete/${membre.id}`); + deleteMembre(membreId: number): Observable{ + return this.http.delete(`${this.apiUrl}/membres/delete/${membreId}`); } updateMembre(membre: Membre): Observable | void { From c162d5060534d442fa9ad4be88e89345771f5b30 Mon Sep 17 00:00:00 2001 From: HarmandI Date: Sun, 6 Mar 2022 18:50:11 +0100 Subject: [PATCH 07/23] Corrections des bugs --- .../to-do-list/to-do-list.component.scss | 4 +-- .../to-do-list/to-do-list.component.ts | 27 +++++++++++++------ src/app/models/to-do-list.ts | 1 + 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/app/components/to-do-list/to-do-list.component.scss b/src/app/components/to-do-list/to-do-list.component.scss index 7bfbde7..8ce3710 100644 --- a/src/app/components/to-do-list/to-do-list.component.scss +++ b/src/app/components/to-do-list/to-do-list.component.scss @@ -58,7 +58,7 @@ } .deleteTache { - width: 75%; + width: 10%; cursor: pointer; margin-left: 14px; &:hover { @@ -77,7 +77,7 @@ } .modifier-element { - font-size: 24px; + font-size: 18px; color: white; margin-left: 12px; width: 100%; diff --git a/src/app/components/to-do-list/to-do-list.component.ts b/src/app/components/to-do-list/to-do-list.component.ts index 0892eb3..15ae91a 100644 --- a/src/app/components/to-do-list/to-do-list.component.ts +++ b/src/app/components/to-do-list/to-do-list.component.ts @@ -4,7 +4,6 @@ import { Tache } from 'src/app/models/tache'; import { ToDoList } from 'src/app/models/to-do-list'; import { TodoService } from 'src/app/services/todo.service'; - @Component({ selector: 'app-to-do-list', templateUrl: './to-do-list.component.html', @@ -36,8 +35,8 @@ export class ToDoListComponent implements OnInit { this.casesRestantes = true; this.filter = 'tous'; this.todoTitle = ''; - if (this.toDoRest()===0){ - this.masterSelected=true; + if (this.toDoRest() === 0) { + this.masterSelected = true; } } //supprimer la todoList en fonction de son id @@ -52,6 +51,7 @@ export class ToDoListComponent implements OnInit { addTache(idTodoList: number) { //idTodoList id que la todoList que l'on récupère console.log(idTodoList); + //permet de construire l'objet à passer en base const tache: Tache = { id: 0, texte: this.todoTitle, @@ -70,9 +70,19 @@ export class ToDoListComponent implements OnInit { //modifier le titre de la to-do-list updateTodo(todoList: ToDoList): void { - this.TodoService.updateTodo(todoList)?.subscribe((resp) => { - window.location.reload(); - }); + let nouvelleTodolist = { + id: todoList.id, + nom: todoList.nom, + team: todoList.team, + }; + console.log(todoList.team); + if (nouvelleTodolist.nom != '') { + this.TodoService.updateTodo(nouvelleTodolist)?.subscribe((resp) => { + window.location.reload(); + }); + } else { + window.alert('Il faut saisir du texte'); // sinon msg d'erreur} + } } //modifier la tâche par l'input @@ -94,12 +104,14 @@ export class ToDoListComponent implements OnInit { }); } - // annuler la modification + // annuler la modification de la tâche cancelEdit(tache: Tache): void { tache.texte = this.beforeEditCache; tache.editing = false; } + + //supprimer la tache deleteTache(id: number) { this.TodoService.deleteTacheById(id).subscribe((resp) => { @@ -123,7 +135,6 @@ export class ToDoListComponent implements OnInit { this.todo.taches[i].etat = this.masterSelected; this.TodoService.updateTache(this.todo.taches[i]).subscribe((resp) => { console.log(this.todo.taches[i]); - }); } //this.cocherAllTodoList(); diff --git a/src/app/models/to-do-list.ts b/src/app/models/to-do-list.ts index 4b8c345..219a143 100644 --- a/src/app/models/to-do-list.ts +++ b/src/app/models/to-do-list.ts @@ -5,4 +5,5 @@ export interface ToDoList { nom: string; taches: Tache[]; id: number; + team? : Team; } From c2c30c3cf8d6c55b6551ee27aeba04d8dc8c25e6 Mon Sep 17 00:00:00 2001 From: Hedi Date: Sun, 6 Mar 2022 19:55:26 +0100 Subject: [PATCH 08/23] fix humeur + ajout des couleur par page pour la side bar --- src/app/components/alert/alert.component.html | 2 +- src/app/components/humeur/humeur.component.ts | 8 ++++---- src/app/pages/page-agenda/page-agenda.component.html | 2 +- .../page-ajout-evenements.component.html | 2 +- .../pages/page-dashboard/page-dashboard.component.html | 2 +- .../page-menu-semaine/page-menu-semaine.component.html | 2 +- .../pages/page-not-found/page-not-found.component.html | 2 +- src/app/services/membre.service.ts | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/app/components/alert/alert.component.html b/src/app/components/alert/alert.component.html index 32e0ec5..c81fef4 100644 --- a/src/app/components/alert/alert.component.html +++ b/src/app/components/alert/alert.component.html @@ -1,4 +1,4 @@ -