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

change order

Browse Source
This commit is contained in:
Peter Maquiran
2023-06-22 13:09:11 +01:00
parent 6ea40ab55f
commit e4b08b8873
4 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/event-list/event-list.page.html
+10 -2
View File
@@ -56,11 +56,19 @@
</mat-form-field>
</div>
<ion-toolbar>
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)" class="row-reverse">
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
<!-- <ion-segment-button value="MDGPR">
Minha agenda
</ion-segment-button> -->
<ion-segment-button *ngFor="let calendars of eventService.calendarNamesAry; let i index" [value]="i === 'Meu calendario' ? 'Meu calendario' : i.OwnerUserId ">
<ion-segment-button *ngFor="let calendars of eventService.calendarNamesAryPR; 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>
<div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </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>
</ion-segment-button>
<ion-segment-button *ngFor="let calendars of eventService.calendarNamesAryNoPr; 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>
<div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </div>
src/app/shared/agenda/event-list/event-list.page.html
+10 -2
View File
@@ -9,8 +9,16 @@
</div>
</div>
<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 ">
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
<ion-segment-button *ngFor="let calendars of eventService.calendarNamesAryPR; 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>
<div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}}</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>
</ion-segment-button>
<ion-segment-button *ngFor="let calendars of eventService.calendarNamesAryNoPr; 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>
<div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </div>
src/app/shared/agenda/event-list/event-list.page.ts
-2
View File
@@ -44,8 +44,6 @@ export class EventListPage implements OnInit {
public eventService: EventsService,
) {
this.loggeduser = SessionStore.user;
}
ngAfterViewInit(): void {
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "f849610b8",
"SHA": "f849610b8c6e4815d2c8536b544ac0dac7a7b278",
"shortSHA": "6ea40ab55",
"SHA": "6ea40ab55f681269113bbb8c6724fbe4f60099c7",
"branch": "feature/gabinete-search",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Mon Jun 19 12:15:39 2023 +0100'",
"lastCommitMessage": "change home",
"lastCommitNumber": "5016",
"lastCommitTime": "'Thu Jun 22 12:53:35 2023 +0100'",
"lastCommitMessage": "remove un used import",
"lastCommitNumber": "5017",
"change": "",
"changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: .gitignore\n\tmodified: src/app/app.component.ts\n\tnew file: src/app/controller/chat.ts\n\tnew file: src/app/controller/event.ts\n\tnew file: src/app/controller/process/dispactch.ts\n\tmodified: src/app/models/beast-orm.ts\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/app/pages/agenda/view-event/view-event.page.ts\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tdeleted: src/app/pages/chat/new-group/group-chat/group-chat-routing.module.ts\n\tdeleted: src/app/pages/chat/new-group/group-chat/group-chat.module.ts\n\tdeleted: src/app/pages/chat/new-group/group-chat/group-chat.page.html\n\tdeleted: src/app/pages/chat/new-group/group-chat/group-chat.page.scss\n\tdeleted: src/app/pages/chat/new-group/group-chat/group-chat.page.spec.ts\n\tdeleted: src/app/pages/chat/new-group/group-chat/group-chat.page.ts\n\tmodified: src/app/pages/chat/new-group/new-group-routing.module.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/services/chat/room.service.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/app/shared/agenda/view-event/view-event.page.html\n\tmodified: src/app/shared/agenda/view-event/view-event.page.ts\n\tdeleted: src/app/shared/chat/new-group/group-chat/group-chat-routing.module.ts\n\tdeleted: src/app/shared/chat/new-group/group-chat/group-chat.module.ts\n\tdeleted: src/app/shared/chat/new-group/group-chat/group-chat.page.html\n\tdeleted: src/app/shared/chat/new-group/group-chat/group-chat.page.scss\n\tdeleted: src/app/shared/chat/new-group/group-chat/group-chat.page.spec.ts\n\tdeleted: src/app/shared/chat/new-group/group-chat/group-chat.page.ts\n\tmodified: src/app/shared/chat/new-group/new-group-routing.module.ts\n\tmodified: src/app/shared/chat/new-group/new-group.page.ts\n\tmodified: src/app/store/calendar.service.ts",
"changeStatus": "On branch feature/gabinete-search\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",
"changeAuthor": "peter.maquiran"
}