further improvements in permission

src/app/guards/inactivity.guard.ts

@@ -4,7 +4,7 @@ import { Observable } from 'rxjs';
 import { SessionStore } from '../store/session.service';
 import { AlertController, Platform } from '@ionic/angular';
 import { PermissionService } from '../services/permission.service';
-import { PermissionList } from '../models/permissionList';
+import { PermissionList } from '../models/permission/permissionList';
 
 @Injectable({
   providedIn: 'root'
@@ -24,13 +24,14 @@ export class InactivityGuard implements CanActivate {
     state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
 
       if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
-        if(this.permissionService.userPermission(this.permissionList.Agenda) || this.permissionService.userPermission(this.permissionList.Gabinete)){
+        console.log(this.permissionList);
+        if(this.permissionService.userPermission(this.permissionList.Agenda.access) || this.permissionService.userPermission(this.permissionList.Gabinete.access)){
           this.router.navigate(['/home/events']);
         }
-        else if(this.permissionService.userPermission(this.permissionList.Chat)){
+        else if(this.permissionService.userPermission(this.permissionList.Chat.access) && this.permissionService.userPermission(this.permissionList.Actions.access)){
           this.router.navigate(['/home/chat']);
         }
-        else if(this.permissionService.userPermission(this.permissionList.Actions)){
+        else if(this.permissionService.userPermission(this.permissionList.Actions.access)){
           this.router.navigate(['/home/publications']);
         }
         return false
@@ -40,13 +41,13 @@ export class InactivityGuard implements CanActivate {
         return true
       }//Mobile or Tablet without session
       else {
-        if(this.permissionService.userPermission(this.permissionList.Agenda) || this.permissionService.userPermission(this.permissionList.Gabinete)){
+        if(this.permissionService.userPermission(this.permissionList.Agenda.access) || this.permissionService.userPermission(this.permissionList.Gabinete.access)){
           this.router.navigate(['/home/events']);
         }
-        else if(this.permissionService.userPermission(this.permissionList.Chat)){
+        else if(this.permissionService.userPermission(this.permissionList.Chat.access) && this.permissionService.userPermission(this.permissionList.Actions.access)){
           this.router.navigate(['/home/chat']);
         }
-        else if(this.permissionService.userPermission(this.permissionList.Actions)){
+        else if(this.permissionService.userPermission(this.permissionList.Actions.access)){
           this.router.navigate(['/home/publications']);
         }
         return false

src/app/home/home.page.html

@@ -2,7 +2,7 @@
 <ion-tabs class="tab">
   <ion-tab-bar class="bottoms" slot="bottom">
 
-      <ion-tab-button *ngIf="p.userPermission([permissionList.Agenda]) || p.userPermission([permissionList.Gabinete])" tab="events" [class.active]="pathname === '/home/events'">
+      <ion-tab-button *ngIf="p.userPermission([permissionList.Agenda.access]) || p.userPermission([permissionList.Gabinete.access])" tab="events" [class.active]="pathname === '/home/events'">
         <!-- <ion-icon name="home"></ion-icon> -->
         <ion-icon *ngIf="pathname != '/home/events'" class="nav-icon" src="assets/images/icons-nav-home.svg"></ion-icon>
         <ion-icon *ngIf="pathname == '/home/events'" class="nav-icon" src="assets/images/nav-hover/icons-nav-home-active.svg"></ion-icon>
@@ -10,14 +10,14 @@
         <ion-label>Início</ion-label>
       </ion-tab-button>
 
-      <ion-tab-button *ngIf="p.userPermission([permissionList.Agenda])" tab="agenda" [class.active]="pathname === '/home/agenda' ">
+      <ion-tab-button *ngIf="p.userPermission([permissionList.Agenda.access])" tab="agenda" [class.active]="pathname === '/home/agenda' ">
         <!-- <ion-icon name="calendar"></ion-icon> -->
         <ion-icon *ngIf="pathname != '/home/agenda'" class="nav-icon" src="assets/images/icons-nav-calendar.svg"></ion-icon>
         <ion-icon *ngIf="pathname == '/home/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])" (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]="pathname === '/home/gabinete-digital' ">
         <!-- <ion-icon name="file-tray-stacked"></ion-icon> -->
         <ion-icon *ngIf="pathname != '/home/gabinete-digital'" class="nav-icon" src="assets/images/icons-nav-gabinete-inactive.svg"></ion-icon>
         <ion-icon *ngIf="pathname == '/home/gabinete-digital'" class="nav-icon" src="assets/images/nav-hover/icons-nav-gabinete-active.svg"></ion-icon>
@@ -26,13 +26,13 @@
         <ion-label>Gabinete</ion-label>
       </ion-tab-button>
 
-      <ion-tab-button *ngIf="p.userPermission([permissionList.Actions])" tab="publications" [class.active]="pathname === '/home/publications' ">
+      <ion-tab-button *ngIf="p.userPermission([permissionList.Actions.access])" tab="publications" [class.active]="pathname === '/home/publications' ">
         <ion-icon *ngIf="pathname != '/home/publications'" class="nav-icon" src="assets/images/icons-nav-actions.svg"></ion-icon>
         <ion-icon *ngIf="pathname == '/home/publications'" class="nav-icon" src="assets/images/nav-hover/icons-nav-actions-active.svg"></ion-icon>
         <ion-label style="margin-bottom: 2px;" class="overflow-visible">Ações</ion-label>
       </ion-tab-button>
 
-      <ion-tab-button *ngIf="p.userPermission([permissionList.Actions])" tab="chat" [class.active]="pathname === '/home/chat' ">
+      <ion-tab-button *ngIf="p.userPermission([permissionList.Chat.access])" tab="chat" [class.active]="pathname === '/home/chat' ">
         <ion-icon *ngIf="pathname != '/home/chat'" class="nav-icon" src="assets/images/icons-nav-chat-inactive.svg"></ion-icon>
         <ion-icon *ngIf="pathname == '/home/chat'" class="nav-icon" src="assets/images/nav-hover/icons-nav-chat-active.svg"></ion-icon>
         <ion-label>Chat</ion-label>

src/app/home/home.page.ts

@@ -31,7 +31,7 @@ import { environment } from 'src/environments/environment';
 import { v4 as uuidv4 } from 'uuid'
 import { NativeNotificationService } from 'src/app/services/native-notification.service';
 import { UserSession } from '../models/user.model';
-import { PermissionList } from '../models/permissionList';
+import { PermissionList } from '../models/permission/permissionList';
 
 @Component({
   selector: 'app-home',
@@ -180,6 +180,7 @@ export class HomePage implements OnInit {
 
     myWorker.postMessage('ali'); */
     this.clearTabButtonSelection();
+
   }
 
   clearTabButtonSelection(){

src/app/models/permission/actions.permission.ts

@@ -0,0 +1,9 @@
+export class ActionsPermission{
+  access = 534;
+  create = 535;
+  remove = 536;
+  edit = 537;
+  createPost = 538;
+  removePost = 539;
+  editPost = 540;
+}

src/app/models/permission/agenda-permission.ts

@@ -0,0 +1,3 @@
+export class AgendaPermission{
+  access = 530
+}

src/app/models/permission/chat-permission.ts

@@ -0,0 +1,3 @@
+export class ChatPermission{
+  access = 541;
+}

src/app/models/permission/gabinete-permission.ts

@@ -0,0 +1,5 @@
+export class GabinetePermission{
+  access = 531;
+  pr_tasks = 532;
+  md_tasks = 533;
+}

src/app/models/permission/permissionList.ts

@@ -0,0 +1,11 @@
+import { ActionsPermission } from "./actions.permission";
+import { AgendaPermission } from "./agenda-permission";
+import { ChatPermission } from "./chat-permission";
+import { GabinetePermission } from "./gabinete-permission";
+
+export class PermissionList{
+  Agenda = new AgendaPermission();
+  Gabinete = new GabinetePermission();
+  Actions = new ActionsPermission();
+  Chat = new ChatPermission();
+}

src/app/models/permissionList.ts

@@ -1,6 +0,0 @@
-export class PermissionList{
-  Agenda = 530;
-  Gabinete = 531;
-  Actions = 534;
-  Chat = 541;
-}

src/app/pages/events/events.page.html

@@ -26,7 +26,7 @@
     <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
 
     <div class="conteiner-box px-20 height-100" ng-swipe-up="swipe($event)">
-      <div class="schedule height-100">
+      <div *ngIf="p.userPermission([permissionList.Agenda.access])" class="schedule height-100">
         <div class="schedule-header">
           <div class="title">
             <ion-icon class="icon" slot="end" src="assets/images/icons-default-agenda.svg" ></ion-icon>
@@ -94,7 +94,7 @@
         </div>
       </div>
 
-      <div class="schedule height-100">
+      <div *ngIf="p.userPermission([permissionList.Gabinete.access])" class="schedule height-100">
         <div class="schedule-header">
           <div class="title">
             <ion-icon class="icon" slot="end" src="assets/images/icons-correspondencias.svg"></ion-icon>

src/app/pages/events/events.page.ts

@@ -22,6 +22,8 @@ import { BackgroundService } from 'src/app/services/background.service';
 import { momentG } from 'src/plugin/momentG';
 import { ThemeService } from 'src/app/services/theme.service'
 import { Storage } from '@ionic/storage';
+import { PermissionList } from 'src/app/models/permission/permissionList';
+import { PermissionService } from 'src/app/services/permission.service';
 @Component({
   selector: 'app-events',
   templateUrl: './events.page.html',
@@ -81,6 +83,8 @@ export class EventsPage implements OnInit {
 
   /* existingScreenOrientation: string; */
 
+  permissionList = new PermissionList();
+
   constructor(
     private eventService: EventsService,
     private router: Router,
@@ -97,7 +101,8 @@ export class EventsPage implements OnInit {
     private networkconnection: NetworkConnectionService,
     private backgroundservice: BackgroundService,
     public ThemeService: ThemeService,
-    private storage: Storage
+    private storage: Storage,
+    public p: PermissionService,
   ) {
   /*   this.existingScreenOrientation = this.screenOrientation.type;
     console.log(this.existingScreenOrientation); */

src/app/pages/login/login.page.ts

@@ -13,7 +13,7 @@ import { ThemeService } from 'src/app/services/theme.service';
 import { StorageService } from 'src/app/services/storage.service';
 import { ChatService } from 'src/app/services/chat.service';
 import { PermissionService } from 'src/app/services/permission.service';
-import { PermissionList } from 'src/app/models/permissionList';
+import { PermissionList } from 'src/app/models/permission/permissionList';
 
 @Component({
   selector: 'app-login',
@@ -148,13 +148,14 @@ export class LoginPage implements OnInit {
     if(pathName) {
       this.router.navigate([pathName]);
     } else {
-      if(this.permissionService.userPermission(this.permissionList.Agenda) || this.permissionService.userPermission(this.permissionList.Gabinete)){
+      if(this.permissionService.userPermission(this.permissionList.Agenda.access) || this.permissionService.userPermission(this.permissionList.Gabinete.access)){
         this.router.navigate(['/home/events']);
       }
-      else if(this.permissionService.userPermission(this.permissionList.Chat)){
+      else if(this.permissionService.userPermission(this.permissionList.Chat.access) && this.permissionService.userPermission(this.permissionList.Actions.access)){
         this.router.navigate(['/home/chat']);
       }
-      else if(this.permissionService.userPermission(this.permissionList.Actions)){
+      else if(this.permissionService.userPermission(this.permissionList.Actions.access)){
+        alert('here')
         this.router.navigate(['/home/publications']);
       }
     }

src/app/shared/header/header.page.html

@@ -66,7 +66,7 @@
 
         <div class="d-flex flex-1 pr-20 pl-50">
 
-          <div *ngIf="p.userPermission([permissionList.Agenda]) || p.userPermission([permissionList.Gabinete])" class="tab mr-20 d-flex align-center cursor-pointer" (click)="changeRoute('/home/events')"
+          <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'">
 
             <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-40" src='assets/images/icons-nav-home-active-black.svg'></ion-icon>
@@ -78,7 +78,7 @@
 
           <!-- *ngIf="p.userPermission([permissionList.Agenda])" -->
 
-          <div *ngIf="p.userPermission([permissionList.Agenda])" class="tab mr-20 d-flex align-center cursor-pointer" (click)="changeRoute('/home/agenda')"
+          <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'">
             <ion-icon *ngIf="ThemeService.currentTheme == 'default' " 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>
@@ -89,7 +89,7 @@
 
           <!-- *ngIf="p.userPermission([permissionList.Gabinete])" -->
 
-          <div *ngIf="p.userPermission([permissionList.Gabinete])" class="tab mr-20  d-flex align-center cursor-pointer" (click)="changeRoute('/home/gabinete-digital')"
+          <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'">
 
             <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-40" src='assets/images/icons-nav-home-dk.svg'></ion-icon>
@@ -100,7 +100,7 @@
 
           <!-- *ngIf="p.userPermission([permissionList.Actions])" -->
 
-          <div *ngIf="p.userPermission([permissionList.Actions])" class="tab mr-20  d-flex align-center cursor-pointer" (click)="changeRoute('/home/publications')"
+          <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'">
             <ion-icon *ngIf="ThemeService.currentTheme == 'default' " 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>
@@ -110,7 +110,7 @@
 
           <!-- *ngIf="p.userPermission([permissionList.Chat])" -->
 
-          <div *ngIf="p.userPermission([permissionList.Chat])" class="tab mr-20  d-flex align-center cursor-pointer" (click)="changeRoute('/home/chat')"
+          <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'">
             <ion-icon *ngIf="ThemeService.currentTheme == 'default' " 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>

src/app/shared/header/header.page.ts

@@ -11,7 +11,7 @@ import { EventTrigger } from '../../services/eventTrigger.service';
 import { ThemeService } from '../../services/theme.service';
 import { interval } from 'rxjs';
 import { RouteService } from 'src/app/services/route.service';
-import { PermissionList } from 'src/app/models/permissionList';
+import { PermissionList } from 'src/app/models/permission/permissionList';
 import { PermissionService } from 'src/app/services/permission.service';
 
 @Component({