save

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

@@ -16,16 +16,10 @@ export class DiscartExpedientModalPage implements OnInit {
     private modalController: ModalController,
     private processes:ProcessesService,
     private router:Router,
-    private navParams: NavParams,
   ) { 
-    this.serialNumber = this.navParams.get('serialNumber');
-    this.folderId = this.navParams.get('folderId');
-    this.action = this.navParams.get('action');
    }
 
   ngOnInit() {
-    console.log(this.serialNumber);
-    
   }
   close(){
     this.modalController.dismiss('No');

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

@@ -139,7 +139,7 @@
     <div class="aside-right flex-column height-100">
       <div class="buttons">
         <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
-        <button (click)="distartExpedientModal(fulltask)" class="btn-cancel" shape="round" >Descartar</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>

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

@@ -211,13 +211,9 @@ export class ExpedienteDetailPage implements OnInit {
   }
 
   async distartExpedientModal(body:any){
-    console.log(this.fulltask);
     const modal = await this.modalController.create({
       component: DiscartExpedientModalPage,
        componentProps: {
-        serialNumber: this.fulltask.serialNumber,
-        folderId: this.fulltask.workflowInstanceDataFields.FolderID,
-        action: 'complete',
       },
       cssClass: 'discart-expedient-modal',
       backdropDismiss: false
@@ -226,44 +222,42 @@ export class ExpedienteDetailPage implements OnInit {
     await modal.present();
     modal.onDidDismiss().then(res=>{
       console.log(res['data']);
+      console.log(body);
 
-      if(res['data']== 'Yes'){
+      if(body == 'descartar'){
-        this.processes.CompleteTask(body);
+        if(res['data']== 'Yes'){
-        this.goBack();
+          let otherbody = {
-      }
+            "serialNumber": body.serialNumber,
-      else if(res['data'] == 'No'){
+            "action": "Passivo",
-        let otherbody = {
+            "ActionTypeId": 94,
-          "serialNumber": body.serialNumber,
+            "dataFields": {
-          "action": "Passivo",
+              "Note": "",
-          "ActionTypeId": 94,
+            }
-          "dataFields": {
-            "Note": "",
           }
+          this.processes.CompleteTask(otherbody);
         }
-        this.processes.CompleteTask(otherbody);
+        else if(res['data'] == 'No'){
+          //Do nothing
+        }
+
       }
-      //Volta na lista principal
+      else{
-      this.modalController.dismiss();
+        if(res['data']== 'Yes'){
+          this.processes.CompleteTask(body);
+          
+          this.goBack();
+        }
+        else if(res['data'] == 'No'){
+          console.log('Update');
+          
+          this.processes.UpdateTaskStatus(this.task.FolderId);
+        }
+      }
+      
       
     });
   }
 
-  async distartExpedientModal2(task: any){
-    const modal = await this.modalController.create({
-      component: DiscartExpedientModalPage,
-       componentProps: {
-        serialNumber: task.serialNumber,
-        folderId: task.workflowInstanceDataFields.FolderID,
-        action: 'discart',
-      },
-      cssClass: 'discart-expedient-modal',
-      backdropDismiss: false
-    });
-    
-    await modal.present();
-    modal.onDidDismiss();
-  }
-
   async openBookMeetingModal(task: any) {
     let classs;
     if( window.innerWidth <= 800){