diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html index 27e2d3e7c..943f62daa 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html +++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html @@ -49,7 +49,7 @@
1 {{customDate}}
-2 das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}
+2 das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'HH:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}
3 (Não se repete)
4 Repete
{{customDate}}
-das12 {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}
+das12 {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'HH:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}
(Não se repete)
Repete
{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}
-{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}
+{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}
+{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}
{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}
@@ -58,8 +58,8 @@ *ngFor="let event of eventsPRList" (click)="goToEventToApproveDetail(event.serialNumber)">{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}
-{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}
+{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}
+{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}
{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html index f4df4a6d8..5c09ff957 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html @@ -86,8 +86,8 @@{{event.StartDate | date: 'hh:mm'}}
-{{event.EndDate | date: 'hh:mm'}}
+{{event.StartDate | date: 'HH:mm'}}
+{{event.EndDate | date: 'HH:mm'}}
{{event.StartDate | date: 'd/M/yy' }} - {{ event.EndDate | date: 'dd/mm/yy'}} | {{event.Location}}
diff --git a/src/app/pages/publications/view-publications/view-publications.page.html b/src/app/pages/publications/view-publications/view-publications.page.html index d41f936b7..3dc836b6c 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.html +++ b/src/app/pages/publications/view-publications/view-publications.page.html @@ -13,7 +13,7 @@{{item.Detail}}
-{{item.DateBegin}}
+{{item.DateBegin | date: 'dd-MM-yy | HH:mm'}}
{{publication.Message}}
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/shared/agenda/approve-event/approve-event.page.html index 482453ad1..d7ef655e1 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.html +++ b/src/app/shared/agenda/approve-event/approve-event.page.html @@ -38,7 +38,7 @@{{customDate}}
-das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}
+das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'HH:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}
(Não se repete)
Repete
{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}
-{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}
+{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}
+{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}
{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}
@@ -52,8 +52,8 @@ (click)="openApproveModal(event.serialNumber, event)">{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}
-{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}
+{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}
+{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}
{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}
diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index a19dbb451..0c7bc0d84 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -338,7 +338,7 @@ export class NewEventPage implements OnInit { restoreDatepickerData() { if (this.postEvent) { - this.dateControlOccurrence = new FormControl(moment(this.postEvent.EventRecurrence.LastOccurrence, "DD MM YYYY hh:mm")) + this.dateControlOccurrence = new FormControl(moment(this.postEvent.EventRecurrence.LastOccurrence, "DD MM YYYY HH:mm")) } } 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 76ab1c5ea..bee6eaf62 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 @@ -37,8 +37,8 @@{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}
-{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}
+{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}
+{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}
{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}
@@ -57,8 +57,8 @@ >{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}
-{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}
+{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}
+{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}
{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}
diff --git a/src/app/shared/publication/view-publications/view-publications.page.html b/src/app/shared/publication/view-publications/view-publications.page.html index 24dd457ad..4a8950b02 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.html +++ b/src/app/shared/publication/view-publications/view-publications.page.html @@ -9,7 +9,7 @@{{item.Detail}}
-{{ item.DateBegin | date: 'dd-MM-yy | hh:mm'}}
+{{ item.DateBegin | date: 'dd-MM-yy | HH:mm'}}
{{publication.Message}}