From 02e696b2814e8da920d083e0d904ed0d771f9f8c Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 23 Jun 2021 09:47:24 +0100 Subject: [PATCH 1/4] save --- .../event-list/approve-event/approve-event.page.ts | 7 ------- .../book-meeting-modal/book-meeting-modal.page.ts | 4 +++- .../expediente-detail/expediente-detail.page.ts | 2 +- .../events-to-approve/events-to-approve.page.ts | 13 +------------ 4 files changed, 5 insertions(+), 21 deletions(-) diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts index 32f83fc2b..3a0ea4da1 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts @@ -62,13 +62,6 @@ export class ApproveEventPage implements OnInit { this.caller = params["params"].caller; } }); - - /* 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/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index e9677c103..63c551f92 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -141,13 +141,15 @@ export class BookMeetingModalPage implements OnInit { HasAttachments: true, } console.log(this.postData); + console.log(this.task); + if(this.task.FsId == '8') { try { switch (this.loggeduser.Profile) { case 'MDGPR': - await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise(); + //await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise(); break; case 'PR': diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index 528462d36..9d9dc654c 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -135,7 +135,7 @@ export class ExpedienteDetailPage implements OnInit { async LoadTaskDetail(serial: string) { this.processes.GetTask(serial).subscribe(res => { - //console.log(res); + /* console.log(res); */ this.task = { "SerialNumber": res.serialNumber, diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts index e17f8403d..b10b79e00 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts @@ -59,21 +59,10 @@ export class EventsToApprovePage implements OnInit { this.eventsPRList = prEvents; console.log(this.eventsPRList); - /* this.processes.GetToApprovedEvents('PR','false').subscribe(res=>{ - this.showLoader = false; - this.eventsPRList = res; - - console.log('this.eventsPRList', this.eventsPRList) - }); */ let mdEvents = await this.processes.GetToApprovedEvents('MDGPR','false').toPromise(); this.eventsMDGPRList = mdEvents; console.log(this.eventsMDGPRList); - /* this.processes.GetToApprovedEvents('MDGPR','false').subscribe(res=>{ - this.showLoader = false; - this.eventsMDGPRList = res; - - console.log('this.eventsMDGPRList', this.eventsMDGPRList) - }); */ + this.showLoader = false; } From dcebb41d04d1303bb962e0b2f53375cbb2a38ebd Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 23 Jun 2021 09:52:10 +0100 Subject: [PATCH 2/4] save --- src/app/pages/gabinete-digital/gabinete-digital.page.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 344ad82cb..364c5ed64 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -294,7 +294,9 @@ export class GabineteDigitalPage implements OnInit { this.LoadCounts(); //this.refreshExpedientes(); - event.target.complete(); + setTimeout(() => { + event.target.complete(); + }, 2000); } notImplemented(){ From f949a9d1af9796da3916368ee09558d16b751427 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 23 Jun 2021 10:20:19 +0100 Subject: [PATCH 3/4] save --- .../gabinete-digital/gabinete-digital.page.ts | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 364c5ed64..6545b3340 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -279,6 +279,8 @@ export class GabineteDigitalPage implements OnInit { } doRefresh(event) { + console.log(event); + this.closeAllDesktopComponents(); switch(this.loggeduser.Profile){ case 'MDGPR': @@ -294,9 +296,15 @@ export class GabineteDigitalPage implements OnInit { this.LoadCounts(); //this.refreshExpedientes(); - setTimeout(() => { - event.target.complete(); - }, 2000); + if(event){ + setTimeout(() => { + event.target.complete(); + }, 2000); + } + else{ + console.log('null'); + + } } notImplemented(){ From d1ce8be9fd677d77f2d6663012e7958b6430c143 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 23 Jun 2021 10:25:47 +0100 Subject: [PATCH 4/4] save --- .../events-to-approve/events-to-approve.page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html index a336b3081..71dc18df6 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html @@ -30,7 +30,7 @@