From 5522a534b2cc19b19248902f737fd0f253b29032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Andr=C3=A9?= Date: Thu, 28 Nov 2019 10:42:39 +0100 Subject: [PATCH] Affichage des DZs favorites + tri des DZs en fonction de cela --- Back/skydiveLogs-api/Data/JumpsDb-log.db | Bin 0 -> 32768 bytes Back/skydiveLogs-api/Data/JumpsDb.db | Bin 155648 -> 155648 bytes .../list-of-dzs/list-of-dzs.component.html | 4 ++-- .../app/list-of-dzs/list-of-dzs.component.ts | 5 +++-- Front/skydivelogs-app/src/models/dropzone.ts | 4 ++-- .../src/services/service-api-put.service.ts | 4 ++-- 6 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 Back/skydiveLogs-api/Data/JumpsDb-log.db diff --git a/Back/skydiveLogs-api/Data/JumpsDb-log.db b/Back/skydiveLogs-api/Data/JumpsDb-log.db new file mode 100644 index 0000000000000000000000000000000000000000..62fd188b4a7cec370cd721792c2f9aad34ba806c GIT binary patch literal 32768 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 delta 96 zcmV-m0H6PWzzKlB39uJn2N)KB0k{_zv7v(jv!P*P6$-Tg000nQX=DHflflarlOcCD zlj3R^lX!Owla{k076L(JWO8M5a{vJV00002MQveeYybhXvv)NJ0lS0gf4Av>0T - favorite DZ - favorite DZ diff --git a/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.ts b/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.ts index 5b437c2..5eb9f9e 100644 --- a/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.ts +++ b/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.ts @@ -40,6 +40,7 @@ export class ListOfDzsComponent implements OnInit { private getListOfDropZones() { this.serviceApiGet.getListOfDropZones().subscribe(data => { + data.sort((a, b) => (b.isFavorite ? 1 : 0) - (a.isFavorite ? 1 : 0)); this.dataSourceTable = new MatTableDataSource(data); this.dataSourceTable.paginator = this.paginator; this.resultsLength = data.length; @@ -47,10 +48,10 @@ export class ListOfDzsComponent implements OnInit { } public setToFavorite(dropzone: DropZoneResp) { - dropzone.isfavorite = this.serviceApiPut.SetFavoriteDropZone(dropzone); + dropzone.isFavorite = this.serviceApiPut.SetFavoriteDropZone(dropzone); } public removeToFavorite(dropzone: DropZoneResp) { - dropzone.isfavorite = this.serviceApiPut.RemoveFavoriteDropZone(dropzone); + dropzone.isFavorite = this.serviceApiPut.RemoveFavoriteDropZone(dropzone); } } diff --git a/Front/skydivelogs-app/src/models/dropzone.ts b/Front/skydivelogs-app/src/models/dropzone.ts index 5687ef1..d35123c 100644 --- a/Front/skydivelogs-app/src/models/dropzone.ts +++ b/Front/skydivelogs-app/src/models/dropzone.ts @@ -11,7 +11,7 @@ export class DropZoneResp { public website: string; public email: string; public type: Array; - public isfavorite: boolean; + public isFavorite: boolean; } export class DropZoneReq { @@ -27,5 +27,5 @@ export class DropZoneReq { public website: string; public email: string; public type: Array; - public isfavorite: boolean; + public isFavorite: boolean; } diff --git a/Front/skydivelogs-app/src/services/service-api-put.service.ts b/Front/skydivelogs-app/src/services/service-api-put.service.ts index 51c9634..e4200c8 100644 --- a/Front/skydivelogs-app/src/services/service-api-put.service.ts +++ b/Front/skydivelogs-app/src/services/service-api-put.service.ts @@ -14,7 +14,7 @@ export class ServiceApiPut { constructor(private http: HttpClient, private dateService: DateService) { } public SetFavoriteDropZone(selectedDz: DropZoneResp): boolean { - selectedDz.isfavorite = true; + selectedDz.isFavorite = true; this.http .put(`${environment.urlApi}/api/DropZone/${selectedDz.id}`, selectedDz, { headers: this.headers @@ -25,7 +25,7 @@ export class ServiceApiPut { } public RemoveFavoriteDropZone(selectedDz: DropZoneResp): boolean { - selectedDz.isfavorite = false; + selectedDz.isFavorite = false; this.http .put(`${environment.urlApi}/api/DropZone/${selectedDz.id}`, selectedDz, { headers: this.headers