From 15a22e28bee040e9e34b650bcdf3dfd448e977d3 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 6 Aug 2021 09:42:34 +0100
Subject: [PATCH] improve

---
 src/app/Rules/despacho.service.ts             | 25 ++++++++-----------
 .../create-process/create-process.page.ts     |  2 --
 .../document-detail/document-detail.page.html |  3 ++-
 .../expediente-detail.page.html               | 11 ++++----
 4 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/app/Rules/despacho.service.ts b/src/app/Rules/despacho.service.ts
index ca5392df6..04c1d2ac5 100644
--- a/src/app/Rules/despacho.service.ts
+++ b/src/app/Rules/despacho.service.ts
@@ -50,7 +50,6 @@ export class DespachoService {
   //     },
   //     "AttachmentList" :documents,
   //   }
-    
   //   return this.processes.CompleteTask(body)
   // }
  
@@ -93,7 +92,6 @@ export class DespachoService {
     // }
   }
 
-
   rexecucao({note, documents, serialnumber}) {
     let body = {
       "serialNumber": serialnumber,
@@ -123,18 +121,17 @@ export class DespachoService {
     return this.processes.CompleteTask(body)
   }
 
-
-  Finalizar({serialNumber}) {
-    const body = {
-      "serialNumber": serialNumber,
-      "action": "Conhecimento",
-      "ActionTypeId": 104,
-      "dataFields": {
-        "ReviewUserComment": '',
-      },
-      "AttachmentList" :null,
-    }
-  }
+  // Finalizar({serialNumber}) {
+  //   const body = {
+  //     "serialNumber": serialNumber,
+  //     "action": "Conhecimento",
+  //     "ActionTypeId": 104,
+  //     "dataFields": {
+  //       "ReviewUserComment": '',
+  //     },
+  //     "AttachmentList" :null,
+  //   }
+  // }
 
   sendExpedienteToPending(serialnumber) {
     return this.processes.SetTaskToPending(serialnumber)
diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts
index c43dde0ed..7c4bb7607 100644
--- a/src/app/modals/create-process/create-process.page.ts
+++ b/src/app/modals/create-process/create-process.page.ts
@@ -198,7 +198,6 @@ export class CreateProcessPage implements OnInit {
 
   async saveTask() {
 
-
     if(!this.p.userRole(['PR'])) {
       this.injectValidation()
       this.runValidation()
@@ -239,7 +238,6 @@ export class CreateProcessPage implements OnInit {
     this.dispatchFolder.SubjectTypes = this.selectedTypes;
     const loader = this.toastService.loading()
 
-
     switch (this.loggeduser.Profile) {
       case 'MDGPR':
 
diff --git a/src/app/modals/document-detail/document-detail.page.html b/src/app/modals/document-detail/document-detail.page.html
index df3087c99..f5db52381 100644
--- a/src/app/modals/document-detail/document-detail.page.html
+++ b/src/app/modals/document-detail/document-detail.page.html
@@ -53,7 +53,8 @@
 
     <div *ngIf="LoadedDocument" class="aside-right flex-column height-100">
       <div class="buttons">
-        <button (click)="openExpedientActionsModal('0')" class="btn-ok" shape="round" >Marcar Despacho</button>
+        <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>
         <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 f2b6f2748..178e963cd 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
@@ -93,16 +93,15 @@
 
     <div *ngIf="task" class="aside-right flex-column height-100">
       <div class="buttons">
+        <button (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Aprovar</button>
+        <button (click)="openAddNoteModal('Revisão')" class="btn-cancel" shape="round" >Mandar para Revisão</button>
         <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
-        <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
-        <div class="solid"></div>
         <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)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
-        <div hidden class="solid"></div>
-        <button hidden class="btn-cancel" shape="round" >Delegar</button>
-        <button hidden (click)="showToast()" class="btn-cancel" shape="round" >ShowToast</button>
+        <button (click)="attachDocument()" class="btn-cancel" shape="round" >Anexar Documento <br />(Gestão Documental)</button>
+        <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
+        <div class="solid"></div>
       </div>
     </div>