Fix go back

src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html

@@ -11,6 +11,7 @@
 <ion-content>
   
   <div class="width-100 overflow-y-auto height-100" >
+
     <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
     <ion-list *ngIf="expedienteprstore.list.length >= 1">
       <div

src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts

@@ -1,15 +1,13 @@
-import { Component, EventEmitter, OnInit, Output, ViewChild } from '@angular/core';
+import { Component, EventEmitter, OnInit, Output } from '@angular/core';
 import { NavigationStart, Router } from '@angular/router';
-import { CalendarComponent } from 'ionic2-calendar';
-
-import { DailyWorkTask } from '../../../models/dailyworktask.model';
+import { customTaskList, DailyWorkTask } from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ModalController } from '@ionic/angular';
-import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
 import { AlertService } from 'src/app/services/alert.service';
 import { User } from 'src/app/models/user.model';
 import { AuthService } from 'src/app/services/auth.service';
 import { ExpedienteprStore } from 'src/app/store/expedientepr-store.service';
+import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
 
 @Component({
   selector: 'app-expedientes-pr',
@@ -17,12 +15,12 @@ import { ExpedienteprStore } from 'src/app/store/expedientepr-store.service';
   styleUrls: ['./expedientes-pr.page.scss'],
 })
 export class ExpedientesPrPage implements OnInit {
-  @ViewChild(CalendarComponent) myCal: CalendarComponent;
 
   taskslist:DailyWorkTask[] = [];
   serialNumber:string;
   skeletonLoader = true;
   expedienteprstore = ExpedienteprStore;
+  customTaskPipe = new CustomTaskPipe()
 
   loggeduser: User;
   @Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
@@ -38,7 +36,7 @@ export class ExpedientesPrPage implements OnInit {
     }
 
   ngOnInit() {
-    
+
     this.router.events.forEach((event) => {
       if (event instanceof NavigationStart &&
         event.url.startsWith('/home/gabinete-digital?expedientespr=true') ||
@@ -60,32 +58,19 @@ export class ExpedientesPrPage implements OnInit {
     this.openExpedientDetail.emit(data);
   }
 
-  LoadList(){
+  LoadList() {
     this.skeletonLoader = true;
     this.processes.GetTasksList("Expediente", false).subscribe(result => {
 
       this.taskslist = [];
       let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
       res.forEach(element => {
-        let date = new Date(element.taskStartDate);
-        date.setMonth(date.getMonth() + 1);
-        let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
-        let task: DailyWorkTask = {
-          "SerialNumber": element.serialNumber,
-          "Folio": element.workflowInstanceDataFields.Subject,
-          "Senders": element.workflowInstanceDataFields.Sender,
-          "CreateDate": taskDate,
-          "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-          "Remetente": element.workflowInstanceDataFields.Remetente,
-          "DocumentsQty": 0,
-          "WorkflowName": element.workflowDisplayName,
-          "activityInstanceName": element.activityInstanceName,
-          "Status": element.workflowInstanceDataFields.Status,
-          }
-          this.taskslist.push(task);
+        let task: customTaskList = this.customTaskPipe.transform(element);
+        this.taskslist.push(task);
       });
       this.expedienteprstore.reset(this.taskslist);
       this.skeletonLoader = false;
+
     });
   }
 
@@ -106,21 +91,4 @@ export class ExpedientesPrPage implements OnInit {
     this.router.navigate(['/home/gabinete-digital/expedientes-pr',serialNumber,'gabinete-digital']);
   }
 
-  async viewExpedientDetail(serialNumber:any) {
-    const modal = await this.modalController.create({
-      component: ExpedienteDetailPage,
-      componentProps:{
-        enterAnimation: "",
-        serialNumber: serialNumber,
-        profile: this.loggeduser.Profile,
-      },
-      cssClass: 'modal modal-desktop',
-    });
-    await modal.present();
-    modal.onDidDismiss().then((res)=>{
-      console.log('refresh list');
-      this.LoadList();
-    });
-  }
-
 }

src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts

@@ -12,6 +12,7 @@ import { AttachmentsService } from 'src/app/services/attachments.service';
 import { AuthService } from 'src/app/services/auth.service';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ToastService } from 'src/app/services/toast.service';
+import { Location } from '@angular/common'
 
 @Component({
   selector: 'app-opts-expediente-pr',
@@ -48,7 +49,8 @@ export class OptsExpedientePrPage implements OnInit {
     private navParams: NavParams,
     private animationController: AnimationController,
     private router: Router,
-    private toastService: ToastService
+    private toastService: ToastService,
+    private location: Location,
 
   ) {
 
@@ -276,7 +278,7 @@ export class OptsExpedientePrPage implements OnInit {
       console.log(res['data']);
       let body = res['data'];
       // alert('close '+ res['data'])
-      if(res['data']){
+      if(res['data']) {
         console.log('open discart');
 
         const loader = this.toastService.loading()
@@ -290,7 +292,6 @@ export class OptsExpedientePrPage implements OnInit {
         }  finally {
           loader.remove()
         }
-        this.goBack();
 
       }
       else{
@@ -321,16 +322,7 @@ export class OptsExpedientePrPage implements OnInit {
   }
 
   goBack() {
-    if (window.innerWidth <= 800) {
-      this.router.navigate(['/home/gabinete-digital/expedientes-pr']);
-    } else {
-      let navigationExtras: NavigationExtras = {
-        queryParams: {
-          "expedientes-pr": true,
-        }
-      };
-      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-    }
+    this.location.back()
   }
 
   getAttachments(serialNumber){