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

test-1

Browse Source
This commit is contained in:
Peter Maquiran
2022-05-05 16:12:51 +01:00
parent 08d836f661
commit 5552a0caad
7 changed files with 250 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
+6 -7
View File
@@ -56,13 +56,12 @@ constructor (
let despachoList = [];
let despachosPr;
switch (this.loggeduser.Profile) {
case 'MDGPR':
despachosPr = result.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
break;
case 'PR':
despachosPr = result.reverse().filter(data => data.activityInstanceName == "Concluir Despacho");
break;
if(this.loggeduser.Profile != 'PR') {
despachosPr = result.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
} else if(this.loggeduser.Profile != 'PR') {
despachosPr = result.reverse().filter(data => data.activityInstanceName == "Concluir Despacho");
}
despachosPr = despachosPr.filter(data => data.workflowInstanceDataFields.Status == "Active");
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+3 -3
View File
@@ -66,7 +66,7 @@ export class EventsToApprovePage implements OnInit {
this.showLoader = true;
this.getFromDB();
if(this.segment == 'MDGPR'){
if(this.segment != 'PR') {
let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
@@ -79,7 +79,7 @@ export class EventsToApprovePage implements OnInit {
//this.eventaprovacaostore.resetmd(this.sortService.sortDate(this.eventsMDGPRList, 'CreateDate'));
}
else if(this.segment == 'PR'){
else if(this.segment == 'PR') {
let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
this.eventsPRList = prEventsOficial.concat(prEventsPessoal);
@@ -109,7 +109,7 @@ export class EventsToApprovePage implements OnInit {
return new Date(e).toDateString()
}
goToEventDetail(event){
goToEventDetail(event) {
this.router.navigate(['/home/gabinete-digital/event-list/approve-event',event.serialNumber, 'gabinete-digital'])
}