From f5b556ac540f6b1b4be3b9baa79dfb979bbb1235 Mon Sep 17 00:00:00 2001 From: "EQUILIBRIUM\\hirondino.van-dunem" Date: Wed, 6 Jul 2022 14:24:10 +0100 Subject: [PATCH 1/9] validated the last ocurrence date in event-to-approve --- .../agenda/edit-event-to-approve/edit-event-to-approve.page.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html index 91363486f..a1a99a38e 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html @@ -254,6 +254,7 @@ placeholder="Choose a date" [(ngModel)]="eventProcess.workflowInstanceDataFields.LastOccurrence" [disabled]="disabled" + [min]="eventProcess.workflowInstanceDataFields.EndDate" > Date: Fri, 8 Jul 2022 13:31:09 +0100 Subject: [PATCH 2/9] show pr event list --- src/app/pages/agenda/agenda.page.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index b62c42f52..611b6fa1a 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -293,7 +293,7 @@ -
+
@@ -334,7 +334,7 @@
-
+
From b536d739c508b34538ab28c039f1c50298929723 Mon Sep 17 00:00:00 2001 From: "EQUILIBRIUM\\hirondino.van-dunem" Date: Mon, 11 Jul 2022 16:39:50 +0100 Subject: [PATCH 3/9] validated the last ocurrence date in edit-event-to-approve on mobile and web --- .../edit-event.page.html | 3 ++ .../edit-event-to-approve/edit-event.page.ts | 49 +++++++++++++++++-- 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html index 3214adf1d..957ff060b 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html @@ -111,6 +111,7 @@ placeholder="Choose a date" [(ngModel)]="startDate" [disabled]="disabled" + [min]="currentDate" > 1){ - this.selectedRecurringType = ev.filter(data => data != '-1'); + this.postEvent.EventRecurrence.Type = ev.filter(data => data != '-1'); } if(ev.length == 0){ - this.selectedRecurringType = "-1"; - } */ + this.postEvent.EventRecurrence.Type = "-1"; + } + } + + calculetedLastOccurrence(type:number){ + var valor; + var opcao: boolean; + if (type == 0) { + valor = 7; + opcao = true; + } else if(type == 1){ + valor = 30; + opcao = true; + } else if(type == 2){ + valor = 1; + opcao = false; + }else if(type == 3){ + valor = 5; + opcao = false; + } + this.defineLastOccurrence(valor, opcao); + } + + + defineLastOccurrence(valor:number, opcao:boolean){ + var time = new Date(this.endDate); + if (opcao == true) { + time.setDate(time.getDate() + valor); + this.eventProcess.workflowInstanceDataFields.LastOccurrence = time; + } else { + time = new Date( + time.getFullYear() + valor, + time.getMonth(), + time.getDate(), + time.getHours(), + time.getMinutes() + ); + this.eventProcess.workflowInstanceDataFields.LastOccurrence = time; + } + } openLastOccurrence() { From b01f75295f41a895bfd608f27eb6b1dd4fa39044 Mon Sep 17 00:00:00 2001 From: "EQUILIBRIUM\\hirondino.van-dunem" Date: Tue, 12 Jul 2022 09:51:55 +0100 Subject: [PATCH 4/9] fixed ocurrence in event-to-approve-view on mobile and web --- .../event-list/approve-event/approve-event.page.html | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html index d0be4c730..65a3b4bbd 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html @@ -60,8 +60,13 @@

{{customDate}}

das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'HH:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}

{{loadedEvent.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ loadedEvent.workflowInstanceDataFields.StartDate | date: 'dd/M/yy'}}

-

(Não se repete)

-

Repete

+

+ Diário + Semanal + Mensal + Anual + (Não se repete) +

From 14157481f7595875f66583c4f857a90e2fccd2da Mon Sep 17 00:00:00 2001 From: "EQUILIBRIUM\\hirondino.van-dunem" Date: Tue, 12 Jul 2022 11:12:35 +0100 Subject: [PATCH 5/9] fixed range date in event-to-approve-view --- .../event-list/approve-event/approve-event.page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html index 65a3b4bbd..195d17574 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html @@ -59,7 +59,7 @@

{{customDate}}

das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'HH:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}

-

{{loadedEvent.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ loadedEvent.workflowInstanceDataFields.StartDate | date: 'dd/M/yy'}}

+

{{loadedEvent.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ loadedEvent.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}}

Diário Semanal From ce30125e3c3d9e6d7e7145dc9714853f0efe461b Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 12 Jul 2022 15:22:36 +0100 Subject: [PATCH 6/9] fix --- src/app/pages/agenda/view-event/view-event.page.html | 5 +++-- src/app/pages/agenda/view-event/view-event.page.ts | 3 ++- src/app/shared/agenda/view-event/view-event.page.html | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html index 2194acc24..96ae78e19 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -40,12 +40,13 @@

{{loadedEvent.Location}}
-
+ +
{{loadedEvent.CalendarName}} {{loadedEvent.CalendarName}}
-
+
{{loadedEvent.CalendarName}} {{loadedEvent.CalendarName}}
diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index 953f4812e..02b2b5de7 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -71,8 +71,9 @@ export class ViewEventPage implements OnInit { public ThemeService: ThemeService, private RouteService: RouteService, private ionicStorage: Storage, - private CalendarService: CalendarService + private CalendarService: CalendarService, ) { + this.isEventEdited = false; this.loadedEvent = new Event(); diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html index 1bb5b3fb3..856eb4426 100644 --- a/src/app/shared/agenda/view-event/view-event.page.html +++ b/src/app/shared/agenda/view-event/view-event.page.html @@ -36,12 +36,13 @@ {{loadedEvent.Location}}
-
+ +
{{loadedEvent.CalendarName}} {{loadedEvent.CalendarName}}
-
+
{{loadedEvent.CalendarName}} {{loadedEvent.CalendarName}}
From 68713698eee1bca0ac6acd69bd1326e9137725f3 Mon Sep 17 00:00:00 2001 From: "EQUILIBRIUM\\hirondino.van-dunem" Date: Tue, 12 Jul 2022 16:19:57 +0100 Subject: [PATCH 7/9] fixed filter position --- src/app/pages/search/search.page.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index 34e1c398b..6617d4ee9 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -11,7 +11,7 @@ -
+
@@ -34,7 +34,7 @@
-
+
From 84545f5414c22fdda5586d2982650f18eefd9c9c Mon Sep 17 00:00:00 2001 From: "EQUILIBRIUM\\hirondino.van-dunem" Date: Wed, 13 Jul 2022 12:16:03 +0100 Subject: [PATCH 8/9] fixed the loader of gabinete digital --- .../gabinete-digital/all-processes/all-processes.page.html | 4 ++-- .../gabinete-digital/all-processes/all-processes.page.ts | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html index 72ec3d7d4..1bc3ba743 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html @@ -84,13 +84,13 @@
Lista vazia
-
+
diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts index b8ed791a3..925331d61 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts @@ -80,6 +80,9 @@ export class AllProcessesPage implements OnInit { get AllProcess() { + setTimeout(() => { + this.skeletonLoader = false; + }, 5000); return this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento) .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr) .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.despachoStore.list) From 523e52a2ca4e886a0d1e04d87ce1fffe360705a6 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 13 Jul 2022 14:48:20 +0100 Subject: [PATCH 9/9] change colors --- .../despachos-pr/despacho-pr/despacho-pr.page.ts | 2 +- src/app/pages/gabinete-digital/diplomas/diplomas.page.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts index f4b1f50c2..515e0b03a 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts @@ -43,7 +43,7 @@ export class DespachoPrPage implements OnInit { serialNumber: string; caller: string; profile: string; - intervenientes: any; + intervenientes: any =[] cc: any = []; constructor( diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html index 39f4f7fd9..4b5d29bc3 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html @@ -16,10 +16,10 @@ - Por validar ... + Por validar - Assinados PR ... + Assinados PR