From fd89eb7f5b466f213c29676bd1f3dc7044d84d39 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Thu, 31 Mar 2022 15:49:13 +0100
Subject: [PATCH] save expedient

---
 .../models/permission/actions.permission.ts   |  2 +-
 .../expediente-detail.page.html               | 22 +++++++++----------
 .../gabinete-digital.page.html                | 12 +++++-----
 .../gabinete-digital/gabinete-digital.page.ts |  4 ++--
 .../group-messages/group-messages.page.ts     |  3 ---
 src/environments/environment.ts               |  9 ++++----
 6 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/src/app/models/permission/actions.permission.ts b/src/app/models/permission/actions.permission.ts
index bf4d4af1a..fcdc95e7c 100644
--- a/src/app/models/permission/actions.permission.ts
+++ b/src/app/models/permission/actions.permission.ts
@@ -1,7 +1,7 @@
 export class ActionsPermission{
   access = 534;
   create = 535;
-  remove = 536;
+  delete = 536;
   edit = 537;
   createPost = 538;
   deletePost = 539;
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
index 9d96e8231..05b4e0be8 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+++ b/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 *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>
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 71556f4dc..1717613ef 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/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>
@@ -208,7 +208,7 @@
               </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>
@@ -220,19 +220,19 @@
               <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>
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index fa90ee7a4..5634ab2ec 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/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;
diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts
index 829ce53d3..46f3658e9 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -152,9 +152,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
   }
 
   ngOnInit() {
-    console.log(this.roomId);
-    this.loggedUser = this.loggedUserChat;
-
     this.loggedUser=this.loggedUserChat;
     setTimeout(() => {
       this.getRoomInfo();
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 3fa4b4df2..c54548512 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -5,11 +5,12 @@
 export const environment = {
   production: false,
   //apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
+  apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
+  apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket',
+
   apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
-  /* apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
-  apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket', */
-  apiChatUrl: 'https://www.tabularium.pt/api/v1/',
-  apiWsChatUrl: 'wss://www.tabularium.pt/websocket',
+ /*  apiChatUrl: 'https://www.tabularium.pt/api/v1/',
+  apiWsChatUrl: 'wss://www.tabularium.pt/websocket', */
   /* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */
   domain: 'gabinetedigital.local', //gabinetedigital.local
   defaultuser: 'paulo.pinto@gabinetedigital.local',//paulo.pinto paulo.pinto@gabinetedigital.local