mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 13:02:56 +00:00
Merge branch 'feature/pendentes-count' into develop
This commit is contained in:
@@ -85,8 +85,8 @@ 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)
|
||||
// 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) {
|
||||
@@ -105,12 +105,12 @@ export class EventsToApprovePage implements OnInit {
|
||||
getFromDB() {
|
||||
this.storage.get('event-to-aproveMD').then((events = []) => {
|
||||
this.eventsMDGPRList = events
|
||||
console.log('DB',this.eventsMDGPRList)
|
||||
// console.log('DB',this.eventsMDGPRList)
|
||||
})
|
||||
|
||||
this.storage.get('event-to-aprovePR').then((events) => {
|
||||
this.eventsPRList = events
|
||||
console.log('DB',this.eventsPRList)
|
||||
// console.log('DB',this.eventsPRList)
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user