From 66025fca69955209a5ada0eed4e38b56dcfaeebf Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 8 Feb 2023 10:17:12 +0100
Subject: [PATCH] improve tab

---
 src/app/home/home.page.html            | 10 +++++-----
 src/app/shared/header/header.page.html | 10 +++++-----
 src/app/shared/header/header.page.ts   | 24 ++----------------------
 version/git-version.ts                 | 12 ++++++------
 4 files changed, 18 insertions(+), 38 deletions(-)

diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html
index 8cb8dafb9..3b16e2708 100644
--- a/src/app/home/home.page.html
+++ b/src/app/home/home.page.html
@@ -3,34 +3,34 @@
 
   <ion-tab-bar *ngIf="p.userPermissionCount([permissionList.Agenda.access, permissionList.Gabinete.access, permissionList.Actions.access, permissionList.Chat.access]) >= 2 || (p.userPermission([permissionList.Agenda.access]) &&  SessionStore.user.OwnerCalendars.length != 0) || p.userPermission([permissionList.Gabinete.access])" class="bottoms" slot="bottom">
 
-      <ion-tab-button *ngIf="SessionStore.user.OwnerCalendars.length >= 1 || p.userPermission([permissionList.Gabinete.access])" (click)="goto('/home/events')" tab="events" [class.active]="pathname === '/home/events'">
+      <ion-tab-button *ngIf="SessionStore.user.OwnerCalendars.length >= 1 || p.userPermission([permissionList.Gabinete.access])" (click)="goto('/home/events')" tab="events" [class.active]="ActiveTabService.pages.home">
         <!-- <ion-icon name="home"></ion-icon> -->
         <ion-icon *ngIf="!ActiveTabService.pages.home" class="nav-icon" src="assets/images/icons-nav-home.svg"></ion-icon>
         <ion-icon *ngIf="ActiveTabService.pages.home" class="nav-icon" src="assets/images/nav-hover/icons-nav-home-active.svg"></ion-icon>
         <ion-label>Início</ion-label>
       </ion-tab-button>
 
-      <ion-tab-button *ngIf="p.userPermission([permissionList.Agenda.access])" (click)="goto('/home/agenda')" tab="agenda" [class.active]="pathname === '/home/agenda' ">
+      <ion-tab-button *ngIf="p.userPermission([permissionList.Agenda.access])" (click)="goto('/home/agenda')" tab="agenda" [class.active]="ActiveTabService.pages.agenda">
         <!-- <ion-icon name="calendar"></ion-icon> -->
         <ion-icon *ngIf="!ActiveTabService.pages.agenda" class="nav-icon" src="assets/images/icons-nav-calendar.svg"></ion-icon>
         <ion-icon *ngIf="ActiveTabService.pages.agenda" class="nav-icon" src="assets/images/nav-hover/icons-nav-agenda-active.svg"></ion-icon>
         <ion-label style="margin-bottom: 2px;" class="overflow-visible">Agenda</ion-label>
       </ion-tab-button>
 
-      <ion-tab-button *ngIf="p.userPermission([permissionList.Gabinete.access])" (click)="goto('/home/gabinete-digital')" [class.active]="pathname === '/home/gabinete-digital' ">
+      <ion-tab-button *ngIf="p.userPermission([permissionList.Gabinete.access])" (click)="goto('/home/gabinete-digital')" [class.active]="ActiveTabService.pages.gabinete">
         <!-- <ion-icon name="file-tray-stacked"></ion-icon> -->
         <ion-icon *ngIf="!ActiveTabService.pages.gabinete" class="nav-icon" src="assets/images/icons-nav-gabinete-inactive.svg"></ion-icon>
         <ion-icon *ngIf="ActiveTabService.pages.gabinete" class="nav-icon" src="assets/images/nav-hover/icons-nav-gabinete-active.svg"></ion-icon>
         <ion-label>Gabinete</ion-label>
       </ion-tab-button>
 
