From da9df36320a997e95911fb1662e632a8ac9f50a4 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 11 Aug 2021 11:15:43 +0100
Subject: [PATCH] add options

---
 .../expediente-detail.page.ts                 |  9 ++++-----
 .../expediente-pr/expediente-pr.page.ts       |  7 +++----
 .../opts-expediente/opts-expediente.page.ts   | 19 ++++++++++---------
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
index ffe3fcc1f..2f7130ebb 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
@@ -83,7 +83,7 @@ export class ExpedienteDetailPage implements OnInit {
   }
 
 
-  async approve(note:string, documents:any){
+  async approve(note:string, documents:any) {
     let body = {
       "serialNumber": this.serialnumber,
       "action": "Aprovar",
@@ -110,7 +110,7 @@ export class ExpedienteDetailPage implements OnInit {
 
   }
 
-  async sendToReview(note:string, documents:any){
+  async sendToReview(note:string, documents:any) {
     let body = {
       "serialNumber": this.serialnumber,
       "action": "Retificar",
@@ -231,7 +231,6 @@ export class ExpedienteDetailPage implements OnInit {
     });
   }
 
-
   async LoadTaskDetail(serial: string) {
 
     this.processes.GetTask(serial).subscribe(res => {
@@ -317,7 +316,7 @@ export class ExpedienteDetailPage implements OnInit {
     });
   }
 
-  getAttachments(serialNumber){
+  getAttachments(serialNumber) {
     console.log(serialNumber);
 
     this.attachmentsService.getAttachmentsBySerial(serialNumber).subscribe(res=>{
@@ -501,7 +500,7 @@ export class ExpedienteDetailPage implements OnInit {
     });
   }
 
-  goToEvent(eventId:any){
+  goToEvent(eventId:any) {
     this.router.navigate(['/home/events', eventId, 'expediente']);
   }
 
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
index eb9687cf1..b84b3ef92 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
@@ -236,7 +236,6 @@ export class ExpedientePrPage implements OnInit {
   }
 
   attachDocument() {
-    console.log('HERE');
 
     this.getDoc();
   }
@@ -300,7 +299,7 @@ export class ExpedientePrPage implements OnInit {
     this.modalController.dismiss();
   }
 
-  async approve(note:string, documents:any){
+  async approve(note:string, documents:any) {
     let body = {
       "serialNumber": this.serialnumber,
       "action": "Aprovar",
@@ -327,7 +326,7 @@ export class ExpedientePrPage implements OnInit {
 
   }
 
-  async sendToReview(note:string, documents:any){
+  async sendToReview(note:string, documents:any) {
     let body = {
       "serialNumber": this.serialnumber,
       "action": "Retificar",
@@ -360,7 +359,7 @@ export class ExpedientePrPage implements OnInit {
     }
     const modal = await this.modalController.create({
       component: AddNotePage,
-      componentProps:{
+      componentProps: {
         showAttachmentBtn: false,
       },
       cssClass: classs,
diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
index 56cbb5128..a3d01676d 100644
--- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
+++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
@@ -49,7 +49,7 @@ export class OptsExpedientePage implements OnInit {
   }
 
   close() {
-    if( window.innerWidth < 801){
+    if( window.innerWidth < 801) {
       this.popoverController.dismiss();
     }
     else{
@@ -127,7 +127,7 @@ export class OptsExpedientePage implements OnInit {
 
     await modal.present();
 
-    modal.onDidDismiss().then(res => {
+    modal.onDidDismiss().then( async (res) => {
       console.log(res);
       if(res.data){
         const DocumentToSave = res.data.documents.map((e) => {
@@ -142,21 +142,22 @@ export class OptsExpedientePage implements OnInit {
           Attachments: DocumentToSave,
         }
 
-        if(actionName == 'Aprovar'){
-          this.approve(res.data.note, docs);
+        if(actionName == 'Aprovar') {
+          await this.approve(res.data.note, docs);
         }
-        else if(actionName == 'Revisão'){
-          this.sendToReview(res.data.note, docs);
+        else if(actionName == 'Revisão') {
+          await this.sendToReview(res.data.note, docs);
         }
+        this.popoverController.dismiss();
         this.goBack();
       }
     });
   }
 
 
-  async sendToReview(note:string, documents:any){
+  async sendToReview(note:string, documents:any) {
     let body = {
-      "serialNumber": this.task.serialnumber,
+      "serialNumber": this.task.serialnumber || this.task.SerialNumber,
       "action": "Retificar",
       "ActionTypeId": 99999877,
       "dataFields": {
@@ -190,7 +191,7 @@ export class OptsExpedientePage implements OnInit {
 
   async approve(note:string, documents:any){
     let body = {
-      "serialNumber": this.task.serialnumber,
+      "serialNumber": this.task.serialnumber || this.task.SerialNumber,
       "action": "Aprovar",
       "ActionTypeId": 100000004 ,
       "dataFields": {