packed installed

src/app/pages/agenda/agenda-routing.module.ts

@@ -1,42 +1,46 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-
-import { AgendaPage } from './agenda.page';
-
-const routes: Routes = [
-  {
-    path: '',
-    component: AgendaPage
-  },
-  {
-    path: 'approve-event-modal',
-    loadChildren: () => import('../gabinete-digital/event-list/approve-event-modal/approve-event-modal.module').then( m => m.ApproveEventModalPageModule)
-  },
-  {
-    path: 'event-actions-popover',
-    loadChildren: () => import('./event-actions-popover/event-actions-popover.module').then( m => m.EventActionsPopoverPageModule)
-  },
-  {
-    path: 'emend-message-modal',
-    loadChildren: () => import('./emend-message-modal/emend-message-modal.module').then( m => m.EmendMessageModalPageModule)
-  },
-  {
-    path: 'new-event',
-    loadChildren: () => import('./new-event/new-event.module').then( m => m.NewEventPageModule)
-  },
-  {
-    path: 'edit-event',
-    loadChildren: () => import('./edit-event/edit-event.module').then( m => m.EditEventPageModule)
-  },
-  {
-    path: 'view-event',
-    loadChildren: () => import('./view-event/view-event.module').then( m => m.ViewEventPageModule)
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { AgendaPage } from './agenda.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: AgendaPage
+  },
+  {
+    path: 'approve-event-modal',
+    loadChildren: () => import('../gabinete-digital/event-list/approve-event-modal/approve-event-modal.module').then( m => m.ApproveEventModalPageModule)
+  },
+  {
+    path: 'event-actions-popover',
+    loadChildren: () => import('./event-actions-popover/event-actions-popover.module').then( m => m.EventActionsPopoverPageModule)
+  },
+  {
+    path: 'emend-message-modal',
+    loadChildren: () => import('./emend-message-modal/emend-message-modal.module').then( m => m.EmendMessageModalPageModule)
+  },
+  {
+    path: 'new-event',
+    loadChildren: () => import('./new-event/new-event.module').then( m => m.NewEventPageModule)
+  },
+  {
+    path: 'edit-event',
+    loadChildren: () => import('./edit-event/edit-event.module').then( m => m.EditEventPageModule)
+  },
+  {
+    path: 'view-event',
+    loadChildren: () => import('./view-event/view-event.module').then( m => m.ViewEventPageModule)
+  },
+  {
+    path: 'evandre',
     loadChildren: () => import('./evandre/evandre.module').then( m => m.EvandrePageModule)
   }
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
-export class AgendaPageRoutingModule {}
+
+
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})

src/app/pages/agenda/evandre/evandre-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { EvandrePage } from './evandre.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: EvandrePage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class EvandrePageRoutingModule {}

src/app/pages/agenda/evandre/evandre.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { EvandrePageRoutingModule } from './evandre-routing.module';
+
+import { EvandrePage } from './evandre.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    EvandrePageRoutingModule
+  ],
+  declarations: [EvandrePage]
+})
+export class EvandrePageModule {}

src/app/pages/agenda/evandre/evandre.page.html

@@ -0,0 +1,9 @@
+<ion-header>
+  <ion-toolbar>
+    <ion-title>evandre</ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content>
+
+</ion-content>

src/app/pages/agenda/evandre/evandre.page.spec.ts

@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { EvandrePage } from './evandre.page';
+
+describe('EvandrePage', () => {
+  let component: EvandrePage;
+  let fixture: ComponentFixture<EvandrePage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ EvandrePage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(EvandrePage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/pages/agenda/evandre/evandre.page.ts

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-evandre',
+  templateUrl: './evandre.page.html',
+  styleUrls: ['./evandre.page.scss'],
+})
+export class EvandrePage implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

src/app/pages/chat/messages/messages.page.ts

@@ -42,9 +42,10 @@ import { FileToBase64Service } from 'src/app/services/file/file-to-base64.servic
 import { Camera, CameraResultType, CameraSource } from '@capacitor/camera';
 import { Plugins, Capacitor } from '@capacitor/core';
 import { MultipleDocumentsPicker } from '@awesome-cordova-plugins/multiple-document-picker/ngx';
-import { DomSanitizer} from '@angular/platform-browser';
+import { DomSanitizer } from '@angular/platform-browser';
 import { StringDecoder } from 'string_decoder';
-import { File } from '@ionic-native/file/ngx'; 
+import { File } from '@awesome-cordova-plugins/file/ngx';
+import { FileOpener } from '@awesome-cordova-plugins/file-opener/ngx';
 
 
 const IMAGE_DIR = 'stored-images';
@@ -91,8 +92,8 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
   allowTyping = true;
   storedFileNames = [];
   lastAudioRecorded = '';
-  audioRecorded:any = "";
-  audioDownloaded:any = "";
+  audioRecorded: any = "";
+  audioDownloaded: any = "";
   durationDisplay = '';
   duration = 0;
   @ViewChild('recordbtn', { read: ElementRef }) recordBtn: ElementRef;
@@ -103,7 +104,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
   @ViewChild('filechooser') fileChooserElementRef: ElementRef;
   //items: File[] = [];
   fileSelected?: Blob;
-  pdfUrl?:string;
+  pdfUrl?: string;
   base64File: string;
   downloadProgess: number;
 
@@ -134,7 +135,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     private multipleDocumentsPicker: MultipleDocumentsPicker,
     private sant: DomSanitizer,
     private file: File,
-    //private fileOpener: FileOpener,
+    private fileOpener: FileOpener,
     private sanitiser: DomSanitizer,
   ) {
     this.loggedUser = authService.ValidatedUserChat['data'];
@@ -222,16 +223,16 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     try {
       this.storage.get('recordData').then((recordData) => {
         console.log(recordData);
-        if(recordData?.value?.recordDataBase64.includes('data:audio')){
+        if (recordData?.value?.recordDataBase64.includes('data:audio')) {
           this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(recordData?.value?.recordDataBase64);
         }
-        else{
+        else {
           this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(`data:${recordData.value.mimeType};base64,${recordData?.value?.recordDataBase64}`);
         }
       });
-    } catch (error) {}
+    } catch (error) { }
+
 
-    
   }
 
   startRecording() {
@@ -242,8 +243,8 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     }
     this.recording = true;
     VoiceRecorder.startRecording()
-    .then((result: GenericResponse) => console.log(result.value))
-    .catch(error => console.log(error));
+      .then((result: GenericResponse) => console.log(result.value))
+      .catch(error => console.log(error));
     this.calculateDuration();
   }
 
