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

show two calendar at time

Browse Source
This commit is contained in:
Peter Maquiran
2024-06-07 13:37:06 +01:00
parent 0d415679ea
commit 41cabb76ac
4 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.html
+3 -3
View File
@@ -57,7 +57,7 @@
<!-- Debug line to print data -->
<mat-form-field class="select-calendar" appearance="none" color="ion-color-secondary" placeholder="Selecione agenda" *ngIf="calendarData?.length && showCalendarField">
<div *ngIf="selectedUserCalendar != SessionStore.user.UserId && !hasChangeCalendar " style="margin-bottom: -20px;">PR </div>
<div *ngIf="hasPrCalendar(calendarData) && !hasChangeCalendar " style="margin-bottom: -20px;">PR </div>
<div *ngIf="selectedUserCalendar == SessionStore.user.UserId && !hasChangeCalendar " style="margin-bottom: -20px;">
Minha agenda
</div>
@@ -76,9 +76,9 @@
</mat-option>
<!-- <mat-option value="PR+MDGPR" *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks]) && environment.presidential">
<mat-option value="PR+MDGPR" *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks]) && environment.presidential">
PR+MDGPR
</mat-option> -->
</mat-option>
</mat-select>
</mat-form-field>
src/app/pages/agenda/agenda.page.ts
+17 -5
View File
@@ -282,6 +282,18 @@ export class AgendaPage implements OnInit {
this.weekToShow()
}
hasPrCalendar(data: TableSharedCalendar[]) {
for(const e of data) {
if(e.roleId == this.RoleIdService.PRES) {
return true
}
}
return false
}
segmentChanged() {
this.showCalendarField = true
}
@@ -299,7 +311,6 @@ export class AgendaPage implements OnInit {
}
ngOnInit() {
this.setCalendarByDefault(false)
@@ -680,6 +691,9 @@ export class AgendaPage implements OnInit {
this.myCal.loadEvents();
} catch (error) {}
console.log('selectedCalendarIds', selectedCalendarIds)
let load = 0;
for (const selectedCalendar of selectedCalendarIds) {
@@ -748,11 +762,9 @@ export class AgendaPage implements OnInit {
const data = await this.AgendaDataRepositoryService.geCalendars()
const prObject = data.find(e => e?.roleId == 100000014)
const myCalendar = data.find(e => e?.wxUserId == SessionStore.user.UserId)
return[{
...this.eventService.calendarNamesType['Meu calendario'],
wxUserId: this.SessionStore.user.UserId
}, {
return[{...myCalendar}, {
...prObject
}]