-      <ion-tab-button *ngIf="p.userPermission([permissionList.Actions.access])" tab="publications" [class.active]="pathname === '/home/publications' ">
+      <ion-tab-button *ngIf="p.userPermission([permissionList.Actions.access])" tab="publications" [class.active]="ActiveTabService.pages.publication">
         <ion-icon *ngIf="!ActiveTabService.pages.publication" class="nav-icon" src="assets/images/icons-nav-actions.svg"></ion-icon>
         <ion-icon *ngIf="ActiveTabService.pages.publication" class="nav-icon" src="assets/images/nav-hover/icons-nav-actions-active.svg"></ion-icon>
         <ion-label style="margin-bottom: 2px;" class="overflow-visible">Acções</ion-label>
       </ion-tab-button>
 
-      <ion-tab-button *ngIf="p.userPermission([permissionList.Chat.access])" tab="chat" [class.active]="pathname === '/home/chat' ">
+      <ion-tab-button *ngIf="p.userPermission([permissionList.Chat.access])" tab="chat" [class.active]="ActiveTabService.pages.chat">
         <ion-icon *ngIf="!ActiveTabService.pages.chat" class="nav-icon" src="assets/images/icons-nav-chat-inactive.svg"></ion-icon>
         <ion-icon *ngIf="ActiveTabService.pages.chat" class="nav-icon" src="assets/images/nav-hover/icons-nav-chat-active.svg"></ion-icon>
         <ion-label>Chat</ion-label>
diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html
index 40f801f40..1be4eaaea 100644
--- a/src/app/shared/header/header.page.html
+++ b/src/app/shared/header/header.page.html
@@ -74,7 +74,7 @@
         <div class="d-flex flex-1 pr-20 pl-50" *ngIf="p.userPermissionCount([permissionList.Agenda.access, permissionList.Gabinete.access, permissionList.Actions.access, permissionList.Chat.access]) >= 2 || (p.userPermission([permissionList.Agenda.access]) &&  loggeduser.OwnerCalendars.length != 0) || p.userPermission([permissionList.Gabinete.access])">
 
           <div *ngIf="p.userPermission([permissionList.Agenda.access]) || p.userPermission([permissionList.Gabinete.access])" class="tab mr-20 d-flex align-center cursor-pointer" (click)="changeRoute('/home/events')"
-            [class.active]="locationPathname() == '/home/events'">
+            [class.active]="ActiveTabService.pages.home">
 
             <ion-icon *ngIf="ThemeService.currentTheme == 'default' || ThemeService.currentTheme == 'doneIt' " class="font-40" src='assets/images/icons-nav-home-active-black.svg'></ion-icon>
             <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-40" src='assets/images/theme/gov/icons-nav-home-active-black.svg'></ion-icon>
@@ -83,7 +83,7 @@
           </div>
 
           <div *ngIf="p.userPermission([permissionList.Agenda.access])" class="tab mr-20 d-flex align-center cursor-pointer" (click)="changeRoute('/home/agenda')"
-            [class.active]="locationPathname() == '/home/agenda'">
+            [class.active]="ActiveTabService.pages.agenda">
             <ion-icon *ngIf="ThemeService.currentTheme == 'default' || ThemeService.currentTheme == 'doneIt' " class="font-40" src='assets/images/icons-nav-agenda-inactive.svg'></ion-icon>
             <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-40" src='assets/images/theme/gov/icons-nav-agenda-inactive.svg'></ion-icon>
 
@@ -91,7 +91,7 @@
           </div>
 
           <div *ngIf="p.userPermission([permissionList.Gabinete.access])" class="tab mr-20  d-flex align-center cursor-pointer" (click)="changeRoute('/home/gabinete-digital')"
-            [class.active]="locationPathname() == '/home/gabinete-digital'">
+            [class.active]="ActiveTabService.pages.gabinete">
 
             <ion-icon *ngIf="ThemeService.currentTheme == 'default' || ThemeService.currentTheme == 'doneIt' " class="font-40" src='assets/images/icons-nav-home-dk.svg'></ion-icon>
             <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-40" src='assets/images/theme/gov/icons-nav-home-dk.svg'></ion-icon>
