From b197bebd49e9389af1d60f9553812b690e5359d9 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 27 May 2021 15:18:00 +0100 Subject: [PATCH] Update list --- .../despachos-pr/despachos-pr.page.ts | 63 +++++--- .../despachos/despachos.page.ts | 10 +- .../diplomas-assinar/diplomas-assinar.page.ts | 150 +++++++++--------- .../opts-expediente/opts-expediente.page.ts | 2 +- 4 files changed, 122 insertions(+), 103 deletions(-) diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts index 0c622e8fb..890c167f9 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts @@ -236,6 +236,7 @@ async viewExpedientDetail(serialNumber:any) { await modal.present(); modal.onDidDismiss().then(res=>{ console.log(res['data']); + this.LoadList(); if(res['data']=='openDiscart'){ console.log('open discart'); @@ -262,22 +263,31 @@ async viewExpedientDetail(serialNumber:any) { }, } - 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(); + 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().then(res=>{ + this.LoadList(); + if(res['data']=='close'){ + // this.close(); + /* console.log('2Expedient Discard closed2'); + this.close(); + this.openMenu(); */ + } + + }); } @@ -298,16 +308,17 @@ async viewExpedientDetail(serialNumber:any) { backdropDismiss: false }); - await modal.present(); - modal.onDidDismiss().then(res=>{ - if(res['data']=='close'){ - // this.close(); - /* console.log('2Expedient Discard closed2'); - this.close(); - this.openMenu(); */ - } - - }); + await modal.present(); + modal.onDidDismiss().then(res=>{ + this.LoadList(); + if(res['data']=='close'){ + // this.close(); + /* console.log('2Expedient Discard closed2'); + this.close(); + this.openMenu(); */ + } + + }); } docIndex(index: number) { diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts index 7c5725176..19f8644f8 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts @@ -92,6 +92,7 @@ export class DespachosPage implements OnInit { async LoadList(){ + alert('load') let result = await this.processes.GetTasksList("Despacho", false).toPromise(); //let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)"); @@ -205,9 +206,11 @@ export class DespachosPage implements OnInit { await modal.present(); modal.onDidDismiss().then(res=>{ console.log(res['data']); + this.LoadList(); if(res['data']=='openDiscart'){ console.log('open discart'); + // this.distartExpedientModal(); } @@ -246,7 +249,10 @@ export class DespachosPage implements OnInit { backdropDismiss: false }); await modal.present(); - modal.onDidDismiss(); + modal.onDidDismiss().then(res=>{ + this.LoadList(); + + }); } @@ -269,6 +275,8 @@ export class DespachosPage implements OnInit { await modal.present(); modal.onDidDismiss().then(res=>{ + this.LoadList(); + if(res['data']=='close'){ // this.close(); /* console.log('2Expedient Discard closed2'); diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts index 7a6b86383..62f33c54e 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts @@ -22,87 +22,87 @@ serialNumber:string; @Input() profile:string; @Input() segment:string; -constructor( - private processes:ProcessesService, - private modalController: ModalController, - private alertService: AlertService, - private router: Router, - ) { + constructor( + private processes:ProcessesService, + private modalController: ModalController, + private alertService: AlertService, + private router: Router, + ) { + } + + ngOnInit() { + this.LoadList(); } -ngOnInit() { - this.LoadList(); -} + goToDiploma(serialNumber:any){ + let navigationExtras: NavigationExtras = { + queryParams: { + "serialNumber": serialNumber, + } + }; + this.router.navigate(['/home/gabinete-digital/diplomas-assinar/diploma-assinar'], navigationExtras); + } -goToDiploma(serialNumber:any){ - let navigationExtras: NavigationExtras = { - queryParams: { - "serialNumber": serialNumber, - } - }; - this.router.navigate(['/home/gabinete-digital/diplomas-assinar/diploma-assinar'], navigationExtras); -} + doRefresh() { + this.LoadList(); + setTimeout(() => { + //event.target.complete(); + }, 2000); + } -doRefresh() { - this.LoadList(); - setTimeout(() => { - //event.target.complete(); - }, 2000); -} + async LoadList(){ + + let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); + this.diplomasList = new Array(); -async LoadList(){ - - let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); - this.diplomasList = new Array(); + console.log(diplomas); + let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar diploma"); + console.log(diplomasAssinar); + diplomasAssinar.forEach(element => { + let DocId = element.workflowInstanceDataFields.FolderID; + let ApplicationId = element.workflowInstanceDataFields.ApplicationId; + this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{ + this.totalDocs = res.DocumentsTotal; + console.log(res.DocumentsTotal); + 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(); - console.log(diplomas); - let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar diploma"); - console.log(diplomasAssinar); - diplomasAssinar.forEach(element => { - let DocId = element.workflowInstanceDataFields.FolderID; - let ApplicationId = element.workflowInstanceDataFields.ApplicationId; - this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{ - this.totalDocs = res.DocumentsTotal; - console.log(res.DocumentsTotal); - 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 = { + "SerialNumber": element.serialNumber, + "Folio": element.workflowInstanceDataFields.Subject, + "Senders": element.originator.email, + "CreateDate": taskDate, + "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, + "Remetente": element.workflowInstanceDataFields.Remetente, + "DocumentsQty": 0, + "DocId": element.workflowInstanceDataFields.DocIdDiferimento, + "WorkflowName": element.workflowDisplayName, + "activityInstanceName": element.activityInstanceName, + } + this.diplomasList.push(task); + }, + (error)=>{ + 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 = { - "SerialNumber": element.serialNumber, - "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.originator.email, - "CreateDate": taskDate, - "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, - "Remetente": element.workflowInstanceDataFields.Remetente, - "DocumentsQty": 0, - "DocId": element.workflowInstanceDataFields.DocIdDiferimento, - "WorkflowName": element.workflowDisplayName, - "activityInstanceName": element.activityInstanceName, - } - this.diplomasList.push(task); - }, - (error)=>{ - 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 = { - "SerialNumber": element.serialNumber, - "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.originator.email, - "CreateDate": taskDate, - "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, - "Remetente": element.workflowInstanceDataFields.Remetente, - "DocumentsQty": 0, - "DocId": element.workflowInstanceDataFields.DocIdDiferimento, - "WorkflowName": element.workflowDisplayName, - "activityInstanceName": element.activityInstanceName, - } - this.diplomasList.push(task); - }); - }); - this.showLoader = false; -} + let task = { + "SerialNumber": element.serialNumber, + "Folio": element.workflowInstanceDataFields.Subject, + "Senders": element.originator.email, + "CreateDate": taskDate, + "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, + "Remetente": element.workflowInstanceDataFields.Remetente, + "DocumentsQty": 0, + "DocId": element.workflowInstanceDataFields.DocIdDiferimento, + "WorkflowName": element.workflowDisplayName, + "activityInstanceName": element.activityInstanceName, + } + this.diplomasList.push(task); + }); + }); + this.showLoader = false; + } } diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts index 82cee3843..42f55fd4b 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts @@ -52,7 +52,7 @@ export class OptsExpedientePage implements OnInit { } } - sendExpedienteToPending(){ + sendExpedienteToPending() { this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{ console.log(res); this.close();