diff --git a/config.xml b/config.xml index 09d2165cb..721c9620c 100644 --- a/config.xml +++ b/config.xml @@ -134,7 +134,7 @@ 0 - 8.0.0.00-20210214-154410 + 8.0.0.00-20210308-063916 diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html index 21b9cce76..5c207bdc8 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html @@ -23,14 +23,14 @@ -
+
@@ -48,10 +48,10 @@
-
+
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 3af8d002c..edb58cdf9 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 @@ -6,6 +6,7 @@ import { ModalController } from '@ionic/angular'; import { NavigationEnd, NavigationExtras, NavigationStart, Router } from '@angular/router'; import { User } from 'src/app/models/user.model'; import { AuthService } from 'src/app/services/auth.service'; +import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.service'; @Component({ selector: 'app-events-to-approve', @@ -23,6 +24,7 @@ export class EventsToApprovePage implements OnInit { serialnumber:string; loggeduser: User; segment:string; + eventaprovacaostore = EventoAprovacaoStore; constructor( private processes:ProcessesService, @@ -63,11 +65,13 @@ export class EventsToApprovePage implements OnInit { let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise(); let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise(); this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal); + this.eventaprovacaostore.resetmd(this.eventsMDGPRList); } else if(this.segment == 'PR'){ let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise(); let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise(); this.eventsPRList = prEventsOficial.concat(prEventsPessoal); + this.eventaprovacaostore.resetpr(this.eventsPRList); } this.showLoader = false; } diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html index d3512b156..aadda107b 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.html +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html @@ -21,10 +21,10 @@
- +
@@ -56,13 +56,13 @@
Lista vazia
-
+
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts index 7e497a6d0..07217ddc7 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts @@ -9,6 +9,7 @@ import { LoadingService } from 'src/app/services/loading.service'; import { ModalController, NavParams } from '@ionic/angular'; import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page'; import { AlertService } from 'src/app/services/alert.service'; +import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service'; @Component({ selector: 'app-expedients', @@ -26,6 +27,7 @@ export class ExpedientsPage implements OnInit { @Input() profile:string; skeletonLoader = true + expedientegbstore = ExpedienteGdStore constructor( private processes:ProcessesService, @@ -90,7 +92,10 @@ export class ExpedientsPage implements OnInit { "Status": element.workflowInstanceDataFields.Status, } this.taskslist.push(task); + }); + console.log("Buffer store", this.taskslist) + this.expedientegbstore.reset(this.taskslist); }); } diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html index 36bd467ee..28bf13ee2 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html @@ -30,13 +30,13 @@
-
+
-
@@ -69,11 +69,11 @@
-
+
@@ -108,7 +108,7 @@
Lista vazia @@ -117,14 +117,14 @@
Lista vazia
-
+
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts index e6ed488c3..1ca172910 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts @@ -10,6 +10,8 @@ import { ModalController, NavParams } from '@ionic/angular'; import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page'; import { AlertService } from 'src/app/services/alert.service'; import { PedidoPage } from 'src/app/pages/gabinete-digital/pedidos/pedido/pedido.page'; +import { PendentesStore } from 'src/app/store/pendestes-store.service'; +import { PedidosStore } from 'src/app/store/pedidos-store.service'; @Component({ selector: 'app-pedidos', @@ -38,6 +40,7 @@ export class PedidosPage implements OnInit { @Input() segment:string; @Output() openPedido:EventEmitter = new EventEmitter(); skeletonLoader = true + pedidosstore = PedidosStore; constructor( private router: Router, @@ -121,6 +124,7 @@ export class PedidosPage implements OnInit { } this.parecerList.push(task); }); + this.pedidosstore.resetparecer(this.parecerList); } else if(this.segment == 'deferimento') { @@ -155,6 +159,7 @@ export class PedidosPage implements OnInit { } this.deferimentoList.push(task); }); + this.pedidosstore.resetdeferimento(this.deferimentoList); }); } diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html index 701575c67..630f7f7d9 100644 --- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html +++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html @@ -20,10 +20,10 @@
- +
@@ -55,13 +55,13 @@
Lista vazia
-
+
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts index 3240caad3..7415ec7b3 100644 --- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts @@ -7,6 +7,7 @@ import { ProcessesService } from 'src/app/services/processes.service'; import { ModalController } from '@ionic/angular'; import { AlertService } from 'src/app/services/alert.service'; import { AuthService } from 'src/app/services/auth.service'; +import { PendentesStore } from 'src/app/store/pendestes-store.service'; @Component({ @@ -22,6 +23,7 @@ export class PendentesPage implements OnInit { serialNumber:string; totalDocs:any; skeletonLoader: boolean; + pendentesstore = PendentesStore; @Input() profile:string; segment:string; @@ -96,6 +98,7 @@ export class PendentesPage implements OnInit { this.pendentesList = removeDuplicate( this.pendentesList) this.pendentesList = this.sortArrayISODate(this.pendentesList); }); + this.pendentesstore.reset(this.pendentesList); this.skeletonLoader = false; } diff --git a/src/app/store/eventoaprovacao-store.service.spec.ts b/src/app/store/eventoaprovacao-store.service.spec.ts new file mode 100644 index 000000000..a96a873a0 --- /dev/null +++ b/src/app/store/eventoaprovacao-store.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { EventoaprovacaoStoreService } from './eventoaprovacao-store.service'; + +describe('EventoaprovacaoStoreService', () => { + let service: EventoaprovacaoStoreService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(EventoaprovacaoStoreService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/store/eventoaprovacao-store.service.ts b/src/app/store/eventoaprovacao-store.service.ts new file mode 100644 index 000000000..f615da6b3 --- /dev/null +++ b/src/app/store/eventoaprovacao-store.service.ts @@ -0,0 +1,83 @@ +import { Injectable } from '@angular/core'; +import { localstoreService } from './localstore.service' +import { AES, enc, SHA1 } from 'crypto-js' + +@Injectable({ + providedIn: 'root' +}) +export class EventoaprovacaoStoreService { + + // main data + private _listpr: Event[] + private _listmd: Event[] + // local storage keyName + private keyNamemd: string; + private keyNamepr: string; + private _count = 0 + + constructor() { + + this.keyNamemd = (SHA1(this.constructor.name+"md")).toString() + this.keyNamepr = (SHA1(this.constructor.name+"pr")).toString() + + + setTimeout(()=>{ + let restoremd = localstoreService.get(this.keyNamemd, {}) + let restorepr = localstoreService.get(this.keyNamepr, {}) + this._listpr = restorepr.eventsListpr || [] + this._listmd = restoremd.eventsListmd || [] + this._count = restorepr.count + restoremd.count || 0 + }, 10) + + } + + get listpr() { + return this._listpr + } + + get listmd() { + return this._listmd +} + get count() { + return this._count + } + set count(value) { + this._count = value + } + + resetpr(eventsList: any) { + this._listpr = eventsList + + this.count = this._listpr.length + this.savepr(this._listpr) + } + + resetmd(eventsList: any) { + this._listmd = eventsList + + this.count = this._listmd.length + this.savemd(this._listmd) +} + private savemd(eventsListmd: any) { + setTimeout(()=>{ + localstoreService.set(this.keyNamemd,{ + eventsListmd, + count: this._listmd, + }) + }, 10) + + } + + private savepr(eventsListpr: any) { + setTimeout(()=>{ + localstoreService.set(this.keyNamepr,{ + eventsListpr, + count: this._listpr, + }) + }, 10) + +} + +} + +export const EventoAprovacaoStore = new EventoaprovacaoStoreService() diff --git a/src/app/store/expedientegd-store.service.spec.ts b/src/app/store/expedientegd-store.service.spec.ts new file mode 100644 index 000000000..19dfa8bec --- /dev/null +++ b/src/app/store/expedientegd-store.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { ExpedientegdStoreService } from './expedientegd-store.service'; + +describe('ExpedientegdStoreService', () => { + let service: ExpedientegdStoreService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(ExpedientegdStoreService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/store/expedientegd-store.service.ts b/src/app/store/expedientegd-store.service.ts new file mode 100644 index 000000000..efdad45e2 --- /dev/null +++ b/src/app/store/expedientegd-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 ExpedientegdStoreService { + +// main data +private _list: Event[] +// 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 || 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 ExpedienteGdStore = new ExpedientegdStoreService() \ No newline at end of file diff --git a/src/app/store/pedidos-store.service.spec.ts b/src/app/store/pedidos-store.service.spec.ts new file mode 100644 index 000000000..60f8aaef3 --- /dev/null +++ b/src/app/store/pedidos-store.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { PedidosStoreService } from './pedidos-store.service'; + +describe('PedidosStoreService', () => { + let service: PedidosStoreService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(PedidosStoreService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/store/pedidos-store.service.ts b/src/app/store/pedidos-store.service.ts new file mode 100644 index 000000000..5b598b6b5 --- /dev/null +++ b/src/app/store/pedidos-store.service.ts @@ -0,0 +1,82 @@ +import { Injectable } from '@angular/core'; +import { localstoreService } from './localstore.service' +import { AES, enc, SHA1 } from 'crypto-js' + +@Injectable({ + providedIn: 'root' +}) +export class PedidosStoreService { + + private _listparecer: Event[] + private _listdeferimento: Event[] + // local storage keyName + private keyNameparecer: string; + private keyNamedeferiemnto: string; + private _count = 0 + + constructor() { + + this.keyNameparecer = (SHA1(this.constructor.name+"parecer")).toString() + this.keyNamedeferiemnto = (SHA1(this.constructor.name+"deferimneto")).toString() + + + setTimeout(()=>{ + let restoreparecer = localstoreService.get(this.keyNameparecer, {}) + let restoredeferimento = localstoreService.get(this.keyNamedeferiemnto, {}) + this._listparecer = restoredeferimento.eventsListdeferimento || [] + this._listdeferimento = restoreparecer.eventsListparecer || [] + this._count = restoredeferimento.count + restoreparecer.count || 0 + }, 10) + + } + + get listparecer() { + return this._listparecer + } + + get listdeferimento() { + return this._listdeferimento + } + get count() { + return this._count + } + set count(value) { + this._count = value + } + + resetparecer(eventsList: any) { + this._listparecer = eventsList + + this.count = this._listparecer.length + this.savedeferimento(this._listparecer) + } + + resetdeferimento(eventsList: any) { + this._listdeferimento = eventsList + + this.count = this._listdeferimento.length + this.saveparecer(this._listdeferimento) + } + private saveparecer(eventsListparecer: any) { + setTimeout(()=>{ + localstoreService.set(this.keyNameparecer,{ + eventsListparecer, + count: this._listdeferimento, + }) + }, 10) + + } + + private savedeferimento(eventsListdeferimento: any) { + setTimeout(()=>{ + localstoreService.set(this.keyNamedeferiemnto,{ + eventsListdeferimento, + count: this._listparecer, + }) + }, 10) + + } + +} + +export const PedidosStore = new PedidosStoreService() diff --git a/src/app/store/pendestes-store.service.spec.ts b/src/app/store/pendestes-store.service.spec.ts new file mode 100644 index 000000000..0840aef07 --- /dev/null +++ b/src/app/store/pendestes-store.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { PendestesStoreService } from './pendestes-store.service'; + +describe('PendestesStoreService', () => { + let service: PendestesStoreService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(PendestesStoreService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/store/pendestes-store.service.ts b/src/app/store/pendestes-store.service.ts new file mode 100644 index 000000000..43b6baf44 --- /dev/null +++ b/src/app/store/pendestes-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 PendestesStoreService { + + // main data +private _list: Event[] +// 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 || 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 PendentesStore = new PendestesStoreService() +