peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 12:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

pull made

Browse Source
This commit is contained in:
Eudes Inácio
2023-08-22 14:13:41 +01:00
parent 8cbcc370f3 51a526644a
commit 926e4e39d8
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.ts
+3 -2
View File
@@ -844,9 +844,10 @@ export class AgendaPage implements OnInit {
const selectedCalendarIds = this.getSelectedAgendaCalendars(); const selectedCalendarIds = this.getSelectedAgendaCalendars();
this.listToPresent = this.CalendarStore.getEventsByCalendarIds(selectedCalendarIds) 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')) const listToPresent = this.listToPresent.filter( e => momentG(new Date(this.eventSelectedDate), '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 })
this.TimelineMDList = this.listBoxService.list(listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
const selectedDay = momentG(this.eventSelectedDate, 'dd', 'pt'); const selectedDay = momentG(this.eventSelectedDate, 'dd', 'pt');
if(this.TimelineMDList[selectedDay]) { if(this.TimelineMDList[selectedDay]) {
src/global.scss
+1
View File
@@ -56,6 +56,7 @@ td.monthview-current{
border-bottom: 1px solid var(--monthview-selected) !important; border-bottom: 1px solid var(--monthview-selected) !important;
color: black !important; color: black !important;
background-color: #e39c956b !important; background-color: #e39c956b !important;
font-weight: 500;
} }
// selected date ============================= // selected date =============================
td.monthview-selected { td.monthview-selected {
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = { export let versionData = {
"shortSHA": "cb95084c1", "shortSHA": "8cbcc370f",
"SHA": "cb95084c1020acc9cff39b2088445226b668425d", "SHA": "8cbcc370f3786feb511794e60dd716e0908b9967",
"branch": "developer-prod", "branch": "developer-prod",
"lastCommitAuthor": "'Eudes Inácio'", "lastCommitAuthor": "'Eudes Inácio'",
"lastCommitTime": "'Tue Aug 22 11:52:16 2023 +0100'", "lastCommitTime": "'Tue Aug 22 13:31:19 2023 +0100'",
"lastCommitMessage": "agenda text change again", "lastCommitMessage": "Text change from Rever to Enviar para Revisão",
"lastCommitNumber": "5200", "lastCommitNumber": "5202",
"change": "", "change": "",
"changeStatus": "On branch developer-prod\nYour branch and 'origin/developer-prod' have diverged,\nand have 1 and 1 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/event-actions-popover/event-actions-popover.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.html\n\tmodified: src/app/shared/agenda/event-list/event-list.page.html\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts", "changeStatus": "On branch developer-prod\nYour branch and 'origin/developer-prod' have diverged,\nand have 2 and 1 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/global.scss",
"changeAuthor": "eudes.inacio" "changeAuthor": "eudes.inacio"
} }