From fffdec8ecbde9ebef83eeaa1ae96e669b9d2caf9 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 25 May 2021 15:17:39 +0100 Subject: [PATCH] save --- .../despachos/despacho/despacho.page.ts | 2 + .../despachos/despachos.page.ts | 131 ++---------------- .../expedient-task-modal.page.ts | 1 + .../gabinete-digital/gabinete-digital.page.ts | 11 +- 4 files changed, 17 insertions(+), 128 deletions(-) diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts index 6e4ba732e..6c41242d2 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -53,12 +53,14 @@ export class DespachoPage implements OnInit { private activatedRoute: ActivatedRoute, private router: Router, ) { + this.activatedRoute.queryParams.subscribe(params => { if(params["serialNumber"]) { this.serialnumber = params["serialNumber"]; console.log(params["serialNumber"]); } }); + } ngOnInit() { diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.ts b/src/app/pages/gabinete-digital/despachos/despachos.page.ts index 89cd047a1..48bdb4792 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despachos.page.ts @@ -14,6 +14,7 @@ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discar import { AuthService } from 'src/app/services/auth.service'; import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page'; +import { NavigationExtras, Router } from '@angular/router'; @Component({ selector: 'app-despachos', @@ -49,6 +50,7 @@ export class DespachosPage implements OnInit { private modalController: ModalController, private alertService: AlertService, private authService: AuthService, + private router: Router, ) { this.profile = 'mdgpr'; // alert('nice!') @@ -132,134 +134,17 @@ export class DespachosPage implements OnInit { } async viewExpedientDetail(serialNumber:any) { - console.log(this.profile); - - const modal = await this.modalController.create({ - component: DespachoPage, - componentProps:{ - enterAnimation: "", - serialNumber: serialNumber, - profile: this.profile, - }, - cssClass: 'modal modal-desktop', - }); - await modal.present(); - modal.onDidDismiss().then((res)=>{ - console.log('refresh list'); - this.LoadList(); - }); - } - - // old - async openExpedientActionsModal(taskAction: any, task: any) { - //this.modalController.dismiss(); - let classs; - if( window.innerWidth <= 800){ - classs = 'modal modal-desktop' - } else { - classs = 'modal modal-desktop showAsideOptions' - } - - const doc = this.loadedAttachments[ this.dicIndex]; - - task = { - serialNumber: doc.SourceId, - taskStartDate: doc.CreateDate, - isEvent: true, - workflowInstanceDataFields: { - FsId: doc.ApplicationId, - FolderID: null, - DocId: doc.SourceId, - Subject: doc.SourceName - }, - } - - const modal = await this.modalController.create({ - component: ExpedientTaskModalPage, - componentProps: { - taskAction: taskAction, - task: task, - profile: this.profile, - }, - cssClass: classs, - }); - await modal.present(); - modal.onDidDismiss().then(res=>{ - console.log(res['data']); - if(res['data']=='openDiscart'){ - console.log('open discart'); - - // this.distartExpedientModal(); + let navigationExtras: NavigationExtras = { + queryParams: { + "serialNumber": serialNumber, } + }; + + this.router.navigate(['/home/gabinete-digital/despachos/despacho'], navigationExtras); - }); } - async openBookMeetingModal(task: any) { - - const doc = this.loadedAttachments[ this.dicIndex]; - - task = { - serialNumber: doc.SourceId, - taskStartDate: doc.CreateDate, - isEvent: true, - workflowInstanceDataFields: { - FsId: doc.ApplicationId, - FolderID: null, - DocId: doc.SourceId, - Subject: doc.SourceName - }, - } - - let classs; - if( window.innerWidth <= 800){ - classs = 'book-meeting-modal modal modal-desktop' - } else { - classs = 'modal modal-desktop showAsideOptions' - } - const modal = await this.modalController.create({ - component: BookMeetingModalPage, - componentProps: { - task: task, - }, - cssClass: classs, - backdropDismiss: false - }); - await modal.present(); - modal.onDidDismiss(); - } - - - async distartExpedientModal() { - - const doc = this.taskList[ this.dicIndex]; - - console.log(doc, this.dicIndex, this.taskList) - - const modal = await this.modalController.create({ - component: DiscartExpedientModalPage, - componentProps: { - serialNumber: doc.serialNumber, - folderId: doc.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(); */ - } - - }); - } - docIndex(index: number) { this.dicIndex = index; } diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index af9520ddb..f97c539cf 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -303,6 +303,7 @@ export class ExpedientTaskModalPage implements OnInit { this.loadedAttachments = res; console.log(res); }); + } async addParticipants() { diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 37809c9ec..75108cfd3 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -266,16 +266,16 @@ export class GabineteDigitalPage implements OnInit { return false; } - openEventsToApprovePage(profile:any){ + openEventsToApprovePage(profile:any) { console.log(profile); this.closeAllDesktopComponents(); let navigationExtras: NavigationExtras = { queryParams: {"eventos": true,}}; - if( window.innerWidth <= 800){ + if( window.innerWidth <= 800) { //this.openEventsToApproveList(profile); this.router.navigate(['/home/gabinete-digital/event-list']); } - else{ + else { this.router.navigate(['/home/gabinete-digital'], navigationExtras); this.showEventsToApprove = true; } @@ -347,7 +347,7 @@ export class GabineteDigitalPage implements OnInit { openPedidosPage(segment:string){ this.closeAllDesktopComponents(); - if( window.innerWidth <= 800){ + if( window.innerWidth <= 800) { this.openPedidoList(); } else{ @@ -461,7 +461,7 @@ export class GabineteDigitalPage implements OnInit { //if( window.innerWidth <= 1024){ const modal = await this.modalController.create({ component: ExpedientePage, - componentProps:{ + componentProps: { profile: this.profile, }, cssClass: 'modal modal-desktop', @@ -495,6 +495,7 @@ export class GabineteDigitalPage implements OnInit { component: DespachosPage, componentProps:{ profile: this.profile, + serialNumber: this.serialNumber }, cssClass: 'modal modal-desktop', });