@@ -263,8 +264,8 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
         //console.log(recordData);
         const fileName = new Date().getTime() + ".mp3";
         //Save file
-        this.storage.set('fileName',fileName);
-        this.storage.set('recordData',result).then(() => {
+        this.storage.set('fileName', fileName);
+        this.storage.set('recordData', result).then(() => {
           console.log('Audio recorded saved');
         })
       }
@@ -274,7 +275,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     }, 1000);
   }
 
-  async deleteRecording(){
+  async deleteRecording() {
     this.storage.remove('fileName');
     this.storage.remove('recordData');
 
@@ -393,17 +394,17 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     var byteArrays = new Array(slicesCount);
 
     for (var sliceIndex = 0; sliceIndex < slicesCount; ++sliceIndex) {
-        var begin = sliceIndex * sliceSize;
-        var end = Math.min(begin + sliceSize, bytesLength);
+      var begin = sliceIndex * sliceSize;
+      var end = Math.min(begin + sliceSize, bytesLength);
 
-        var bytes = new Array(end - begin);
-        for (var offset = begin, i = 0; offset < end; ++i, ++offset) {
-            bytes[i] = byteCharacters[offset].charCodeAt(0);
-        }
-        byteArrays[sliceIndex] = new Uint8Array(bytes);
+      var bytes = new Array(end - begin);
+      for (var offset = begin, i = 0; offset < end; ++i, ++offset) {
+        bytes[i] = byteCharacters[offset].charCodeAt(0);
+      }
+      byteArrays[sliceIndex] = new Uint8Array(bytes);
     }
     return new Blob(byteArrays, { type: contentType });
-}
+  }
 
   async sendAudio(fileName) {
     const roomId = this.roomId
@@ -411,37 +412,37 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     this.storage.get('recordData').then((recordData) => {
 
       audioFile = recordData;
-      if(recordData?.value?.recordDataBase64.includes('data:audio')){
+      if (recordData?.value?.recordDataBase64.includes('data:audio')) {
         this.audioRecorded = recordData?.value?.recordDataBase64;
       }
-      else{
+      else {
         this.audioRecorded = `data:${recordData.value.mimeType};base64,${recordData?.value?.recordDataBase64}`;
       }
 
       console.log(this.audioRecorded);
 
-    //Converting base64 to blob
-    const encodedData = btoa(this.audioRecorded);
-    const blob =  this.base64toBlob(encodedData, recordData.value.mimeType)
-    console.log(blob)
-    const formData = new FormData();
-    formData.append("blobFile", blob);
+      //Converting base64 to blob
+      const encodedData = btoa(this.audioRecorded);
+      const blob = this.base64toBlob(encodedData, recordData.value.mimeType)
+      console.log(blob)
+      const formData = new FormData();
+      formData.append("blobFile", blob);
 
-    this.wsChatMethodsService.getDmRoom(roomId).send({
-      file: {
-        "type": "application/audio",
-        "msDuration":audioFile.value.msDuration,
-        "mimeType":audioFile.value.mimeType,
-      },
-      attachments: [{
-        "title": fileName ,
-        "title_link_download": true,
-        "type": "audio"
-      }],
-      temporaryData: formData
-    })
+      this.wsChatMethodsService.getDmRoom(roomId).send({
+        file: {
+          "type": "application/audio",
+          "msDuration": audioFile.value.msDuration,
+          "mimeType": audioFile.value.mimeType,
+        },
+        attachments: [{
+          "title": fileName,
+          "title_link_download": true,
+          "type": "audio"
+        }],
+        temporaryData: formData
+      })
 
-  });
+    });
     this.deleteRecording();
   }
 
@@ -767,63 +768,63 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     const fileReader = new FileReader();
     const zoneOriginalInstance = (fileReader as any)["__zone_symbol__originalInstance"];
     return zoneOriginalInstance || fileReader;
