From 088ee19e5ccf5ce4557d0c5e54a5bd8688239f6b Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 28 Aug 2023 17:39:48 +0100 Subject: [PATCH 1/3] add color black --- .../all-processes/all-processes.page.scss | 2 +- .../gabinete-digital/diplomas/diplomas.page.scss | 2 +- .../generic/task-list/task-list.page.scss | 2 +- version/git-version.ts | 14 +++++++------- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss b/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss index 4740129d2..891363122 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss @@ -140,7 +140,7 @@ ion-list{ float: right; font-size: rem(12); padding: 2.5px 13.5px 2.5px 13.5px; - color: #fff; + color: black; } } .item-date{ diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss b/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss index 3f911c5ce..4dbc4f087 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss @@ -170,7 +170,7 @@ ion-item{ /* font-size: 12px; */ float: right; padding: 2.5px 13.5px 2.5px 13.5px; - color: #fff; + color: black; } } .exp-date{ diff --git a/src/app/shared/gabinete-digital/generic/task-list/task-list.page.scss b/src/app/shared/gabinete-digital/generic/task-list/task-list.page.scss index ee3d4cb19..91bfc7dd1 100644 --- a/src/app/shared/gabinete-digital/generic/task-list/task-list.page.scss +++ b/src/app/shared/gabinete-digital/generic/task-list/task-list.page.scss @@ -66,7 +66,7 @@ /* font-size: rem(12); */ float: right; padding: 2.5px 13.5px 2.5px 13.5px; - color: #fff; + color: black; } } .exp-date{ diff --git a/version/git-version.ts b/version/git-version.ts index 2591e94f4..6b8645745 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "624d0b1d7", - "SHA": "624d0b1d7a142ec7b58756a9a023a650fdd2e952", + "shortSHA": "ead20b5b4", + "SHA": "ead20b5b4eb7fbfa9d3f974b3ee3e8fe8697f99a", "branch": "developer-prod", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Aug 28 17:11:29 2023 +0100'", - "lastCommitMessage": "add gitignore", - "lastCommitNumber": "5222", - "change": "diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss b/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss\nindex 3f911c5ce..4dbc4f087 100644\n--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss\n+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss\n@@ -170,7 +170,7 @@ ion-item{\n /* font-size: 12px; */\n float: right;\n padding: 2.5px 13.5px 2.5px 13.5px;\n- color: #fff;\n+ color: black;\n }\n }\n .exp-date{", - "changeStatus": "On branch developer-prod\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/modals/document-detail/document-detail.page.scss\n\tmodified: src/app/modals/view-event/view-event.page.scss\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/agenda.page.scss\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/view-event/view-event.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.scss\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.scss\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.scss\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.scss\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.page.scss\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.page.scss\n\tmodified: src/app/services/agenda/list-box.service.ts\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.scss\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.scss\n\tmodified: src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.page.scss\n\tmodified: src/app/shared/gabinete-digital/generic/task-detail-header/task-detail-header.page.scss\n\tmodified: src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss\n\tmodified: src/app/shared/gabinete-digital/pedidos/pedidos.page.scss\n\tmodified: src/app/shared/gabinete-digital/pendentes/pendentes.page.scss\n\tmodified: src/global.scss\n\tmodified: src/theme/variables.scss\n\tmodified: version/git-version.ts\n\nChanges not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.scss", + "lastCommitTime": "'Mon Aug 28 17:32:11 2023 +0100'", + "lastCommitMessage": "merge", + "lastCommitNumber": "5224", + "change": "", + "changeStatus": "On branch developer-prod\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.scss\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.scss\n\tmodified: src/app/shared/gabinete-digital/generic/task-list/task-list.page.scss", "changeAuthor": "peter.maquiran" } \ No newline at end of file From 53e67403238dbaaf46480561ce789b3f4cd17d82 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 29 Aug 2023 16:42:46 +0100 Subject: [PATCH 2/3] agenda change timeline --- src/app/pages/agenda/agenda.page.html | 49 +++--- src/app/pages/agenda/agenda.page.scss | 68 +------- src/app/pages/agenda/agenda.page.ts | 164 ++---------------- src/app/services/agenda/list-box.service.ts | 16 +- .../despachos-pr/despachos-pr.page.scss | 2 +- .../despachos/despachos.page.scss | 2 +- src/global.scss | 8 +- version/git-version.ts | 12 +- 8 files changed, 57 insertions(+), 264 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 3717b449d..939d3d400 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -217,45 +217,40 @@
-
+ -
+
-
- {{ TimelineDay(events.key)}}
{{ viewTitle }}
-
-
+
-
+
-
+
-
Início
-
Fim
+
+ + {{ events.startTime | date: 'dd-MM-yyyy HH:mm' }} +
+
+ + {{ events.endTime | date: 'dd-MM-yyyy HH:mm' }} +
-
{{event.event.StartDate | date: 'HH:mm'}}
-
{{event.event.EndDate | date: 'HH:mm'}}
- -
Todo
-
o dia
- -
-
-
Todo
-
o dia
-
-

{{event.event.Subject}}

+
+ + {{events.event.Location}}
-
{{event.event.Location}}
-
{{SessionStore.user.FullName}}
- {{eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId)}} +
+

