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