-}
+  }
 
   async addFileToChat(types: typeof FileType[]) {
 
-       /*  this.multipleDocumentsPicker.pick(2)
-          .then(async (res: any) => {
-            this.files = JSON.parse(res)
-            console.log('1 Add file', this.files[0].uri)
-            console.log('1 Add file', JSON.stringify(this.files[0].uri))
-            
-             
+    /*  this.multipleDocumentsPicker.pick(2)
+       .then(async (res: any) => {
+         this.files = JSON.parse(res)
+         console.log('1 Add file', this.files[0].uri)
+         console.log('1 Add file', JSON.stringify(this.files[0].uri))
+         
+          
 
-             const downloadPath = (
-              this.platform.is('android')
-           ) ? this.file.externalDataDirectory : this.file.documentsDirectory;
+          const downloadPath = (
+           this.platform.is('android')
+        ) ? this.file.externalDataDirectory : this.file.documentsDirectory;
  
-            this.file.writeFile(downloadPath, 'YHaaa2.pdf', 'Eudes Inácio').then((fil)=> {
-             console.log('write file', fil)
-           })  
-            
-            
-           this.fileToBase64('GS_FOLHETO_AUTOMOVEL_AC.pdf',this.files[0].uri).then(
-            (data) => console.log(data)
-          );
-            
-    
-            const blob = new Blob([res])
-            console.log('Add Blob file', blob)
-    
-            const formData = new FormData();
-            formData.append("blobFile", blob);
-            console.log(formData)
-    
-            this.wsChatMethodsService.getDmRoom(this.roomId).send({
-              file: {
-                "type": 'application/pdf',
-                "guid": '',
-              },
-              attachments: [{
-                "title": 'pdf1',
-                "name": 'pdf1',
-                // "text": "description",
-                "title_link_download": false,
-              }],
-              temporaryData: formData
-            })
-          })
-          .catch((error: any) => console.error(error));  */
+         this.file.writeFile(downloadPath, 'YHaaa2.pdf', 'Eudes Inácio').then((fil)=> {
+          console.log('write file', fil)
+        })  
+         
+         
+        this.fileToBase64('GS_FOLHETO_AUTOMOVEL_AC.pdf',this.files[0].uri).then(
+         (data) => console.log(data)
+       );
+         
+ 
+         const blob = new Blob([res])
+         console.log('Add Blob file', blob)
+ 
+         const formData = new FormData();
+         formData.append("blobFile", blob);
+         console.log(formData)
+ 
+         this.wsChatMethodsService.getDmRoom(this.roomId).send({
+           file: {
+             "type": 'application/pdf',
+             "guid": '',
+           },
+           attachments: [{
+             "title": 'pdf1',
+             "name": 'pdf1',
+             // "text": "description",
+             "title_link_download": false,
+           }],
+           temporaryData: formData
+         })
+       })
+       .catch((error: any) => console.error(error));  */
 
-     const roomId = this.roomId
+    const roomId = this.roomId
 
     const file: any = await this.fileService.getFileFromDevice(types);
-     
+
     console.log('Add file', JSON.stringify(await this.getBase64(file)))
 
-    const encodedData = btoa(JSON.stringify( await this.getBase64(file)));
-    const blob =  this.base64toBlob(encodedData, 'application/pdf')
+    const encodedData = btoa(JSON.stringify(await this.getBase64(file)));
+    const blob = this.base64toBlob(encodedData, 'application/pdf')
     console.log('Add Blob file', blob)
     //console.log('Add Blob file', await this.blobToBase64(blob))
     //console.log('Add Blob file', await this.fileToByteArray(file))
@@ -846,7 +847,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
         "title_link_download": false,
       }],
       temporaryData: formData
-    }); 
+    });
 
 
 
@@ -863,26 +864,26 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
         console.log('Error: ', error);
       };
     });
-    
- }
+
+  }
 
   fileToByteArray(file) {
     return new Promise((resolve, reject) => {
-        try {
-            let reader = this.getFileReader();
-            //var file = new File([filepath], filename);
-            reader.readAsBinaryString(file);
-            reader.onloadend = (evt) => {
-              console.log(evt.target.result)
-              resolve(evt.target.result);         // Convert data to base64
-            reader.readAsDataURL(file); 
-            }
+      try {
+        let reader = this.getFileReader();
+        //var file = new File([filepath], filename);
+        reader.readAsBinaryString(file);
+        reader.onloadend = (evt) => {
+          console.log(evt.target.result)
+          resolve(evt.target.result);         // Convert data to base64
+          reader.readAsDataURL(file);
         }
-        catch (e) {
-            reject(e);
-        } 
+      }
+      catch (e) {
+        reject(e);
+      }
     })
-}
+  }
 
   blobToBase64 = blob => {
     const reader = this.getFileReader();
@@ -1008,10 +1009,10 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
 
   }
 
- /*  testeDownload(msg: MessageService) {
-    this.downloadFile = "";
-    this.AttachmentsService.downloadFileAndStore(msg.file.guid);
-  } */
+  /*  testeDownload(msg: MessageService) {
+     this.downloadFile = "";
+     this.AttachmentsService.downloadFileAndStore(msg.file.guid);
+   } */
 
 
   downloadFileMsg(msg: MessageService) {
@@ -1062,6 +1063,46 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     return window.btoa(binary);
   }
 
