diff --git a/src/app/services/active-tab.service.ts b/src/app/services/active-tab.service.ts index bba6b7c8e..3fe770e8f 100644 --- a/src/app/services/active-tab.service.ts +++ b/src/app/services/active-tab.service.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; +import { HeaderSettingsService } from './header-settings.service'; @Injectable({ providedIn: 'root' @@ -11,13 +12,16 @@ export class ActiveTabService { agenda: false, publication: false, home: false, - gabinete: false + gabinete: false, + gabineteDetails: false } - constructor(private router: Router) { + constructor( + private router: Router, + public HeaderSettingsService: HeaderSettingsService) { this.detectActiveTab() - + this.router.events.subscribe((val) => { this.detectActiveTab() }); @@ -27,13 +31,20 @@ export class ActiveTabService { detectActiveTab() { this.setFalseToAllPage(); const pathName = window.location.pathname - + + this.HeaderSettingsService.hideHeader = false + if(pathName.startsWith('/home/agenda')) { this.pages.agenda = true } else if (pathName.startsWith('/home/events')) { this.pages.home = true } else if (pathName.startsWith('/home/gabinete-digital')) { this.pages.gabinete = true + + if (pathName.endsWith('gabinete-digital')) { + this.pages.gabineteDetails = true + } + } else if (pathName.startsWith('/home/publications')) { this.pages.publication = true } else if (pathName.startsWith('/home/chat')) { @@ -44,6 +55,6 @@ export class ActiveTabService { setFalseToAllPage() { for( const page in this.pages) { this.pages[page] = false - } + } } } diff --git a/src/app/services/hardware-go-back.service.spec.ts b/src/app/services/hardware-go-back.service.spec.ts new file mode 100644 index 000000000..e4b1f2ea9 --- /dev/null +++ b/src/app/services/hardware-go-back.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { HardwareGoBackService } from './hardware-go-back.service'; + +describe('HardwareGoBackService', () => { + let service: HardwareGoBackService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(HardwareGoBackService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/services/hardware-go-back.service.ts b/src/app/services/hardware-go-back.service.ts new file mode 100644 index 000000000..a0a533693 --- /dev/null +++ b/src/app/services/hardware-go-back.service.ts @@ -0,0 +1,9 @@ +import { Injectable } from '@angular/core'; + +@Injectable({ + providedIn: 'root' +}) +export class HardwareGoBackService { + + constructor() { } +} diff --git a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts index a12fde7e2..e98204a27 100644 --- a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts +++ b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts @@ -135,4 +135,8 @@ export class TaskDetailsPage implements OnInit { this.dropButton = !this.dropButton; this.HeaderSettingsService.hideHeader = !this.dropButton } + + onOndestroy() { + this.HeaderSettingsService.hideHeader == false + } } diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index 5738a62f3..29569306c 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts index eeffbdb12..a64e8061a 100644 --- a/src/app/shared/header/header.page.ts +++ b/src/app/shared/header/header.page.ts @@ -61,7 +61,7 @@ export class HeaderPage implements OnInit { private zone: NgZone, private attachmentService: AttachmentsService, public NotificationHolderService: NotificationHolderService, - public HeaderSettingsService: HeaderSettingsService + public HeaderSettingsService: HeaderSettingsService, ) { this.loggeduser = SessionStore.user; router.events.subscribe((val) => {