further improvements

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

@@ -95,6 +95,7 @@ export class ExpedientTaskModalPage implements OnInit {
         SouceType: 'DOC', //FOLDER
         SourceId: this.task.workflowInstanceDataFields.DocId, //FolderId
         DeadlineType: '',
+        SubjectTypes: new Array(),
 
       };
       
@@ -194,12 +195,25 @@ export class ExpedientTaskModalPage implements OnInit {
             SubjectTypeId: this.postData.SubjectTypeId,
             UsersSelected: attendees,
             DispatchFolder: this.dispatchFolder,
-            AttachmentList: docs
+            AttachmentList: docs,
+            //SubjectTypes: [],
+
           }
-          console.log(JSON.stringify(this.postData))
           console.log('this.postData', this.postData, this.taskType);
           this.taskResult = await this.processes.postDespatcho(this.postData);
+          console.log('this.taskResult', this.taskResult);
+
+          let action_despacho = {
+            "serialNumber": this.task.serialNumber,
+            "action": "Tratado",
+            "ActionTypeId": 94,
+            "dataFields": {
+              "Note": "",
+            }
+          }
+          this.modalController.dismiss(action_despacho);
           break;
+
         case '1':
           this.postData = {
             DistributionType: "Paralelo",
@@ -213,6 +227,17 @@ export class ExpedientTaskModalPage implements OnInit {
           }
           console.log(this.postData);
           this.taskResult = await this.processes.postParecer(this.postData);
+          console.log('this.taskResult', this.taskResult);
+
+          let action_parecer = {
+            "serialNumber": this.task.serialNumber,
+            "action": "Tratado",
+            "ActionTypeId": 92,
+            "dataFields": {
+              "Note": "",
+            }
+          }
+          this.modalController.dismiss(action_parecer);
           break;
         case '2':
           this.postData = {
@@ -227,11 +252,20 @@ export class ExpedientTaskModalPage implements OnInit {
           }
           console.log(this.postData);
           this.taskResult = await this.processes.postDeferimento(this.postData);
+          
+          console.log('this.taskResult', this.taskResult);
+          
+          let action_deferimento = {
+            "serialNumber": this.task.serialNumber,
+            "action": "Tratado",
+            "ActionTypeId": 93,
+            "dataFields": {
+              "Note": "",
+            }
+          }
+          this.modalController.dismiss(action_deferimento);
           break;
       }
-
-    console.log('this.taskResult', this.taskResult)
-    this.modalController.dismiss('openDiscart');
   }
   else {
     this.alertController.presentAlert("Lista de intervenientes vazia. Por favor, adicione 1 ou mais intervenientes.");

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

@@ -170,17 +170,59 @@ export class ExpedienteDetailPage implements OnInit {
     await modal.present();
     modal.onDidDismiss().then(res=>{
       console.log(res['data']);
+      let body = res['data'];
       // alert('close '+ res['data'])
-      if(res['data']=='openDiscart'){
+      if(res['data']){
         console.log('open discart');
         
-        this.distartExpedientModal();
+        this.distartExpedientModal(body);
 
       }
+      else{
+        console.log('Not open');
+        
+      }
 
     });
   }
 
+  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
+    });
+    
+    await modal.present();
+    modal.onDidDismiss().then(res=>{
+      console.log(res['data']);
+      
+      if(res['data']== 'Yes'){
+        this.processes.CompleteTask(body); 
+      }
+      else if(res['data'] == 'No'){
+        let otherbody = {
+          "serialNumber": body.serialNumber,
+          "action": "Passivo",
+          "ActionTypeId": 94,
+          "dataFields": {
+            "Note": "",
+          }
+        }
+        this.processes.CompleteTask(otherbody);
+      }
+      //Volta na lista principal
+      this.modalController.dismiss();
+      
+    });
+  }
+
   async distartExpedientModal2(task: any){
     const modal = await this.modalController.create({
       component: DiscartExpedientModalPage,
@@ -234,30 +276,7 @@ export class ExpedienteDetailPage implements OnInit {
       }
     });
   }
-  async distartExpedientModal(){
-    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
-    });
-    
-    await modal.present();
-    modal.onDidDismiss().then(res=>{
-      if(res['data']=='close'){
-        this.close();
-        /* console.log('2Expedient Discard closed2');
-        this.close();
-        this.openMenu(); */
-      }
-      
-    });
-  }
+  
 
   async openOptions(taskAction: any) {
     const popover = await this.popoverController.create({