diff --git a/Back/skydiveLogs-api/Data/JumpsDb-log.db b/Back/skydiveLogs-api/Data/JumpsDb-log.db new file mode 100644 index 0000000..62fd188 Binary files /dev/null and b/Back/skydiveLogs-api/Data/JumpsDb-log.db differ diff --git a/Back/skydiveLogs-api/Data/JumpsDb.db b/Back/skydiveLogs-api/Data/JumpsDb.db index 7cbbbe9..cef281b 100644 Binary files a/Back/skydiveLogs-api/Data/JumpsDb.db and b/Back/skydiveLogs-api/Data/JumpsDb.db differ diff --git a/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.html b/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.html index bed649b..f888c58 100644 --- a/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.html +++ b/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.html @@ -3,9 +3,9 @@ - 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