This commit is contained in:
tiago.kayaya
2021-09-16 09:35:09 +01:00
parent bc1cf6ef73
commit 42ef6f0dc4
3 changed files with 38 additions and 9 deletions
@@ -174,7 +174,7 @@ export class DocumentDetailPage implements OnInit {
}); });
await modal.present(); await modal.present();
modal.onDidDismiss().then(res=>{ modal.onDidDismiss().then(res=>{
this.location.back(); //this.location.back();
}); });
} }
@@ -119,6 +119,8 @@ export class DocumentSetUpMeetingPage implements OnInit {
this.adding = "intervenient"; this.adding = "intervenient";
this.setDefaultTime() this.setDefaultTime()
this.getRecurrenceTypes(); this.getRecurrenceTypes();
console.log(this.document);
} }
getRecurrenceTypes() { getRecurrenceTypes() {
@@ -207,14 +209,24 @@ export class DocumentSetUpMeetingPage implements OnInit {
}) })
}) */ }) */
this.document.Documents.forEach((e)=> { if(this.document.Documents){
this.docs.push({ this.document.Documents.forEach((e)=> {
ApplicationId: e.ApplicationId || e.ApplicationType, this.docs.push({
Source: 1, ApplicationId: e.ApplicationId || e.ApplicationType,
SourceId: e.DocId || e.docID || e.docId, Source: 1,
SourceName: e.Assunto SourceId: e.DocId || e.docID || e.docId,
SourceName: e.Assunto
})
}) })
}) }
else{
this.docs.push({
ApplicationId: this.document.ApplicationId || this.document.ApplicationType,
Source: 1,
SourceId: this.document.DocId || this.document.docID || this.document.docId,
SourceName: this.document.Assunto
})
}
console.log(this.docs); console.log(this.docs);
@@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router'; import { NavigationStart, Router } from '@angular/router';
import { LoginUserRespose } from 'src/app/models/user.model'; import { LoginUserRespose } from 'src/app/models/user.model';
import { AuthService } from 'src/app/services/auth.service'; import { AuthService } from 'src/app/services/auth.service';
import { ProcessesService } from 'src/app/services/processes.service'; import { ProcessesService } from 'src/app/services/processes.service';
@@ -26,6 +26,16 @@ export class AllProcessesPage implements OnInit {
ngOnInit() { ngOnInit() {
this.loadAllProcesses(); this.loadAllProcesses();
this.router.events.forEach((event) => {
if (event instanceof NavigationStart && event.url.startsWith('/home/gabinete-digital')) {
if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
this.refreshing();
} else {
this.loadAllProcesses();
}
}
});
} }
doRefresh() { doRefresh() {
@@ -35,6 +45,13 @@ export class AllProcessesPage implements OnInit {
}, 1000); }, 1000);
} }
refreshing() {
setTimeout(() => {
this.loadAllProcesses();
}, 1000);
}
async loadAllProcesses(){ async loadAllProcesses(){
let allProcessesList = await this.processesService.GetTasksList("", false).toPromise(); let allProcessesList = await this.processesService.GetTasksList("", false).toPromise();
console.log(allProcessesList); console.log(allProcessesList);