@@ -99,14 +99,14 @@
           </div>
 
           <div *ngIf="p.userPermission([permissionList.Actions.access])" class="tab mr-20  d-flex align-center cursor-pointer" (click)="changeRoute('/home/publications')"
-            [class.active]="locationPathname() == '/home/publications'">
+            [class.active]="ActiveTabService.pages.publication">
             <ion-icon *ngIf="ThemeService.currentTheme == 'default' || ThemeService.currentTheme == 'doneIt' " class="font-40" src='assets/images/icons-nav-a-es-inactive.svg'></ion-icon>
             <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-40" src='assets/images/theme/gov/icons-nav-a-es-inactive.svg'></ion-icon>
             <span>Acções</span>
           </div>
 
           <div *ngIf="p.userPermission([permissionList.Chat.access])" class="tab mr-20  d-flex align-center cursor-pointer" (click)="changeRoute('/home/chat')"
-            [class.active]="locationPathname() == '/home/chat'">
+            [class.active]="ActiveTabService.pages.chat">
             <ion-icon *ngIf="ThemeService.currentTheme == 'default' || ThemeService.currentTheme == 'doneIt' " class="font-40" src='assets/images/icons-nav-grupos-inactive-dk-white.svg'></ion-icon>
             <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-40" src='assets/images/theme/gov/icons-nav-grupos-inactive-dk-white.svg'></ion-icon>
             <span>Chat</span>
diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts
index 3ad89fdfe..64b5a90ee 100644
--- a/src/app/shared/header/header.page.ts
+++ b/src/app/shared/header/header.page.ts
@@ -12,7 +12,7 @@ import { RouteService } from 'src/app/services/route.service';
 import { PermissionList } from 'src/app/models/permission/permissionList';
 import { PermissionService } from 'src/app/services/permission.service';
 import { EventTrigger } from 'src/app/services/eventTrigger.service'
-/* import { Events } from 'ionic-angular' */
+import { ActiveTabService } from 'src/app/services/active-tab.service';
 
 @Component({
   selector: 'app-header',
@@ -48,6 +48,7 @@ export class HeaderPage implements OnInit {
     public RouteService: RouteService,
     public p: PermissionService,
     private eventTriger: EventTrigger,
+    public ActiveTabService: ActiveTabService
   ) {
     this.loggeduser = SessionStore.user;
     router.events.subscribe((val) => {
@@ -98,27 +99,6 @@ export class HeaderPage implements OnInit {
     }
   }
 
-  locationPathname(): string {
-    let path = window.location.pathname;
-    if(path.includes('/home/events')){
-      return '/home/events';
-    }
-    else if(path.includes('/home/agenda')){
-      return '/home/agenda';
-    }
-    else if(path.includes('/home/gabinete-digital')){
-      return '/home/gabinete-digital';
-    }
-    else if(path.includes('/home/publications')){
-      return '/home/publications';
-    }
-    else if(path.includes('/home/chat')){
-      return '/home/chat';
-    }
-    else{
-      return path;
-    }
-  }
 
   async openSearch() {
 
diff --git a/version/git-version.ts b/version/git-version.ts
index 033d12aee..80c243d51 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "468237128",
-  "SHA": "46823712867f8a5685047185c2104dd362a038cf",
+  "shortSHA": "7652db706",
+  "SHA": "7652db7063d035465e8253a47c575d53efd3d144",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Tue Feb 7 17:24:26 2023 +0100'",
-  "lastCommitMessage": "fix",
-  "lastCommitNumber": "4752",
+  "lastCommitTime": "'Wed Feb 8 09:53:21 2023 +0100'",
+  "lastCommitMessage": "activation improve",
+  "lastCommitNumber": "4753",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/home/home.page.html\n\tmodified:   src/app/home/home.page.ts\n\tnew file:   src/app/services/active-tab.service.spec.ts\n\tnew file:   src/app/services/active-tab.service.ts\n\tmodified:   src/environments/environment.ts",
+  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/home/home.page.html\n\tmodified:   src/app/shared/header/header.page.html\n\tmodified:   src/app/shared/header/header.page.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file