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

improve

Browse Source
This commit is contained in:
Peter Maquiran
2022-05-06 15:56:18 +01:00
parent 5552a0caad 169bf9bbda
commit 224ab442db
18 changed files with 102 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
+10
View File
@@ -63,6 +63,16 @@ export class AllProcessesPage implements OnInit {
//
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Conhecimento')
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Revisar Diploma')
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma')
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma')
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Prorrogar prazo')
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Concluir Despacho por Delegação')
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Tarefa de Despacho por Delegação')
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Reexecutar Despacho por Delegação')
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Editar Evento')
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Retificar Expediente')
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Agendar Reunião para o Ministro e Director')
this.skeletonLoader = true;
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+18 -3
View File
@@ -19,7 +19,7 @@ export class EventsToApprovePage implements OnInit {
showLoader: boolean;
eventsPRList: any = []
eventsMDGPRList: any = []
eventsMDGPRList;
eventPerson: EventPerson;
eventBody: EventBody;
categories: string[];
@@ -41,6 +41,7 @@ export class EventsToApprovePage implements OnInit {
}
ngOnInit() {
console.log('ERROR LEGN',this.eventsMDGPRList.length)
this.segment = this.loggeduser.Profile;
this.LoadToApproveEvents();
@@ -66,11 +67,18 @@ export class EventsToApprovePage implements OnInit {
this.showLoader = true;
this.getFromDB();
if(this.segment != 'PR') {
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();
console.log(mdEventsOficial)
console.log(mdEventsPessoal)
this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList)
this.eventsMDGPRList = this.eventsMDGPRList.filter(function(item) {
return item.activityInstanceName != 'Editar Evento'
})
console.log(this.eventsMDGPRList)
this.storage.set('event-to-aproveMD',this.eventsMDGPRList).then(() => {
@@ -82,8 +90,13 @@ export class EventsToApprovePage implements OnInit {
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();
console.log(prEventsOficial)
console.log(prEventsPessoal)
this.eventsPRList = prEventsOficial.concat(prEventsPessoal);
this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList)
this.eventsPRList = this.eventsPRList.filter(function(item) {
return item.activityInstanceName != 'Editar Evento'
})
this.storage.set('event-to-aprovePR',this.eventsPRList).then(() => {
@@ -97,10 +110,12 @@ export class EventsToApprovePage implements OnInit {
getFromDB() {
this.storage.get('event-to-aproveMD').then((events) => {
this.eventsMDGPRList = events
console.log('DB',this.eventsMDGPRList)
})
this.storage.get('event-to-aprovePR').then((events) => {
this.eventsPRList = events
console.log('DB',this.eventsPRList)
})
}
@@ -153,7 +168,7 @@ export class EventsToApprovePage implements OnInit {
}, 1000)
}
close(){
close() {
this.modalController.dismiss(null);