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

Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
Peter Maquiran
2022-05-09 15:32:31 +01:00
parent 8356e23744 08b127725e
commit b8ccefc9e3
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/app/src/main/assets/capacitor.config.json
-3
View File
@@ -16,8 +16,5 @@
"sound" "sound"
] ]
} }
},
"server": {
"url": "http://192.168.0.50:8101"
} }
} }
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+8 -2
View File
@@ -639,13 +639,19 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR', false).toPromise(); let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
let mdEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal MDGPR', false).toPromise(); let mdEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
const eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal); let eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
eventsMDGPRList = eventsMDGPRList.filter(function(item) {
return item.activityInstanceName != 'Editar Evento'
})
this.eventoaprovacaostore.countMd = eventsMDGPRList.length this.eventoaprovacaostore.countMd = eventsMDGPRList.length
this.eventoaprovacaostore.resetmd(eventsMDGPRList); this.eventoaprovacaostore.resetmd(eventsMDGPRList);
let prEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial PR', false).toPromise(); let prEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial PR', false).toPromise();
let prEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal PR', false).toPromise(); let prEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal PR', false).toPromise();
const eventsPRList = prEventsOficial.concat(prEventsPessoal); let eventsPRList = prEventsOficial.concat(prEventsPessoal);
eventsPRList = eventsPRList.filter(function(item) {
return item.activityInstanceName != 'Editar Evento'
})
this.eventoaprovacaostore.countPr = eventsPRList.length this.eventoaprovacaostore.countPr = eventsPRList.length
this.eventoaprovacaostore.resetpr(eventsPRList); this.eventoaprovacaostore.resetpr(eventsPRList);