From ada8b6b72d4874f166a0c8737474167ae64f7443 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Andr=C3=A9?= Date: Wed, 9 Oct 2019 17:13:53 +0200 Subject: [PATCH] Affichage du titre des pages dans la navigation --- Front/skydivelogs-app/src/app/app.component.ts | 1 + .../app/list-of-aircrafts/list-of-aircrafts.component.ts | 4 +++- .../src/app/list-of-dzs/list-of-dzs.component.ts | 5 ++++- .../list-of-jump-types/list-of-jump-types.component.ts | 4 +++- .../src/app/list-of-jumps/list-of-jumps.component.ts | 5 ++++- .../src/app/new-jump/new-jump.component.ts | 4 +++- .../skydivelogs-app/src/app/summary/summary.component.ts | 4 +++- Front/skydivelogs-app/src/services/serviceComm.ts | 8 ++++++++ 8 files changed, 29 insertions(+), 6 deletions(-) diff --git a/Front/skydivelogs-app/src/app/app.component.ts b/Front/skydivelogs-app/src/app/app.component.ts index 109aed1..f250fde 100644 --- a/Front/skydivelogs-app/src/app/app.component.ts +++ b/Front/skydivelogs-app/src/app/app.component.ts @@ -14,6 +14,7 @@ export class AppComponent implements OnInit { } ngOnInit() { + this.serviceComm.componentTitle.subscribe(title => this.title = title); } toggleMenu() { diff --git a/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.ts b/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.ts index 0cdc567..56d35b2 100644 --- a/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.ts +++ b/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.ts @@ -1,6 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { AircraftResp } from '../../models/aircraft'; import { ServiceApi } from '../../services/serviceApi'; +import { ServiceComm } from '../../services/serviceComm'; @Component({ selector: 'app-list-of-aircrafts', @@ -10,10 +11,11 @@ import { ServiceApi } from '../../services/serviceApi'; export class ListOfAircraftsComponent implements OnInit { public listOfAircrafts: Array = new Array(); - constructor(private serviceApi: ServiceApi) { + constructor(private serviceApi: ServiceApi, private serviceComm: ServiceComm) { } ngOnInit() { + this.serviceComm.updatedComponentTitle('List of aircrafts'); this.getListOfAircrafts(); } 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 f83d7e8..e0d2fe5 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 @@ -1,6 +1,7 @@ import { Component, OnInit, Injectable } from '@angular/core'; import { DropZoneResp } from '../../models/dropzone'; import { ServiceApi } from '../../services/serviceApi'; +import { ServiceComm } from '../../services/serviceComm'; @Component({ selector: 'app-list-of-dzs', @@ -12,10 +13,12 @@ import { ServiceApi } from '../../services/serviceApi'; export class ListOfDzsComponent implements OnInit { public listOfDropZones: Array = new Array(); - constructor(private serviceApi: ServiceApi) { + constructor(private serviceApi: ServiceApi, + private serviceComm: ServiceComm) { } ngOnInit() { + this.serviceComm.updatedComponentTitle('List of DZs'); this.getListOfDropZones(); } diff --git a/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.ts b/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.ts index 0bb05bc..9680885 100644 --- a/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.ts +++ b/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.ts @@ -1,6 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { JumpTypeResp } from '../../models/jumpType'; import { ServiceApi } from '../../services/serviceApi'; +import { ServiceComm } from '../../services/serviceComm'; @Component({ selector: 'app-list-of-jump-types', @@ -10,10 +11,11 @@ import { ServiceApi } from '../../services/serviceApi'; export class ListOfJumpTypesComponent implements OnInit { public listOfJumpTypes: Array = new Array(); - constructor(private serviceApi: ServiceApi) { + constructor(private serviceApi: ServiceApi, private serviceComm: ServiceComm) { } ngOnInit() { + this.serviceComm.updatedComponentTitle('List of jump types'); this.getListOfJumpTypes(); } 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 6530321..4ead4af 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 @@ -2,6 +2,8 @@ import { Component, OnInit } from '@angular/core'; import { Observable } from 'rxjs/Observable'; import { JumpResp } from '../../models/jump'; import { ServiceApi } from '../../services/serviceApi'; +import { ServiceComm } from '../../services/serviceComm'; + @Component({ selector: 'app-list-of-jumps', @@ -11,10 +13,11 @@ import { ServiceApi } from '../../services/serviceApi'; export class ListOfJumpsComponent implements OnInit { public listOfJumps: Observable>; - constructor(private serviceApi: ServiceApi) { + constructor(private serviceApi: ServiceApi, private serviceComm: ServiceComm) { } ngOnInit() { + this.serviceComm.updatedComponentTitle('List of jumps'); this.getListOfJumps(); } 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 20c67a3..2eb67bc 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 @@ -1,4 +1,5 @@ import { Component, OnInit } from '@angular/core'; +import { ServiceComm } from '../../services/serviceComm'; @Component({ selector: 'app-new-jump', @@ -7,9 +8,10 @@ import { Component, OnInit } from '@angular/core'; }) export class NewJumpComponent implements OnInit { - constructor() { } + constructor(private serviceComm: ServiceComm) { } ngOnInit() { + this.serviceComm.updatedComponentTitle('Add a new jump'); } } diff --git a/Front/skydivelogs-app/src/app/summary/summary.component.ts b/Front/skydivelogs-app/src/app/summary/summary.component.ts index fd3e3bd..69f0648 100644 --- a/Front/skydivelogs-app/src/app/summary/summary.component.ts +++ b/Front/skydivelogs-app/src/app/summary/summary.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from '@angular/core'; +import { ServiceComm } from '../../services/serviceComm'; @Component({ selector: 'app-summary', @@ -7,9 +8,10 @@ import { Component, OnInit } from '@angular/core'; }) export class SummaryComponent implements OnInit { - constructor() { } + constructor(private serviceComm: ServiceComm) { } ngOnInit() { + this.serviceComm.updatedComponentTitle('Summary'); } } diff --git a/Front/skydivelogs-app/src/services/serviceComm.ts b/Front/skydivelogs-app/src/services/serviceComm.ts index 1ebfaad..66e87c4 100644 --- a/Front/skydivelogs-app/src/services/serviceComm.ts +++ b/Front/skydivelogs-app/src/services/serviceComm.ts @@ -1,6 +1,14 @@ import { Injectable } from '@angular/core'; +import { BehaviorSubject } from 'rxjs/BehaviorSubject'; @Injectable() export class ServiceComm { + private componentTitleSource = new BehaviorSubject(""); + componentTitle = this.componentTitleSource.asObservable(); + constructor() { } + + updatedComponentTitle(title: string) { + this.componentTitleSource.next(title); + } }