{{events.event.Subject}}

+
+
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index 3418faa07..839e5cdd1 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -485,17 +485,16 @@ td.monthview-primary-with-event { } - .schedule-time{ margin-right: 10px; - min-width: 33px; + min-width: 150px; .time-start{ - color: #797979 !important; + color: black !important; font-family: Roboto; font-size: rem(13); } .time-end{ - color: #797979 !important; + color: black !important; font-family: Roboto; font-size: rem(13); } @@ -1005,67 +1004,6 @@ $font-size: rem(15); } - - -@media only screen and (min-width: 100px) { - - .week-5 { - .calendar-title-container { - font-size: 14px; - } - .height-75 { - height: 75px; - } - - .height-356 { - height: 324px; - } - } - - .week-6 { - .calendar-title-container { - font-size: 14px; - } - .height-75 { - height: 75px; - } - - .height-356 { - height: 360px; - } - } - -} - -@media only screen and (min-width: 500px) { - .week-5 { - .calendar-title-container { - font-size: 16px; - } - .height-75 { - height: 75px; - } - - .height-356 { - height: 356px; - } - } - - .week-6 { - .calendar-title-container { - font-size: 16px; - } - .height-75 { - height: 75px; - } - - .height-356 { - height: 395px; - } - } - -} - .calendar-conteiner-height { height: 100%; transition: 0.5s; diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index faefffa88..5f07609ab 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -181,8 +181,7 @@ export class AgendaPage implements OnInit { private backgroundservice: BackgroundService, public ThemeService: ThemeService, public p: PermissionService, - public RoleIdService: RoleIdService, - private ContactsService: ContactsService + public RoleIdService: RoleIdService ) { this.dateAdapter.setLocale('es'); @@ -239,7 +238,7 @@ export class AgendaPage implements OnInit { this.reloadCalendar() } - + this.weekToShow() } tigerUpdate() { @@ -291,7 +290,7 @@ export class AgendaPage implements OnInit { }, 1000) } - height = '75px' + height = 'unset' weekToShow() { @@ -323,7 +322,6 @@ export class AgendaPage implements OnInit { }, 100) } }, 250) - } setCalendarByDefault() { @@ -623,6 +621,7 @@ export class AgendaPage implements OnInit { this.CalendarStore.pushEvent(eventsList, label); this.listToPresent = this.CalendarStore.getEventsByCalendarIds(selectedCalendarIds) + this.updateEventListBox() this.showTimelinePR = true; @@ -703,160 +702,19 @@ export class AgendaPage implements OnInit { } - // trasnformData(response, profile) { - - // response.forEach(element => { - // let event = { - // startTime: new Date(element.StartDate), - // endTime: new Date(element.EndDate), - // allDay: false, - // event: element, - // calendarName: element.CalendarName, - // profile: profile, - // id: element.EventId, - // } - // this.array.push(event) - // }); - // this.listToPresent = this.array; - - // } - - // //Deve ser removido para ficar só um method transform - // trasnformDataDB(response) { - - // if(response) { - - // response.forEach(element => { - // let event = { - // startTime: new Date(element.StartDate), - // endTime: new Date(element.EndDate), - // allDay: false, - // event: element, - // calendarName: element.CalendarName, - // profile: element.Profile, - // id: element.EventId, - // } - // this.array.push(event) - // }); - // this.listToPresent = this.array; - - // } - - // } - - // addEventToDB(response, profile) { - // if (this.platform.is('desktop') || this.platform.is('mobileweb')) { - // let responseArray = []; - // response.forEach(element => { - // let event = { - // CalendarId: element.CalendarId, - // CalendarName: element.CalendarName, - // EndDate: element.EndDate, - // EventId: element.EventId, - // HasAttachments: element.HasAttachments, - // HumanDate: element.HumanDate, - // IsAllDayEvent: element.IsAllDayEvent, - // Location: element.Location, - // StartDate: element.StartDate, - // Subject: element.Subject, - // Profile: profile - // } - // responseArray.push(event) - - // }); - - // this.storage.set('agendaResponse',responseArray).then(() => { - - // }) - // } else { - // if (response.length > 0) { - - // response.forEach(element => { - // let event = { - // CalendarId: element.CalendarId, - // CalendarName: element.CalendarName, - // EndDate: element.EndDate, - // EventId: element.EventId, - // HasAttachments: element.HasAttachments, - // HumanDate: element.HumanDate, - // IsAllDayEvent: element.IsAllDayEvent, - // Location: element.Location, - // StartDate: element.StartDate, - // Subject: element.Subject, - // Profile: profile - // } - // this.sqliteservice.addEvent(event) - - // }); - // } - // } - // } - - // getFromDB() { - - // if (this.platform.is('desktop') || this.platform.is('mobileweb')) { - // this.storage.get('agendaResponse').then((events) => { - // this.trasnformDataDB(events) - // this.updateEventListBox() - - // this.myCal.update(); - // this.myCal.loadEvents(); - - // this.showLoader = false; - // this.showTimeline = true; - // }) - // } else { - // this.sqliteservice.getAllEvents().then((events: any[] = []) => { - - // let eventArray = []; - - // this.trasnformDataDB(events) - // this.updateEventListBox() - - // this.myCal.update(); - // this.myCal.loadEvents(); - - // this.showLoader = false; - // this.showTimeline = true; - - - // }) - // } - - // } - - - // getEventsFromDB () { - - // new Promise((resolve, reject) => { - // if (this.platform.is('desktop') || this.platform.is('mobileweb')) { - // this.storage.get('agendaResponse').then((events) => { - // resolve(events) - // }) - // } else { - // this.sqliteservice.getAllEvents().then((events: any[] = []) => { - // resolve(events) - // }) - // } - // }).catch ((error) => { - // console.error(error); - // }); - - // } - updateEventListBox() { const selectedCalendarIds = this.getSelectedAgendaCalendars(); - this.listToPresent = this.CalendarStore.getEventsByCalendarIds(selectedCalendarIds) + //this.listToPresent = this.CalendarStore.getEventsByCalendarIds(selectedCalendarIds); 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'); - if(this.TimelineMDList[selectedDay]) { - this.hasEventToday = true - } else { - this.hasEventToday = false - } + // const selectedDay = momentG(this.eventSelectedDate, 'dd', 'pt'); + // if(this.TimelineMDList[selectedDay]) { + // this.hasEventToday = true + // } else { + // this.hasEventToday = false + // } this.isSelectedDayHasEvent = momentG(new Date(), 'dd MMMM yyyy', 'pt') == momentG(this.eventSelectedDate, 'dd MMMM yyyy', 'pt'); diff --git a/src/app/services/agenda/list-box.service.ts b/src/app/services/agenda/list-box.service.ts index 4673ecb8d..2bd290208 100644 --- a/src/app/services/agenda/list-box.service.ts +++ b/src/app/services/agenda/list-box.service.ts @@ -16,12 +16,16 @@ export class ListBoxService { return eventSource.filter((e) => e.profile == profile) } - getEventInsideRange(eventSource: EventListStore[], rangeStartDate, randEndDate) { + getEventInsideRange(eventSource: EventListStore[], rangeStartDate, randEndDate, selectedDate) { return eventSource.filter((e)=> { if(new Date(rangeStartDate).getTime() <= new Date(e.startTime).getTime() && - new Date(randEndDate).getTime() >= new Date(e.endTime).getTime()) { + new Date(randEndDate).getTime() >= new Date(e.endTime).getTime()) { + return true + } else if ( new Date(selectedDate).getMonth() == new Date(e.endTime).getMonth() || + new Date(selectedDate).getMonth() == new Date(e.startTime).getMonth()) { return true } + return false }) } @@ -47,16 +51,14 @@ export class ListBoxService { if(segment!='Combinado') { eventSource = this.filterSegment(eventSource, segment) } + + eventSource = this.getEventInsideRange(eventSource, rangeStartDate, randEndDate, selectedDate) // if(profile != 'all') { // eventSource = this.filterProfile(eventSource, profile) // } - let newStracture:CustomCalendarEvent[]; - - newStracture = this.encapsulation(eventSource); - - return this.display(newStracture, selectedDate) + return eventSource } display(list: CustomCalendarEvent[], selectedDate) { diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss index befa8575b..594cabec7 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss @@ -181,7 +181,7 @@ ion-item{ /* font-size: rem(12); */ float: right; padding: 2.5px 13.5px 2.5px 13.5px; - color: #fff; + color: black; } } .exp-date{ diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.scss b/src/app/shared/gabinete-digital/despachos/despachos.page.scss index 0a5b354a8..93d422843 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.scss +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.scss @@ -161,7 +161,7 @@ ion-item{ /* font-size: 12px; */ float: right; padding: 2.5px 13.5px 2.5px 13.5px; - color: #fff; + color: black; } } .exp-date{ diff --git a/src/global.scss b/src/global.scss index a3ff1b1a5..a9859e333 100644 --- a/src/global.scss +++ b/src/global.scss @@ -609,13 +609,13 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- tbody { tr { td { - padding: em(8) !important; + padding: rem(4) !important; div { - width: 30px !important; - height: 30px; + width: rem(30) !important; + height: rem(30); } div.number { - font-size: em(18) !important; + font-size: rem(18) !important; } } } diff --git a/version/git-version.ts b/version/git-version.ts index 6b8645745..b6003d8f4 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "ead20b5b4", - "SHA": "ead20b5b4eb7fbfa9d3f974b3ee3e8fe8697f99a", + "shortSHA": "088ee19e5", + "SHA": "088ee19e5ccf5ce4557d0c5e54a5bd8688239f6b", "branch": "developer-prod", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Aug 28 17:32:11 2023 +0100'", - "lastCommitMessage": "merge", - "lastCommitNumber": "5224", + "lastCommitTime": "'Mon Aug 28 17:39:48 2023 +0100'", + "lastCommitMessage": "add color black", + "lastCommitNumber": "5225", "change": "", - "changeStatus": "On branch developer-prod\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.scss\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.scss\n\tmodified: src/app/shared/gabinete-digital/generic/task-list/task-list.page.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.html\n\tmodified: src/app/pages/agenda/agenda.page.scss\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/services/agenda/list-box.service.ts\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.scss\n\tmodified: src/global.scss", "changeAuthor": "peter.maquiran" } \ No newline at end of file From 8030e4e53f9ac007e7ae79f316c11e74a9359e61 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 29 Aug 2023 16:57:01 +0100 Subject: [PATCH 3/3] merge --- src/app/pages/agenda/agenda.page.html | 52 +++++++++------- src/app/pages/agenda/agenda.page.scss | 68 ++++++++++++++++++++- src/app/pages/agenda/agenda.page.ts | 15 ++--- src/app/services/agenda/list-box.service.ts | 16 +++-- version/git-version.ts | 12 ++-- 5 files changed, 115 insertions(+), 48 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 939d3d400..f6afc0046 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -44,7 +44,8 @@
-
- Todos + Todos...
Pessoais @@ -217,40 +218,45 @@
- +
-
+
+
+ {{ TimelineDay(events.key)}}
{{ viewTitle }}
+
-
+
-
+
-
+
-
- - {{ events.startTime | date: 'dd-MM-yyyy HH:mm' }} -
-
- - {{ events.endTime | date: 'dd-MM-yyyy HH:mm' }} -
+
Início
+
Fim
+ +
{{event.event.StartDate | date: 'HH:mm'}}
+
{{event.event.EndDate | date: 'HH:mm'}}
+ +
Todo
+
o dia
+
+
Todo
+
o dia
+
-
- - {{events.event.Location}} -
-

{{events.event.Subject}}

+

{{event.event.Subject}}

- +
{{event.event.Location}}
+
{{SessionStore.user.FullName}}
+ {{eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId)}}
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index 839e5cdd1..3418faa07 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -485,16 +485,17 @@ td.monthview-primary-with-event { } + .schedule-time{ margin-right: 10px; - min-width: 150px; + min-width: 33px; .time-start{ - color: black !important; + color: #797979 !important; font-family: Roboto; font-size: rem(13); } .time-end{ - color: black !important; + color: #797979 !important; font-family: Roboto; font-size: rem(13); } @@ -1004,6 +1005,67 @@ $font-size: rem(15); } + + +@media only screen and (min-width: 100px) { + + .week-5 { + .calendar-title-container { + font-size: 14px; + } + .height-75 { + height: 75px; + } + + .height-356 { + height: 324px; + } + } + + .week-6 { + .calendar-title-container { + font-size: 14px; + } + .height-75 { + height: 75px; + } + + .height-356 { + height: 360px; + } + } + +} + +@media only screen and (min-width: 500px) { + .week-5 { + .calendar-title-container { + font-size: 16px; + } + .height-75 { + height: 75px; + } + + .height-356 { + height: 356px; + } + } + + .week-6 { + .calendar-title-container { + font-size: 16px; + } + .height-75 { + height: 75px; + } + + .height-356 { + height: 395px; + } + } + +} + .calendar-conteiner-height { height: 100%; transition: 0.5s; diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 5f07609ab..28b94df19 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -705,22 +705,23 @@ export class AgendaPage implements OnInit { updateEventListBox() { const selectedCalendarIds = this.getSelectedAgendaCalendars(); - //this.listToPresent = this.CalendarStore.getEventsByCalendarIds(selectedCalendarIds); + this.listToPresent = this.CalendarStore.getEventsByCalendarIds(selectedCalendarIds) 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'); - // if(this.TimelineMDList[selectedDay]) { - // this.hasEventToday = true - // } else { - // this.hasEventToday = false - // } + const selectedDay = momentG(this.eventSelectedDate, 'dd', 'pt'); + if(this.TimelineMDList[selectedDay]) { + this.hasEventToday = true + } else { + this.hasEventToday = false + } this.isSelectedDayHasEvent = momentG(new Date(), 'dd MMMM yyyy', 'pt') == momentG(this.eventSelectedDate, 'dd MMMM yyyy', 'pt'); } + changeYear = (year) => { const a = this.calendar.currentDate diff --git a/src/app/services/agenda/list-box.service.ts b/src/app/services/agenda/list-box.service.ts index 2bd290208..4673ecb8d 100644 --- a/src/app/services/agenda/list-box.service.ts +++ b/src/app/services/agenda/list-box.service.ts @@ -16,16 +16,12 @@ export class ListBoxService { return eventSource.filter((e) => e.profile == profile) } - getEventInsideRange(eventSource: EventListStore[], rangeStartDate, randEndDate, selectedDate) { + getEventInsideRange(eventSource: EventListStore[], rangeStartDate, randEndDate) { return eventSource.filter((e)=> { if(new Date(rangeStartDate).getTime() <= new Date(e.startTime).getTime() && - new Date(randEndDate).getTime() >= new Date(e.endTime).getTime()) { - return true - } else if ( new Date(selectedDate).getMonth() == new Date(e.endTime).getMonth() || - new Date(selectedDate).getMonth() == new Date(e.startTime).getMonth()) { + new Date(randEndDate).getTime() >= new Date(e.endTime).getTime()) { return true } - return false }) } @@ -51,14 +47,16 @@ export class ListBoxService { if(segment!='Combinado') { eventSource = this.filterSegment(eventSource, segment) } - - eventSource = this.getEventInsideRange(eventSource, rangeStartDate, randEndDate, selectedDate) // if(profile != 'all') { // eventSource = this.filterProfile(eventSource, profile) // } - return eventSource + let newStracture:CustomCalendarEvent[]; + + newStracture = this.encapsulation(eventSource); + + return this.display(newStracture, selectedDate) } display(list: CustomCalendarEvent[], selectedDate) { diff --git a/version/git-version.ts b/version/git-version.ts index 75e68a177..aa9727709 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "53e674032", - "SHA": "53e67403238dbaaf46480561ce789b3f4cd17d82", + "shortSHA": "ae105eaf0", + "SHA": "ae105eaf0eada7785fb08d6bbca3338b999decf7", "branch": "developer-prod", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Aug 29 16:42:46 2023 +0100'", - "lastCommitMessage": "agenda change timeline", - "lastCommitNumber": "5226", + "lastCommitTime": "'Tue Aug 29 16:45:29 2023 +0100'", + "lastCommitMessage": "merge", + "lastCommitNumber": "5233", "change": "", - "changeStatus": "On branch developer-prod\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/modals/create-process/create-process.page.html\n\tmodified: src/app/modals/document-detail/document-detail.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/modals/forward/forward.page.html\n\tmodified: src/app/modals/profile/edit-profile/edit-profile.page.html\n\tmodified: src/app/modals/profile/edit-profile/edit-profile.page.ts\n\tmodified: src/app/modals/profile/profile.page.html\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/modals/view-event/view-event.page.html\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/app/pages/agenda/view-event/view-event.page.html\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.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/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html\n\tmodified: src/app/pages/login/login.page.ts\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.html\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/shared/agenda/new-event/new-event.page.html\n\tmodified: src/app/shared/agenda/view-event/view-event.page.html\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/shared/chat/messages/messages.page.ts\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html\n\tmodified: src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.page.html\n\tmodified: src/app/shared/gabinete-digital/generic/task-details/task-details.page.html\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/app/shared/header/header.page.ts\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.ts\n\tmodified: version/git-version.ts", + "changeStatus": "On branch developer-prod\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/agenda.page.scss\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/services/agenda/list-box.service.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file