+  b64toBlob(b64Data, contentType, sliceSize) {
+    contentType = contentType || '';
+    sliceSize = sliceSize || 512;
+    var byteCharacters = atob(b64Data);
+    var byteArrays = [];
+    for (var offset = 0; offset < byteCharacters.length; offset += sliceSize) {
+      var slice = byteCharacters.slice(offset, offset + sliceSize);
+      var byteNumbers = new Array(slice.length);
+      for (var i = 0; i < slice.length; i++) {
+        byteNumbers[i] = slice.charCodeAt(i);
+      }
+      var byteArray = new Uint8Array(byteNumbers);
+      byteArrays.push(byteArray);
+    }
+    var blob = new Blob(byteArrays, { type: contentType });
+    return blob;
+  }
+
+  getUserDataSheet(pdfString) {
+    const blob = this.b64toBlob(pdfString, 'application/pdf', 512)
+    let pathFile = ''
+    const fileName = 'myPdf.pdf'
+    const contentFile = blob
+    if (this.platform.is('ios')) {
+      pathFile = this.file.documentsDirectory
+    } else {
+      pathFile = this.file.externalRootDirectory
+    }
+    this.file
+      .writeFile(pathFile, fileName, contentFile, { replace: true })
+      .then(success => {
+        this.fileOpener
+          .open(pathFile + fileName, 'application/pdf')
+          .then(() => console.log('File is opened'))
+          .catch(e => console.log('Error opening file', e));
+      })
+      .catch(e => console.log('Error writing file', e))
+  }
+
+
   async openPreview(msg) {
     console.log(msg);
 
@@ -1070,20 +1111,10 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
       //this.testDownlod(msg)
 
     } else {
-      /* var str = msg.attachments[0].image_url;
-      str = str.substring(1, ((str.length) - 1)); */
+      var str = msg.attachments[0].image_url;
+      str = str.substring(1, ((str.length) - 1));
 
-      const modal = await this.modalController.create({
-        component: ViewMediaPage,
-        cssClass: 'modal modal-desktop',
-        componentProps: {
-          image: msg.attachments[0].image_url,
-          type: msg.file.type,
-          username: msg.u.name,
-          _updatedAt: msg._updatedAt
-        }
-      });
-      modal.present();
+      this.getUserDataSheet(str);
     }
 
   }
@@ -1092,7 +1123,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     console.log(msg);
     if (!msg.attachments[0].title_link || msg.attachments[0].title_link === null || msg.attachments[0].title_link === '') {
       this.downloadFileMsg(msg)
-    } else {}
+    } else { }
   }
 
 

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); */
@@ -213,7 +218,7 @@ export class EventsPage implements OnInit {
       let mdPessoalEvents = await this.eventService.getAllMdPessoalEvents(start, end).toPromise();
 
       const list = mdOficialEvents.concat(mdPessoalEvents);
-     
+
       this.addEventToDb(list);
       this.listToPresent = list
 

src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html

@@ -79,25 +79,25 @@
 
     <div *ngIf="task" class="aside-right flex-column  height-100 overflow-y-auto">
       <div class="buttons px-20" *ngIf="task.activityInstanceName == 'Tarefa de Despacho'">
-        <div class="option-desc"> <div>Responder ao PR</div> </div>
-        <button (click)="openAddNoteModal('Executado')" class="btn-cancel mb-0" style="margin-bottom: 0px !important;" shape="round" >Executado</button>
+        <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc"> <div>Responder ao PR</div> </div>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Executado')" class="btn-cancel mb-0" style="margin-bottom: 0px !important;" shape="round" >Executado</button>
         <!-- <div class="solid"></div> -->
-        <div class="option-desc">Reencaminhar para Área jurídica</div>
-        <button (click)="openAddNoteModal('Gerar Diploma')" class="btn-cancel" style="margin-bottom: 0px !important;" shape="round" >Gerar Diploma </button>
+        <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc">Reencaminhar para Área jurídica</div>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Gerar Diploma')" class="btn-cancel" style="margin-bottom: 0px !important;" shape="round" >Gerar Diploma </button>
         <!-- <div class="solid"></div> -->
-        <div class="option-desc">Outras opções</div>
-        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
-        <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
-        <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
-        <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+        <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc">Outras opções</div>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
+        <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
         <!-- <div class="solid"></div> -->
-        <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks]) && task.Status != 'Pending'" (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
       </div>
       <div class="buttons px-20" *ngIf="task.activityInstanceName == 'Concluir Despacho'">
-        <button (click)="openAddNoteModal('Concluido')" class="btn-cancel" shape="round" >Marcar como Concluído</button>
-        <button (click)="openAddNoteModal('Reexecução')" class="btn-cancel" shape="round" >Enviar para Reexecução</button>
-        <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
-        <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openAddNoteModal('Concluido')" class="btn-cancel" shape="round" >Marcar como Concluído</button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openAddNoteModal('Reexecução')" class="btn-cancel" shape="round" >Enviar para Reexecução</button>
+        <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks]) && task.Status != 'Pending'" (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
       </div>
     </div>
 

src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts

@@ -24,6 +24,7 @@ import { SqliteService } from 'src/app/services/sqlite.service';
 import { BackgroundService } from 'src/app/services/background.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { RouteService } from 'src/app/services/route.service';
