save

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

@@ -12,6 +12,7 @@ import { AddParticipantsModalPage } from '../add-participants-modal/add-particip
 import { environment } from 'src/environments/environment';
 import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
 import { AttachmentsService } from 'src/app/services/attachments.service';
+import { ExpedienteDetailPage } from '../expediente-detail/expediente-detail.page';
 
 @Component({
   selector: 'app-expedient-task-modal',
@@ -46,6 +47,7 @@ export class ExpedientTaskModalPage implements OnInit {
   showAttendees= false;
 
   adding: "intervenient" | "CC" = "intervenient";
+  profile: string;
 
   constructor(
     private modalController: ModalController,
@@ -76,6 +78,7 @@ export class ExpedientTaskModalPage implements OnInit {
       this.postData.SubjectTypeId = '99999844';
       /* Initialize 'Subject' with the title of the expedient */
       this.postData.DispatchFolder.Subject = this.task.workflowInstanceDataFields.Subject;
+      this.profile = this.navParams.get('profile');
   }
 
   async setAdding(type:  "intervenient" | "CC"){
@@ -93,15 +96,18 @@ export class ExpedientTaskModalPage implements OnInit {
     this.router.navigate(['/home/gabinete-digital/expediente']);
     this.modalController.dismiss(null);
   }
-  cancelTask(){
-    this.modalController.dismiss(null);
-  }
+  
   getSubjectType(){
     this.processes.GetSubjectType().subscribe(res=>{
       console.log(res);
       this.subjectTypes = res;
     });
   }
+  cancelTask(){
+    this.modalController.dismiss(null);
+    //this.viewExpedientDetail();
+    
+  }
   saveTask(){
    /* console.log(this.taskType); */
     
@@ -118,7 +124,9 @@ export class ExpedientTaskModalPage implements OnInit {
           DispatchFolder: this.dispatchFolder,
         }
         console.log(this.postData);
-        this.processes.postDespatcho(this.postData);
+      /*   this.processes.postDespatcho(this.postData); */
+      //this.distartExpedientModal();
+      this.modalController.dismiss('openDiscart');
 
         break;
       case '1':
@@ -131,7 +139,9 @@ export class ExpedientTaskModalPage implements OnInit {
           UsersSelected: this.participants,
           DispatchFolder: this.dispatchFolder,
         }
-        this.processes.postParecer(this.postData);
+        /* this.processes.postParecer(this.postData); */
+        //this.distartExpedientModal();
+        this.modalController.dismiss();
         break;
       case '2':
         this.postData = {
@@ -144,10 +154,13 @@ export class ExpedientTaskModalPage implements OnInit {
           DispatchFolder: this.dispatchFolder,
         }
         this.processes.postDeferimento(this.postData);
+        //this.distartExpedientModal();
+        this.close();
         break;
     }
-    this.distartExpedientModal();
-    this.close();
+    /* this.distartExpedientModal();
+    this.close(); */
+    
   }
   getAttachments(){
     this.attachmentsService.getAttachmentsBySerial(this.task.serialNumber).subscribe(res=>{
@@ -245,7 +258,13 @@ export class ExpedientTaskModalPage implements OnInit {
     });
     
     await modal.present();
-    modal.onDidDismiss();
+    modal.onDidDismiss().then(res=>{
+      if(res['data']=='close'){
+        console.log('Expedient Discard closed');
+        this.modalController.dismiss(res['data'])
+      }
+      
+    });
   }
 
   async setContact(data:EventPerson[]){
@@ -271,4 +290,32 @@ export class ExpedientTaskModalPage implements OnInit {
     this.showAttendees = false;
   }
 
+  async viewExpedientDetail() {
+    console.log(this.profile);
+
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    const modal = await this.modalController.create({
+      component: ExpedienteDetailPage,
+      componentProps:{
+        serialNumber: this.task.serialNumber,
+        profile: this.profile,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss().then((res)=>{
+      console.log('!refresh list');
+    });
+  }
+
+
+
+
 }

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(); */
+      }
+      
+    });
+  }
 }

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

@@ -67,7 +67,7 @@ export class ExpedientePage implements OnInit {
     console.log(this.profile);
 
     let classs;
-    if( window.innerWidth <= 1024){
+    if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'
     } else  {
       classs = 'gabinete-digital-mobile-modal-to-Desktop'
@@ -84,7 +84,8 @@ export class ExpedientePage implements OnInit {
     });
     await modal.present();
     modal.onDidDismiss().then((res)=>{
-      
+      console.log('refresh list');
+      this.LoadList();
     });
   }