From 2688b1e0128c17f8ad7d85518287afbfb3f8f4d9 Mon Sep 17 00:00:00 2001
From: Peter Maquiran
Date: Sun, 11 Jun 2023 20:17:10 +0100
Subject: [PATCH] performance
---
.../event-actions-popover.page.ts | 10 +-
src/app/pages/events/events.page.html | 2 +-
src/app/pages/events/events.page.ts | 26 +++-
.../despacho-pr/despacho-pr.page.ts | 2 +-
.../diplomas/diploma/diploma.page.ts | 14 +-
.../diplomas/diplomas.page.ts | 3 +-
.../approve-event/approve-event.page.ts | 8 +-
.../gabinete-digital.page.html | 112 +++++++--------
.../gabinete-digital/gabinete-digital.page.ts | 135 +++++++++---------
.../pedidos/pedido/pedido.page.ts | 1 +
src/app/services/task.service.ts | 14 +-
.../all-processes/all-processes.page.ts | 41 +++---
.../despachos-pr/despachos-pr.page.ts | 18 ++-
.../despachos/despachos.page.ts | 40 ++++--
.../diplomas-assinar/diplomas-assinar.page.ts | 31 +++-
.../diplomas-gerar/diplomas-gerar.page.ts | 36 ++++-
.../diplomas/diplomas.page.ts | 33 +++--
.../events-to-approve.page.ts | 33 ++++-
.../expedientes-pr/expedientes-pr.page.ts | 31 +++-
.../expedients/expedients.page.ts | 34 ++++-
.../gabinete-digital/pedidos/pedidos.page.ts | 29 +++-
.../pendentes/pendentes.page.ts | 33 ++++-
.../deploma-options/deploma-options.page.ts | 5 +-
.../despachos-pr-options.page.ts | 1 +
.../diplomas-gerar-options.page.ts | 7 +-
.../opts-expediente-pr.page.ts | 5 +-
.../opts-expediente/opts-expediente.page.ts | 1 +
src/app/store/deplomas.service.ts | 10 +-
src/app/store/despacho-store.service.ts | 11 +-
src/app/store/despachospr-store.service.ts | 10 +-
.../store/eventoaprovacao-store.service.ts | 10 +-
src/app/store/expedientegd-store.service.ts | 10 +-
src/app/store/pedidos-store.service.ts | 11 +-
src/app/store/pendestes-store.service.ts | 11 +-
src/environments/environment.prod.ts | 4 +-
src/environments/suport/oapr.ts | 4 +-
version/git-version.ts | 14 +-
37 files changed, 543 insertions(+), 257 deletions(-)
diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
index 83ada0142..1619476af 100644
--- a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
+++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
@@ -7,6 +7,7 @@ import { EmendMessageModalPage } from '../emend-message-modal/emend-message-moda
import { ThemeService } from 'src/app/services/theme.service'
import { RouteService } from 'src/app/services/route.service';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
+import { TaskService } from 'src/app/services/task.service'
@Component({
@@ -27,7 +28,8 @@ export class EventActionsPopoverPage implements OnInit {
private toastService: ToastService,
private RouteService: RouteService,
private httpErrorHandle: HttpErrorHandle,
- public ThemeService: ThemeService) {
+ public ThemeService: ThemeService,
+ public TaskService: TaskService) {
this.serialNumber = this.navParams.get('serialNumber');
this.instanceId = this.navParams.get('InstanceId');
this.activityInstanceName = this.navParams.get('InstanceId');
@@ -58,7 +60,7 @@ export class EventActionsPopoverPage implements OnInit {
const loader = this.toastService.loading()
try {
await this.processes.PostTaskAction(body).toPromise()
-
+ this.TaskService.loadEventosParaAprovacao()
this.httpErrorHandle.httpsSucessMessagge('Evento aprovação')
this.goBack();
} catch (error) {
@@ -77,7 +79,7 @@ export class EventActionsPopoverPage implements OnInit {
const loader = this.toastService.loading()
try {
await this.processes.PostTaskAction(body).toPromise()
-
+ this.TaskService.loadEventosParaAprovacao()
this.httpErrorHandle.httpsSucessMessagge('Rever')
this.goBack();
} catch (error) {
@@ -121,6 +123,7 @@ export class EventActionsPopoverPage implements OnInit {
try {
await this.processes.PostTaskAction(body).toPromise();
this.httpErrorHandle.httpsSucessMessagge('Rever')
+ this.TaskService.loadEventosParaAprovacao()
this.goBack();
} catch (error) {
this.httpErrorHandle.httpStatusHandle(error)
@@ -145,6 +148,7 @@ export class EventActionsPopoverPage implements OnInit {
const loader = this.toastService.loading();
try {
await this.processes.PostTaskAction(body).toPromise();
+ this.TaskService.loadEventosParaAprovacao()
this.httpErrorHandle.httpsSucessMessagge('Rejeitar')
this.goBack();
} catch (error) {
diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html
index ed8137bc1..b9b08179b 100644
--- a/src/app/pages/events/events.page.html
+++ b/src/app/pages/events/events.page.html
@@ -26,7 +26,7 @@
-
+
{{customDate}}
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index 6d742e2ec..8b42f02e2 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -72,6 +72,10 @@ export class EventsPage implements OnInit {
searchSubject: string = '';
AllProcess = []
ordinance: string = 'old'
+ listSubscription : {
+ delete(): void;
+ }
+
constructor(
private eventService: EventsService,
@@ -87,12 +91,7 @@ export class EventsPage implements OnInit {
private changeProfileService: ChangeProfileService,
public TaskService: TaskService
) {
-
-
- this.loadAllTask();
-
-
window['zipPhoneCallback'] = function (zipphone) {
var frame = document.getElementById('home-iframe');
if(frame) {
@@ -101,18 +100,30 @@ export class EventsPage implements OnInit {
}
this.changeProfileService.registerCallback(() => {
-
this.listToPresent = [];
this.listToPresentexpediente = []
})
- this.TaskService.registerCallback({
+ }
+
+ ngAfterViewInit(): void {
+
+
+ this.loadAllTask();
+
+ this.listSubscription = this.TaskService.registerCallback({
id: import.meta.url,
funx:() => {
this.dynamicSearch()
}
})
+
+ this.dynamicSearch()
+
+ }
+ ngOnDestroy() {
+ this.listSubscription.delete()
}
ngOnInit() {
@@ -170,6 +181,7 @@ export class EventsPage implements OnInit {
async loadAllTask() {
this.loadingAllTask = true
await this.TaskService.LoadTask()
+ this.dynamicSearch()
this.loadingAllTask = false
}
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
index 892b94fd2..f6e2a1b0e 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
@@ -403,7 +403,7 @@ export class DespachoPrPage implements OnInit {
}
this.TaskService.loadDiplomas()
- // this.goBack();
+ this.goBack();
}
});
}
diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
index fba03add6..71c8b1aa8 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
@@ -1,17 +1,16 @@
import { Component, OnInit } from '@angular/core';
-import { AnimationController, ModalController, PopoverController } from '@ionic/angular';
+import { ModalController, PopoverController } from '@ionic/angular';
import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
import { ProcessesService } from 'src/app/services/processes.service';
import { momentG } from 'src/plugin/momentG';
-import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
-import { ActivatedRoute, Router } from '@angular/router';
+
+import { ActivatedRoute } from '@angular/router';
import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page';
import { DeplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page';
import { ToastService } from 'src/app/services/toast.service';
import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
-import { Platform } from '@ionic/angular';
-import { SqliteService } from 'src/app/services/sqlite.service';
+
import { BackgroundService } from 'src/app/services/background.service';
import { ThemeService } from 'src/app/services/theme.service'
import { RouteService } from 'src/app/services/route.service';
@@ -47,15 +46,10 @@ export class DiplomaPage implements OnInit {
private processes: ProcessesService,
public popoverController: PopoverController,
private modalController: ModalController,
- private iab: InAppBrowser,
private activatedRoute: ActivatedRoute,
- private router: Router,
- private animationController: AnimationController,
private toastService: ToastService,
private RouteService: RouteService,
- private sqliteservice: SqliteService,
private backgroundservice: BackgroundService,
- private platform: Platform,
public ThemeService: ThemeService,
private httpErrorHandle: HttpErrorHandle,
private despachoService: DespachoService,
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
index 8905599b6..7e6d25901 100644
--- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
@@ -1,8 +1,8 @@
import { Component, OnDestroy, OnInit } from '@angular/core';
import { ActivatedRoute, NavigationStart, Router } from '@angular/router';
import { ProcessesService } from 'src/app/services/processes.service';
-
import { BackgroundService } from 'src/app/services/background.service';
+import { ThemeService } from 'src/app/services/theme.service'
import { PermissionService } from 'src/app/services/permission.service';
import { DeplomasStore } from 'src/app/store/deplomas.service';
import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
@@ -39,6 +39,7 @@ export class DiplomasPage implements OnInit, OnDestroy {
private router: Router,
private activatedRoute: ActivatedRoute,
private backgroundservice: BackgroundService,
+ public ThemeService: ThemeService,
public p: PermissionService,
public TaskService: TaskService,
private RouteService: RouteService,
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
index b78ca9a62..204e463ed 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
@@ -1,6 +1,6 @@
import { Component, OnInit, Input, EventEmitter, Output } from '@angular/core';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
-import { AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular';
+import { MenuController, ModalController, PopoverController } from '@ionic/angular';
import { Event } from 'src/app/models/event.model';
import { ProcessesService } from 'src/app/services/processes.service';
import { EmendMessageModalPage } from 'src/app/pages/agenda/emend-message-modal/emend-message-modal.page';
@@ -9,13 +9,10 @@ import { EditEventToApproveComponent } from 'src/app/shared/gabinete-digital/edi
import { ToastService } from 'src/app/services/toast.service';
import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
-import { SqliteService } from '../../../../services/sqlite.service';
import { BackgroundService } from '../../../../services/background.service';
-import { Platform } from '@ionic/angular';
import { ThemeService } from 'src/app/services/theme.service'
import { OfflineManagerService } from 'src/app/services/offline-manager.service';
import { RouteService } from 'src/app/services/route.service';
-import { Storage } from '@ionic/storage';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { TaskService } from 'src/app/services/task.service'
@@ -55,12 +52,9 @@ export class ApproveEventPage implements OnInit {
private menu: MenuController,
private toastService: ToastService,
private RouteService: RouteService,
- private sqliteservice: SqliteService,
- private platform: Platform,
private backgroundservice: BackgroundService,
public ThemeService: ThemeService,
private offlineManager: OfflineManagerService,
- private storage: Storage,
private httpErrorHandle: HttpErrorHandle,
public TaskService: TaskService
) {
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index c74dd8ef6..d787b6401 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -55,7 +55,7 @@
-
@@ -433,14 +432,15 @@
{{TaskService.eventoaprovacaostore.countAll}}
- Documento
- Documento
- 1">Documentos
+ correspondência
+ correspondência
+ 1">correspondências
-
+ {{ selectedElement }}
+
@@ -456,9 +456,9 @@
{{TaskService.expedientegbstore.count}}
- Documento
- Documento
- 1">Documentos
+ correspondência
+ correspondência
+ 1">correspondências
@@ -478,9 +478,9 @@
{{TaskService.despachoStore.count}}
- Documento
- Documento
- 1">Documentos
+ correspondência
+ correspondência
+ 1">correspondências
@@ -508,9 +508,9 @@
{{TaskService.pedidosstore.countparecer}}
- Documento
- Documento
- 1">Documentos
+ correspondência
+ correspondência
+ 1">correspondências
@@ -531,9 +531,9 @@
{{ TaskService.pedidosstore.countdeferimento}}
- Documento
- Documento
- 1">Documentos
+ correspondência
+ correspondência
+ 1">correspondências
@@ -559,9 +559,9 @@
{{TaskService.pendentesstore.count}}
- Documento
- Documento
- 1">Documentos
+ correspondência
+ correspondência
+ 1">correspondências
@@ -665,21 +665,21 @@
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index efe2b1922..934fe72a2 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -111,49 +111,21 @@ export class GabineteDigitalPage implements OnInit {
) {
window.onresize = (event) => {
- // if not mobile remove all component
if (window.innerWidth < 701) {
this.modalController.dismiss();
+ this.hideRefreshBtn = false;
+ this.hideInMobile = false;
this.segmentVista = "listview";
}
else {
+ this.hideRefreshBtn = true;
+ this.hideInMobile = true;
this.segmentVista = "boxview";
}
}
- this.checkRoutes();
-
// fix with many timeout
- setTimeout(() => {
- this.dynamicSearch()
- }, 2000)
- // setTimeout(() => {
- // this.dynamicSearch()
- // }, 4000)
- setTimeout(() => {
- this.dynamicSearch()
- }, 6000)
- setTimeout(() => {
- this.dynamicSearch()
- }, 10000)
- setTimeout(() => {
- this.dynamicSearch()
- }, 14000)
- setTimeout(() => {
- this.dynamicSearch()
- }, 18000)
- setTimeout(() => {
-
- this.dynamicSearch()
-
- this.TaskService.registerCallback({
- id: import.meta.url,
- funx:() => {
- this.dynamicSearch()
- }
- })
- }, 20000)
}
@@ -223,9 +195,34 @@ export class GabineteDigitalPage implements OnInit {
this.segmentVista = "boxview"
}
- this.LoadCounts();
- this.checkFilter();
+
+ this.hideRefreshButton();
+ }
+
+ ngAfterViewInit(): void {
+ // We can access the TestComponent now that this portion of the view tree has been initiated.
+ const element = this.scroll.nativeElement
+ this.scroll.nativeElement.addEventListener("scroll", (e)=> {
+ this.changeTab()
+ });
+
+
+ (async () => {
+ await this.loadAllProcesses()
+ this.TaskService.registerCallback({
+ id: import.meta.url,
+ funx:() => {
+ this.dynamicSearch()
+ }
+ })
+ })();
+
+ this.checkFilter();
+ this.checkRoutes();
+ this.dynamicSearch()
+
+
const pathname = '/home/gabinete-digital'
this.router.events.forEach((event) => {
if (event instanceof NavigationEnd && event.url.includes(pathname) && !event.url.includes('/home/gabinete-digital/')) {
@@ -241,22 +238,14 @@ export class GabineteDigitalPage implements OnInit {
// this.LoadCounts();
this.checkFilter()
}
+
+ this.mobile()
}
})
}
});
- this.checkRoutes()
- this.hideRefreshButton();
-
- }
- ngAfterViewInit(): void {
- // We can access the TestComponent now that this portion of the view tree has been initiated.
- const element = this.scroll.nativeElement
- this.scroll.nativeElement.addEventListener("scroll", (e)=> {
- this.changeTab()
- });
}
functionTimer1 = null;
@@ -292,9 +281,6 @@ export class GabineteDigitalPage implements OnInit {
}
- async loadAllProcesses() {
- this.LoadCounts();
- }
goto(url) {
@@ -353,18 +339,7 @@ export class GabineteDigitalPage implements OnInit {
}
hideRefreshButton() {
- window.onresize = (event) => {
- if (window.innerWidth < 701) {
- this.hideRefreshBtn = false;
- this.hideInMobile = false;
- this.segmentVista = "listview";
- }
- else {
- this.hideRefreshBtn = true;
- this.hideInMobile = true;
- this.segmentVista = "boxview";
- }
- }
+ console.log(this.router.url)
if (window.innerWidth < 701) {
this.hideRefreshBtn = false;
this.hideInMobile = false;
@@ -377,6 +352,15 @@ export class GabineteDigitalPage implements OnInit {
}
}
+ mobile() {
+ console.log(this.router.url)
+ if (window.innerWidth < 701 && this.router.url.includes('filter=')) {
+ this.hideRefreshBtn = false;
+ this.hideInMobile = false;
+ this.segmentVista = "listview";
+ }
+ }
+
checkRoutes() {
this.closeAllDesktopComponents();
@@ -417,11 +401,13 @@ export class GabineteDigitalPage implements OnInit {
}
else if (this.router.url == '/home/gabinete-digital?despachospr=true') {
this.openDespachosPrPage('');
- this.selectedElement = 'DispatchesPr'
+ this.selectedElement = 'showDespachosPr'
}
- else if (this.router.url == '/home/gabinete-digital?diplomas=true') {
+ else if (this.router.url == '/home/gabinete-digital?diplomas=assinados') {
+ this.openDiplomasPage('assinados');
+ }
+ else if (this.router.url == '/home/gabinete-digital?diplomas=validar') {
this.openDiplomasPage('validar');
- this.selectedElement = 'DiplomasPorValidar';
}
else if (this.router.url == '/home/gabinete-digital?diplomasassinar=true') {
this.openDiplomasAssinarPage();
@@ -464,17 +450,26 @@ export class GabineteDigitalPage implements OnInit {
return Object.keys(this.loadProcess)
}
- async LoadCounts() {
+ async loadAllProcesses() {
// this.skeletonLoader = true
await this.TaskService.LoadTask()
+ this.dynamicSearch()
// this.skeletonLoader = false
}
+
+ doRefreshAside() {
+ window['gabinete-aside-refresh']()
+ setTimeout(() => {
+ this.loadAllProcesses();
+ }, 1000)
+ }
+
doRefresh(event) {
- this.LoadCounts();
+ this.loadAllProcesses();
if (event) {
setTimeout(() => {
@@ -634,9 +629,11 @@ export class GabineteDigitalPage implements OnInit {
let navigationExtras: NavigationExtras;
if (segment == 'validar') {
- navigationExtras = { queryParams: { "validar": true, } };
+ navigationExtras = { queryParams: { "diplomas": 'validar', } };
+ this.selectedElement = 'DiplomasPorValidar';
} else if (segment == 'assinados') {
- navigationExtras = { queryParams: { "assinados": true, } };
+ this.selectedElement = 'DiplomasAssinados';
+ navigationExtras = { queryParams: { "diplomas": 'assinados', } };
}
this.segment = segment;
@@ -646,10 +643,10 @@ export class GabineteDigitalPage implements OnInit {
}
else {
this.closeAllDesktopComponents();
- this.segment = segment;
- let navigationExtras: NavigationExtras = { queryParams: { "diplomas": true, } };
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
- this.showDiplomas = true;
+ setTimeout(() => {
+ this.showDiplomas = true;
+ }, 10)
}
}
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
index 0142cdeaa..cf54bc41f 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
@@ -267,6 +267,7 @@ export class PedidoPage implements OnInit {
if (res['data'] == 'close') {
this.goBack()
}
+ this.TaskService.loadPedidos();
}))
diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts
index 0f6784f66..a78b1d467 100644
--- a/src/app/services/task.service.ts
+++ b/src/app/services/task.service.ts
@@ -17,6 +17,7 @@ import { EventsService } from './events.service';
import { SortService } from './functions/sort.service';
import { customTask } from '../models/dailyworktask.model';
import { Router } from '@angular/router';
+import { v4 as uuidv4 } from 'uuid'
@Injectable({
providedIn: 'root'
@@ -75,10 +76,21 @@ export class TaskService {
this.updateAllProcess();
this.updateCount()
this.runCallback();
+
+ document.addEventListener('resume', function () {
+ this.loadAllTask();
+ });
}
- registerCallback({funx, id}) {
+ registerCallback({funx, id = uuidv4()}) {
+
this.callbacks[id] = { funx, id}
+
+ return {
+ delete: ()=> {
+ delete this.callbacks[id]
+ }
+ }
}
runCallback() {
diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
index 25536f35d..ab7c5e9c9 100644
--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
@@ -29,47 +29,42 @@ export class AllProcessesPage implements OnInit {
AllProcess = []
ordinance: string = 'old'
+ listSubscription : {
+ delete(): void;
+ }
+
+
constructor(
private router: Router,
public ThemeService: ThemeService,
public TaskService: TaskService,
- private route: ActivatedRoute
) {}
ngOnInit() {
// this.updateAllProcess()
this.checkFilter();
+ }
- this.router.events.forEach((event) => {
- if (event instanceof NavigationEnd && event.url.includes('/home/gabinete-digital')) {
- // this.refreshing();
- this.checkFilter();
- }
- });
+ ngAfterViewInit(): void {
-
- setTimeout(() => {
- // this.miniSearch.addAll(this.TaskService.AllProcess)
- // window['miniSearch'] = this.miniSearch
-
-
- this.TaskService.registerCallback({
- id: import.meta.url,
- funx:() => {
- this.dynamicSearch()
- }
- })
- }, 10)
-
-
- this.TaskService.registerCallback({
+ this.listSubscription = this.TaskService.registerCallback({
id: import.meta.url,
funx:() => {
+
this.dynamicSearch()
+
}
})
+
+ this.dynamicSearch();
+
}
+ ngOnDestroy() {
+ this.listSubscription.delete()
+ }
+
+
openSearch() {
// this.dynamicSearch()
}
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
index caaa04f2b..e3e458151 100644
--- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
+++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
@@ -33,7 +33,7 @@ export class DespachosPrPage implements OnInit {
listSubscription : {
delete(): void;
}
-
+ routerSubscription;
constructor (
private router: Router,
@@ -54,15 +54,29 @@ constructor (
funx:() => {
this.dynamicSearch()
- this.LoadList()
}
})
+ this.routerSubscription = this.router.events.subscribe((event) => {
+ if (event instanceof NavigationStart &&
+ event.url.startsWith('/home/gabinete-digital?despachospr=true')) {
+ if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
+ this.refreshing()
+ } else {
+ this.LoadList()
+ }
+ }
+ });
+ window['gabinete-aside-refresh'] = () => {
+ this.LoadList()
+ }
+
}
ngOnDestroy() {
this.listSubscription.delete()
+ this.routerSubscription?.unsubscribe();
}
changeFilterName(filterName) {
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
index bd5d15481..6e9a81ccc 100644
--- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
@@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { customTask } from '../../../models/dailyworktask.model';
-import { NavigationStart, Router } from '@angular/router';
+import { NavigationEnd, NavigationStart, Router, } from '@angular/router';
import { DespachoService } from 'src/app/Rules/despacho.service';
import { TaskService } from 'src/app/services/task.service';
import { ThemeService } from 'src/app/services/theme.service'
@@ -20,6 +20,12 @@ export class DespachosPage implements OnInit {
hideSearchBtn: boolean = false;
ordinance: string = 'old'
+ listSubscription : {
+ delete(): void;
+ }
+
+ routerSubscription;
+
constructor (
private router: Router,
private despachoRule: DespachoService,
@@ -29,26 +35,34 @@ export class DespachosPage implements OnInit {
ngOnInit() {
- // this.LoadList();
+ this.LoadList()
- this.router.events.forEach((event) => {
+ this.listSubscription = this.TaskService.despachoStore.registerCallback({
+ id: import.meta.url,
+ funx:() => {
+
+ this.dynamicSearch()
+ }
+ })
+ this.dynamicSearch();
+
+
+ this.routerSubscription = this.router.events.subscribe((event) => {
if (event instanceof NavigationStart && event.url.startsWith('/home/gabinete-digital?despachos=true')) {
this.LoadList()
}
});
- this.TaskService.despachoStore.registerCallback({
- id: import.meta.url,
- funx:() => {
+ window['gabinete-aside-refresh'] = () => {
+ this.LoadList()
+ }
- this.list = this.TaskService.despachoStore.list.filter(task => this.TaskService.filter(task, this.filterName))
-
- }
- })
-
-
- this.dynamicSearch();
+ }
+ ngOnDestroy() {
+ console.log('destroy')
+ this.listSubscription.delete()
+ this.routerSubscription?.unsubscribe();
}
reorderList(orderBy: string) {
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 f7d8bf85e..30e497b9c 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
@@ -28,28 +28,51 @@ export class DiplomasAssinarPage implements OnInit {
hideSearchBtn: boolean = false;
ordinance: string = 'old'
+ listSubscription : {
+ delete(): void;
+ }
+ routerSubscription;
constructor(
- private processes:ProcessesService,
private router: Router,
- private sortService: SortService,
public ThemeService: ThemeService,
public TaskService: TaskService
) {}
ngOnInit() {
- // this.LoadList()
+ this.dynamicSearch()
+ this.LoadList()
- this.router.events.forEach((event) => {
+
+ this.listSubscription = this.deplomasStore.registerCallback({
+ id: import.meta.url,
+ funx:() => {
+
+ this.dynamicSearch()
+
+ }
+ })
+
+ this.routerSubscription = this.router.events.subscribe((event) => {
if (event instanceof NavigationStart && '/home/gabinete-digital?diplomasassinar=true'.startsWith(event.url)) {
this.LoadList()
}
});
+ window['gabinete-aside-refresh'] = () => {
+ this.LoadList()
+ }
+
this.dynamicSearch()
}
+ ngOnDestroy() {
+ this.listSubscription.delete()
+
+ this.routerSubscription?.unsubscribe();
+ }
+
reorderList(orderBy: string) {
diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts
index a1c226981..fe614992e 100644
--- a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts
+++ b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts
@@ -1,10 +1,8 @@
import { Component, OnInit } from '@angular/core';
import { NavigationStart, Router } from '@angular/router';
-import { customTask, DailyWorkTask } from '../../../models/dailyworktask.model';
-import { ProcessesService } from 'src/app/services/processes.service';
+import { DailyWorkTask } from '../../../models/dailyworktask.model';
import { DeplomasStore } from 'src/app/store/deplomas.service';
import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
-import { SortService } from 'src/app/services/functions/sort.service';
import { ThemeService } from 'src/app/services/theme.service'
import { TaskService } from 'src/app/services/task.service'
@@ -29,17 +27,35 @@ export class DiplomasGerarPage implements OnInit {
hideSearchBtn: boolean = false;
ordinance: string = 'old'
+ listSubscription : {
+ delete(): void;
+ }
+
+ routerSubscription;
+
+
constructor(
- private processes:ProcessesService,
private router: Router,
- private sortService: SortService,
public ThemeService: ThemeService,
public TaskService: TaskService
) {}
ngOnInit() {
- this.router.events.forEach((event) => {
+ this.LoadList()
+ this.dynamicSearch()
+
+ this.listSubscription = this.deplomasStore.registerCallback({
+ id: import.meta.url,
+ funx:() => {
+
+ this.dynamicSearch()
+
+ }
+ })
+
+
+ this.routerSubscription = this.router.events.subscribe((event) => {
if (event instanceof NavigationStart && '/home/gabinete-digital/?gerarDiplomas=true'.startsWith(event.url)) {
if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
this.LoadList()
@@ -51,8 +67,16 @@ export class DiplomasGerarPage implements OnInit {
}
});
+ window['gabinete-aside-refresh'] = () => {
+ this.LoadList()
+ }
+ }
+
+ ngOnDestroy() {
+ this.listSubscription.delete()
+ this.routerSubscription?.unsubscribe();
}
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 46eb6110b..605186296 100644
--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
@@ -1,11 +1,9 @@
import { Component, Input, OnInit } from '@angular/core';
import { NavigationStart, Router } from '@angular/router';
import { DailyWorkTask } from '../../../models/dailyworktask.model';
-import { ProcessesService } from 'src/app/services/processes.service';
import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
import { DeplomasStore } from 'src/app/store/deplomas.service';
import { ThemeService } from 'src/app/services/theme.service'
-import { SortService } from 'src/app/services/functions/sort.service';
import { PermissionService } from 'src/app/services/permission.service';
import { TaskService } from 'src/app/services/task.service'
@@ -36,22 +34,33 @@ export class DiplomasPage implements OnInit {
listDiplomasAssinadosPR = []
hideSearchBtn: boolean = false;
ordinance: string = 'old'
+
+ listSubscription : {
+ delete(): void;
+ }
+ routerSubscription;
constructor(
- private processes:ProcessesService,
private router: Router,
public ThemeService: ThemeService,
- private sortService: SortService,
public p: PermissionService,
public TaskService: TaskService
) {}
ngOnInit() {
- // update list
- // this.LoadList()
- this.router.events.forEach((event) => {
- if (event instanceof NavigationStart && '/home/gabinete-digital?diplomas=true'.startsWith(event.url)) {
+ this.LoadList()
+ this.listSubscription = this.deplomasStore.registerCallback({
+ id: import.meta.url,
+ funx:() => {
+
+ this.dynamicSearch()
+
+ }
+ })
+
+ this.routerSubscription = this.router.events.subscribe((event) => {
+ if (event instanceof NavigationStart && ( '/home/gabinete-digital?diplomas=validar'.startsWith(event.url) || '/home/gabinete-digital?diplomas=validar'.startsWith(event.url)) ) {
if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
this.LoadList()
} else {
@@ -59,11 +68,19 @@ export class DiplomasPage implements OnInit {
}
}
});
+ window['gabinete-aside-refresh'] = () => {
+ this.LoadList()
+ }
this.dynamicSearch();
}
+ ngOnDestroy() {
+ this.listSubscription.delete()
+ this.routerSubscription?.unsubscribe();
+ }
+
reorderList(orderBy: string) {
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 7274e8a4c..b3daa426c 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
@@ -4,7 +4,6 @@ import { EventPerson } from 'src/app/models/eventperson.model';
import { ProcessesService } from 'src/app/services/processes.service';
import { ModalController } from '@ionic/angular';
import { NavigationStart, Router } from '@angular/router';
-import { AuthService } from 'src/app/services/auth.service';
import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.service';
import { SortService } from 'src/app/services/functions/sort.service';
import { Storage } from '@ionic/storage';
@@ -44,12 +43,16 @@ export class EventsToApprovePage implements OnInit {
list = []
hideSearchBtn: boolean = false;
ordinance: string = 'old'
-
+ listSubscription : {
+ delete(): void;
+ }
+ routerSubscription;
+
+
constructor(
private processes:ProcessesService,
private modalController: ModalController,
private router: Router,
- private userAuth: AuthService,
private sortService: SortService,
private storage: Storage,
public eventService: EventsService,
@@ -66,10 +69,18 @@ export class EventsToApprovePage implements OnInit {
this.segment = this.eventService.calendarNamesAry[0].OwnerUserId
}
}
+ this.LoadToApproveEvents()
- // this.LoadToApproveEvents();
+ this.listSubscription = this.eventoaprovacaostore.registerCallback({
+ id: import.meta.url,
+ funx:() => {
- this.router.events.forEach((event) => {
+ this.dynamicSearch()
+
+ }
+ })
+
+ this.routerSubscription = this.router.events.subscribe((event) => {
if (event instanceof NavigationStart &&
'/home/gabinete-digital?eventos=true'.startsWith(event.url)) {
@@ -80,10 +91,20 @@ export class EventsToApprovePage implements OnInit {
}
}
});
+ window['gabinete-aside-refresh'] = () => {
+ this.LoadToApproveEvents()
+ }
- this.dynamicSearch()
+
+
+ this.dynamicSearch();
}
+ ngOnDestroy() {
+ this.listSubscription.delete()
+
+ this.routerSubscription?.unsubscribe();
+ }
reorderList(orderBy: string) {
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 f032b281f..68d2d58f6 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
@@ -36,6 +36,13 @@ export class ExpedientesPrPage implements OnInit {
@Output() openExpedientDetail:EventEmitter = new EventEmitter();
+
+ listSubscription : {
+ delete(): void;
+ }
+ routerSubscription;
+
+
constructor(
private processes:ProcessesService,
private router: Router,
@@ -48,9 +55,19 @@ export class ExpedientesPrPage implements OnInit {
ngOnInit() {
- // this.LoadList()
+ this.LoadList()
- this.router.events.forEach((event) => {
+ this.listSubscription = this.expedienteGdStore.registerCallback({
+ id: import.meta.url,
+ funx:() => {
+
+ this.dynamicSearch()
+ }
+ })
+
+
+
+ this.routerSubscription = this.router.events.subscribe((event) => {
if (event instanceof NavigationStart &&
event.url.startsWith('/home/gabinete-digital?expedientespr=true') ||
event instanceof NavigationStart &&
@@ -59,17 +76,21 @@ export class ExpedientesPrPage implements OnInit {
event.url.startsWith('/home/gabinete-digital?expedientes=true' )) {
if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
- this.refreshing()
+ this.LoadList()
} else {
this.LoadList()
}
}
});
- this.dynamicSearch()
+ this.dynamicSearch();
+
}
-
+ ngOnDestroy() {
+ this.listSubscription.delete()
+ this.routerSubscription?.unsubscribe();
+ }
reorderList(orderBy: string) {
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
index 527d9241e..fc4d482c4 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
@@ -30,13 +30,18 @@ export class ExpedientsPage implements OnInit {
list = []
hideSearchBtn: boolean = false;
ordinance: string = 'old'
+ listSubscription : {
+ delete(): void;
+ }
+
+ routerSubscription;
+
constructor(
private processes: ProcessesService,
private router: Router,
public ThemeService: ThemeService,
private sortService: SortService,
- private storage: Storage,
private eventTriger: EventTrigger,
public TaskService: TaskService
) {
@@ -53,20 +58,39 @@ export class ExpedientsPage implements OnInit {
ngOnInit() {
//Inicializar segment
this.segment = "expedientes";
- // this.LoadList()
+ this.LoadList()
- this.router.events.forEach((event) => {
+
+ this.listSubscription = this.expedientegbstore.registerCallback({
+ id: import.meta.url,
+ funx:() => {
+
+ this.dynamicSearch()
+ }
+ })
+
+
+ this.routerSubscription = this.router.events.subscribe((event) => {
if (event instanceof NavigationStart &&
event.url.startsWith('/home/gabinete-digital?expedientes=true')) {
this.LoadList()
}
});
- this.dynamicSearch()
+ window['gabinete-aside-refresh'] = () => {
+ this.LoadList()
+ }
+
+
+
+ this.dynamicSearch();
}
-
+ ngOnDestroy() {
+ this.listSubscription.delete()
+ this.routerSubscription?.unsubscribe();
+ }
reorderList(orderBy: string) {
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
index ae3320bb0..cadaeb40f 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
@@ -48,6 +48,13 @@ export class PedidosPage implements OnInit {
hideSearchBtn: boolean = false;
ordinance: string = 'old'
+ listSubscription : {
+ delete(): void;
+ }
+
+
+ routerSubscription;
+
constructor(
private router: Router,
private processes:ProcessesService,
@@ -61,7 +68,18 @@ export class PedidosPage implements OnInit {
ngOnInit() {
- this.router.events.forEach((event) => {
+ this.LoadList()
+
+ this.listSubscription = this.pedidosstore.registerCallback({
+ id: import.meta.url,
+ funx:() => {
+
+ this.dynamicSearch()
+ }
+ })
+ this.dynamicSearch();
+
+ this.routerSubscription = this.router.events.subscribe((event) => {
if(event instanceof NavigationStart && '/home/gabinete-digital?parecer=true'.startsWith(event.url) ||
event instanceof NavigationStart && '/home/gabinete-digital?deferimento=true'.startsWith(event.url) ||
event instanceof NavigationStart && '/home/gabinete-digital?pedidos=true'.startsWith(event.url)
@@ -76,11 +94,16 @@ export class PedidosPage implements OnInit {
}
});
-
- this.dynamicSearch()
+ window['gabinete-aside-refresh'] = () => {
+ this.LoadList()
+ }
}
+ ngOnDestroy() {
+ this.listSubscription.delete()
+ this.routerSubscription?.unsubscribe();
+ }
reorderList(orderBy: string) {
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
index e25750d28..ad347b67c 100644
--- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
+++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
@@ -35,20 +35,36 @@ export class PendentesPage implements OnInit {
hideSearchBtn: boolean = false;
ordinance: string = 'old'
+ listSubscription : {
+ delete(): void;
+ }
+
+ routerSubscription;
+
constructor(
private processes:ProcessesService,
private router: Router,
private sortService: SortService,
private storage: Storage,
public TaskService: TaskService,
- public ThemeService: ThemeService
- ) {
+ public ThemeService: ThemeService) {
this.loggeduser = SessionStore.user;
}
ngOnInit() {
- this.router.events.forEach((event) => {
+ this.LoadList()
+
+ this.listSubscription = this.pendentesstore.registerCallback({
+ id: import.meta.url,
+ funx:() => {
+
+ this.dynamicSearch()
+ }
+ })
+ this.dynamicSearch();
+
+ this.routerSubscription = this.router.events.subscribe((event) => {
if (event instanceof NavigationStart &&
event.url.startsWith('/home/gabinete-digital?pendentes=true')) {
if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
@@ -60,7 +76,16 @@ export class PendentesPage implements OnInit {
});
- this.dynamicSearch()
+ window['gabinete-aside-refresh'] = () => {
+ this.LoadList()
+ }
+
+ }
+
+
+ ngOnDestroy() {
+ this.listSubscription.delete()
+ this.routerSubscription?.unsubscribe();
}
reorderList(orderBy: string) {
diff --git a/src/app/shared/popover/deploma-options/deploma-options.page.ts b/src/app/shared/popover/deploma-options/deploma-options.page.ts
index bfe241105..cfc97d13b 100644
--- a/src/app/shared/popover/deploma-options/deploma-options.page.ts
+++ b/src/app/shared/popover/deploma-options/deploma-options.page.ts
@@ -11,6 +11,7 @@ import { CreateProcessPage } from 'src/app/modals/create-process/create-process.
import { AttachmentList } from 'src/app/models/Excludetask';
import { DespachoService } from 'src/app/Rules/despacho.service';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
+import { TaskService } from 'src/app/services/task.service'
@Component({
selector: 'app-deploma-options',
@@ -35,7 +36,8 @@ export class DeplomaOptionsPage implements OnInit {
private RouteService: RouteService,
public p: PermissionService,
private despachoService: DespachoService,
- private httpErroHandle: HttpErrorHandle) {
+ private httpErroHandle: HttpErrorHandle,
+ public TaskService: TaskService) {
this.serialNumber = this.navParams.get('serialNumber');
this.task = this.navParams.get('task');
this.fulltask = this.navParams.get('fulltask');
@@ -319,6 +321,7 @@ export class DeplomaOptionsPage implements OnInit {
goBack() {
this.RouteService.goBack()
+ this.TaskService.loadDiplomas()
}
diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
index 6c8b59230..e697cddd5 100644
--- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
+++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
@@ -399,6 +399,7 @@ export class DespachosPrOptionsPage implements OnInit {
goBack() {
this.RouteService.goBack();
+ this.TaskService.loadDiplomas()
}
cancle() {
diff --git a/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts
index 8e5286f47..dde17fd4b 100644
--- a/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts
+++ b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts
@@ -9,6 +9,8 @@ import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
import { customTask, fullTask } from 'src/app/models/dailyworktask.model';
+import { RouteService } from 'src/app/services/route.service';
+import { TaskService } from 'src/app/services/task.service'
@Component({
selector: 'app-diplomas-gerar-options',
@@ -30,6 +32,8 @@ export class DiplomasGerarOptionsPage implements OnInit {
private despachoService: DespachoService,
private navParams: NavParams,
private router: Router,
+ private RouteService: RouteService,
+ public TaskService: TaskService
) { }
ngOnInit() {
@@ -178,7 +182,8 @@ export class DiplomasGerarOptionsPage implements OnInit {
goBack() {
this.popoverController.dismiss();
- this.router.navigate(['/home/gabinete-digital/diplomas-gerar']);
+ this.RouteService.goBack();
+ this.TaskService.loadDespachos();
}
}
diff --git a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
index 49ed2fc64..50379d4b0 100644
--- a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
+++ b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
@@ -15,6 +15,7 @@ import { RouteService } from 'src/app/services/route.service';
import { PermissionService } from 'src/app/services/permission.service';
import { SessionStore } from 'src/app/store/session.service';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
+import { TaskService } from 'src/app/services/task.service'
@Component({
selector: 'app-opts-expediente-pr',
@@ -51,7 +52,8 @@ export class OptsExpedientePrPage implements OnInit {
private RouteService: RouteService,
public ThemeService: ThemeService,
public p: PermissionService,
- private httpErrorHandle: HttpErrorHandle
+ private httpErrorHandle: HttpErrorHandle,
+ public TaskService: TaskService
) {
@@ -333,6 +335,7 @@ export class OptsExpedientePrPage implements OnInit {
goBack() {
this.RouteService.goBack()
+ this.TaskService.loadExpedientes()
}
getAttachments(serialNumber){
diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
index 27172e68e..88b906c3a 100644
--- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
+++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
@@ -89,6 +89,7 @@ export class OptsExpedientePage implements OnInit {
}
goBack() {
+ this.TaskService.loadExpedientes()
this.RouteService.goBack()
}
diff --git a/src/app/store/deplomas.service.ts b/src/app/store/deplomas.service.ts
index f8d61c518..e2c51ce24 100644
--- a/src/app/store/deplomas.service.ts
+++ b/src/app/store/deplomas.service.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
import { localstoreService } from './localstore.service'
import { AES, enc, SHA1 } from 'crypto-js'
import { momentG } from 'src/plugin/momentG';
+import { v4 as uuidv4 } from 'uuid'
@Injectable({
providedIn: 'root'
})
@@ -66,8 +67,15 @@ export class DeplomasService {
}
- registerCallback({funx, id}) {
+ registerCallback({funx, id = uuidv4()}) {
+
this.callbacks[id] = { funx, id}
+
+ return {
+ delete: ()=> {
+ delete this.callbacks[id]
+ }
+ }
}
runCallback() {
diff --git a/src/app/store/despacho-store.service.ts b/src/app/store/despacho-store.service.ts
index c3d1001eb..243f904a7 100644
--- a/src/app/store/despacho-store.service.ts
+++ b/src/app/store/despacho-store.service.ts
@@ -4,6 +4,8 @@ import { SHA1 } from 'crypto-js'
import { customTask } from '../models/dailyworktask.model';
import { ObjectQueryService } from '../services/object-query.service';
import { momentG } from 'src/plugin/momentG';
+import { v4 as uuidv4 } from 'uuid'
+
@Injectable({
providedIn: 'root'
})
@@ -41,8 +43,15 @@ export class DespachoStoreService {
}
- registerCallback({funx, id}) {
+ registerCallback({funx, id = uuidv4()}) {
+
this.callbacks[id] = { funx, id}
+
+ return {
+ delete: ()=> {
+ delete this.callbacks[id]
+ }
+ }
}
diff --git a/src/app/store/despachospr-store.service.ts b/src/app/store/despachospr-store.service.ts
index 82c25fa12..5a3fa23fd 100644
--- a/src/app/store/despachospr-store.service.ts
+++ b/src/app/store/despachospr-store.service.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
import { localstoreService } from './localstore.service'
import { AES, enc, SHA1 } from 'crypto-js'
import { momentG } from 'src/plugin/momentG';
+import { v4 as uuidv4 } from 'uuid'
@Injectable({
providedIn: 'root'
@@ -34,8 +35,15 @@ constructor() {
}
-registerCallback({funx, id}) {
+registerCallback({funx, id = uuidv4()}) {
+
this.callbacks[id] = { funx, id}
+
+ return {
+ delete: ()=> {
+ delete this.callbacks[id]
+ }
+ }
}
runCallback() {
diff --git a/src/app/store/eventoaprovacao-store.service.ts b/src/app/store/eventoaprovacao-store.service.ts
index 60d4181c5..648c5a9ef 100644
--- a/src/app/store/eventoaprovacao-store.service.ts
+++ b/src/app/store/eventoaprovacao-store.service.ts
@@ -4,6 +4,7 @@ import { AES, enc, SHA1 } from 'crypto-js'
import { isArray } from 'ionic-angular/umd/util/util';
import { EventoApprovePipe } from 'src/app/pipes/evento-approve.pipe'
import { momentG } from 'src/plugin/momentG';
+import { v4 as uuidv4 } from 'uuid'
@Injectable({
providedIn: 'root'
@@ -49,8 +50,15 @@ export class EventoaprovacaoStoreService {
}
- registerCallback({funx, id}) {
+ registerCallback({funx, id = uuidv4()}) {
+
this.callbacks[id] = { funx, id}
+
+ return {
+ delete: ()=> {
+ delete this.callbacks[id]
+ }
+ }
}
runCallback() {
diff --git a/src/app/store/expedientegd-store.service.ts b/src/app/store/expedientegd-store.service.ts
index a8aabc7b8..8fa3ae1c5 100644
--- a/src/app/store/expedientegd-store.service.ts
+++ b/src/app/store/expedientegd-store.service.ts
@@ -3,6 +3,7 @@ import { localstoreService } from './localstore.service'
import { SHA1 } from 'crypto-js'
import { ExpedienteTask } from '../models/dailyworktask.model';
import { momentG } from 'src/plugin/momentG';
+import { v4 as uuidv4 } from 'uuid'
@Injectable({
providedIn: 'root'
@@ -38,8 +39,15 @@ export class ExpedientegdStoreService {
}
- registerCallback({funx, id}) {
+ registerCallback({funx, id = uuidv4()}) {
+
this.callbacks[id] = { funx, id}
+
+ return {
+ delete: ()=> {
+ delete this.callbacks[id]
+ }
+ }
}
runCallback() {
diff --git a/src/app/store/pedidos-store.service.ts b/src/app/store/pedidos-store.service.ts
index 2ef807a83..27a918954 100644
--- a/src/app/store/pedidos-store.service.ts
+++ b/src/app/store/pedidos-store.service.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
import { localstoreService } from './localstore.service'
import { AES, enc, SHA1 } from 'crypto-js'
import { momentG } from 'src/plugin/momentG';
+import { v4 as uuidv4 } from 'uuid'
@Injectable({
providedIn: 'root'
@@ -47,10 +48,18 @@ export class PedidosStoreService {
}
- registerCallback({funx, id}) {
+ registerCallback({funx, id = uuidv4()}) {
+
this.callbacks[id] = { funx, id}
+
+ return {
+ delete: ()=> {
+ delete this.callbacks[id]
+ }
+ }
}
+
runCallback() {
for (const [key, value] of Object.entries(this.callbacks)) {
value.funx()
diff --git a/src/app/store/pendestes-store.service.ts b/src/app/store/pendestes-store.service.ts
index c51c1ef50..130e4bc8b 100644
--- a/src/app/store/pendestes-store.service.ts
+++ b/src/app/store/pendestes-store.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
import { localstoreService } from './localstore.service'
import { AES, enc, SHA1 } from 'crypto-js'
import { momentG } from 'src/plugin/momentG';
-
+import { v4 as uuidv4 } from 'uuid'
@Injectable({
providedIn: 'root'
})
@@ -38,8 +38,15 @@ export class PendestesStoreService {
}
- registerCallback({funx, id}) {
+ registerCallback({funx, id = uuidv4()}) {
+
this.callbacks[id] = { funx, id}
+
+ return {
+ delete: ()=> {
+ delete this.callbacks[id]
+ }
+ }
}
runCallback() {
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 38a854fa6..5bb822335 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -1,6 +1,6 @@
import { Environment } from './../app/models/envarioment'
import { oaprProd } from './suport/oapr'
import { doneITProd } from './suport/doneIt'
+import { DevDev } from './suport/dev'
-
-export const environment: Environment = doneITProd;
\ No newline at end of file
+export const environment: Environment = DevDev;
\ No newline at end of file
diff --git a/src/environments/suport/oapr.ts b/src/environments/suport/oapr.ts
index d5994cd7b..5e804d434 100644
--- a/src/environments/suport/oapr.ts
+++ b/src/environments/suport/oapr.ts
@@ -9,7 +9,7 @@ export const oaprProd: Environment = {
apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket',
logoLabel: 'Presidente da República',
despachoLabel: 'Presidencial',
- despachoLabel2: 'Despachos Presidenciais',
+ despachoLabel2: 'Despachos Presidênciais',
production: false,
domain: 'oapr.gov.ao',
defaultuser: '',
@@ -21,7 +21,7 @@ export const oaprProd: Environment = {
agendaVP: 'Agenda do MD',
PR: 'PR',
VP: '',
- dispatchPR: 'Despachos Presidenciais',
+ dispatchPR: 'Despachos Presidênciais',
sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712'
};
diff --git a/version/git-version.ts b/version/git-version.ts
index 8c622902e..4464f293d 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
export let versionData = {
- "shortSHA": "acb79bb62",
- "SHA": "acb79bb62e2a6ce2862e0b0115065f405cd4be2e",
+ "shortSHA": "e6fc2f19f",
+ "SHA": "e6fc2f19f249768ca94a10d44bbc0881c99f2104",
"branch": "feature/gabinete-search",
"lastCommitAuthor": "'Peter Maquiran'",
- "lastCommitTime": "'Sun Jun 11 13:36:27 2023 +0100'",
- "lastCommitMessage": "remove sqlite and unused import",
- "lastCommitNumber": "4975",
- "change": "diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html\nindex ed8137bc1..b9b08179b 100644\n--- a/src/app/pages/events/events.page.html\n+++ b/src/app/pages/events/events.page.html\n@@ -26,7 +26,7 @@\n \n \n
\n-
\n+
\n
\n
{{customDate}}
\n
\ndiff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts\nindex 6d742e2ec..8b42f02e2 100644\n--- a/src/app/pages/events/events.page.ts\n+++ b/src/app/pages/events/events.page.ts\n@@ -72,6 +72,10 @@ export class EventsPage implements OnInit {\n searchSubject: string = '';\n AllProcess = []\n ordinance: string = 'old'\n+ listSubscription : {\n+ delete(): void;\n+ }\n+\n \n constructor(\n private eventService: EventsService,\n@@ -87,12 +91,7 @@ export class EventsPage implements OnInit {\n private changeProfileService: ChangeProfileService,\n public TaskService: TaskService\n ) {\n-\n \n-\n- this.loadAllTask();\n- \n-\n window['zipPhoneCallback'] = function (zipphone) {\n var frame = document.getElementById('home-iframe');\n if(frame) {\n@@ -101,18 +100,30 @@ export class EventsPage implements OnInit {\n }\n \n this.changeProfileService.registerCallback(() => {\n-\n this.listToPresent = [];\n this.listToPresentexpediente = []\n })\n \n- this.TaskService.registerCallback({\n+ }\n+\n+ ngAfterViewInit(): void {\n+ \n+\n+ this.loadAllTask();\n+\n+ this.listSubscription = this.TaskService.registerCallback({\n id: import.meta.url,\n funx:() => {\n this.dynamicSearch()\n }\n })\n+ \n+ this.dynamicSearch()\n+ \n+ }\n \n+ ngOnDestroy() {\n+ this.listSubscription.delete()\n }\n \n ngOnInit() {\n@@ -170,6 +181,7 @@ export class EventsPage implements OnInit {\n async loadAllTask() {\n this.loadingAllTask = true\n await this.TaskService.LoadTask()\n+ this.dynamicSearch()\n this.loadingAllTask = false\n }\n \ndiff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\nindex 892b94fd2..f6e2a1b0e 100644\n--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n@@ -403,7 +403,7 @@ export class DespachoPrPage implements OnInit {\n }\n \n this.TaskService.loadDiplomas()\n- // this.goBack();\n+ this.goBack();\n }\n });\n }\ndiff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts\nindex 8905599b6..7e6d25901 100644\n--- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts\n+++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts\n@@ -1,8 +1,8 @@\n import { Component, OnDestroy, OnInit } from '@angular/core';\n import { ActivatedRoute, NavigationStart, Router } from '@angular/router';\n import { ProcessesService } from 'src/app/services/processes.service';\n-\n import { BackgroundService } from 'src/app/services/background.service';\n+import { ThemeService } from 'src/app/services/theme.service'\n import { PermissionService } from 'src/app/services/permission.service';\n import { DeplomasStore } from 'src/app/store/deplomas.service';\n import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';\n@@ -39,6 +39,7 @@ export class DiplomasPage implements OnInit, OnDestroy {\n private router: Router,\n private activatedRoute: ActivatedRoute,\n private backgroundservice: BackgroundService,\n+ public ThemeService: ThemeService,\n public p: PermissionService,\n public TaskService: TaskService,\n private RouteService: RouteService,\ndiff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html\nindex c74dd8ef6..422452bea 100644\n--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html\n+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html\n@@ -278,7 +278,6 @@\n 1\">Documentos\n \n
\n-\n \n
\n
\n@@ -665,21 +664,21 @@\n \n
\n \n-
\n-
\n-
\n-\n-
\n-
\n-
\n-
\n-
\n-
\n-
\n-
\n-
\n-\n-
\n+
\n+
\n+
\n+\n+
\n+
\n+
\n+
\n+
\n+
\n+
\n+
\n+
\n+\n+
\n
\n
\n \ndiff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts\nindex efe2b1922..dd5789f21 100644\n--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts\n+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts\n@@ -121,39 +121,8 @@ export class GabineteDigitalPage implements OnInit {\n }\n }\n \n- this.checkRoutes();\n-\n \n // fix with many timeout\n- setTimeout(() => {\n- this.dynamicSearch()\n- }, 2000)\n- // setTimeout(() => {\n- // this.dynamicSearch()\n- // }, 4000)\n- setTimeout(() => {\n- this.dynamicSearch()\n- }, 6000)\n- setTimeout(() => {\n- this.dynamicSearch()\n- }, 10000)\n- setTimeout(() => {\n- this.dynamicSearch()\n- }, 14000)\n- setTimeout(() => {\n- this.dynamicSearch()\n- }, 18000)\n- setTimeout(() => {\n-\n- this.dynamicSearch()\n-\n- this.TaskService.registerCallback({\n- id: import.meta.url,\n- funx:() => {\n- this.dynamicSearch()\n- }\n- })\n- }, 20000)\n \n }\n \n@@ -223,9 +192,34 @@ export class GabineteDigitalPage implements OnInit {\n this.segmentVista = \"boxview\"\n }\n \n- this.LoadCounts();\n- this.checkFilter();\n+\n+ this.hideRefreshButton();\n+ \n+ }\n+\n+ ngAfterViewInit(): void {\n+ // We can access the TestComponent now that this portion of the view tree has been initiated.\n+ const element = this.scroll.nativeElement\n+ this.scroll.nativeElement.addEventListener(\"scroll\", (e)=> {\n+ this.changeTab()\n+ });\n+\n \n+ (async () => {\n+ await this.loadAllProcesses()\n+ this.TaskService.registerCallback({\n+ id: import.meta.url,\n+ funx:() => {\n+ this.dynamicSearch()\n+ }\n+ })\n+ })();\n+\n+ this.checkFilter();\n+ this.checkRoutes();\n+ this.dynamicSearch()\n+\n+\n const pathname = '/home/gabinete-digital'\n this.router.events.forEach((event) => {\n if (event instanceof NavigationEnd && event.url.includes(pathname) && !event.url.includes('/home/gabinete-digital/')) {\n@@ -246,17 +240,7 @@ export class GabineteDigitalPage implements OnInit {\n }\n });\n \n- this.checkRoutes()\n- this.hideRefreshButton();\n- \n- }\n \n- ngAfterViewInit(): void {\n- // We can access the TestComponent now that this portion of the view tree has been initiated.\n- const element = this.scroll.nativeElement\n- this.scroll.nativeElement.addEventListener(\"scroll\", (e)=> {\n- this.changeTab()\n- });\n }\n \n functionTimer1 = null;\n@@ -292,9 +276,6 @@ export class GabineteDigitalPage implements OnInit {\n \n } \n \n- async loadAllProcesses() {\n- this.LoadCounts();\n- }\n \n \n goto(url) {\n@@ -417,11 +398,13 @@ export class GabineteDigitalPage implements OnInit {\n }\n else if (this.router.url == '/home/gabinete-digital?despachospr=true') {\n this.openDespachosPrPage('');\n- this.selectedElement = 'DispatchesPr'\n+ this.selectedElement = 'showDespachosPr'\n }\n- else if (this.router.url == '/home/gabinete-digital?diplomas=true') {\n+ else if (this.router.url == '/home/gabinete-digital?diplomas=assinados') {\n+ this.openDiplomasPage('assinados');\n+ }\n+ else if (this.router.url == '/home/gabinete-digital?diplomas=validar') {\n this.openDiplomasPage('validar');\n- this.selectedElement = 'DiplomasPorValidar';\n }\n else if (this.router.url == '/home/gabinete-digital?diplomasassinar=true') {\n this.openDiplomasAssinarPage();\n@@ -464,17 +447,18 @@ export class GabineteDigitalPage implements OnInit {\n return Object.keys(this.loadProcess)\n }\n \n- async LoadCounts() {\n+ async loadAllProcesses() {\n \n // this.skeletonLoader = true\n await this.TaskService.LoadTask()\n+ this.dynamicSearch()\n // this.skeletonLoader = false\n }\n \n doRefresh(event) {\n \n \n- this.LoadCounts();\n+ this.loadAllProcesses();\n \n if (event) {\n setTimeout(() => {\n@@ -634,9 +618,11 @@ export class GabineteDigitalPage implements OnInit {\n let navigationExtras: NavigationExtras;\n \n if (segment == 'validar') {\n- navigationExtras = { queryParams: { \"validar\": true, } };\n+ navigationExtras = { queryParams: { \"diplomas\": 'validar', } };\n+ this.selectedElement = 'DiplomasPorValidar';\n } else if (segment == 'assinados') {\n- navigationExtras = { queryParams: { \"assinados\": true, } };\n+ this.selectedElement = 'DiplomasAssinados';\n+ navigationExtras = { queryParams: { \"diplomas\": 'assinados', } };\n }\n \n this.segment = segment;\n@@ -646,8 +632,6 @@ export class GabineteDigitalPage implements OnInit {\n }\n else {\n this.closeAllDesktopComponents();\n- this.segment = segment;\n- let navigationExtras: NavigationExtras = { queryParams: { \"diplomas\": true, } };\n this.router.navigate(['/home/gabinete-digital'], navigationExtras);\n this.showDiplomas = true;\n }\ndiff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts\nindex 0f6784f66..a78b1d467 100644\n--- a/src/app/services/task.service.ts\n+++ b/src/app/services/task.service.ts\n@@ -17,6 +17,7 @@ import { EventsService } from './events.service';\n import { SortService } from './functions/sort.service';\n import { customTask } from '../models/dailyworktask.model';\n import { Router } from '@angular/router';\n+import { v4 as uuidv4 } from 'uuid'\n \n @Injectable({\n providedIn: 'root'\n@@ -75,10 +76,21 @@ export class TaskService {\n this.updateAllProcess();\n this.updateCount()\n this.runCallback();\n+\n+ document.addEventListener('resume', function () {\n+ this.loadAllTask();\n+ });\n }\n \n- registerCallback({funx, id}) {\n+ registerCallback({funx, id = uuidv4()}) {\n+\n this.callbacks[id] = { funx, id}\n+ \n+ return {\n+ delete: ()=> {\n+ delete this.callbacks[id]\n+ }\n+ }\n }\n \n runCallback() {\ndiff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\nindex 25536f35d..ab7c5e9c9 100644\n--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n@@ -29,47 +29,42 @@ export class AllProcessesPage implements OnInit {\n AllProcess = []\n ordinance: string = 'old'\n \n+ listSubscription : {\n+ delete(): void;\n+ }\n+\n+\n constructor(\n private router: Router,\n public ThemeService: ThemeService,\n public TaskService: TaskService,\n- private route: ActivatedRoute\n ) {}\n \n ngOnInit() {\n // this.updateAllProcess()\n this.checkFilter();\n+ }\n \n- this.router.events.forEach((event) => {\n- if (event instanceof NavigationEnd && event.url.includes('/home/gabinete-digital')) {\n- // this.refreshing();\n- this.checkFilter();\n- }\n- });\n-\n-\n- setTimeout(() => {\n- // this.miniSearch.addAll(this.TaskService.AllProcess)\n- // window['miniSearch'] = this.miniSearch\n-\n-\n- this.TaskService.registerCallback({\n- id: import.meta.url,\n- funx:() => {\n- this.dynamicSearch()\n- }\n- })\n- }, 10)\n-\n+ ngAfterViewInit(): void {\n \n- this.TaskService.registerCallback({\n+ this.listSubscription = this.TaskService.registerCallback({\n id: import.meta.url,\n funx:() => {\n+\n this.dynamicSearch()\n+ \n }\n })\n+\n+ this.dynamicSearch();\n+\n+ }\n+\n+ ngOnDestroy() {\n+ this.listSubscription.delete()\n }\n \n+\n openSearch() {\n // this.dynamicSearch()\n }\ndiff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts\nindex bd5d15481..70d3061b0 100644\n--- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts\n+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts\n@@ -20,6 +20,10 @@ export class DespachosPage implements OnInit {\n hideSearchBtn: boolean = false;\n ordinance: string = 'old'\n \n+ listSubscription : {\n+ delete(): void;\n+ }\n+\n constructor (\n private router: Router,\n private despachoRule: DespachoService,\n@@ -29,28 +33,23 @@ export class DespachosPage implements OnInit {\n \n ngOnInit() {\n \n- // this.LoadList();\n-\n- this.router.events.forEach((event) => {\n- if (event instanceof NavigationStart && event.url.startsWith('/home/gabinete-digital?despachos=true')) {\n- this.LoadList()\n- }\n- });\n+ this.LoadList()\n \n- this.TaskService.despachoStore.registerCallback({\n+ this.listSubscription = this.TaskService.despachoStore.registerCallback({\n id: import.meta.url,\n funx:() => {\n \n- this.list = this.TaskService.despachoStore.list.filter(task => this.TaskService.filter(task, this.filterName))\n- \n+ this.dynamicSearch()\n }\n })\n-\n-\n this.dynamicSearch();\n \n }\n \n+ ngOnDestroy() {\n+ this.listSubscription.delete()\n+ }\n+\n reorderList(orderBy: string) {\n \n this.ordinance = orderBy;\ndiff --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\nindex f7d8bf85e..50fff9642 100644\n--- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n+++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n@@ -28,28 +28,39 @@ export class DiplomasAssinarPage implements OnInit {\n hideSearchBtn: boolean = false;\n ordinance: string = 'old'\n \n+ listSubscription : {\n+ delete(): void;\n+ }\n \n constructor(\n- private processes:ProcessesService,\n private router: Router,\n- private sortService: SortService,\n public ThemeService: ThemeService,\n public TaskService: TaskService\n ) {}\n \n ngOnInit() {\n \n- // this.LoadList()\n+ this.dynamicSearch()\n+ this.LoadList()\n+\n \n- this.router.events.forEach((event) => {\n- if (event instanceof NavigationStart && '/home/gabinete-digital?diplomasassinar=true'.startsWith(event.url)) {\n- this.LoadList()\n+ this.listSubscription = this.deplomasStore.registerCallback({\n+ id: import.meta.url,\n+ funx:() => {\n+ \n+ this.dynamicSearch()\n+ \n }\n- });\n+ })\n+\n \n this.dynamicSearch()\n }\n \n+ ngOnDestroy() {\n+ this.listSubscription.delete()\n+ }\n+\n \n reorderList(orderBy: string) {\n \ndiff --git a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\nindex a1c226981..200fdb577 100644\n--- a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n+++ b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n@@ -29,29 +29,29 @@ export class DiplomasGerarPage implements OnInit {\n hideSearchBtn: boolean = false;\n ordinance: string = 'old'\n \n+ listSubscription : {\n+ delete(): void;\n+ }\n+\n constructor(\n- private processes:ProcessesService,\n private router: Router,\n- private sortService: SortService,\n public ThemeService: ThemeService,\n public TaskService: TaskService\n ) {}\n \n ngOnInit() {\n \n- this.router.events.forEach((event) => {\n- if (event instanceof NavigationStart && '/home/gabinete-digital/?gerarDiplomas=true'.startsWith(event.url)) {\n- if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {\n- this.LoadList()\n- this.dynamicSearch()\n- } else {\n- this.LoadList()\n- this.dynamicSearch()\n- }\n- }\n- });\n+ this.LoadList()\n+ this.dynamicSearch()\n \n+ this.listSubscription = this.deplomasStore.registerCallback({\n+ id: import.meta.url,\n+ funx:() => {\n \n+ this.dynamicSearch()\n+ \n+ }\n+ })\n \n }\n \ndiff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts\nindex 46eb6110b..fef8aea1b 100644\n--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts\n+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts\n@@ -36,12 +36,14 @@ export class DiplomasPage implements OnInit {\n listDiplomasAssinadosPR = []\n hideSearchBtn: boolean = false;\n ordinance: string = 'old'\n+ \n+ listSubscription : {\n+ delete(): void;\n+ }\n \n constructor(\n- private processes:ProcessesService,\n private router: Router,\n public ThemeService: ThemeService,\n- private sortService: SortService,\n public p: PermissionService,\n public TaskService: TaskService\n ) {}\n@@ -50,20 +52,24 @@ export class DiplomasPage implements OnInit {\n // update list\n // this.LoadList()\n \n- this.router.events.forEach((event) => {\n- if (event instanceof NavigationStart && '/home/gabinete-digital?diplomas=true'.startsWith(event.url)) {\n- if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {\n- this.LoadList()\n- } else {\n- this.LoadList()\n- }\n+ this.LoadList()\n+ this.listSubscription = this.deplomasStore.registerCallback({\n+ id: import.meta.url,\n+ funx:() => {\n+\n+ this.dynamicSearch()\n+ \n }\n- });\n+ })\n \n \n this.dynamicSearch();\n }\n \n+ ngOnDestroy() {\n+ this.listSubscription.delete()\n+ }\n+\n \n reorderList(orderBy: string) {\n \ndiff --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\nindex 7274e8a4c..52afe71b3 100644\n--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n@@ -44,12 +44,15 @@ export class EventsToApprovePage implements OnInit {\n list = []\n hideSearchBtn: boolean = false;\n ordinance: string = 'old'\n- \n+ listSubscription : {\n+ delete(): void;\n+ }\n+\n+\n constructor(\n private processes:ProcessesService,\n private modalController: ModalController,\n private router: Router,\n- private userAuth: AuthService,\n private sortService: SortService,\n private storage: Storage,\n public eventService: EventsService,\n@@ -66,24 +69,23 @@ export class EventsToApprovePage implements OnInit {\n this.segment = this.eventService.calendarNamesAry[0].OwnerUserId\n }\n }\n+ this.LoadToApproveEvents()\n \n- // this.LoadToApproveEvents();\n+ this.listSubscription = this.eventoaprovacaostore.registerCallback({\n+ id: import.meta.url,\n+ funx:() => {\n \n- this.router.events.forEach((event) => {\n- if (event instanceof NavigationStart &&\n- '/home/gabinete-digital?eventos=true'.startsWith(event.url)) {\n-\n- if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {\n- this.LoadToApproveEvents()\n- } else {\n- this.LoadToApproveEvents()\n- }\n+ this.dynamicSearch()\n+ \n }\n- });\n+ })\n \n- this.dynamicSearch()\n+ this.dynamicSearch();\n }\n \n+ ngOnDestroy() {\n+ this.listSubscription.delete()\n+ }\n \n reorderList(orderBy: string) {\n \ndiff --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\nindex f032b281f..7af7b48ee 100644\n--- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n+++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n@@ -36,6 +36,12 @@ export class ExpedientesPrPage implements OnInit {\n \n @Output() openExpedientDetail:EventEmitter
= new EventEmitter();\n \n+ \n+ listSubscription : {\n+ delete(): void;\n+ }\n+\n+ \n constructor(\n private processes:ProcessesService,\n private router: Router,\n@@ -48,28 +54,22 @@ export class ExpedientesPrPage implements OnInit {\n \n ngOnInit() {\n \n- // this.LoadList()\n-\n- this.router.events.forEach((event) => {\n- if (event instanceof NavigationStart &&\n- event.url.startsWith('/home/gabinete-digital?expedientespr=true') ||\n- event instanceof NavigationStart &&\n- event.url.startsWith('/home/gabinete-digital?expedientes-pr=true' ) ||\n- event instanceof NavigationStart &&\n- event.url.startsWith('/home/gabinete-digital?expedientes=true' )) {\n-\n- if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {\n- this.refreshing()\n- } else {\n- this.LoadList()\n- }\n+ this.LoadList()\n+\n+ this.listSubscription = this.expedienteGdStore.registerCallback({\n+ id: import.meta.url,\n+ funx:() => {\n+\n+ this.dynamicSearch()\n }\n- });\n+ })\n+ this.dynamicSearch();\n \n- this.dynamicSearch()\n }\n \n-\n+ ngOnDestroy() {\n+ this.listSubscription.delete()\n+ }\n \n reorderList(orderBy: string) {\n \ndiff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts\nindex 527d9241e..a3e1209d1 100644\n--- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts\n+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts\n@@ -30,13 +30,16 @@ export class ExpedientsPage implements OnInit {\n list = []\n hideSearchBtn: boolean = false;\n ordinance: string = 'old'\n+ listSubscription : {\n+ delete(): void;\n+ }\n+\n \n constructor(\n private processes: ProcessesService,\n private router: Router,\n public ThemeService: ThemeService,\n private sortService: SortService,\n- private storage: Storage,\n private eventTriger: EventTrigger,\n public TaskService: TaskService\n ) {\n@@ -53,20 +56,24 @@ export class ExpedientsPage implements OnInit {\n ngOnInit() {\n //Inicializar segment\n this.segment = \"expedientes\";\n- // this.LoadList()\n+ this.LoadList()\n \n- this.router.events.forEach((event) => {\n- if (event instanceof NavigationStart &&\n- event.url.startsWith('/home/gabinete-digital?expedientes=true')) {\n- this.LoadList()\n- }\n- });\n \n- this.dynamicSearch()\n+ this.listSubscription = this.expedientegbstore.registerCallback({\n+ id: import.meta.url,\n+ funx:() => {\n \n- }\n+ this.dynamicSearch()\n+ }\n+ })\n+ \n+ this.dynamicSearch();\n \n+ }\n \n+ ngOnDestroy() {\n+ this.listSubscription.delete()\n+ }\n \n reorderList(orderBy: string) {\n \ndiff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts\nindex ae3320bb0..cbdfeeb6d 100644\n--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts\n+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts\n@@ -48,6 +48,11 @@ export class PedidosPage implements OnInit {\n hideSearchBtn: boolean = false;\n ordinance: string = 'old'\n \n+ listSubscription : {\n+ delete(): void;\n+ }\n+\n+\n constructor(\n private router: Router,\n private processes:ProcessesService,\n@@ -61,23 +66,16 @@ export class PedidosPage implements OnInit {\n \n ngOnInit() {\n \n- this.router.events.forEach((event) => {\n- if(event instanceof NavigationStart && '/home/gabinete-digital?parecer=true'.startsWith(event.url) ||\n- event instanceof NavigationStart && '/home/gabinete-digital?deferimento=true'.startsWith(event.url) ||\n- event instanceof NavigationStart && '/home/gabinete-digital?pedidos=true'.startsWith(event.url)\n- ) {\n+ this.LoadList()\n \n- if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {\n- this.LoadList()\n- } else {\n- this.LoadList()\n- }\n+ this.listSubscription = this.pedidosstore.registerCallback({\n+ id: import.meta.url,\n+ funx:() => {\n \n+ this.dynamicSearch()\n }\n- });\n-\n-\n- this.dynamicSearch()\n+ })\n+ this.dynamicSearch();\n \n }\n \ndiff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts\nindex e25750d28..ad5fad2e5 100644\n--- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts\n+++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts\n@@ -35,32 +35,38 @@ export class PendentesPage implements OnInit {\n hideSearchBtn: boolean = false;\n ordinance: string = 'old'\n \n+ listSubscription : {\n+ delete(): void;\n+ }\n+\n+\n constructor(\n private processes:ProcessesService,\n private router: Router,\n private sortService: SortService,\n private storage: Storage,\n public TaskService: TaskService, \n- public ThemeService: ThemeService\n- ) {\n+ public ThemeService: ThemeService) {\n this.loggeduser = SessionStore.user;\n }\n \n ngOnInit() {\n \n- this.router.events.forEach((event) => {\n- if (event instanceof NavigationStart &&\n- event.url.startsWith('/home/gabinete-digital?pendentes=true')) {\n- if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {\n- this.LoadList()\n- } else {\n- this.LoadList()\n- }\n+ this.LoadList()\n+\n+ this.listSubscription = this.pendentesstore.registerCallback({\n+ id: import.meta.url,\n+ funx:() => {\n+\n+ this.dynamicSearch()\n }\n+ })\n+ this.dynamicSearch();\n \n- });\n+ }\n \n- this.dynamicSearch()\n+ ngOnDestroy() {\n+ this.listSubscription.delete()\n }\n \n reorderList(orderBy: string) {\ndiff --git a/src/app/store/deplomas.service.ts b/src/app/store/deplomas.service.ts\nindex f8d61c518..e2c51ce24 100644\n--- a/src/app/store/deplomas.service.ts\n+++ b/src/app/store/deplomas.service.ts\n@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';\n import { localstoreService } from './localstore.service'\n import { AES, enc, SHA1 } from 'crypto-js'\n import { momentG } from 'src/plugin/momentG';\n+import { v4 as uuidv4 } from 'uuid'\n @Injectable({\n providedIn: 'root'\n })\n@@ -66,8 +67,15 @@ export class DeplomasService {\n \n }\n \n- registerCallback({funx, id}) {\n+ registerCallback({funx, id = uuidv4()}) {\n+\n this.callbacks[id] = { funx, id}\n+\n+ return {\n+ delete: ()=> {\n+ delete this.callbacks[id]\n+ }\n+ }\n }\n \n runCallback() {\ndiff --git a/src/app/store/despacho-store.service.ts b/src/app/store/despacho-store.service.ts\nindex c3d1001eb..243f904a7 100644\n--- a/src/app/store/despacho-store.service.ts\n+++ b/src/app/store/despacho-store.service.ts\n@@ -4,6 +4,8 @@ import { SHA1 } from 'crypto-js'\n import { customTask } from '../models/dailyworktask.model';\n import { ObjectQueryService } from '../services/object-query.service';\n import { momentG } from 'src/plugin/momentG';\n+import { v4 as uuidv4 } from 'uuid'\n+\n @Injectable({\n providedIn: 'root'\n })\n@@ -41,8 +43,15 @@ export class DespachoStoreService {\n \n }\n \n- registerCallback({funx, id}) {\n+ registerCallback({funx, id = uuidv4()}) {\n+\n this.callbacks[id] = { funx, id}\n+\n+ return {\n+ delete: ()=> {\n+ delete this.callbacks[id]\n+ }\n+ }\n }\n \n \ndiff --git a/src/app/store/despachospr-store.service.ts b/src/app/store/despachospr-store.service.ts\nindex 82c25fa12..5a3fa23fd 100644\n--- a/src/app/store/despachospr-store.service.ts\n+++ b/src/app/store/despachospr-store.service.ts\n@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';\n import { localstoreService } from './localstore.service'\n import { AES, enc, SHA1 } from 'crypto-js'\n import { momentG } from 'src/plugin/momentG';\n+import { v4 as uuidv4 } from 'uuid'\n \n @Injectable({\n providedIn: 'root'\n@@ -34,8 +35,15 @@ constructor() {\n \n }\n \n-registerCallback({funx, id}) {\n+registerCallback({funx, id = uuidv4()}) {\n+\n this.callbacks[id] = { funx, id}\n+\n+ return {\n+ delete: ()=> {\n+ delete this.callbacks[id]\n+ }\n+ }\n }\n \n runCallback() {\ndiff --git a/src/app/store/eventoaprovacao-store.service.ts b/src/app/store/eventoaprovacao-store.service.ts\nindex 60d4181c5..648c5a9ef 100644\n--- a/src/app/store/eventoaprovacao-store.service.ts\n+++ b/src/app/store/eventoaprovacao-store.service.ts\n@@ -4,6 +4,7 @@ import { AES, enc, SHA1 } from 'crypto-js'\n import { isArray } from 'ionic-angular/umd/util/util';\n import { EventoApprovePipe } from 'src/app/pipes/evento-approve.pipe'\n import { momentG } from 'src/plugin/momentG';\n+import { v4 as uuidv4 } from 'uuid'\n \n @Injectable({\n providedIn: 'root'\n@@ -49,8 +50,15 @@ export class EventoaprovacaoStoreService {\n }\n \n \n- registerCallback({funx, id}) {\n+ registerCallback({funx, id = uuidv4()}) {\n+\n this.callbacks[id] = { funx, id}\n+\n+ return {\n+ delete: ()=> {\n+ delete this.callbacks[id]\n+ }\n+ }\n }\n \n runCallback() {\ndiff --git a/src/app/store/expedientegd-store.service.ts b/src/app/store/expedientegd-store.service.ts\nindex a8aabc7b8..8fa3ae1c5 100644\n--- a/src/app/store/expedientegd-store.service.ts\n+++ b/src/app/store/expedientegd-store.service.ts\n@@ -3,6 +3,7 @@ import { localstoreService } from './localstore.service'\n import { SHA1 } from 'crypto-js'\n import { ExpedienteTask } from '../models/dailyworktask.model';\n import { momentG } from 'src/plugin/momentG';\n+import { v4 as uuidv4 } from 'uuid'\n \n @Injectable({\n providedIn: 'root'\n@@ -38,8 +39,15 @@ export class ExpedientegdStoreService {\n \n }\n \n- registerCallback({funx, id}) {\n+ registerCallback({funx, id = uuidv4()}) {\n+\n this.callbacks[id] = { funx, id}\n+\n+ return {\n+ delete: ()=> {\n+ delete this.callbacks[id]\n+ }\n+ }\n }\n \n runCallback() {\ndiff --git a/src/app/store/pedidos-store.service.ts b/src/app/store/pedidos-store.service.ts\nindex 2ef807a83..27a918954 100644\n--- a/src/app/store/pedidos-store.service.ts\n+++ b/src/app/store/pedidos-store.service.ts\n@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';\n import { localstoreService } from './localstore.service'\n import { AES, enc, SHA1 } from 'crypto-js'\n import { momentG } from 'src/plugin/momentG';\n+import { v4 as uuidv4 } from 'uuid'\n \n @Injectable({\n providedIn: 'root'\n@@ -47,10 +48,18 @@ export class PedidosStoreService {\n \n }\n \n- registerCallback({funx, id}) {\n+ registerCallback({funx, id = uuidv4()}) {\n+\n this.callbacks[id] = { funx, id}\n+\n+ return {\n+ delete: ()=> {\n+ delete this.callbacks[id]\n+ }\n+ }\n }\n \n+\n runCallback() {\n for (const [key, value] of Object.entries(this.callbacks)) {\n value.funx()\ndiff --git a/src/app/store/pendestes-store.service.ts b/src/app/store/pendestes-store.service.ts\nindex c51c1ef50..130e4bc8b 100644\n--- a/src/app/store/pendestes-store.service.ts\n+++ b/src/app/store/pendestes-store.service.ts\n@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';\n import { localstoreService } from './localstore.service'\n import { AES, enc, SHA1 } from 'crypto-js'\n import { momentG } from 'src/plugin/momentG';\n-\n+import { v4 as uuidv4 } from 'uuid'\n @Injectable({\n providedIn: 'root'\n })\n@@ -38,8 +38,15 @@ export class PendestesStoreService {\n \n }\n \n- registerCallback({funx, id}) {\n+ registerCallback({funx, id = uuidv4()}) {\n+\n this.callbacks[id] = { funx, id}\n+\n+ return {\n+ delete: ()=> {\n+ delete this.callbacks[id]\n+ }\n+ }\n }\n \n runCallback() {\ndiff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts\nindex 38a854fa6..5bb822335 100644\n--- a/src/environments/environment.prod.ts\n+++ b/src/environments/environment.prod.ts\n@@ -1,6 +1,6 @@\n import { Environment } from './../app/models/envarioment'\n import { oaprProd } from './suport/oapr'\n import { doneITProd } from './suport/doneIt'\n+import { DevDev } from './suport/dev'\n \n-\n-export const environment: Environment = doneITProd;\n\\ No newline at end of file\n+export const environment: Environment = DevDev;\n\\ No newline at end of file",
- "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\nChanges not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\tmodified: src/app/shared/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified: src/app/shared/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified: src/app/store/deplomas.service.ts\n\tmodified: src/app/store/despacho-store.service.ts\n\tmodified: src/app/store/despachospr-store.service.ts\n\tmodified: src/app/store/eventoaprovacao-store.service.ts\n\tmodified: src/app/store/expedientegd-store.service.ts\n\tmodified: src/app/store/pedidos-store.service.ts\n\tmodified: src/app/store/pendestes-store.service.ts\n\tmodified: src/environments/environment.prod.ts",
+ "lastCommitTime": "'Sun Jun 11 15:59:05 2023 +0100'",
+ "lastCommitMessage": "add go back",
+ "lastCommitNumber": "4976",
+ "change": "",
+ "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\tmodified: src/app/shared/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified: src/app/shared/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified: src/app/shared/popover/deploma-options/deploma-options.page.ts\n\tmodified: src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts\n\tmodified: src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts\n\tmodified: src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.ts\n\tmodified: src/app/store/deplomas.service.ts\n\tmodified: src/app/store/despacho-store.service.ts\n\tmodified: src/app/store/despachospr-store.service.ts\n\tmodified: src/app/store/eventoaprovacao-store.service.ts\n\tmodified: src/app/store/expedientegd-store.service.ts\n\tmodified: src/app/store/pedidos-store.service.ts\n\tmodified: src/app/store/pendestes-store.service.ts\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/suport/oapr.ts",
"changeAuthor": "peter.maquiran"
}
\ No newline at end of file