+import { PermissionService } from 'src/app/services/permission.service';
 
 @Component({
   selector: 'app-despacho-pr',
@@ -45,7 +46,8 @@ export class DespachoPrPage implements OnInit {
   intervenientes: any;
   cc: any = [];
 
-  constructor(private activateRoute: ActivatedRoute,
+  constructor(
+    private activateRoute: ActivatedRoute,
     private processes: ProcessesService,
     private iab: InAppBrowser,
     private attachmentsService: AttachmentsService,
@@ -62,7 +64,8 @@ export class DespachoPrPage implements OnInit {
     private backgroundservice: BackgroundService,
     private platform: Platform,
     public ThemeService: ThemeService,
-    private RouteService: RouteService
+    private RouteService: RouteService,
+    public p: PermissionService,
   ) {
     this.activatedRoute.paramMap.subscribe(params => {
       if (params["params"].SerialNumber) {

src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html

@@ -14,7 +14,7 @@
           <div class="middle d-flex align-center flex-grow-1">
             <ion-label class="title">{{ task.Folio}}</ion-label>
           </div>
-          <div class="div-icon" (click)="openOptions()">
+          <div class="div-icon" (click)="openOptions()" *ngIf="p.userPermission([p.permissionList.Agenda.access])">
             <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
             <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
           </div>
@@ -96,7 +96,7 @@
         <div class="solid"></div>
         <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
-        <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+        <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
         <div class="solid"></div>
         <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
       </div>
@@ -106,7 +106,7 @@
         <div class="solid"></div>
         <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
-        <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+        <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
         <div class="solid"></div>
         <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
       </div>
@@ -115,7 +115,7 @@
         <div class="solid"></div>
         <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
-        <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+        <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
         <div class="solid"></div>
         <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
         <button (click)="openAddNoteModal('Reexecução')" class="btn-cancel" shape="round" >Enviar para Reexecução</button>

src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts

@@ -63,7 +63,7 @@ export class DespachoPage implements OnInit {
     private sqliteservice: SqliteService,
     private platform: Platform,
     private backgroundservice: BackgroundService,
-    public ThemeService: ThemeService
+    public ThemeService: ThemeService,
 
 
   ) {

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html

@@ -90,26 +90,26 @@
       </div>
     </div>
 
-    <div *ngIf="task && !p.userRole(['PR'])" class="aside-right flex-column height-100 overflow-y-auto">
+    <div class="aside-right flex-column height-100 overflow-y-auto">
       <div class="buttons">
-        <div class="option-desc"> <div>Enviar para o PR</div> </div>
-        <button (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Avaliação Superior</button>
-        <div class="option-desc"> <div>Solicitar revisão</div> </div>
-        <button (click)="openAddNoteModal('Revisão')" class="btn-cancel" shape="round" >Mandar para Revisão</button>
-        <div class="option-desc"> <div>Outras opções</div> </div>
+        <div *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="option-desc"> <div>Enviar para o PR</div> </div>
+        <button *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Avaliação Superior</button>
+        <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc"> <div>Solicitar revisão</div> </div>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Revisão')" class="btn-cancel" shape="round" >Mandar para Revisão</button>
+        <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks]) || p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="option-desc"> <div>Outras opções</div> </div>
         <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
-        <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
-        <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
-        <button *ngIf="!p.userRole(['PR'])" (click)="attachDocument()" class="btn-cancel" shape="round" >Anexar Documentos</button>
+        <button (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
+        <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="attachDocument()" class="btn-cancel" shape="round" >Anexar Documentos</button>
         <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
         <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" full class="btn-cancel" shape="round"  >Enviar para pendentes</button>
-        <button (click)="openNewGroupPage()" class="btn-cancel" shape="round" >Iniciar Conversa</button>
+        <button *ngIf="p.userPermission([p.permissionList.Chat.access])" (click)="openNewGroupPage()" class="btn-cancel" shape="round" >Iniciar Conversa</button>
         <div class="solid"></div>
       </div>
     </div>
 
-    <div *ngIf="task && p.userRole(['PR'])" class="aside-right flex-column height-100 overflow-y-auto">
+    <!-- <div *ngIf="task && p.userRole(['PR'])" class="aside-right flex-column height-100 overflow-y-auto">
 
       <div class="buttons">
         <button (click)="openExpedientActionsModal('0', fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
@@ -123,7 +123,7 @@
         <button hidden class="btn-cancel" shape="round" >Delegar</button>
       </div>
 
-    </div>
+    </div> -->
 
   </div>
 </ion-content>

src/app/pages/gabinete-digital/gabinete-digital.page.html

@@ -101,7 +101,7 @@
               <p class="text-center exp-card-content">{{ allProcessesList.length }} <span class="title1">Documentos</span></p>
             </div>
 
-            <div (click)="openEventsToApprovePage();selectedElement='approval'" [class.active]="selectedElement == 'approval'"  class="box-hover exp-card d-flex flex-column" *ngIf="loggeduser.Profile == 'MDGPR'" >
+            <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openEventsToApprovePage();selectedElement='approval'" [class.active]="selectedElement == 'approval'"  class="box-hover exp-card d-flex flex-column">
               <div class="d-flex justify-center">
                 <ion-icon  src="assets/images/icons-agenda.svg"></ion-icon>
               </div>
@@ -128,24 +128,24 @@
                 <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'Pending'" src="assets/images/theme/gov/icons-expediente-pendente-hover.svg"></ion-icon>
                 <ion-icon  *ngIf="ThemeService.currentTheme == 'tribunal' && selectedElement != 'Pending'" src="assets/images/theme/gov/icons-expediente-pendente.svg"></ion-icon>
               </div>
-              <p *ngIf="loggeduser.Profile == 'MDGPR'" class="text-center exp-card-title ">Pendentes</p>
-              <p *ngIf="loggeduser.Profile == 'PR'" class="text-center exp-card-title ">Meus Pendentes</p>
+              <p *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="text-center exp-card-title ">Pendentes</p>
+              <p *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="text-center exp-card-title ">Meus Pendentes</p>
               <p class="text-center exp-card-content"><span class="number">{{pendentesstore.count}} </span> <span class="title1">Documentos</span></p>
             </div>
 
-            <div *ngIf="loggeduser.Profile == 'PR'" (click)="openDespachosPrPage(); selectedElement='DispatchesPr'" [class.active]="selectedElement == 'DispatchesPr'" class="box-hover exp-card d-md-flex flex-column justify-center" >
+            <div *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks]) || p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openDespachosPrPage(); selectedElement='DispatchesPr'" [class.active]="selectedElement == 'DispatchesPr'" class="box-hover exp-card d-md-flex flex-column justify-center" >
               <div class="d-flex justify-center">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-despachos-presidente.svg"></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'DispatchesPr'"  src="assets/images/theme/gov/icons-despachos-presidente.svg"></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'DispatchesPr'"  src="assets/images/theme/gov/icons-despachos-presidente-hover.svg"></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' && selectedElement != 'DispatchesPr'"  src="assets/images/theme/gov/icons-despachos-presidente.svg"></ion-icon>
               </div>
-              <p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'MDGPR'">Despacho do Presidente da República</p>
-              <p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'PR'">Despachos criados por mim</p>
+              <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])">Despacho do Presidente da República</p>
+              <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])">Despachos criados por mim</p>
               <p class="text-center exp-card-content">{{ despachoprstore.count }} <span class="title1">Documentos</span> </p>
             </div>
 
-            <div [class.active]="selectedElement == 'Dispatches'" class="box-hover exp-card d-flex flex-column justify-center" (click)="openDespachosPage(); selectedElement='Dispatches'" *ngIf="loggeduser.Profile == 'MDGPR'">
+            <div *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])" [class.active]="selectedElement == 'Dispatches'" class="box-hover exp-card d-flex flex-column justify-center" (click)="openDespachosPage(); selectedElement='Dispatches'">
               <div class="d-flex justify-center">
                 <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-despachos-presidente.svg"></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'Dispatches'"  src="assets/images/theme/gov/icons-despachos-presidente.svg"></ion-icon>
@@ -163,8 +163,8 @@
                 <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'RequestsForOpinion'" src="assets/images/theme/gov/icons-expediente-parecer-hover.svg"></ion-icon>
                 <ion-icon  *ngIf="ThemeService.currentTheme == 'tribunal' && selectedElement != 'RequestsForOpinion' " src="assets/images/theme/gov/icons-expediente-parecer.svg"></ion-icon>
               </div>
-              <p *ngIf="loggeduser.Profile == 'MDGPR'" class="text-center exp-card-title ">Pedidos de Parecer</p>
-              <p *ngIf="loggeduser.Profile == 'PR'" class="text-center exp-card-title ">Pedidos de Parecer solicitados por mim</p>
+              <p *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="text-center exp-card-title ">Pedidos de Parecer</p>
+              <p *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="text-center exp-card-title ">Pedidos de Parecer solicitados por mim</p>
               <p class="text-center exp-card-content">{{pedidosstore.countparecer}} <span class="title1">Documentos</span></p>
             </div>
 
@@ -193,7 +193,7 @@
               </div>
             </div> -->
 
-            <div *ngIf="loggeduser.Profile == 'MDGPR'" (click)="openDespachosPrPage(); selectedElement='showDespachosPr'" [class.active]="selectedElement == 'showDespachosPr'" class="box-hover exp-card-long width-100 d-flex flex-column justify-center">
+            <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openDespachosPrPage(); selectedElement='showDespachosPr'" [class.active]="selectedElement == 'showDespachosPr'" class="box-hover exp-card-long width-100 d-flex flex-column justify-center">
               <div class="center-div">
                 <div class="exp-card-icon">
                   <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-despachos-presidente.svg"></ion-icon>
@@ -208,31 +208,31 @@
               </div>
             </div>
 
-            <div *ngIf="loggeduser.Profile == 'MDGPR'" (click)="openDiplomasPage('validar'); selectedElement='DiplomasPorValidar'" [class.active]="selectedElement == 'DiplomasPorValidar'" class="box-hover exp-card d-flex flex-column justify-center">
+            <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openDiplomasPage('validar'); selectedElement='DiplomasPorValidar'" [class.active]="selectedElement == 'DiplomasPorValidar'" class="box-hover exp-card d-flex flex-column justify-center">
               <div class="d-flex justify-center">
                 <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-diploma.svg"></ion-icon>
                 <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'DiplomasPorValidar' " src="assets/images/theme/gov/icons-expediente-diploma.svg"></ion-icon>
                 <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'DiplomasPorValidar' " src="assets/images/theme/gov/icons-expediente-diploma-hover.svg"></ion-icon>
                 <ion-icon  *ngIf="ThemeService.currentTheme == 'tribunal' && selectedElement != 'DiplomasPorValidar' " src="assets/images/theme/gov/icons-expediente-diploma.svg"></ion-icon>
               </div>
-              <p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'MDGPR' ">Diplomas por Validar</p>
-              <p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'PR'">Diplomas por Assinar</p>
+              <p class="text-center exp-card-title " *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])">Diplomas por Validar</p>
+              <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])">Diplomas por Assinar</p>
               <p class="text-center exp-card-content">{{ deplomasStore.deplomasReviewCount }} <span class="title1">Documentos</span> </p>
             </div>
 
