From bcc8015f93481a75e19151f514c34a5821941ade Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 24 Aug 2021 14:43:26 +0100 Subject: [PATCH 1/4] fix options --- .../pages/gabinete-digital/despachos/despacho/despacho.page.ts | 1 + 1 file changed, 1 insertion(+) 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 d6f3ae327..3629425c9 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -285,6 +285,7 @@ export class DespachoPage implements OnInit { if(actionName == 'Executado'){ await this.executado(res.data.note, docs); + this.goBack(); } else if(actionName == 'Arquivar'){ await this.arquivar(res.data.note, docs); From 322aa4a1e928acac5423017dcd94dabaf8580b68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Tue, 24 Aug 2021 14:57:50 +0100 Subject: [PATCH 2/4] =?UTF-8?q?Notification=20for=20=20Eventos=20para=20ap?= =?UTF-8?q?rova=C3=A7=C3=A3o=20changed=20to=20agenda=20and=20notification?= =?UTF-8?q?=20diploma-assinar=20open=20bug=20fixed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.xml | 2 +- src/app/modals/profile/profile.page.ts | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/config.xml b/config.xml index 97d2fb38d..7b18d7926 100644 --- a/config.xml +++ b/config.xml @@ -3,7 +3,7 @@ gabinete digital An awesome Ionic/Cordova app. Ionic Framework Team - + diff --git a/src/app/modals/profile/profile.page.ts b/src/app/modals/profile/profile.page.ts index a40a4e2e5..6578fe6e4 100644 --- a/src/app/modals/profile/profile.page.ts +++ b/src/app/modals/profile/profile.page.ts @@ -144,15 +144,17 @@ export class ProfilePage implements OnInit { } notificatinsRoutes = (index, Service, Object, IdObject, FolderId) => { - - if (Service === "agenda") { + + if (Service === "agenda" && IdObject.length > 10) { + console.log("Id Lenght",IdObject.length) this.zone.run(() => this.router.navigate(['/home/agenda', IdObject, 'agenda'])); } else if (Service === "gabinete-digital" && Object === "expediente") { this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expediente', IdObject, 'gabinete-digital'])); } - else if (Service === "gabinete-digital" && Object === "event-list") { - this.zone.run(() => this.router.navigate(['/home/gabinete-digital/event-list/approve-event',IdObject, 'gabinete-digital'])); + else if (Service === "agenda" && Object === "event-list") { + //this.zone.run(() => this.router.navigate(['/home/gabinete-digital/event-list/approve-event',IdObject, 'agenda'])); + this.zone.run(() =>this.router.navigate(['/home/agenda/event-list/approve-event',IdObject, 'agenda'])); } else if (Service === "gabinete-digital" && Object === "despachos") { @@ -180,12 +182,8 @@ export class ProfilePage implements OnInit { this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas', IdObject, 'gabinete-digital'])); } else if (Service === "gabinete-digital" && Object === "diplomas-assinar") { - let navigationExtras: NavigationExtras = { - queryParams: { - "serialNumber": IdObject, - } - }; - this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas-assinar/diploma-assinar'], navigationExtras)); + + this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas-assinar',IdObject,'gabinete-digital'])); } else if (Service === "gabinete-digital" && Object === "expedientes-pr") { this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expedientes-pr', IdObject, 'gabinete-digital'])); From 46baae09d24cb49c7a5c92092df8e1198c8aecda Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 24 Aug 2021 15:11:33 +0100 Subject: [PATCH 3/4] Fix --- .../gabinete-digital/gabinete-digital.page.ts | 16 +++++++++++++--- 1 file changed, 13 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 9bf903b4f..a1c6e57ab 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -19,6 +19,7 @@ import { PermissionService } from 'src/app/OtherService/permission.service'; import { removeDuplicate } from 'src/plugin/removeDuplicate.js' import { WaitForDomService } from 'src/app/services/dom/wait-for-dom.service'; import { TotalDocumentStore } from 'src/app/store/total-document.service'; +import { DeplomasStore } from 'src/app/store/deplomas.service'; @Component({ selector: 'app-gabinete-digital', @@ -96,6 +97,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck { expedienteprstore = ExpedienteprStore; despachoprstore = DespachosprStore; totalDocumentStore = TotalDocumentStore + deplomasStore = DeplomasStore @ViewChild(ExpedientsPage) expedientesPage: ExpedientsPage; @ViewChild(PendentesPage) pendentesListPage: PendentesPage; @@ -439,16 +441,22 @@ export class GabineteDigitalPage implements OnInit, DoCheck { this.count_all_processes = Object.keys(allPreocesses_).length; let expedientes = await this.processesbackend.GetTasksList("Expediente", false).toPromise(); - this.count_exp_dailywork = Object.keys(expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active")).length; + expedientes = expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active") + this.count_exp_dailywork = Object.keys(expedientes).length; this.expedientegbstore.count = this.count_exp_dailywork; + this.expedientegbstore.reset(expedientes) let expedientes_pr = await this.processesbackend.GetTasksList("Expediente", false).toPromise(); - this.count_exp_pr = Object.keys(expedientes_pr.filter(data => data.workflowInstanceDataFields.Status == "Active")).length; + expedientes_pr = expedientes_pr.filter(data => data.workflowInstanceDataFields.Status == "Active") + this.count_exp_pr = Object.keys(expedientes_pr).length; this.expedienteprstore.count = this.count_exp_pr; + this.expedienteprstore.reset(expedientes_pr) let despachos = await this.processesbackend.GetTasksList("Despacho", false).toPromise(); - this.count_desp_dailywork = Object.keys(despachos.filter(data => data.workflowInstanceDataFields.Status == "Active")).length; + despachos = despachos.filter(data => data.workflowInstanceDataFields.Status == "Active") + this.count_desp_dailywork = Object.keys(despachos).length; this.despachoStore.count = this.count_desp_dailywork + this.despachoStore.reset(despachos) let pareceres = await this.processesbackend.GetTasksList("Pedido de Parecer", false).toPromise(); let pareceresPr = await this.processesbackend.GetTasksList("Pedido de Parecer do Presidente", false).toPromise(); @@ -485,9 +493,11 @@ export class GabineteDigitalPage implements OnInit, DoCheck { let diplomasAssinar = despachospr.filter(data => data.activityInstanceName == "Assinar Diploma"); this.count_dip_as = Object.keys(diplomasAssinar).length; + this.deplomasStore.resetDiplomasList(diplomasAssinar) let diplomasAssinados = despachospr.filter(data => data.activityInstanceName == "Diploma Assinado"); this.count_dip_as_pr = Object.keys(diplomasAssinados).length; + this.deplomasStore.resetDiplomasAssinadoList(diplomasAssinados) this.processesbackend.GetToApprovedEvents('Agenda','true').subscribe(res=>{ this.count_ev_apr = res; From 17680c9678c7ca36757d298bf09cfd1b27a775fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Tue, 24 Aug 2021 15:19:31 +0100 Subject: [PATCH 4/4] Date time conversion fixes on perfil page --- src/app/modals/profile/profile.page.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/modals/profile/profile.page.ts b/src/app/modals/profile/profile.page.ts index 6578fe6e4..2639262c7 100644 --- a/src/app/modals/profile/profile.page.ts +++ b/src/app/modals/profile/profile.page.ts @@ -100,8 +100,8 @@ export class ProfilePage implements OnInit { IdObject: element.IdObject, FolderId: element.FolderId, desc: element.desc, - dateInit: this.getFormatedTime(element.dateInit), - dateEnd: this.getFormatedTime(element.dateEnd), + dateInit: element.dateInit, + dateEnd: element.dateEnd, Location: element.Location, TypeAgenda: element.TypeAgenda, Role: element.Role,