diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
index 01b1eba50..31a4dce52 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
@@ -66,13 +66,15 @@ export class DespachosPrPage implements OnInit {
//Inicializar segment
this.segment = "despachos";
- const pathname = window.location.pathname
-
+ const location = window.location
+ const pathname = location.pathname + location.search
+
this.router.events.forEach((event) => {
- if(event instanceof NavigationEnd && event.url == pathname) {
+ if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
this.LoadList();
}
});
+
}
segmentChanged(ev: any) {
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.ts b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
index e7aeecbbe..b9061e243 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
@@ -59,12 +59,16 @@ export class DespachosPage implements OnInit {
ngOnInit() {
//Inicializar segment
this.segment = "despachos";
- const pathname = window.location.pathname;
+
+ const location = window.location
+ const pathname = location.pathname + location.search
+
this.router.events.forEach((event) => {
- if(event instanceof NavigationEnd && event.url == pathname) {
- this.refreshing();
+ if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
+ this.LoadList();
}
});
+
}
async refreshing() {
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
index fbb558eb1..046864698 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
@@ -32,14 +32,16 @@ export class DiplomasAssinarPage implements OnInit {
) {
}
- ngOnInit() {
- const pathname = window.location.pathname;
- this.router.events.forEach((event) => {
- if(event instanceof NavigationEnd && event.url == pathname) {
- this.refreshing();
- }
- });
- }
+ ngOnInit() {
+ const location = window.location
+ const pathname = location.pathname + location.search
+
+ this.router.events.forEach((event) => {
+ if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
+ this.LoadList();
+ }
+ });
+ }
goToDiploma(serialNumber:any){
let navigationExtras: NavigationExtras = {
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
index adfa661bb..94515a13d 100644
--- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
@@ -42,13 +42,15 @@ constructor(
}
});
- const pathname = window.location.pathname
-
+ const location = window.location
+ const pathname = location.pathname + location.search
+
this.router.events.forEach((event) => {
- if(event instanceof NavigationEnd && event.url == pathname) {
- this.refreshing();
+ if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
+ this.LoadList();
}
});
+
}
/* async loadDiplomas(){
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
index ce4083ac4..67787ebfe 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
@@ -36,13 +36,16 @@ export class EventListPage implements OnInit {
this.refreshing();
- const pathname = window.location.pathname
+ const location = window.location
+ const pathname = location.pathname + location.search
+
this.router.events.forEach((event) => {
- if(event instanceof NavigationEnd && event.url == pathname) {
+ if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
this.LoadToApproveEvents();
}
});
+
window.onresize = (event) => {
// if not mobile remove all component
if( window.innerWidth <= 800){
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
index a2869261b..d2ba33918 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
@@ -29,12 +29,16 @@ export class ExpedientePage implements OnInit {
}
ngOnInit() {
- const pathname = window.location.pathname
+
+ const location = window.location
+ const pathname = location.pathname + location.search
+
this.router.events.forEach((event) => {
- if(event instanceof NavigationEnd && event.url == pathname) {
- this.refreshing();
+ if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
+ this.LoadList();
}
});
+
}
LoadList(){
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
index 611d72250..b56b272d5 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
@@ -38,17 +38,19 @@ export class ExpedientesPrPage implements OnInit {
private router: Router,
) {
this.loggeduser = authService.ValidatedUser;
- this.LoadList();
}
ngOnInit() {
- const pathname = window.location.pathname;
+ const location = window.location
+ const pathname = location.pathname + location.search
+
this.router.events.forEach((event) => {
- if(event instanceof NavigationEnd && event.url == pathname) {
- this.refreshing();
+ if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
+ this.LoadList();
}
});
+
}
LoadList(){
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index e5d5fbdf8..5cd8850ed 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -147,18 +147,18 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
index 877396f86..b330309bd 100644
--- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
@@ -22,30 +22,30 @@ import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angula
styleUrls: ['./despachos.page.scss'],
})
export class DespachosPage implements OnInit {
- //profile:string;
+ //profile:string;
- @ViewChild(CalendarComponent) myCal: CalendarComponent;
+ @ViewChild(CalendarComponent) myCal: CalendarComponent;
- taskslist:DailyWorkTask[];
- despachoList:any[] = [];
- deferimentoList:DailyWorkTask[] = [];
+ taskslist:DailyWorkTask[] = [];
+ despachoList:any[] = [];
+ deferimentoList:DailyWorkTask[] = [];
- taskList:tasksList[] = [];
+ taskList:tasksList[] = [];
- taskType: string;
- serialNumber:string;
- totalDocs:any;
+ taskType: string;
+ serialNumber:string;
+ totalDocs:any;
- @Input() profile:string;
- segment:string;
- @Output() openExpedientDetail:EventEmitter = new EventEmitter();
+ @Input() profile:string;
+ segment:string;
+ @Output() openExpedientDetail:EventEmitter = new EventEmitter();
- loadedAttachments:any;
- dicIndex = 0;
- inicial = false
- skeletonLoader = true
+ loadedAttachments:any;
+ dicIndex = 0;
+ inicial = false
+ skeletonLoader = true
- constructor (
+ constructor (
private processes:ProcessesService,
private modalController: ModalController,
private alertService: AlertService,
@@ -60,44 +60,50 @@ export class DespachosPage implements OnInit {
console.log(params["serialNumber"]);
}
});
- }
- ngOnInit() {
+ }
+
+ ngOnInit() {
//Inicializar segment
this.segment = "despachos";
- this.LoadList();
- const pathname = window.location.pathname
+ // update list
+ const location = window.location
+ const pathname = location.pathname + location.search
+
this.router.events.forEach((event) => {
- if(event instanceof NavigationEnd && event.url == pathname) {
- this.doRefresh();
+ if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
+ console.log('update', pathname)
+ this.LoadList();
}
});
}
- segmentChanged(ev: any) {
- this.LoadList();
- }
+ segmentChanged(ev: any) {
+ this.LoadList();
+ }
- goToDespacho(serialNumber:any){
+ goToDespacho(serialNumber:any){
this.router.navigate(['/home/gabinete-digital/despachos',serialNumber,'gabinete-digital']);
}
- notImplemented(){
- this.alertService.presentAlert('Funcionalidade em desenvolvimento');
- }
+ notImplemented(){
+ this.alertService.presentAlert('Funcionalidade em desenvolvimento');
+ }
- openExpedientDetailPage(data){
- this.openExpedientDetail.emit(data);
- }
+ openExpedientDetailPage(data){
+ this.openExpedientDetail.emit(data);
+ }
- async LoadList(){
+ async LoadList() {
+
+ console.log('update ================================')
this.skeletonLoader = true
let result = await this.processes.GetTasksList("Despacho", false).toPromise();
- //let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)");
+
this.despachoList = new Array();
await result.forEach( (element, index) => {
@@ -136,13 +142,13 @@ export class DespachosPage implements OnInit {
});
}
- doRefresh() {
- this.LoadList();
+ doRefresh() {
+ this.LoadList();
- setTimeout(() => {
- //event.target.complete();
- }, 2000);
- }
+ setTimeout(() => {
+ //event.target.complete();
+ }, 2000);
+ }
// old
async openExpedientActionsModal(taskAction: any, task: any) {
diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
index 73bb4e2d3..53d9c9dd6 100644
--- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
@@ -32,14 +32,16 @@ skeletonLoader = true
}
ngOnInit() {
- this.LoadList();
+ // update list
+ const location = window.location
+ const pathname = location.pathname + location.search
- const pathname = window.location.pathname
this.router.events.forEach((event) => {
- if(event instanceof NavigationEnd && event.url == pathname) {
- this.doRefresh();
+ if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
+ this.LoadList();
}
});
+
}
goToDiploma(serialNumber:any){
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
index acc04bf1f..5a3f49729 100644
--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
@@ -32,7 +32,15 @@ constructor(
}
ngOnInit() {
- this.refreshing();
+ // update list
+ const location = window.location
+ const pathname = location.pathname + location.search
+
+ this.router.events.forEach((event) => {
+ if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
+ this.LoadList();
+ }
+ });
}
segmentChanged(ev: any) {
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
index d850f7d05..375f7313e 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
@@ -32,18 +32,19 @@ export class EventsToApprovePage implements OnInit {
)
{
this.loggeduser = userAuth.ValidatedUser;
- }
+ }
ngOnInit() {
this.segment = this.loggeduser.Profile;
console.log(this.segment);
- this.LoadToApproveEvents();
- const pathname = window.location.pathname
+ // update list
+ const location = window.location
+ const pathname = location.pathname + location.search
this.router.events.forEach((event) => {
- if(event instanceof NavigationEnd && event.url == pathname) {
+ if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
this.LoadToApproveEvents();
}
});
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
index 8967468a3..c567bd735 100644
--- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
@@ -20,7 +20,7 @@ import { AuthService } from 'src/app/services/auth.service';
export class ExpedientesPrPage implements OnInit {
@ViewChild(CalendarComponent) myCal: CalendarComponent;
- taskslist:DailyWorkTask[];
+ taskslist:DailyWorkTask[] = [];
serialNumber:string;
skeletonLoader:boolean;
@@ -35,18 +35,20 @@ export class ExpedientesPrPage implements OnInit {
private router: Router,
) {
this.loggeduser = authService.ValidatedUser;
- this.LoadList();
}
ngOnInit() {
- const pathname = window.location.pathname
+ // update list
+ const location = window.location
+ const pathname = location.pathname + location.search
this.router.events.forEach((event) => {
- if(event instanceof NavigationEnd && event.url == pathname) {
- this.refreshing();
+ if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
+ this.LoadList();
}
});
+
}
openExpedientDetailPage(data){
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
index dcf9a1b9b..f1da0f695 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
@@ -41,14 +41,17 @@ export class ExpedientsPage implements OnInit {
ngOnInit() {
//Inicializar segment
this.segment = "expedientes";
- this.LoadList();
- const pathname = window.location.pathname
+ // update list
+ const location = window.location
+ const pathname = location.pathname + location.search
+
this.router.events.forEach((event) => {
- if(event instanceof NavigationEnd && event.url == pathname) {
+ if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
this.LoadList();
}
});
+
}
segmentChanged(){
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
index eb3e0be8a..6cbb893dd 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
@@ -51,10 +51,13 @@ export class PedidosPage implements OnInit {
ngOnInit() {
this.LoadList();
- const pathname = window.location.pathname
+ // update list
+ const location = window.location
+ const pathname = location.pathname + location.search
+
this.router.events.forEach((event) => {
- if(event instanceof NavigationEnd && event.url == pathname) {
- this.doRefresh();
+ if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
+ this.LoadList();
}
});
}
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
index 906cc3cb0..c0b700bc9 100644
--- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
+++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
@@ -41,15 +41,16 @@ export class PendentesPage implements OnInit {
ngOnInit() {
//Inicializar segment
this.segment = "despachos";
- this.LoadList();
+ // update list
+ const location = window.location
+ const pathname = location.pathname + location.search
- const pathname = window.location.pathname
-
- this.router.events.forEach((event) => {
- if(event instanceof NavigationEnd && event.url == pathname) {
- this.LoadList();
- }
- });
+ this.router.events.forEach((event) => {
+ if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
+ this.LoadList();
+ }
+ });
+
}
segmentChanged(ev: any) {
@@ -63,9 +64,10 @@ export class PendentesPage implements OnInit {
async LoadList(){
this.skeletonLoader = true;
- this.pendentesList = new Array();
+
let pendentes = await this.processes.GetPendingTasks(false).toPromise();
-
+ this.pendentesList = new Array();
+
pendentes.forEach(element => {
let date = new Date(element.taskStartDate);
date.setMonth(date.getMonth() + 1);
diff --git a/src/plugin/reg.js b/src/plugin/reg.js
new file mode 100644
index 000000000..80ab94d51
--- /dev/null
+++ b/src/plugin/reg.js
@@ -0,0 +1,8 @@
+function regexIndexOf(string, regex, startpos) {
+ var indexOf = string.substring(startpos || 0).search(regex);
+ return (indexOf >= 0) ? (indexOf + (startpos || 0)) : indexOf;
+}
+
+module.exports = {
+ regexIndexOf: regexIndexOf
+}
\ No newline at end of file