From 9fb66fc1fd8ebeee3f9890e743ead58d34725e3d Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 14 Jun 2021 14:16:16 +0100
Subject: [PATCH] Improve despacho options

---
 .../despachos/despacho/despacho.page.ts       | 11 ++++++-----
 .../despachos-options.page.html               | 19 ++++++++++++++++---
 .../despachos-options.page.ts                 | 19 ++++++++++++++-----
 3 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
index 57dbf26c0..d54c89460 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
@@ -20,6 +20,7 @@ import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
 import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
 import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
 import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
+import { DespachosOptionsPage } from 'src/app/shared/popover/despachos-options/despachos-options.page';
 
 @Component({
   selector: 'app-despacho',
@@ -90,11 +91,11 @@ export class DespachoPage implements OnInit {
     let navigationExtras: NavigationExtras = {
       queryParams: {
         // "serialNumber": serialNumber,
-        'despachos': true
+        //'despachos': true
       }
     }
 
-    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+    this.router.navigate(['/home/gabinete-digital/despachos'], navigationExtras);
 
   }
 
@@ -409,13 +410,14 @@ export class DespachoPage implements OnInit {
   }
 
   async openOptions(taskAction?: any) {
+    
     const popover = await this.popoverController.create({
-      component: OptsExpedientePage,
+      component: DespachosOptionsPage,
       cssClass: 'exp-options',
       componentProps: {
         task: this.task,
         fulltask: this.fulltask,
-        taskAction:taskAction,
+        taskAction: taskAction,
         showEnviarPendentes: false
       },
       translucent: true
@@ -423,7 +425,6 @@ export class DespachoPage implements OnInit {
     return await popover.present();
   }
   
-
   async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.html b/src/app/shared/popover/despachos-options/despachos-options.page.html
index 5158a629c..1ef3745fc 100644
--- a/src/app/shared/popover/despachos-options/despachos-options.page.html
+++ b/src/app/shared/popover/despachos-options/despachos-options.page.html
@@ -8,7 +8,16 @@
   <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Despacho'">
     <button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
     <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
-    <button (click)="openAddNoteModal('Gerar Diploma')" class="btn-cancel" shape="round" >Gerar Diploma </button>
+    <div class="solid"></div>
+    <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar 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>
+    <div class="solid"></div>
+    <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+  </div>
+  <div class="buttons" *ngIf="task.activityInstanceName == 'Reexecutar Despacho'">
+    <button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
+    <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
     <div class="solid"></div>
     <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
     <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
@@ -17,10 +26,14 @@
     <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
   </div>
   <div class="buttons" *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)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
+    <div class="solid"></div>
+    <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar 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>
+    <div class="solid"></div>
     <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+    <button (click)="openAddNoteModal('Reexecução')" class="btn-cancel" shape="round" >Enviar para Reexecução</button>
   </div>
 
 </ion-content>
diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.ts b/src/app/shared/popover/despachos-options/despachos-options.page.ts
index fac026cb2..8a14c56d0 100644
--- a/src/app/shared/popover/despachos-options/despachos-options.page.ts
+++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts
@@ -5,7 +5,7 @@ import { EventsService } from 'src/app/services/events.service';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 import { formatDate } from '@angular/common';
-import { AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular';
+import { AnimationController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { AlertService } from 'src/app/services/alert.service';
 import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
 import { momentG }  from 'src/plugin/momentG'
@@ -42,7 +42,13 @@ export class DespachosOptionsPage implements OnInit {
     private alertService: AlertService,
     public popoverController: PopoverController,
     private activatedRoute: ActivatedRoute,
-    private animationController: AnimationController) { }
+    private animationController: AnimationController,
+    private navParams: NavParams) { 
+
+      this.task = this.navParams.get('task')
+      this.fulltask = this.navParams.get('fulltask')
+
+    }
 
   ngOnInit() {
     
@@ -371,12 +377,15 @@ export class DespachosOptionsPage implements OnInit {
 
 
   goBack() {
+    alert(' goback')
+    
     let navigationExtras: NavigationExtras = {
       queryParams: {
-        "despachospr": true,
+        // "despachospr": true,
       }
-    };
-    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+    }
+
+    this.router.navigate(['/home/gabinete-digital/despachos'], navigationExtras);
 
     // window.history.back()
   }