From ecfc910508d53371bd8d64be1f98a067bbe0cd31 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 6 Aug 2021 11:46:38 +0100
Subject: [PATCH 1/2] Improve

---
 src/app/modals/document-detail/document-detail.page.html      | 4 ++--
 .../expediente/expediente-detail/expediente-detail.page.html  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/modals/document-detail/document-detail.page.html b/src/app/modals/document-detail/document-detail.page.html
index f5db52381..4d5cdfbdd 100644
--- a/src/app/modals/document-detail/document-detail.page.html
+++ b/src/app/modals/document-detail/document-detail.page.html
@@ -53,8 +53,8 @@
 
     <div *ngIf="LoadedDocument" class="aside-right flex-column height-100">
       <div class="buttons">
-        <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('0')" class="btn-ok" shape="round" >Marcar Despacho</button>
-        <button *ngIf="!p.userRole(['MDGPR'])" (click)="openExpedientActionsModal('0')" class="btn-ok" shape="round" >Efetuar Despacho</button>
+        <button *ngIf="p.userRole(['PR'])" (click)="openExpedientActionsModal('0')" class="btn-ok" shape="round" >Marcar para Despacho</button>
+        <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('0')" class="btn-ok" shape="round" >Efetuar Despacho</button>
         <div class="solid"></div>
         <button (click)="openExpedientActionsModal('0')"  class="btn-cancel" shape="round" >Solicitar Parecer</button>
         <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('2')" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
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 eb72b7b35..55427ff58 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
@@ -102,7 +102,7 @@
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
         <button (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 (click)="attachDocument()" class="btn-cancel" shape="round" >Anexar Documento <br />(Gestão Documental)</button>
+        <button (click)="attachDocument()" class="btn-cancel" shape="round" >Anexar Documentos</button>
         <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
         <div class="solid"></div>
       </div>

From 578165f2584ae61f7eefce807c1771845d86a3e4 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 6 Aug 2021 12:19:38 +0100
Subject: [PATCH 2/2] Improve profile label

---
 src/app/shared/header/header.page.html               |  2 +-
 src/app/shared/header/header.page.ts                 | 10 ++++++++++
 .../header-no-search/header-no-search.page.html      |  2 +-
 .../header-no-search/header-no-search.page.ts        | 12 ++++++++++++
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html
index 648b20441..a19797a8a 100644
--- a/src/app/shared/header/header.page.html
+++ b/src/app/shared/header/header.page.html
@@ -77,7 +77,7 @@
 
         <div class="div-profile d-flex cursor-pointer" (click)="openProfile()">
           <ion-icon class="icon" src='assets/images/icons-profile.svg'></ion-icon>
-          <ion-label class="profile-text">{{loggeduser.Profile}}</ion-label>
+          <ion-label class="profile-text">{{profileLabel(loggeduser.Profile)}}</ion-label>
         </div>
       </div>
     </div>
diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts
index 9a329fe88..774a89644 100644
--- a/src/app/shared/header/header.page.ts
+++ b/src/app/shared/header/header.page.ts
@@ -142,4 +142,14 @@ export class HeaderPage implements OnInit {
    async basicSearch() {
     window['searchTriger']()
    }
+
+   profileLabel(text) {
+    if (text == 'MDGPR') {
+      return 'MD'
+    } else if (text == 'PR') {
+      return text
+    } else {
+      return 'UN'
+    }
+  }
 }
diff --git a/src/app/shared/headers/header-no-search/header-no-search.page.html b/src/app/shared/headers/header-no-search/header-no-search.page.html
index 34bb5da6d..e4be665c1 100644
--- a/src/app/shared/headers/header-no-search/header-no-search.page.html
+++ b/src/app/shared/headers/header-no-search/header-no-search.page.html
@@ -58,7 +58,7 @@
 
         <div class="div-profile d-flex cursor-pointer" (click)="openProfile()">
           <ion-icon class="icon" src='assets/images/icons-profile.svg'></ion-icon>
-          <ion-label class="profile-text">{{loggeduser.Profile}}</ion-label>
+          <ion-label class="profile-text">{{profileLabel(loggeduser.Profile)}}</ion-label>
         </div>
       </div>
     </div>
diff --git a/src/app/shared/headers/header-no-search/header-no-search.page.ts b/src/app/shared/headers/header-no-search/header-no-search.page.ts
index 13c72f775..d3ce679c5 100644
--- a/src/app/shared/headers/header-no-search/header-no-search.page.ts
+++ b/src/app/shared/headers/header-no-search/header-no-search.page.ts
@@ -72,4 +72,16 @@ export class HeaderNoSearchPage implements OnInit {
   locationPathname(): string {
     return window.location.pathname
   }
+
+
+  profileLabel(text) {
+    if (text == 'MDGPR') {
+      return 'MD'
+    } else if (text=='PR') {
+      return text
+    } else {
+      return 'UN'
+    }
+  }
+
 }