Mise à jours et ajout de fonctionnalités

src/app/core/models/aeronef.model.ts

@@ -8,10 +8,18 @@ export interface Aeronef {
     updatedAt: string;
 }
 
-export interface AeronefAggregate {
+export interface AeronefByImat {
     _id: {
         aeronef: string,
         imat: string
     },
     count: number
+}
+
+export interface AeronefByYear {
+    _id: {
+        aeronef: string,
+        year: number
+    },
+    count: number
 }

src/app/core/models/canopy.model.ts

@@ -8,10 +8,18 @@ export interface Canopy {
     updatedAt: string;
 }
 
-export interface CanopyAggregate {
+export interface CanopyBySize {
     _id: {
         canopy: string,
         taille: number
     },
     count: number
+}
+
+export interface CanopyByYear {
+    _id: {
+        canopy: string,
+        year: number
+    },
+    count: number
 }

src/app/core/models/dropzone.model.ts

@@ -8,10 +8,18 @@ export interface DropZone {
     updatedAt: string;
 }
 
-export interface DropZoneAggregate {
+export interface DropZoneByOaci {
     _id: {
         lieu: string,
         oaci: string
     },
     count: number
+}
+
+export interface DropZoneByYear {
+    _id: {
+        lieu: string,
+        year: number
+    },
+    count: number
 }

src/app/core/models/index.ts

@@ -2,6 +2,7 @@ export * from './aeronef.model';
 export * from './aeronef-list.model';
 export * from './application.model';
 export * from './application-list-config.model';
+export * from './calculator.model';
 export * from './canopy.model';
 export * from './canopysize.model';
 export * from './reducerow.model';

src/app/core/services/aeronefs.service.ts

@@ -4,7 +4,7 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { ApiService } from './api.service';
-import { Aeronef, AeronefAggregate, AeronefList, JumpList, JumpListConfig, JumpListFilters } from 'src/app/core/models';
+import { Aeronef, AeronefByImat, AeronefList, JumpList, JumpListConfig, JumpListFilters } from 'src/app/core/models';
 
 @Injectable({ providedIn: 'root' })
 export class AeronefsService {
@@ -12,7 +12,7 @@ export class AeronefsService {
         private apiService: ApiService
     ) { }
 
-    getAll(): Observable<Array<AeronefAggregate>> {
+    getAllByImat(): Observable<Array<AeronefByImat>> {
         return this.apiService.get('/aeronefs')
             .pipe(map(data => data.aeronefs));
         /*

src/app/core/services/canopies.service.ts

@@ -4,7 +4,7 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { ApiService } from './api.service';
-import { Canopy, CanopyAggregate ,JumpList, JumpListConfig, JumpListFilters } from 'src/app/core/models';
+import { Canopy, CanopyBySize ,JumpList, JumpListConfig, JumpListFilters } from 'src/app/core/models';
 
 @Injectable({ providedIn: 'root' })
 export class CanopiesService {
@@ -12,7 +12,7 @@ export class CanopiesService {
         private apiService: ApiService
     ) { }
 
-    getAll(): Observable<Array<CanopyAggregate>> {
+    getAllBySize(): Observable<Array<CanopyBySize>> {
         return this.apiService.get('/canopies')
             .pipe(map(data => data.canopies));
     }

src/app/core/services/dropzones.service.ts

@@ -4,7 +4,7 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { ApiService } from './api.service';
-import { DropZone, DropZoneAggregate, JumpList, JumpListConfig, JumpListFilters } from 'src/app/core/models';
+import { DropZone, DropZoneByOaci, JumpList, JumpListConfig, JumpListFilters } from 'src/app/core/models';
 
 @Injectable({ providedIn: 'root' })
 export class DropZonesService {
@@ -12,7 +12,7 @@ export class DropZonesService {
         private apiService: ApiService
     ) { }
 
-    getAll(): Observable<Array<DropZoneAggregate>> {
+    getAllByOaci(): Observable<Array<DropZoneByOaci>> {
         return this.apiService.get('/dropzones')
             .pipe(map(data => data.dropzones));
     }