From 2e8182d15324d4df1e8500395c1468e7c9e9e0b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Andr=C3=A9?=
 <sebastien.a-andre@external.total.com>
Date: Mon, 3 May 2021 09:40:30 +0200
Subject: [PATCH] Bug fix

---
 .../app/list-of-gears/list-of-gears.component.css |  4 ++++
 .../list-of-gears/list-of-gears.component.html    |  6 +++---
 .../list-of-jumps/list-of-jumps.component.html    | 15 +++++++++------
 .../app/list-of-jumps/list-of-jumps.component.ts  |  5 +----
 .../src/app/summary/summary.component.ts          |  3 +++
 .../src/models/cache-api-key.enum.ts              |  3 ++-
 .../skydivelogs-app/src/services/stats.service.ts |  3 ++-
 7 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.css b/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.css
index ff391a1..7d2df70 100644
--- a/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.css
+++ b/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.css
@@ -20,3 +20,7 @@ table {
   align-items: initial;
   padding-top: 25px;
 }
+
+th.mat-header-cell {
+  text-align: center;
+}
diff --git a/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.html b/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.html
index faae98c..08f9c9d 100644
--- a/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.html
+++ b/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.html
@@ -9,7 +9,7 @@
       </ng-container>
 
       <ng-container matColumnDef="name">
-        <th mat-header-cell *matHeaderCellDef>Name</th>
+        <th mat-header-cell *matHeaderCellDef style="min-width: 130px;">Name</th>
         <td mat-cell *matCellDef="let element">{{element.name}}</td>
       </ng-container>
 
@@ -19,8 +19,8 @@
       </ng-container>
 
       <ng-container matColumnDef="maxSize">
-        <th mat-header-cell *matHeaderCellDef>Canopy size</th>
-        <td mat-cell *matCellDef="let element">{{element.maxSize}} - {{element.minSize}}</td>
+        <th mat-header-cell *matHeaderCellDef style="min-width: 90px;">Canopy size</th>
+        <td mat-cell *matCellDef="let element">{{element.minSize}} - {{element.maxSize}}</td>
       </ng-container>
 
       <ng-container matColumnDef="aad">
diff --git a/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.html b/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.html
index dca79d6..ef923c2 100644
--- a/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.html
+++ b/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.html
@@ -5,17 +5,20 @@
   <div *ngIf="dataSourceTable != null else loading">
     <table mat-table [dataSource]="dataSourceTable">
       <ng-container matColumnDef="infos">
-        <th mat-header-cell *matHeaderCellDef style="width: 60px;"></th>
+        <th mat-header-cell *matHeaderCellDef style="min-width: 90px;"></th>
         <td mat-cell *matCellDef="let element" style="text-align: left;">
+          <mat-icon aria-hidden="false" aria-label="Additional informations of the jump" 
+                    style="cursor: pointer;" (click)='openDialog(element, false)'>info</mat-icon>
+          <mat-icon aria-hidden="false" aria-label="Special jump" [style.visibility]="element.notes != undefined ? 'visible' : 'hidden'">sticky_note_2</mat-icon>
           <mat-icon aria-hidden="false" aria-label="Special jump" [style.visibility]="element.isSpecial ? 'visible' : 'hidden'">celebration</mat-icon>
-          <mat-icon aria-hidden="false" aria-label="Additional informations of the jump" style="cursor: pointer;"
-                    (click)='openDialog(element, false)' *ngIf="toShow(element)">info</mat-icon>
         </td>
       </ng-container>
 
       <ng-container matColumnDef="id">
-        <th mat-header-cell *matHeaderCellDef style="width: 90px;">Num</th>
-        <td mat-cell *matCellDef="let element; let i = index">{{ resultsLength - i }}</td>
+        <th mat-header-cell *matHeaderCellDef style="min-width: 90px;">Num</th>
+        <td mat-cell *matCellDef="let element; let i = index">
+          {{ resultsLength - ( (dataSourceTable.paginator.pageIndex * dataSourceTable.paginator.pageSize ) + i ) }}
+        </td>
       </ng-container>
 
       <ng-container matColumnDef="jumpDate">
@@ -52,7 +55,7 @@
       </ng-container>
 
       <ng-container matColumnDef="actions">
