diff --git a/Back/skydiveLogs-api/skydiveLogs-api.csproj.user b/Back/skydiveLogs-api/skydiveLogs-api.csproj.user index 0f82007..530be4c 100644 --- a/Back/skydiveLogs-api/skydiveLogs-api.csproj.user +++ b/Back/skydiveLogs-api/skydiveLogs-api.csproj.user @@ -10,5 +10,6 @@ False skydiveLogsApi - Web Deploy + false \ No newline at end of file diff --git a/Front/skydivelogs-app/src/app/new-jump/new-jump.component.ts b/Front/skydivelogs-app/src/app/new-jump/new-jump.component.ts index ab194e9..6d62579 100644 --- a/Front/skydivelogs-app/src/app/new-jump/new-jump.component.ts +++ b/Front/skydivelogs-app/src/app/new-jump/new-jump.component.ts @@ -43,10 +43,10 @@ export class NewJumpComponent implements OnInit { private serviceDropzone: DropzoneService, private serviceGear: GearService, private dateService: DateService - ) {} + ) { } ngOnInit() { - this.serviceComm.UpdatedComponentTitle("Add a new jump"); + this.serviceComm.UpdatedComponentTitle('Add a new jump'); this.endDate = new Date(); this.beginDate = this.dateService.AddDays(new Date(), -1); @@ -136,6 +136,6 @@ export class NewJumpComponent implements OnInit { } public allDatasLoaded(): boolean { - return this.countDatasLoaded == 4; + return this.countDatasLoaded === 4; } } diff --git a/Front/skydivelogs-app/src/app/summary/summary.component.html b/Front/skydivelogs-app/src/app/summary/summary.component.html index 6c6ddab..e51c644 100644 --- a/Front/skydivelogs-app/src/app/summary/summary.component.html +++ b/Front/skydivelogs-app/src/app/summary/summary.component.html @@ -1,91 +1,97 @@ -
- - Total Total +
+
+ + Total Total +
+ +
+ +
+ +
+ + Date and location +
+ +
+ +
+ +
+ +
+ +
+ + + + + + + + + + +
{{element.label}}{{element.nb}}
+
+ +
+ + + + + + + + + + +
{{element.label}}{{element.nb}}
+
+ +
+ + + + + + + + + + +
{{element.label}}{{element.nb}}
+
+ +
+ + + + + + + + + + +
{{element.label}}{{element.nb}}
+
+ +
+ + + + + + + + + + +
{{element.label}}{{element.nb}}
+
-
- -
- -
- - Date and location -
- -
- -
- -
- -
- -
- - - - - - - - - - -
{{element.label}}{{element.nb}}
-
- -
- - - - - - - - - - -
{{element.label}}{{element.nb}}
-
- -
- - - - - - - - - - -
{{element.label}}{{element.nb}}
-
- -
- - - - - - - - - - -
{{element.label}}{{element.nb}}
-
- -
- - - - - - - - - - -
{{element.label}}{{element.nb}}
-
+ + + diff --git a/Front/skydivelogs-app/src/app/summary/summary.component.ts b/Front/skydivelogs-app/src/app/summary/summary.component.ts index f493ebb..eeb661f 100644 --- a/Front/skydivelogs-app/src/app/summary/summary.component.ts +++ b/Front/skydivelogs-app/src/app/summary/summary.component.ts @@ -15,6 +15,7 @@ export class SummaryComponent implements OnInit { public dsNbJumpByGear; public dsNbJumpByType; public dsNbJumpByYear; + private countDatasLoaded: number; constructor( private serviceApi: StatsService, @@ -22,24 +23,34 @@ export class SummaryComponent implements OnInit { ) { } ngOnInit() { + this.countDatasLoaded = 0; this.serviceComm.UpdatedComponentTitle('Summary'); const statsResult = this.serviceApi.getStatsOfJumps(); statsResult.statsByDz.subscribe(data => { this.dsNbJumpByDz = new MatTableDataSource(data); + this.countDatasLoaded++; }); statsResult.statsByAircraft.subscribe(data => { this.dsNbJumpByAircraft = new MatTableDataSource(data); + this.countDatasLoaded++; }); statsResult.statsByGear.subscribe(data => { this.dsNbJumpByGear = new MatTableDataSource(data); + this.countDatasLoaded++; }); statsResult.statsByJumpType.subscribe(data => { this.dsNbJumpByType = new MatTableDataSource(data); + this.countDatasLoaded++; }); statsResult.statsByYear.subscribe(data => { this.dsNbJumpByYear = new MatTableDataSource(data); + this.countDatasLoaded++; }); } + + public allDatasLoaded(): boolean { + return this.countDatasLoaded === 5; + } }