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

fix issues

Browse Source
This commit is contained in:
Peter Maquiran
2023-06-13 20:37:23 +01:00
parent f8f0d39be9
commit f023501d9e
11 changed files with 42 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/agenda/event-list/event-list.page.html
+2 -2
View File
@@ -8,8 +8,8 @@
</button>
</div>
</div>
<ion-toolbar>
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
<ion-toolbar >
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)" class="row-reverse">
<ion-segment-button *ngFor="let calendars of eventService.calendarNamesAryReverse; let i index" [value]="i === 'Meu calendario' ? 'Meu calendario' : i.OwnerUserId ">
<div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
<div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> {{ environment.agendaPR}} </div>
src/app/shared/agenda/event-list/event-list.page.ts
+15 -6
View File
@@ -45,13 +45,22 @@ export class EventListPage implements OnInit {
) {
this.loggeduser = SessionStore.user;
if(!this.segment) {
if(this.eventService.calendarNamesAry.includes('Meu calendario')) {
this.segment = 'Meu calendario';
} else {
this.segment = this.eventService.calendarNamesAry[0].OwnerUserId
}
}
ngAfterViewInit(): void {
if(!this.segment) {
if(this.eventService.calendarNamesAry.includes('Meu calendario')) {
this.segment = 'Meu calendario';
} else {
this.segment = this.eventService.calendarNamesAry[0].OwnerUserId
}
// const pr = this.eventService.calendarNamesAry.find( e => e.Role == 'Presidente da República')
// if(pr) {
// this.segment = pr.OwnerUserId
// }
}
}
ngOnInit() {
src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
+1 -2
View File
@@ -1,8 +1,7 @@
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
import { NavigationEnd, Router } from '@angular/router';
import { LoginUserRespose } from 'src/app/models/user.model';
import { ThemeService } from 'src/app/services/theme.service'
import { SessionStore } from 'src/app/store/session.service';
import { TaskService } from 'src/app/services/task.service'
/* import MiniSearch from 'minisearch' */
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+1 -1
View File
@@ -86,7 +86,7 @@
</div>
<ion-toolbar>
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)" class="row-reverse">
<!-- <ion-segment-button value="MDGPR">
Minha agenda
</ion-segment-button> -->
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+5
View File
@@ -68,6 +68,11 @@ export class EventsToApprovePage implements OnInit {
} else {
this.segment = this.eventService.calendarNamesAry[0].OwnerUserId
}
// const pr = this.eventService.calendarNamesAry.find( e => e.Role == 'Presidente da República')
// if(pr) {
// this.segment = pr.OwnerUserId
// }
}
this.LoadToApproveEvents()