mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-21 13:55:51 +00:00
fix all errors
This commit is contained in:
@@ -228,10 +228,6 @@
|
||||
<div class="height-100">
|
||||
<div class="timeline-container height-100 d-flex pt-10 pl-20 filter-{{segment}} flex-column" >
|
||||
|
||||
<div class="timeline-date align-center" *ngIf="isSelectedDayHasEvent && hasEventToday">
|
||||
<span >Hoje, </span> {{ todayDateFormat() }}
|
||||
</div>
|
||||
|
||||
<div class="ss-timeline timeline-mobile flex-grow-1 pr-10 text-black height-100 width-100 overflow-y-auto" >
|
||||
|
||||
<div *ngFor="let year of TimelineMDList " >
|
||||
@@ -240,7 +236,8 @@
|
||||
|
||||
<div *ngFor="let day of month.days; let i = index " class="EventListBox-container" >
|
||||
|
||||
<div class="day" *ngIf="!(i == 0 && isSelectedDayHasEvent)" >
|
||||
<div class="day" >
|
||||
<span *ngIf="i == 0 && isSelectedDayIsToday" > Hoje </span>
|
||||
{{ day.daysInfo.dayName }} <div style="text-transform: capitalize; display: inline;">{{month.monthInfo.monthName}}</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -183,7 +183,7 @@ export class AgendaPage implements OnInit {
|
||||
environment = environment
|
||||
selectedUserCalendar: number | string = null
|
||||
hasEventToday = false
|
||||
isSelectedDayHasEvent = true
|
||||
isSelectedDayIsToday = true
|
||||
|
||||
sharedCalendar: Observable<TableSharedCalendar[]>
|
||||
|
||||
@@ -854,22 +854,27 @@ export class AgendaPage implements OnInit {
|
||||
if(YearIndex == 0) {
|
||||
let MonthNameIndex = year[YearIndex].months.findIndex( x => x.monthInfo.monthName == monthName)
|
||||
if(MonthNameIndex == 0) {
|
||||
let DayNameIndex = year[YearIndex].months[MonthNameIndex].days.findIndex( x => x.daysInfo.dayName == dayName)
|
||||
if(DayNameIndex == 0) {
|
||||
this.hasEventToday = true
|
||||
} else {
|
||||
this.hasEventToday = false
|
||||
let events = year[YearIndex].months[MonthNameIndex].days.filter( x => x.daysInfo.dayName == dayName)
|
||||
|
||||
for(const e of events) {
|
||||
for(const b of e.events) {
|
||||
const equal = (momentG(new Date(), 'dd MMMM yyyy', 'pt') == momentG((b as any).start, 'dd MMMM yyyy', 'pt'))
|
||||
|
||||
if(equal) {
|
||||
this.isSelectedDayIsToday = true
|
||||
return true
|
||||
}
|
||||
}
|
||||
}
|
||||
this.isSelectedDayIsToday = false
|
||||
|
||||
} else {
|
||||
this.hasEventToday = false
|
||||
this.isSelectedDayIsToday = false
|
||||
}
|
||||
} else {
|
||||
this.hasEventToday = false
|
||||
this.isSelectedDayIsToday = false
|
||||
}
|
||||
|
||||
|
||||
this.isSelectedDayHasEvent = momentG(new Date(), 'dd MMMM yyyy', 'pt') == momentG(this.eventSelectedDate, 'dd MMMM yyyy', 'pt');
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user