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 @@ -->
- +

{{ 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 63f748142..67fa8bc9c 100644 --- a/src/global.scss +++ b/src/global.scss @@ -55,7 +55,7 @@ td.monthview-primary-with-event { td.monthview-current{ border-bottom: 1px solid var(--monthview-selected) !important; color: black !important; - background-color: white !important; + background-color: #e39c956b !important; } // selected date ============================= td.monthview-selected { @@ -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 f7d252569..b53da1fef 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "6342ec614", - "SHA": "6342ec614001504ae3cbe01583a8cdf370aa6ad2", + "shortSHA": "76c3dab63", + "SHA": "76c3dab63ede5cf9cf84ae4f115904acbd6920d5", "branch": "developer-prod", "lastCommitAuthor": "'Eudes InĂ¡cio'", - "lastCommitTime": "'Mon Aug 21 17:52:04 2023 +0100'", - "lastCommitMessage": "loader added to notifications", - "lastCommitNumber": "5188", + "lastCommitTime": "'Mon Aug 21 19:13:32 2023 +0100'", + "lastCommitMessage": "Pull made", + "lastCommitNumber": "5190", "change": "", - "changeStatus": "On branch developer-prod\nYour branch and 'origin/developer-prod' have diverged,\nand have 1 and 3 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\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\nYour branch and 'origin/developer-prod' have diverged,\nand have 2 and 2 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\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/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": "eudes.inacio" } \ No newline at end of file