-            <div *ngIf="loggeduser.Profile == 'MDGPR'" (click)="openDiplomasPage('assinados'); selectedElement='DiplomasAssinados'" [class.active]="selectedElement == 'DiplomasAssinados'" class="box-hover exp-card d-flex flex-column justify-center">
+            <div (click)="openDiplomasPage('assinados'); selectedElement='DiplomasAssinados'" [class.active]="selectedElement == 'DiplomasAssinados'" class="box-hover exp-card d-flex flex-column justify-center">
               <div class="d-flex justify-center">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-diplomas-assinados-presidente.svg"></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'DiplomasAssinados'"  src="assets/images/theme/gov/icons-diplomas-assinados-presidente.svg"></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'DiplomasAssinados'"  src="assets/images/theme/gov/icons-diplomas-assinados-presidente-hover.svg"></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' && selectedElement != 'DiplomasAssinados'"  src="assets/images/theme/gov/icons-diplomas-assinados-presidente.svg"></ion-icon>
               </div>
-              <p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'MDGPR'">Diplomas assinados PR</p>
-              <p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'PR'" >Diplomas</p>
+              <p class="text-center exp-card-title " *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])">Diplomas assinados PR</p>
+              <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" >Diplomas</p>
               <p class="text-center exp-card-content">{{ deplomasStore.countDiplomasAssinadoListCount }} <span class="title1">Documentos</span></p>
             </div>
 
