diff --git a/Front/skydivelogs-app/src/app/app.component.ts b/Front/skydivelogs-app/src/app/app.component.ts index 932c497..e0ac791 100644 --- a/Front/skydivelogs-app/src/app/app.component.ts +++ b/Front/skydivelogs-app/src/app/app.component.ts @@ -30,22 +30,14 @@ export class AppComponent implements OnInit { private authenticationService: AuthenticationService, private serviceComm: ServiceComm, private serviceCacheApi : ServiceCacheApi, - private translateService: TranslateService, - private serviceApiAircraft : AircraftService, - private serviceApiJumpType : JumpTypeService, - private serviceApiDropzone : DropzoneService, - private serviceApiGear : GearService) + private translateService: TranslateService) { - this.authenticationService.alwaysLogin(); - this.authenticationService.currentUser.subscribe(user => { if (user) { this.currentUser = user; this.translateService.addLangs(['en', 'fr']); this.translateService.use(user.language); this.selectedLanguageFlag = user.language; - - this.putToCacheRefDatas().subscribe(() => { console.log("Push to cache the referentiel datas"); }); } }); @@ -77,13 +69,4 @@ export class AppComponent implements OnInit { this.authenticationService.currentUserValue = this.currentUser; this.selectedLanguageFlag = event.value; } - - private putToCacheRefDatas(): Observable { - var aircraftResp = this.serviceApiAircraft.getListOfAircrafts(false); - var jumpTypeResp = this.serviceApiJumpType.getListOfJumpTypes(); - var dzResp = this.serviceApiDropzone.getListOfDropZones(false); - var gearResp = this.serviceApiGear.getListOfGears(); - - return forkJoin([aircraftResp, jumpTypeResp, dzResp, gearResp]); - } } diff --git a/Front/skydivelogs-app/src/app/default/default.component.ts b/Front/skydivelogs-app/src/app/default/default.component.ts index 5c7a09c..e8adef7 100644 --- a/Front/skydivelogs-app/src/app/default/default.component.ts +++ b/Front/skydivelogs-app/src/app/default/default.component.ts @@ -1,5 +1,12 @@ import { Component, OnInit } from "@angular/core"; import { TranslateService } from "@ngx-translate/core"; +import { Observable, forkJoin } from "rxjs"; + +import { AircraftService } from "../../services/aircraft.service"; +import { AuthenticationService } from "../../services/authentication.service"; +import { DropzoneService } from "../../services/dropzone.service"; +import { GearService } from "../../services/gear.service"; +import { JumpTypeService } from "../../services/jump-type.service"; import { ServiceComm } from "../../services/service-comm.service"; @Component({ @@ -9,11 +16,29 @@ import { ServiceComm } from "../../services/service-comm.service"; }) export class DefaultComponent implements OnInit { constructor(private serviceComm: ServiceComm, - private translateService: TranslateService) {} + private translateService: TranslateService, + private authenticationService: AuthenticationService, + private serviceApiAircraft : AircraftService, + private serviceApiJumpType : JumpTypeService, + private serviceApiDropzone : DropzoneService, + private serviceApiGear : GearService) {} ngOnInit() { + this.authenticationService.alwaysLogin(); + + this.putToCacheRefDatas().subscribe(() => { console.log("Push to cache the referentiel datas"); }); + this.translateService.get("Home").subscribe( data => { this.serviceComm.UpdatedComponentTitle(data); } ); } + + private putToCacheRefDatas(): Observable { + var aircraftResp = this.serviceApiAircraft.getListOfAircrafts(false); + var jumpTypeResp = this.serviceApiJumpType.getListOfJumpTypes(); + var dzResp = this.serviceApiDropzone.getListOfDropZones(false); + var gearResp = this.serviceApiGear.getListOfGears(); + + return forkJoin([aircraftResp, jumpTypeResp, dzResp, gearResp]); + } } \ No newline at end of file diff --git a/Front/skydivelogs-app/src/services/service-cache-api.service.ts b/Front/skydivelogs-app/src/services/service-cache-api.service.ts index 1924e97..3a34fa3 100644 --- a/Front/skydivelogs-app/src/services/service-cache-api.service.ts +++ b/Front/skydivelogs-app/src/services/service-cache-api.service.ts @@ -15,7 +15,7 @@ export class ServiceCacheApi { } public get(key: CacheApiKey, callToApi: Observable) : Observable { - console.log(`Get cache : ${CacheApiKey[key]}`); + console.log(`Get/push cache : ${CacheApiKey[key]}`); const cached = this.cache.get(key); if (cached) {