save

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

@@ -60,6 +60,10 @@ export class ExpedienteDetailPage implements OnInit {
     this.LoadRelatedEvents(this.serialnumber);
   }
 
+  close(){
+    this.modalController.dismiss();
+  }
+
 
   async LoadTaskDetail(serial: string) {
     this.processes.GetTask(serial).subscribe(res => {
@@ -120,9 +124,11 @@ export class ExpedienteDetailPage implements OnInit {
 
   openMenu() {
     this.menu.open();
+    this.modalController.dismiss();
   }
 
   async openExpedientActionsModal(taskAction: any, task: any) {
+    //this.modalController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'modal'
@@ -134,11 +140,21 @@ export class ExpedienteDetailPage implements OnInit {
       componentProps: {
         taskAction: taskAction,
         task: task,
+        profile: this.profile,
       },
       cssClass: classs,
     });
     await modal.present();
-    modal.onDidDismiss();
+    modal.onDidDismiss().then(res=>{
+      console.log(res['data']);
+      if(res['data']=='openDiscart'){
+        console.log('open discart');
+        
+        this.distartExpedientModal();
+
+      }
+
+    });
   }
 
   discartExpedient() {
@@ -148,7 +164,7 @@ export class ExpedienteDetailPage implements OnInit {
     this.router.navigate(['/home/gabinete-digital/expediente']); */
   }
 
-  async distartExpedientModal(task: any){
+  async distartExpedientModal2(task: any){
     const modal = await this.modalController.create({
       component: DiscartExpedientModalPage,
        componentProps: {
@@ -201,4 +217,28 @@ 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(); */
+      }
+      
+    });
+  }
 }