-            <div *ngIf="loggeduser.Profile == 'PR'" (click)="openDiplomasAssinarPage(); selectedElement='DiplomasAssinar'" [class.active]="selectedElement == 'DiplomasAssinar'" class="box-hover exp-card d-flex flex-column justify-center">
+            <div *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openDiplomasAssinarPage(); selectedElement='DiplomasAssinar'" [class.active]="selectedElement == 'DiplomasAssinar'" class="box-hover exp-card d-flex flex-column justify-center">
               <div class="d-flex justify-center">
                 <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-diploma.svg"></ion-icon>
                 <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'DiplomasAssinar' " src="assets/images/theme/gov/icons-expediente-diploma.svg"></ion-icon>

src/app/pages/gabinete-digital/gabinete-digital.page.ts

@@ -128,7 +128,6 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
     private activatedRoute: ActivatedRoute,
     private router: Router,
     authService: AuthService,
-    public p: PermissionService,
     public waitForDomService: WaitForDomService,
     //private notificationsService: NotificationsService,
     private despachoRule: DespachoService,
@@ -139,7 +138,8 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
     public ThemeService: ThemeService,
     private sortService: SortService,
     private dataService: DataService,
-    private storage: Storage
+    private storage: Storage,
+    public p: PermissionService,
   ) {
 
     this.loggeduser = authService.ValidatedUser;

src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html

@@ -89,7 +89,7 @@
           <button *ngIf="p.userRole(['MDGPR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
           <button *ngIf="p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
           <button *ngIf="loggeduser.Profile == 'MDGPR'" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
-          <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+          <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
           <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
         </div>
         <div class="buttons" *ngIf="task.activityInstanceName == 'Reapreciar Deferimento'">
@@ -99,7 +99,7 @@
           <button *ngIf="p.userRole(['MDGPR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
           <button *ngIf="p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
           <button *ngIf="loggeduser.Profile == 'MDGPR'" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
-          <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+          <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
           <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
         </div>
         <div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Deferimento'">
@@ -110,14 +110,14 @@
           <button *ngIf="p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
           <button hidden (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
           <button (click)="openAddNoteModal('Solicitar Reapreciação')" class="btn-cancel" shape="round" >Solicitar Reapreciação</button>
-          <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+          <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
           <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
         </div>
       </div>
       <div *ngIf="task.WorkflowName == 'Pedido de Parecer' || task.WorkflowName == 'Pedido de Parecer do Presidente'">
         <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Parecer'">
           <button (click)="openDarParecer(task)" class="btn-cancel" shape="round" >Dar o meu Parecer</button>
-          <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+          <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
           <button *ngIf="task.WorkflowName == 'Pedido de Parecer do Presidente'" (click)="openForwardModal(task)" class="btn-cancel" shape="round" >Reencaminhar</button>
           <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
         </div>
@@ -127,7 +127,7 @@
           <button *ngIf="p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
           <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
           <button *ngIf="loggeduser.Profile == 'MDGPR'" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
-          <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+          <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
           <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
         </div>
         <div *ngIf="task.WorkflowName == 'Pedido de Parecer do Presidente'" class="buttons">

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/pages/publications/publication-detail/publication-detail.page.html

@@ -56,12 +56,12 @@
 </ion-content>
 <ion-footer>
   <ion-toolbar class="footer-toolbar">
-    <ion-buttons slot="start">
+    <ion-buttons *ngIf="p.userPermission([p.permissionList.Actions.deletePost])" slot="start">
       <button class="btn-delete" fill="clear" color="#ffe0e0" (click)="deletePost()">
         <ion-label>Eliminar</ion-label>
       </button>
     </ion-buttons>
-    <ion-buttons slot="end">
+    <ion-buttons *ngIf="p.userPermission([p.permissionList.Actions.editPost])" slot="end">
       <button class="btn-ok" fill="clear" color="#fff" (click)="editPost('3')">
         <ion-label>Editar</ion-label>
       </button>

src/app/pages/publications/publication-detail/publication-detail.page.ts

@@ -10,6 +10,7 @@ import { SqliteService } from 'src/app/services/sqlite.service';
 import { BackgroundService } from 'src/app/services/background.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { RouteService } from 'src/app/services/route.service';
+import { PermissionService } from 'src/app/services/permission.service';
 
 @Component({
   selector: 'app-publication-detail',
@@ -31,7 +32,8 @@ export class PublicationDetailPage implements OnInit {
     private RouteService: RouteService,
     private sqliteservice: SqliteService,
     private backgroundservice: BackgroundService,
-    public ThemeService: ThemeService ) {
+    public ThemeService: ThemeService,
+    public p:PermissionService ) {
 
       this.publicationId = this.navParams.get('publicationId');
       /* this.folderId = this.navParams.get('folderIdId'); */

src/app/pages/publications/publications.page.html

@@ -25,7 +25,7 @@
               <ion-label class="title ">Acções Presidenciais</ion-label>
             </div>
             <div class="div-icon">
-              <button title="Adicionar nova ação presidencial" class="btn-no-color" (click)="AddPublicationFolder()">
+              <button *ngIf="p.userPermission([p.permissionList.Actions.create])" title="Adicionar nova ação presidencial" class="btn-no-color" (click)="AddPublicationFolder()">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="icon-only" src='assets/images/icons-add.svg'></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="icon-only" src='assets/images/theme/gov/icons-add.svg'></ion-icon>
               </button>
@@ -92,14 +92,14 @@
             </div>
           </ion-item>
           <ion-item-options class="members-options" side="end">
-            <ion-item-option class="edit-option" (click)="editAction(evento.ProcessId)">
+            <ion-item-option *ngIf="p.userPermission([p.permissionList.Actions.edit])" class="edit-option" (click)="editAction(evento.ProcessId)">
               <button class="btn-no-color">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="edit" slot="end" src="assets/images/icons-edit.svg" ></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="edit" slot="end" src="assets/images/theme/gov/icons-edit.svg" ></ion-icon>
 
               </button>
             </ion-item-option>
-            <ion-item-option class="delete-option" (click)="deleteAction(evento.ProcessId)">
+            <ion-item-option *ngIf="p.userPermission([p.permissionList.Actions.delete])" class="delete-option" (click)="deleteAction(evento.ProcessId)">
               <button class="btn-no-color">
                 <ion-icon class="delete"  name="trash-sharp"></ion-icon>
               </button>

src/app/pages/publications/publications.page.ts

@@ -15,6 +15,7 @@ import { SqliteService } from 'src/app/services/sqlite.service';
 import { BackgroundService } from 'src/app/services/background.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { Storage } from '@ionic/storage';
+import { PermissionService } from 'src/app/services/permission.service';
 
 
 @Component({
@@ -68,7 +69,8 @@ export class PublicationsPage implements OnInit {
     private backgroundservice: BackgroundService,
     private platform: Platform,
     public ThemeService: ThemeService,
-    private storage: Storage
+    private storage: Storage,
+    public p: PermissionService,
 
   ) {
     this.months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];

src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html

@@ -61,12 +61,12 @@
 
 <ion-footer>
   <ion-toolbar class="footer-toolbar">
-    <ion-buttons slot="start">
+    <ion-buttons *ngIf="p.userPermission([p.permissionList.Actions.deletePost])" slot="start">
       <button class="btn-delete" fill="clear" color="#ffe0e0" (click)="deletePost()">
         <ion-label>Eliminar</ion-label>
       </button>
     </ion-buttons>
-    <ion-buttons slot="end">
+    <ion-buttons *ngIf="p.userPermission([p.permissionList.Actions.editPost])" slot="end">
       <button class="btn-ok" fill="clear" color="#fff" (click)="editPost('3')">
         <ion-label>Editar</ion-label>
       </button>

src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts

@@ -10,6 +10,7 @@ import { Location } from '@angular/common';
 import { ThemeService } from 'src/app/services/theme.service'
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
 import { RouteService } from 'src/app/services/route.service';
+import { PermissionService } from 'src/app/services/permission.service';
 
 @Component({
   selector: 'app-publication-detail',
@@ -31,7 +32,8 @@ export class PublicationDetailPage implements OnInit {
     private activatedRoute: ActivatedRoute,
     private router: Router,
     private RouteService: RouteService,
-    public ThemeService: ThemeService
+    public ThemeService: ThemeService,
+    public p:PermissionService,
     ) {
 
       this.activatedRoute.paramMap.subscribe(params => {

src/app/pages/publications/view-publications/view-publications.page.html

@@ -15,7 +15,7 @@
         <p class="item-content-detail">{{item.Detail}}</p>
         <p class="item-content-date">{{item.DateBegin | date: 'dd-MM-yy | HH:mm'}}</p>
       </div>
-      <div class="actions-icon cursor-pointer" (click)="AddPublication('2',item.ProcessId)">
+      <div *ngIf="p.userPermission([p.permissionList.Actions.createPost])" class="actions-icon cursor-pointer" (click)="AddPublication('2',item.ProcessId)">
        <!--  <ion-icon (click)="AddPublication('1',item.ProcessId)" slot="end" src='assets/images/icons-add-photo.svg'></ion-icon> -->
         <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-add.svg'></ion-icon>
         <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-add.svg'></ion-icon>
@@ -59,10 +59,10 @@
         *ngFor="let publication of getpublication"
         (click)="goToPublicationDetail(publication.DocumentId)"
       >
-        
+
           <div  class="post-img">
             <img [defaultImage]=defaultImage [lazyLoad]="publication.FileBase64">
-         
+
           <ng-template #imageLoaded>
             <div *ngIf="publication.FileBase64.length > 30" class="post-img">
               <img [defaultImage]=defaultImage [lazyLoad]="publication.FileBase64">

src/app/pages/publications/view-publications/view-publications.page.ts

@@ -12,6 +12,7 @@ import { BackgroundService } from 'src/app/services/background.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { forkJoin } from 'rxjs';
 import { ToastService } from 'src/app/services/toast.service';
+import { PermissionService } from 'src/app/services/permission.service';
 
 @Component({
   selector: 'app-view-publications',
@@ -42,7 +43,8 @@ export class ViewPublicationsPage implements OnInit {
     private sqliteservice: SqliteService,
     private backgroundservice: BackgroundService,
     public ThemeService: ThemeService,
-    private toastService: ToastService,) {
+    private toastService: ToastService,
+    public p: PermissionService,) {
 
     this.item = new PublicationFolder();
     this.activatedRoute.paramMap.subscribe(params => {
@@ -259,7 +261,7 @@ export class ViewPublicationsPage implements OnInit {
         publicationArray.push(publicationlis);
 
       });
-      
+
       this.publicationList = publicationArray;
     })
   }