-        <th mat-header-cell *matHeaderCellDef style="width: 70px;"></th>
+        <th mat-header-cell *matHeaderCellDef style="min-width: 70px;"></th>
         <td mat-cell *matCellDef="let element" style="text-align: left;">
           <mat-icon aria-hidden="false" aria-label="Delete this jump" style="cursor: pointer;"
                     (click)='delete(element)'>delete</mat-icon>
diff --git a/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.ts b/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.ts
index df674b7..ad4a5cc 100644
--- a/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.ts
+++ b/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.ts
@@ -58,6 +58,7 @@ export class ListOfJumpsComponent implements OnInit {
 
         this.dataSourceTable = new MatTableDataSource<JumpResp>(data);
         this.dataSourceTable.paginator = this.paginator;
+        this.paginator.pageSize
         this.resultsLength = data.length;
       }, 500);
     });
@@ -71,10 +72,6 @@ export class ListOfJumpsComponent implements OnInit {
                      });
   }
 
-  toShow(item: JumpResp) {
-    return item.withCutaway === true || item.notes != undefined;
-  }
-
   delete(item: JumpResp) {
     let data : Array<JumpResp> = this.dataSourceTable.data;
     data = data.filter(d => d.id !== item.id);
diff --git a/Front/skydivelogs-app/src/app/summary/summary.component.ts b/Front/skydivelogs-app/src/app/summary/summary.component.ts
index d38c2ee..fbb66d9 100644
--- a/Front/skydivelogs-app/src/app/summary/summary.component.ts
+++ b/Front/skydivelogs-app/src/app/summary/summary.component.ts
@@ -60,6 +60,8 @@ export class SummaryComponent implements OnInit {
   }
 
   public onTabChanged(event: MatTabChangeEvent) {
+    console.log(event.index);
+    
     switch (event.index) {
       case 0:
         this.serviceApi.getStatsOfLastMonth()
@@ -82,6 +84,7 @@ export class SummaryComponent implements OnInit {
       case 2:
         this.serviceApi.getStatsByDz()
                         .subscribe(data => {
+                          data.sort((a, b) => b.nb - a.nb );
                           this.dsNbJumpByDz = new MatTableDataSource(data);
                         });
         break;
diff --git a/Front/skydivelogs-app/src/models/cache-api-key.enum.ts b/Front/skydivelogs-app/src/models/cache-api-key.enum.ts
index cd78c4b..f183506 100644
--- a/Front/skydivelogs-app/src/models/cache-api-key.enum.ts
+++ b/Front/skydivelogs-app/src/models/cache-api-key.enum.ts
@@ -9,5 +9,6 @@ export enum CacheApiKey {
   StatsByJumpType,
   StatsByGear,
   StatsOfLastYear,
-  StatsOfLastMonth
+  StatsOfLastMonth,
+  StatsByYear
 }
diff --git a/Front/skydivelogs-app/src/services/stats.service.ts b/Front/skydivelogs-app/src/services/stats.service.ts
index 674fc2d..d78679e 100644
--- a/Front/skydivelogs-app/src/services/stats.service.ts
+++ b/Front/skydivelogs-app/src/services/stats.service.ts
@@ -23,6 +23,7 @@ export class StatsService extends BaseService {
     this.serviceCacheApi.delete(CacheApiKey.StatsByAircraft);
     this.serviceCacheApi.delete(CacheApiKey.StatsByJumpType);
     this.serviceCacheApi.delete(CacheApiKey.StatsByGear);
+    this.serviceCacheApi.delete(CacheApiKey.StatsByYear);
     this.serviceCacheApi.delete(CacheApiKey.StatsOfLastYear);
     this.serviceCacheApi.delete(CacheApiKey.StatsOfLastMonth);
   }
@@ -96,7 +97,7 @@ export class StatsService extends BaseService {
                                 })
                               );
 
-    return this.serviceCacheApi.get<Array<StatsByYearResp>>(CacheApiKey.StatsByGear, callToApi);
+    return this.serviceCacheApi.get<Array<StatsByYearResp>>(CacheApiKey.StatsByYear, callToApi);
   }
 
   public getStatsOfLastYear(): Observable<StatsForLastYearResp> {