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

src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts

@@ -70,7 +70,10 @@ export class ApproveEventModalPage implements OnInit {
     })
   }
   approveTask(serialNumber:string){
-    let body = { "serialNumber": serialNumber, "action": "Aprovar" }
+    let body = { 
+      "serialNumber": serialNumber, 
+      "action": "Aprovar" 
+    }
     this.processes.PostTaskAction(body);
     this.router.navigate(['/home/gabinete-digital/event-list']);
     this.modalController.dismiss(null);

src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts

@@ -155,11 +155,12 @@ export class DespachoPage implements OnInit {
     let body = { 
       "serialNumber": this.serialnumber, 
       "action": "Conhecimento",
+      "ActionTypeId": 104,
       "dataFields": {
         "ReviewerUseComment": note,
       }
     }
-    this.processes.PostTaskAction(body);
+    this.processes.CompleteTask(body);
     this.close();
   }
 
@@ -220,13 +221,6 @@ export class DespachoPage implements OnInit {
     });
   }
 
-  discartExpedient() {
-    /* let body = { "serialNumber": this.serialnumber, "action": "Passivo" }
-    console.log(body);
-    this.processes.PostTaskAction(body);
-    this.router.navigate(['/home/gabinete-digital/expediente']); */
-  }
-
   async distartExpedientModal2(task: any){
     const modal = await this.modalController.create({
       component: DiscartExpedientModalPage,

src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts

@@ -41,12 +41,18 @@ export class DiscartExpedientModalPage implements OnInit {
   
   save(){
     if(this.action != 'discart'){
-      let body = { "serialNumber": this.serialNumber, "action": "Tratado" }
+      let body = { 
+        "serialNumber": this.serialNumber, 
+        "action": "Tratado" 
+      }
       console.log(body);
       this.processes.PostTaskAction(body);
     }
     else{
-      let body = { "serialNumber": this.serialNumber, "action": "Passivo" }
+      let body = { 
+        "serialNumber": this.serialNumber, 
+        "action": "Passivo" 
+      }
       console.log(body);
       this.processes.PostTaskAction(body);
     }

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts

@@ -181,13 +181,6 @@ export class ExpedienteDetailPage implements OnInit {
     });
   }
 
-  discartExpedient() {
-    /* let body = { "serialNumber": this.serialnumber, "action": "Passivo" }
-    console.log(body);
-    this.processes.PostTaskAction(body);
-    this.router.navigate(['/home/gabinete-digital/expediente']); */
-  }
-
   async distartExpedientModal2(task: any){
     const modal = await this.modalController.create({
       component: DiscartExpedientModalPage,

src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts

@@ -178,11 +178,12 @@ export class PedidoPage implements OnInit {
     let body = { 
       "serialNumber": this.serialnumber, 
       "action": "Arquivo",
+      "ActionTypeId": 95,
       "dataFields": {
         "ReviewerUseComment": '',
       }
     }
-    this.processes.PostTaskAction(body);
+    this.processes.CompleteTask(body);
   }
 
   sendExpedienteToPending(){
@@ -222,13 +223,6 @@ export class PedidoPage implements OnInit {
     });
   }
 
-  discartExpedient() {
-    /* let body = { "serialNumber": this.serialnumber, "action": "Passivo" }
-    console.log(body);
-    this.processes.PostTaskAction(body);
-    this.router.navigate(['/home/gabinete-digital/expediente']); */
-  }
-
   async distartExpedientModal2(task: any){
     const modal = await this.modalController.create({
       component: DiscartExpedientModalPage,