mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 21:06:06 +00:00
fix
This commit is contained in:
@@ -5,6 +5,7 @@
|
||||
<div class="header-content width-100">
|
||||
<div class="header-title d-flex width-100">
|
||||
<h3>Deseja arquivar este expediente?</h3>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="header-body width-100">
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
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 || calendars.OwnerUserId">
|
||||
<ion-segment-button *ngFor="let calendars of eventService.calendarNamesAryReverse; let i index" [value]="i === 'Meu calendario' ? 'Meu calendario' : i.OwnerUserId || calendars.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>
|
||||
|
||||
@@ -98,6 +98,11 @@ export class EventListPage implements OnInit {
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
ngAfterViewInit(): void {
|
||||
|
||||
|
||||
}
|
||||
|
||||
reorderList(orderBy: string) {
|
||||
|
||||
@@ -51,6 +51,7 @@ export class EventsService {
|
||||
calendarNames = {}
|
||||
|
||||
calendarNamesAry = []
|
||||
calendarNamesAryReverse = []
|
||||
|
||||
calendarNamesType = {}
|
||||
calendarRole = []
|
||||
@@ -306,6 +307,8 @@ export class EventsService {
|
||||
this.hasAnyCalendar = true
|
||||
}
|
||||
|
||||
|
||||
this.calendarNamesAryReverse = this.calendarNamesAry.reverse();
|
||||
|
||||
(() => {
|
||||
const keys = {}
|
||||
@@ -326,6 +329,7 @@ export class EventsService {
|
||||
}
|
||||
}
|
||||
})();
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -62,7 +62,6 @@ export class TaskService {
|
||||
private processesbackend: ProcessesService,
|
||||
private despachoRule: DespachoService,
|
||||
public eventService: EventsService,
|
||||
private sortService: SortService,
|
||||
private router: Router,
|
||||
) {
|
||||
|
||||
@@ -432,4 +431,21 @@ export class TaskService {
|
||||
|
||||
}
|
||||
|
||||
|
||||
dynamicSearch({searchSubject, ordinance, list}) {
|
||||
if(searchSubject) {
|
||||
|
||||
const AllProcess = list.filter((task) => {
|
||||
let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
|
||||
subject = subject.toLowerCase();
|
||||
return subject.includes(searchSubject.toLowerCase())
|
||||
})
|
||||
|
||||
this.AllProcess = list.reorderList(ordinance, AllProcess)
|
||||
} else {
|
||||
const AllProcess = list
|
||||
this.AllProcess = list.reorderList(ordinance, AllProcess)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
</div>
|
||||
<ion-toolbar>
|
||||
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
|
||||
<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.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>
|
||||
<div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </div>
|
||||
|
||||
@@ -28,7 +28,11 @@ export class AllProcessesPage implements OnInit {
|
||||
|
||||
AllProcess = []
|
||||
ordinance: string = 'old'
|
||||
|
||||
|
||||
/**
|
||||
* @description Update List subcription
|
||||
*/
|
||||
listSubscription : {
|
||||
delete(): void;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user