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

Bug solve displaing tabs os event to aprove

Browse Source
This commit is contained in:
Eudes Inácio
2023-02-17 16:53:20 +01:00
parent 39e2f775db
commit 93f1678472
5 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/event-list/event-list.page.html
+4 -3
View File
@@ -16,10 +16,11 @@
</div>
<ion-toolbar>
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
<ion-segment-button value="MDGPR">
<!-- <ion-segment-button value="MDGPR">
Minha agenda
</ion-segment-button>
<ion-segment-button *ngFor="let calendars of eventService.calendarNamesAry" value="PR">
</ion-segment-button> -->
<ion-segment-button *ngFor="let calendars of eventService.calendarNamesAry; let i index" [value]="i === 'Meu calendario' ? 'MDGPR' : 'PR'">
<div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
<div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> Agenda do PR </div>
<div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> Agenda do MD </div>
<div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>
src/app/shared/agenda/event-list/event-list.page.html
+4 -3
View File
@@ -10,10 +10,11 @@
</div>
<ion-toolbar>
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
<ion-segment-button value="MDGPR">
<!-- <ion-segment-button value="MDGPR">
Minha agenda
</ion-segment-button>
<ion-segment-button *ngFor="let calendars of eventService.calendarNamesAry" value="PR">
</ion-segment-button> -->
<ion-segment-button *ngFor="let calendars of eventService.calendarNamesAry; let i index" [value]="i === 'Meu calendario' ? 'MDGPR' : 'PR'">
<div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
<div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> Agenda do PR </div>
<div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> Agenda do MD </div>
<div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>
src/app/shared/agenda/event-list/event-list.page.ts
+1
View File
@@ -40,6 +40,7 @@ export class EventListPage implements OnInit {
public eventService: EventsService,
) {
this.loggeduser = SessionStore.user;
alert(this.segment)
}
ngOnInit() {
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+4 -3
View File
@@ -9,10 +9,11 @@
</div>
<ion-toolbar>
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
<ion-segment-button value="MDGPR">
<!-- <ion-segment-button value="MDGPR">
Minha agenda
</ion-segment-button>
<ion-segment-button *ngFor="let calendars of eventService.calendarNamesAry" value="PR">
</ion-segment-button> -->
<ion-segment-button *ngFor="let calendars of eventService.calendarNamesAry; let i index" [value]="i === 'Meu calendario' ? 'MDGPR' : 'PR'">
<div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
<div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> Agenda do PR </div>
<div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> Agenda do MD </div>
<div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "87d8863d7",
"SHA": "87d8863d7dafa4532fa72e06f94188cb9222c34d",
"shortSHA": "39e2f775d",
"SHA": "39e2f775dbd168470f90f68d18c88ffb96ecb910",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Eudes Inácio'",
"lastCommitTime": "'Fri Feb 17 12:18:28 2023 +0100'",
"lastCommitMessage": "Verb of the action changed",
"lastCommitNumber": "4796",
"lastCommitTime": "'Fri Feb 17 12:24:25 2023 +0100'",
"lastCommitMessage": "git pull made",
"lastCommitNumber": "4805",
"change": "",
"changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 7 and 8 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/models/user.model.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/services/events.service.ts\n\tnew file: src/app/services/notification-message.service.spec.ts\n\tnew file: src/app/services/notification-message.service.ts\n\tnew file: src/app/services/role-id.service.spec.ts\n\tnew file: src/app/services/role-id.service.ts\n\tmodified: src/global.scss",
"changeStatus": "On branch no_bug_movemente\nYour branch is up to date with 'origin/no_bug_movemente'.\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified: src/app/shared/agenda/event-list/event-list.page.html\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html",
"changeAuthor": "eudes.inacio"
}