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

merge

Browse Source
This commit is contained in:
Peter Maquiran
2023-08-29 16:57:01 +01:00
parent ae105eaf0e
commit 8030e4e53f
5 changed files with 115 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.html
+29 -23
View File
@@ -44,7 +44,8 @@
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " slot="icon-only" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-calendar-arrow-right.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " slot="icon-only" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-calendar-arrow-right.svg"></ion-icon>
</div> </div>
<div *ngIf="SessionStore.user.RoleID !== 100000014" style="
<div style="
padding-bottom: 10px; padding-bottom: 10px;
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
@@ -198,7 +199,7 @@
</ion-row> </ion-row>
<div style="padding-right: 50px" class="font-16-em text-black align-center cursor-pointer" (click)="changeSegment('Combinado')" [class.active]="segment == 'Combinado' "> <div style="padding-right: 50px" class="font-16-em text-black align-center cursor-pointer" (click)="changeSegment('Combinado')" [class.active]="segment == 'Combinado' ">
Todos Todos...
</div> </div>
<div style="padding-right: 50px" class="font-16-em text-black align-center cursor-pointer" (click)="changeSegment('Pessoal')" [class.active]="segment == 'Pessoal' "> <div style="padding-right: 50px" class="font-16-em text-black align-center cursor-pointer" (click)="changeSegment('Pessoal')" [class.active]="segment == 'Pessoal' ">
Pessoais Pessoais
@@ -217,40 +218,45 @@
<div class="timeline-container height-100 d-flex pt-10 pl-20 filter-{{segment}}" > <div class="timeline-container height-100 d-flex pt-10 pl-20 filter-{{segment}}" >
<div class="ss-timeline timeline-mobile flex-grow-1 pr-10 text-black height-100 width-100 overflow-y-auto" > <div class="ss-timeline timeline-mobile flex-grow-1 pr-10 text-black height-100 width-100 overflow-y-auto" >
<!-- <div class="timeline-date align-center" *ngIf="isSelectedDayHasEvent && hasEventToday"> <div class="timeline-date align-center" *ngIf="isSelectedDayHasEvent && hasEventToday">
<span >Hoje,&nbsp;</span> {{ timelineDate }} <span >Hoje,&nbsp;</span> {{ timelineDate }}
</div> --> </div>
<div *ngFor="let events of TimelineMDList " > <div *ngFor="let events of TimelineMDList | keyvalue; " >
<div class="EventListBox-container" > <div class="EventListBox-container" >
<div class="day " [class.dayShow]="isSelectedDayHasEvent && hasEventToday" >
{{ TimelineDay(events.key)}} <div style="text-transform: capitalize; display: inline;">{{ viewTitle }}</div>
</div>
<div class="EventListBox mb-10" > <div *ngFor="let event of events.value" class="EventListBox mb-10" >
<div class=" content-{{events.profile}}-{{events.calendarName}} mt-10 cursor-pointer width-100 " <div class="d-flex content-{{event.profile}}-{{event.event.CalendarName}} mt-10 cursor-pointer width-100 " (click)="eventClicked(event)"
(click)="eventClicked(events)" > *ngIf="viewEventMonth <= dateMonth(event) ">
<div class="schedule-time" > <div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
<div class="time-start"> <div *ngIf="event.startMany && !event.middle" class="time-start labelb">Início</div>
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon> <div *ngIf="event.endMany && !event.middle " class="time-end labelb">Fim</div>
{{ events.startTime | date: 'dd-MM-yyyy HH:mm' }}
</div> <div *ngIf="!(event.endMany && !event.middle) && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
<div class="time-end"> <div *ngIf="!(event.startMany && !event.middle) && !event.middle" class="time-end"> {{event.event.EndDate | date: 'HH:mm'}} </div>
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
{{ events.endTime | date: 'dd-MM-yyyy HH:mm' }} <div *ngIf="event.middle" class="time-start"> Todo </div>
</div> <div *ngIf="event.middle" class="time-end text-center"> o dia </div>
</div> </div>
<div class="schedule-time" *ngIf="event.event.IsAllDayEvent">
<div class="time-start">Todo </div>
<div class="time-end text-center">o dia</div>
</div>
<div class="schedule-details"> <div class="schedule-details">
<div class="location">
<ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
{{events.event.Location}}
</div>
<div class="description"> <div class="description">
<p class="m-0">{{events.event.Subject}}</p> <p class="m-0">{{event.event.Subject}}</p>
</div> </div>
<!-- <div class="font-13 calendar-owner"*ngIf="eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) == 'Meu calendario'">{{SessionStore.user.FullName}} </div> --> <div class="location">{{event.event.Location}}</div>
<div class="font-13 calendar-owner"*ngIf="eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) == 'Meu calendario'">{{SessionStore.user.FullName}} </div>
<ng-template #other_content>{{eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId)}}</ng-template>
</div> </div>
</div> </div>
src/app/pages/agenda/agenda.page.scss
+65 -3
View File
@@ -485,16 +485,17 @@ td.monthview-primary-with-event {
} }
.schedule-time{ .schedule-time{
margin-right: 10px; margin-right: 10px;
min-width: 150px; min-width: 33px;
.time-start{ .time-start{
color: black !important; color: #797979 !important;
font-family: Roboto; font-family: Roboto;
font-size: rem(13); font-size: rem(13);
} }
.time-end{ .time-end{
color: black !important; color: #797979 !important;
font-family: Roboto; font-family: Roboto;
font-size: rem(13); 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 { .calendar-conteiner-height {
height: 100%; height: 100%;
transition: 0.5s; transition: 0.5s;
src/app/pages/agenda/agenda.page.ts
+8 -7
View File
@@ -705,22 +705,23 @@ export class AgendaPage implements OnInit {
updateEventListBox() { updateEventListBox() {
const selectedCalendarIds = this.getSelectedAgendaCalendars(); 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 }) 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'); const selectedDay = momentG(this.eventSelectedDate, 'dd', 'pt');
// if(this.TimelineMDList[selectedDay]) { if(this.TimelineMDList[selectedDay]) {
// this.hasEventToday = true this.hasEventToday = true
// } else { } else {
// this.hasEventToday = false this.hasEventToday = false
// } }
this.isSelectedDayHasEvent = momentG(new Date(), 'dd MMMM yyyy', 'pt') == momentG(this.eventSelectedDate, 'dd MMMM yyyy', 'pt'); this.isSelectedDayHasEvent = momentG(new Date(), 'dd MMMM yyyy', 'pt') == momentG(this.eventSelectedDate, 'dd MMMM yyyy', 'pt');
} }
changeYear = (year) => { changeYear = (year) => {
const a = this.calendar.currentDate const a = this.calendar.currentDate
src/app/services/agenda/list-box.service.ts
+7 -9
View File
@@ -16,16 +16,12 @@ export class ListBoxService {
return eventSource.filter((e) => e.profile == profile) return eventSource.filter((e) => e.profile == profile)
} }
getEventInsideRange(eventSource: EventListStore[], rangeStartDate, randEndDate, selectedDate) { getEventInsideRange(eventSource: EventListStore[], rangeStartDate, randEndDate) {
return eventSource.filter((e)=> { return eventSource.filter((e)=> {
if(new Date(rangeStartDate).getTime() <= new Date(e.startTime).getTime() && 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 true
} }
return false return false
}) })
} }
@@ -51,14 +47,16 @@ export class ListBoxService {
if(segment!='Combinado') { if(segment!='Combinado') {
eventSource = this.filterSegment(eventSource, segment) eventSource = this.filterSegment(eventSource, segment)
} }
eventSource = this.getEventInsideRange(eventSource, rangeStartDate, randEndDate, selectedDate)
// if(profile != 'all') { // if(profile != 'all') {
// eventSource = this.filterProfile(eventSource, profile) // eventSource = this.filterProfile(eventSource, profile)
// } // }
return eventSource let newStracture:CustomCalendarEvent[];
newStracture = this.encapsulation(eventSource);
return this.display(newStracture, selectedDate)
} }
display(list: CustomCalendarEvent[], selectedDate) { display(list: CustomCalendarEvent[], selectedDate) {
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = { export let versionData = {
"shortSHA": "53e674032", "shortSHA": "ae105eaf0",
"SHA": "53e67403238dbaaf46480561ce789b3f4cd17d82", "SHA": "ae105eaf0eada7785fb08d6bbca3338b999decf7",
"branch": "developer-prod", "branch": "developer-prod",
"lastCommitAuthor": "'Peter Maquiran'", "lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Tue Aug 29 16:42:46 2023 +0100'", "lastCommitTime": "'Tue Aug 29 16:45:29 2023 +0100'",
"lastCommitMessage": "agenda change timeline", "lastCommitMessage": "merge",
"lastCommitNumber": "5226", "lastCommitNumber": "5233",
"change": "", "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 <file>...\" 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" "changeAuthor": "peter.maquiran"
} }