From c965b9a8b0732de71b549db4a8bd4c889b7a9c1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Fri, 23 Jul 2021 05:43:52 +0100 Subject: [PATCH] Gabinete digital buffer completed --- src/app/home/home.page.ts | 4 +- .../gabinete-digital.page.html | 20 +++---- .../gabinete-digital/gabinete-digital.page.ts | 20 +++++++ .../despachos-pr/despachos-pr.page.html | 8 +-- .../despachos-pr/despachos-pr.page.ts | 4 +- .../expedientes-pr/expedientes-pr.page.html | 8 +-- .../expedientes-pr/expedientes-pr.page.ts | 5 +- src/app/store/despacho-store.service.ts | 2 +- .../store/despachospr-store.service.spec.ts | 16 +++++ src/app/store/despachospr-store.service.ts | 59 +++++++++++++++++++ .../store/eventoaprovacao-store.service.ts | 6 +- src/app/store/expedientegd-store.service.ts | 2 +- .../store/expedientepr-store.service.spec.ts | 16 +++++ src/app/store/expedientepr-store.service.ts | 58 ++++++++++++++++++ src/app/store/pedidos-store.service.ts | 29 +++++---- src/app/store/pendestes-store.service.ts | 4 +- 16 files changed, 222 insertions(+), 39 deletions(-) create mode 100644 src/app/store/despachospr-store.service.spec.ts create mode 100644 src/app/store/despachospr-store.service.ts create mode 100644 src/app/store/expedientepr-store.service.spec.ts create mode 100644 src/app/store/expedientepr-store.service.ts diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index e6a996b82..afe02c753 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -80,7 +80,7 @@ export class HomePage implements OnInit { mobilefirstConnect() { - try { + //try { window['WLAuthorizationManager'].obtainAccessToken("").then( (token) => { console.log('MobileFirst Server connect: Success ' + token); @@ -108,7 +108,7 @@ export class HomePage implements OnInit { alert("Failed to connect to MobileFirst Server"); }); */ }); - } catch {} + //} catch {} } diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 74785d8cc..896718df7 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -26,7 +26,7 @@

Eventos para Aprovação

-

{{count_ev_apr}} Documentos

+

{{eventoaprovacaostore.count}} Documentos

@@ -34,7 +34,7 @@

Correspondencia

-

{{count_exp_dailywork}} Documentos

+

{{expedientegbstore.count}} Documentos

@@ -44,7 +44,7 @@

Pendentes

Meus Pendentes

-

{{count_total_pending}} Documentos

+

{{pendentesstore.count}} Documentos

@@ -52,7 +52,7 @@

Despachos

-

{{count_desp_dailywork}} Documentos

+

{{despachoStore.count}} Documentos

@@ -61,7 +61,7 @@

Pedidos de Parecer

Pedidos de Parecer solicitados por mim

-

{{count_par_dailywork}} Documentos

+

{{pedidosstore.countparecer}} Documentos

@@ -69,7 +69,7 @@

Pedidos de Deferimento

-

{{count_def_dailywork}} Documentos

+

{{pedidosstore.countdeferimento}} Documentos

@@ -78,7 +78,7 @@

Expediente Presidente

Expediente

-

{{count_exp_pr}} Documentos

+

{{expedienteprstore.count}} Documentos

@@ -87,7 +87,7 @@

Despacho do Presidente da República

Despachos criados por mim

-

{{ count_de_pr }} Documentos

+

{{ despachoprstore.count }} Documentos

@@ -98,7 +98,7 @@

Expediente Presidente

Expediente

-

{{count_exp_pr}} Documentos

+

{{expedientegbstore.count}} Documentos

@@ -110,7 +110,7 @@

Despacho do Presidente da República

-

{{ count_de_pr }} Documentos

+

{{ despachoprstore.count }} Documentos

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 9f0e1e16a..ce00bfc03 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -13,6 +13,13 @@ import { User } from 'src/app/models/user.model'; import { ExpedientsPage } from 'src/app/shared/gabinete-digital/expedients/expedients.page'; import { PendentesPage } from 'src/app/shared/gabinete-digital/pendentes/pendentes.page'; import { EventsToApprovePage } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page'; +import { DespachoStore } from 'src/app/store/despacho-store.service'; +import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.service'; +import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service'; +import { PendentesStore } from 'src/app/store/pendestes-store.service'; +import { PedidosStore } from 'src/app/store/pedidos-store.service'; +import { ExpedienteprStore } from 'src/app/store/expedientepr-store.service'; +import { DespachosprStore } from 'src/app/store/despachospr-store.service'; @Component({ selector: 'app-gabinete-digital', templateUrl: './gabinete-digital.page.html', @@ -74,6 +81,14 @@ export class GabineteDigitalPage implements OnInit { hideRefreshBtn = true; + expedientegbstore = ExpedienteGdStore; + pendentesstore = PendentesStore; + despachoStore = DespachoStore; + eventoaprovacaostore = EventoAprovacaoStore; + pedidosstore = PedidosStore; + expedienteprstore = ExpedienteprStore; + despachoprstore = DespachosprStore; + @ViewChild(ExpedientsPage) expedientesPage: ExpedientsPage; @ViewChild(PendentesPage) pendentesListPage: PendentesPage; @ViewChild(EventsToApprovePage) eventsToApprove: EventsToApprovePage; @@ -225,12 +240,15 @@ export class GabineteDigitalPage implements OnInit { let expedientes = await this.processesbackend.GetTasksList("Expediente", false).toPromise(); this.count_exp_dailywork = Object.keys(expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active")).length; + this.expedientegbstore.count; let expedientes_pr = await this.processesbackend.GetTasksList("Expediente do Presidente", false).toPromise(); this.count_exp_pr = Object.keys(expedientes_pr.filter(data => data.workflowInstanceDataFields.Status == "Active")).length; + this.expedientegbstore.count; let despachos = await this.processesbackend.GetTasksList("Despacho", false).toPromise(); this.count_desp_dailywork = Object.keys(despachos.filter(data => data.workflowInstanceDataFields.Status == "Active")).length; + this.despachoStore.count let pareceres = await this.processesbackend.GetTasksList("Pedido de Parecer", false).toPromise(); let pareceresPr = await this.processesbackend.GetTasksList("Pedido de Parecer do Presidente", false).toPromise(); @@ -243,6 +261,7 @@ export class GabineteDigitalPage implements OnInit { let pendentes =await this.processesbackend.GetPendingTasks(false).toPromise(); this.count_total_pending = Object.keys(pendentes).length; + this.pendentesstore.count let despachospr = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise(); let despachosPr; @@ -269,6 +288,7 @@ export class GabineteDigitalPage implements OnInit { this.processesbackend.GetToApprovedEvents('Agenda','true').subscribe(res=>{ this.count_ev_apr = res; }); + this.eventoaprovacaostore.count; this.showLoader = false; diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html index 1c1c1f8c6..068bd4eee 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html @@ -26,12 +26,12 @@
-
+
@@ -64,13 +64,13 @@
Lista vazia
-
+
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 b52bfb594..277a0537e 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 @@ -14,6 +14,7 @@ import { AuthService } from 'src/app/services/auth.service'; import { DespachoPrPage } from 'src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page'; import { User } from 'src/app/models/user.model'; import { NavigationEnd, NavigationExtras, NavigationStart, Router } from '@angular/router'; +import { DespachosprStore } from 'src/app/store/despachospr-store.service'; @Component({ selector: 'app-despachos-pr', @@ -45,6 +46,7 @@ dicIndex = 0; inicial = false loggeduser: User; +despachosprstore = DespachosprStore; constructor ( private processes:ProcessesService, @@ -148,7 +150,7 @@ constructor ( }); this.despachoList = this.sortArrayISODate(this.despachoList).reverse() - + this.despachosprstore.reset(this.despachoList); this.skeletonLoader = false; } diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html index 84a4dea87..6f6cd7640 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html @@ -12,10 +12,10 @@
- +
@@ -47,13 +47,13 @@
Lista vazia
-
+
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 cfdca272c..3600f0743 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 @@ -11,6 +11,7 @@ import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/ import { AlertService } from 'src/app/services/alert.service'; import { User } from 'src/app/models/user.model'; import { AuthService } from 'src/app/services/auth.service'; +import { ExpedienteprStore } from 'src/app/store/expedientepr-store.service'; @Component({ selector: 'app-expedientes-pr', @@ -23,6 +24,7 @@ export class ExpedientesPrPage implements OnInit { taskslist:DailyWorkTask[] = []; serialNumber:string; skeletonLoader = true; + expedienteprstore = ExpedienteprStore; loggeduser: User; @Output() openExpedientDetail:EventEmitter = new EventEmitter(); @@ -90,7 +92,7 @@ export class ExpedientesPrPage implements OnInit { } this.taskslist.push(task); }); - + this.expedienteprstore.reset(this.taskslist); this.skeletonLoader = false; }); @@ -118,6 +120,7 @@ export class ExpedientesPrPage implements OnInit { } this.taskslist.push(task); }); + this.expedienteprstore.reset(this.taskslist); this.skeletonLoader = false; }); diff --git a/src/app/store/despacho-store.service.ts b/src/app/store/despacho-store.service.ts index 0143219cf..ccdb2b57a 100644 --- a/src/app/store/despacho-store.service.ts +++ b/src/app/store/despacho-store.service.ts @@ -48,7 +48,7 @@ export class DespachoStoreService { setTimeout(()=>{ localstoreService.set(this.keyName,{ eventsList, - count: this._list + count: this._list.length }) }, 10) diff --git a/src/app/store/despachospr-store.service.spec.ts b/src/app/store/despachospr-store.service.spec.ts new file mode 100644 index 000000000..2ce485b29 --- /dev/null +++ b/src/app/store/despachospr-store.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { DespachosprStoreService } from './despachospr-store.service'; + +describe('DespachosprStoreService', () => { + let service: DespachosprStoreService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(DespachosprStoreService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/store/despachospr-store.service.ts b/src/app/store/despachospr-store.service.ts new file mode 100644 index 000000000..d3a8f7a4a --- /dev/null +++ b/src/app/store/despachospr-store.service.ts @@ -0,0 +1,59 @@ +import { Injectable } from '@angular/core'; +import { localstoreService } from './localstore.service' +import { AES, enc, SHA1 } from 'crypto-js' + +@Injectable({ + providedIn: 'root' +}) +export class DespachosprStoreService { + +// main data +private _list: [] = [] +// local storage keyName +private keyName: string; +private _count = 0 + +constructor() { + + this.keyName = (SHA1(this.constructor.name)).toString() + + + setTimeout(()=>{ + let restore = localstoreService.get(this.keyName, {}) + this._list = restore.eventsList || [] + this._count = restore.count.length || 0 + }, 10) + +} + +get list() { + return this._list || [] +} + +get count() { + return this._count +} +set count(value) { + this._count = value +} + +reset(eventsList: any) { + this._list = eventsList + + this.count = this._list.length + this.save(this._list) +} + +private save(eventsList: any) { + setTimeout(()=>{ + localstoreService.set(this.keyName,{ + eventsList, + count: this._list + }) + }, 10) + +} + +} + +export const DespachosprStore = new DespachosprStoreService() diff --git a/src/app/store/eventoaprovacao-store.service.ts b/src/app/store/eventoaprovacao-store.service.ts index f615da6b3..b53e059bb 100644 --- a/src/app/store/eventoaprovacao-store.service.ts +++ b/src/app/store/eventoaprovacao-store.service.ts @@ -26,7 +26,7 @@ export class EventoaprovacaoStoreService { let restorepr = localstoreService.get(this.keyNamepr, {}) this._listpr = restorepr.eventsListpr || [] this._listmd = restoremd.eventsListmd || [] - this._count = restorepr.count + restoremd.count || 0 + this._count = restorepr.count.length + restoremd.count.length || 0 }, 10) } @@ -48,14 +48,14 @@ export class EventoaprovacaoStoreService { resetpr(eventsList: any) { this._listpr = eventsList - this.count = this._listpr.length + this.count = this._listmd.length + this.listpr.length this.savepr(this._listpr) } resetmd(eventsList: any) { this._listmd = eventsList - this.count = this._listmd.length + this.count = this._listmd.length + this.listpr.length this.savemd(this._listmd) } private savemd(eventsListmd: any) { diff --git a/src/app/store/expedientegd-store.service.ts b/src/app/store/expedientegd-store.service.ts index efdad45e2..6d9b35452 100644 --- a/src/app/store/expedientegd-store.service.ts +++ b/src/app/store/expedientegd-store.service.ts @@ -47,7 +47,7 @@ private save(eventsList: any) { setTimeout(()=>{ localstoreService.set(this.keyName,{ eventsList, - count: this._list + count: this._list.length }) }, 10) diff --git a/src/app/store/expedientepr-store.service.spec.ts b/src/app/store/expedientepr-store.service.spec.ts new file mode 100644 index 000000000..5e43599b2 --- /dev/null +++ b/src/app/store/expedientepr-store.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { ExpedienteprStoreService } from './expedientepr-store.service'; + +describe('ExpedienteprStoreService', () => { + let service: ExpedienteprStoreService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(ExpedienteprStoreService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/store/expedientepr-store.service.ts b/src/app/store/expedientepr-store.service.ts new file mode 100644 index 000000000..debe8ace2 --- /dev/null +++ b/src/app/store/expedientepr-store.service.ts @@ -0,0 +1,58 @@ +import { Injectable } from '@angular/core'; +import { localstoreService } from './localstore.service' +import { AES, enc, SHA1 } from 'crypto-js' + +@Injectable({ + providedIn: 'root' +}) +export class ExpedienteprStoreService { +// main data +private _list: [] = [] +// local storage keyName +private keyName: string; +private _count = 0 + +constructor() { + + this.keyName = (SHA1(this.constructor.name)).toString() + + + setTimeout(()=>{ + let restore = localstoreService.get(this.keyName, {}) + this._list = restore.eventsList || [] + this._count = restore.count.length || 0 + }, 10) + +} + +get list() { + return this._list || [] +} + +get count() { + return this._count +} +set count(value) { + this._count = value +} + +reset(eventsList: any) { + this._list = eventsList + + this.count = this._list.length + this.save(this._list) +} + +private save(eventsList: any) { + setTimeout(()=>{ + localstoreService.set(this.keyName,{ + eventsList, + count: this._list.length + }) + }, 10) + +} + +} + +export const ExpedienteprStore = new ExpedienteprStoreService() diff --git a/src/app/store/pedidos-store.service.ts b/src/app/store/pedidos-store.service.ts index 5b598b6b5..48fdc676e 100644 --- a/src/app/store/pedidos-store.service.ts +++ b/src/app/store/pedidos-store.service.ts @@ -12,7 +12,8 @@ export class PedidosStoreService { // local storage keyName private keyNameparecer: string; private keyNamedeferiemnto: string; - private _count = 0 + private _countparecer = 0 + private _countdeferiemnto = 0 constructor() { @@ -25,7 +26,8 @@ export class PedidosStoreService { let restoredeferimento = localstoreService.get(this.keyNamedeferiemnto, {}) this._listparecer = restoredeferimento.eventsListdeferimento || [] this._listdeferimento = restoreparecer.eventsListparecer || [] - this._count = restoredeferimento.count + restoreparecer.count || 0 + this._countparecer = restoreparecer.count.length || 0 + this._countdeferiemnto = restoredeferimento.count.length || 0 }, 10) } @@ -37,31 +39,38 @@ export class PedidosStoreService { get listdeferimento() { return this._listdeferimento } - get count() { - return this._count + get countparecer() { + return this._countparecer } - set count(value) { - this._count = value + set countparecer(value) { + this._countparecer = value + } + + get countdeferimento() { + return this._countdeferiemnto + } + set countdeferimento(value) { + this._countdeferiemnto = value } resetparecer(eventsList: any) { this._listparecer = eventsList - this.count = this._listparecer.length + this.countparecer = this._listparecer.length this.savedeferimento(this._listparecer) } resetdeferimento(eventsList: any) { this._listdeferimento = eventsList - this.count = this._listdeferimento.length + this.countdeferimento =this._listdeferimento.length this.saveparecer(this._listdeferimento) } private saveparecer(eventsListparecer: any) { setTimeout(()=>{ localstoreService.set(this.keyNameparecer,{ eventsListparecer, - count: this._listdeferimento, + count: this._listparecer, }) }, 10) @@ -71,7 +80,7 @@ export class PedidosStoreService { setTimeout(()=>{ localstoreService.set(this.keyNamedeferiemnto,{ eventsListdeferimento, - count: this._listparecer, + count: this._listdeferimento, }) }, 10) diff --git a/src/app/store/pendestes-store.service.ts b/src/app/store/pendestes-store.service.ts index 43b6baf44..ec9fe0bc4 100644 --- a/src/app/store/pendestes-store.service.ts +++ b/src/app/store/pendestes-store.service.ts @@ -21,7 +21,7 @@ constructor() { setTimeout(()=>{ let restore = localstoreService.get(this.keyName, {}) this._list = restore.eventsList || [] - this._count = restore.count || 0 + this._count = restore.count.length || 0 }, 10) } @@ -47,7 +47,7 @@ private save(eventsList: any) { setTimeout(()=>{ localstoreService.set(this.keyName,{ eventsList, - count: this._list + count: this._list.length }) }, 10)