peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-21 05:45:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
Eudes Inácio
2021-06-25 10:20:25 +01:00
parent c943eaccbb c99070ad42
commit 450fc46e4f
2 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.html
+6 -6
View File
@@ -219,11 +219,11 @@
<div *ngFor="let events of TimelineMDList | keyvalue;" > <div *ngFor="let events of TimelineMDList | keyvalue;" >
<div class="EventListBox-container" *ngIf="CalendarCurrentDay <= events.key"> <div class="EventListBox-container" *ngIf="CalendarCurrentDay <= events.key">
<div class="day mt-10"> <div class="day mt-10" *ngIf="shoeEventDay(events.value)">
{{ TimelineDayEvent(events.key)}} {{ TimelineDayEvent(events.key)}}
</div> </div>
<div *ngFor="let event of events.value" class="EventListBox"> <div *ngFor="let event of events.value" class="EventListBox" >
<div class="d-flex content-{{event.profile}}-{{event.event.CalendarName}} mt-10 cursor-pointer width-100 " (click)="eventClicked(event)" <div class="d-flex content-{{event.profile}}-{{event.event.CalendarName}} mt-10 cursor-pointer width-100 " (click)="eventClicked(event)"
*ngIf="viewEventMonth <= dateMonth(event) && showEventBox(event)"> *ngIf="viewEventMonth <= dateMonth(event) && showEventBox(event)">
@@ -262,10 +262,10 @@
<div *ngFor="let events of TimelineMDList | keyvalue;" > <div *ngFor="let events of TimelineMDList | keyvalue;" >
<div class="EventListBox-container" *ngIf="CalendarCurrentDay <= events.key"> <div class="EventListBox-container" *ngIf="CalendarCurrentDay <= events.key">
<div class="day EventListBox-day mt-10"> <div class="day EventListBox-day mt-10" *ngIf="shoeEventDay(events.value)">
{{ TimelineDayEvent(events.key)}} {{ TimelineDayEvent(events.key)}}
</div> </div>
<div *ngFor="let event of events.value" class="EventListBox" > <div *ngFor="let event of events.value" class="EventListBox" >
<div class="d-flex content-mdgpr-{{event.event.CalendarName}} mt-10 cursor-pointer" (click)="eventClicked(event)" <div class="d-flex content-mdgpr-{{event.event.CalendarName}} mt-10 cursor-pointer" (click)="eventClicked(event)"
*ngIf="viewEventMonth <= dateMonth(event) && showEventBox(event)"> *ngIf="viewEventMonth <= dateMonth(event) && showEventBox(event)">
@@ -303,11 +303,11 @@
<div class="EventListBox-container" *ngIf="CalendarCurrentDay <= events.key"> <div class="EventListBox-container" *ngIf="CalendarCurrentDay <= events.key">
<div class="day mt-10"> <div class="day mt-10" *ngIf="shoeEventDay(events.value)">
{{ TimelineDayEvent(events.key)}} {{ TimelineDayEvent(events.key)}}
</div> </div>
<div *ngFor="let event of events.value" class="EventListBox"> <div *ngFor="let event of events.value" class="EventListBox" >
<div class="d-flex content-pr-{{event.event.CalendarName}} mt-10 cursor-pointer" (click)="eventClicked(event)" <div class="d-flex content-pr-{{event.event.CalendarName}} mt-10 cursor-pointer" (click)="eventClicked(event)"
*ngIf="viewEventMonth <= dateMonth(event) && showEventBox(event) "> *ngIf="viewEventMonth <= dateMonth(event) && showEventBox(event) ">
src/app/pages/agenda/agenda.page.ts
+33
View File
@@ -1311,6 +1311,27 @@ export class AgendaPage implements OnInit {
} }
this.showTimelineFilterState = false; this.showTimelineFilterState = false;
setTimeout(()=>{
document.querySelectorAll('.EventListBox-container .EventListBox').forEach((e)=>{
if(e.childElementCount == 0) {
e.parentElement.style.display = 'none'
} else {
e.parentElement.style.display = 'block'
}
})
}, 10)
setTimeout(()=>{
document.querySelectorAll('.EventListBox-container .EventListBox').forEach((e)=>{
if(e.childElementCount == 0) {
e.parentElement.style.display = 'none'
} else {
e.parentElement.style.display = 'block'
}
})
}, 100)
} }
async showEventBox(event) { async showEventBox(event) {
@@ -1322,4 +1343,16 @@ export class AgendaPage implements OnInit {
return false return false
} }
shoeEventDay(events: any[]) {
if ( this.segment == 'Combinado') {
return true;
}
const reuslt = events.filter((e)=> e.CalendarName == this.segment)
return reuslt.length != 0
}
} }