Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

src/app/shared/gabinete-digital/despachos/despachos.page.ts

@@ -91,14 +91,10 @@ export class DespachosPage implements OnInit {
  }
 
   async LoadList(){
-    console.log('HERE DESK');
-    
 
     let result = await this.processes.GetTasksList("Despacho", false).toPromise();
     //let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)");
     this.despachoList = new Array();
-    
-    console.log(result);
 
     await result.forEach( (element, index) => {
       
@@ -127,7 +123,6 @@ export class DespachosPage implements OnInit {
     this.despachoList = this.sortArrayISODate(this.despachoList).reverse()
 
     this.despachoList.forEach( (element, index) => {
-      console.log(element['FolderID']);
       
       // let aplicationId = element.workflowInstanceDataFields.SourceSecFsID;
       let FolderID = element['FolderID'];
@@ -154,25 +149,6 @@ export class DespachosPage implements OnInit {
    }, 2000);
  }
 
-  async viewExpedientDetail(serialNumber:any) {
-    console.log(this.profile);
-
-    const modal = await this.modalController.create({
-      component: DespachoPage,
-      componentProps:{
-          enterAnimation: "",
-          serialNumber: serialNumber,
-          profile: this.profile,
-      },
-      cssClass: 'modal modal-desktop',
-    });
-    await modal.present();
-    modal.onDidDismiss().then((res)=>{
-      console.log('refresh list');
-      this.LoadList();
-    });
-  }
-
   // old
   async openExpedientActionsModal(taskAction: any, task: any) {
     //this.modalController.dismiss();

src/app/shared/popover/despachos-options/despachos-options.page.ts

@@ -63,6 +63,8 @@ export class DespachosOptionsPage implements OnInit {
   }
 
   sendExpedienteToPending(){
+    console.log(this.task.SerialNumber);
+    
     this.popoverController.dismiss();
     this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
       console.log(res);

src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts

@@ -119,7 +119,7 @@ export class OptsExpedientePrPage implements OnInit {
   async approve(note:string, documents:any){
     this.popoverController.dismiss();
     let body = { 
-      "serialNumber": this.serialnumber, 
+      "serialNumber": this.task.SerialNumber, 
       "action": "Aprovar",
       "ActionTypeId": 100000004 ,
       "dataFields": {
@@ -182,7 +182,7 @@ export class OptsExpedientePrPage implements OnInit {
             this.toastService.successMessage('Processo descartado');
             this.goBack();
           } catch (error) {
-            this.toastService.badRequest('Processo não descartado')
+            this.toastService.badRequest('Processo não descartado');
           }
           this.goBack();
         }
@@ -193,7 +193,7 @@ export class OptsExpedientePrPage implements OnInit {
             this.toastService.successMessage();
             this.goBack();
           } catch (error) {
-            this.toastService.badRequest()
+            this.toastService.badRequest();
           }
         }
       }
@@ -203,7 +203,7 @@ export class OptsExpedientePrPage implements OnInit {
 
   async sendToReview(note:string, documents:any){
     let body = { 
-      "serialNumber": this.serialnumber, 
+      "serialNumber": this.task.SerialNumber, 
       "action": "Retificar",
       "ActionTypeId": 99999877,
       "dataFields": {
@@ -213,7 +213,7 @@ export class OptsExpedientePrPage implements OnInit {
     }
 
     try {
-      await this.processes.CompleteTask(body);
+      await this.processes.CompleteTask(body).toPromise();
       this.close();
       this.toastService.successMessage()
     } catch(error) {
@@ -223,7 +223,7 @@ export class OptsExpedientePrPage implements OnInit {
 
   sendExpedienteToPending(){
     this.popoverController.dismiss();
-    this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
+    this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
       console.log(res);
       this.close();
     });
@@ -285,15 +285,15 @@ export class OptsExpedientePrPage implements OnInit {
   }
 
   goBack() {
-    let navigationExtras: NavigationExtras = {
-      queryParams: {
-        "expedientes-pr": true,
-      }
-    };
-    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-
-    // window.history.back();
-
+    if (window.innerWidth <= 800) {
+      this.router.navigate(['/home/gabinete-digital/expedientes-pr']);
+    } else {
+      let navigationExtras: NavigationExtras = {
+        queryParams: {
+          "expedientes-pr": true,
+        }
+      };
+      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+    }
   }
-  
 }