mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
fix header
This commit is contained in:
@@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,9 @@
|
||||
import { Injectable } from '@angular/core';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root'
|
||||
})
|
||||
export class HardwareGoBackService {
|
||||
|
||||
constructor() { }
|
||||
}
|
||||
@@ -135,4 +135,8 @@ export class TaskDetailsPage implements OnInit {
|
||||
this.dropButton = !this.dropButton;
|
||||
this.HeaderSettingsService.hideHeader = !this.dropButton
|
||||
}
|
||||
|
||||
onOndestroy() {
|
||||
this.HeaderSettingsService.hideHeader == false
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<div class="header-container header-fix" [ngClass]="{'d-none-header':HeaderSettingsService.hideHeader}" >
|
||||
<div class="header-container header-fix" [ngClass]="{'d-none-header':HeaderSettingsService.hideHeader && ActiveTabService.pages.gabineteDetails}" >
|
||||
<div class="main-tab pb-10 ion-toolbar header-color">
|
||||
|
||||
<div class="mobile pt-20 d-flex div-top-header justify-space-between">
|
||||
|
||||
@@ -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) => {
|
||||
|
||||
Reference in New Issue
Block a user