From 60fd3a473ea7fa038e8900d81ecacb8b536c59aa Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 21 Aug 2023 19:01:54 +0100 Subject: [PATCH 1/2] hide timeline events --- src/app/pages/agenda/agenda.page.scss | 2 +- src/app/pages/agenda/agenda.page.ts | 2 ++ src/app/pages/agenda/new-event/new-event.page.html | 2 +- src/global.scss | 2 +- version/git-version.ts | 12 ++++++------ 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index 484293ee1..ca5c215ae 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -242,7 +242,7 @@ label{ color: #e16817; } td.monthview-primary-with-event { - background-color: white !important; + background-color: red !important; } .header-title{ font-family: Roboto; diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 9903032c1..87e3fa3a9 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -844,6 +844,8 @@ export class AgendaPage implements OnInit { const selectedCalendarIds = this.getSelectedAgendaCalendars(); this.listToPresent = this.CalendarStore.getEventsByCalendarIds(selectedCalendarIds) + this.listToPresent = this.listToPresent.filter( e => momentG(new Date(), 'dd MMMM yyyy', 'pt') == momentG(e.startTime, 'dd MMMM yyyy', 'pt')) + this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) const selectedDay = momentG(this.eventSelectedDate, 'dd', 'pt'); diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html index d2196a135..77a305cbf 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -151,7 +151,7 @@ -->
- + ...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/app/pages/events/attendees/attendees.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.ts\n\tmodified: src/app/services/events/attendees/attendees.page.html\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/event/attendee-modal/attendee-modal.page.html\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.ts\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.ts\n\tmodified: src/app/store/eventoaprovacao-store.service.ts\n\tmodified: src/global.scss", + "changeStatus": "On branch developer-prod\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.scss\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/global.scss", "changeAuthor": "peter.maquiran" } \ No newline at end of file From 9aa7928d897f10ae0aad37dc9d7ec111590e7d0d Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 21 Aug 2023 19:09:55 +0100 Subject: [PATCH 2/2] hide timeline events --- src/app/pages/events/attendees/attendees.page.html | 6 +++--- .../services/events/attendees/attendees.page.html | 6 +++--- .../event/attendee-modal/attendee-modal.page.html | 6 +++--- src/global.scss | 6 +++++- version/git-version.ts | 12 ++++++------ 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/app/pages/events/attendees/attendees.page.html b/src/app/pages/events/attendees/attendees.page.html index ff769cee9..c69d6a1e2 100644 --- a/src/app/pages/events/attendees/attendees.page.html +++ b/src/app/pages/events/attendees/attendees.page.html @@ -22,7 +22,7 @@

{{ attendee.Name }}

-

{{ attendee.EmailAddress }}

+

{{ attendee.EmailAddress }}

@@ -47,7 +47,7 @@

{{ attendee.Name }}

-

{{ attendee.EmailAddress }}

+

{{ attendee.EmailAddress }}

@@ -69,7 +69,7 @@

{{ attendee.Name }}

-

{{ attendee.EmailAddress }}

+

{{ attendee.EmailAddress }}

diff --git a/src/app/services/events/attendees/attendees.page.html b/src/app/services/events/attendees/attendees.page.html index e479e51dc..3e3386dd7 100644 --- a/src/app/services/events/attendees/attendees.page.html +++ b/src/app/services/events/attendees/attendees.page.html @@ -20,7 +20,7 @@

{{ attendee.Name }}

-

{{ attendee.EmailAddress }}

+

{{ attendee.EmailAddress }}

@@ -43,7 +43,7 @@

{{ attendee.Name }}

-

{{ attendee.EmailAddress }}

+

{{ attendee.EmailAddress }}

@@ -63,7 +63,7 @@

{{ attendee.Name }}

-

{{ attendee.EmailAddress }}

+

{{ attendee.EmailAddress }}

diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.html b/src/app/shared/event/attendee-modal/attendee-modal.page.html index d8e0fff25..55725bf06 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.page.html +++ b/src/app/shared/event/attendee-modal/attendee-modal.page.html @@ -20,7 +20,7 @@

{{ attendee.Name }}

-

{{ attendee.EmailAddress }}

+

{{ attendee.EmailAddress }}

@@ -45,7 +45,7 @@

{{ attendee.Name }}

-

{{ attendee.EmailAddress }}

+

{{ attendee.EmailAddress }}

@@ -65,7 +65,7 @@

{{ attendee.Name }}

-

{{ attendee.EmailAddress }}

+

{{ attendee.EmailAddress }}

diff --git a/src/global.scss b/src/global.scss index 5fa79fd43..67fa8bc9c 100644 --- a/src/global.scss +++ b/src/global.scss @@ -1649,4 +1649,8 @@ h5, .buttons{ .ngx-mat-timepicker input { user-select: none !important; color: black !important; -} \ No newline at end of file +} + +.lowercase { + text-transform: lowercase; +} diff --git a/version/git-version.ts b/version/git-version.ts index 27ad7a48d..da810fd4b 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "a02bcb13a", - "SHA": "a02bcb13a35495397840d9f62330d0106e93817a", + "shortSHA": "60fd3a473", + "SHA": "60fd3a473ea7fa038e8900d81ecacb8b536c59aa", "branch": "developer-prod", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Aug 21 17:36:32 2023 +0100'", - "lastCommitMessage": "general review", - "lastCommitNumber": "5188", + "lastCommitTime": "'Mon Aug 21 19:01:54 2023 +0100'", + "lastCommitMessage": "hide timeline events", + "lastCommitNumber": "5189", "change": "", - "changeStatus": "On branch developer-prod\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.scss\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/global.scss", + "changeStatus": "On branch developer-prod\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/events/attendees/attendees.page.html\n\tmodified: src/app/services/events/attendees/attendees.page.html\n\tmodified: src/app/shared/event/attendee-modal/attendee-modal.page.html\n\tmodified: src/global.scss", "changeAuthor": "peter.maquiran" } \ No newline at end of file