peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 04:57:52 +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>
</div>
<div *ngIf="SessionStore.user.RoleID !== 100000014" style="
<div style="
padding-bottom: 10px;
padding-left: 10px;
padding-right: 10px;
@@ -198,7 +199,7 @@
</ion-row>
<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 style="padding-right: 50px" class="font-16-em text-black align-center cursor-pointer" (click)="changeSegment('Pessoal')" [class.active]="segment == 'Pessoal' ">
Pessoais
@@ -217,40 +218,45 @@
<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="timeline-date align-center" *ngIf="isSelectedDayHasEvent && hasEventToday">
<div class="timeline-date align-center" *ngIf="isSelectedDayHasEvent && hasEventToday">
<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="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 "
(click)="eventClicked(events)" >
<div class="d-flex content-{{event.profile}}-{{event.event.CalendarName}} mt-10 cursor-pointer width-100 " (click)="eventClicked(event)"
*ngIf="viewEventMonth <= dateMonth(event) ">
<div class="schedule-time" >
<div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
<div class="time-start">
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
{{ events.startTime | date: 'dd-MM-yyyy HH:mm' }}
</div>
<div class="time-end">
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
{{ events.endTime | date: 'dd-MM-yyyy HH:mm' }}
</div>
<div *ngIf="event.startMany && !event.middle" class="time-start labelb">Início</div>
<div *ngIf="event.endMany && !event.middle " class="time-end labelb">Fim</div>
<div *ngIf="!(event.endMany && !event.middle) && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
<div *ngIf="!(event.startMany && !event.middle) && !event.middle" class="time-end"> {{event.event.EndDate | date: 'HH:mm'}} </div>
<div *ngIf="event.middle" class="time-start"> Todo </div>
<div *ngIf="event.middle" class="time-end text-center"> o dia </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="location">
<ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
{{events.event.Location}}
</div>
<div class="description">
<p class="m-0">{{events.event.Subject}}</p>
<p class="m-0">{{event.event.Subject}}</p>
</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>
src/app/pages/agenda/agenda.page.scss
+65 -3
View File
@@ -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;
src/app/pages/agenda/agenda.page.ts
+8 -7
View File
@@ -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