- + - +
-
@@ -75,12 +75,12 @@
- +
@@ -115,10 +115,10 @@
- +
-
Lista vazia @@ -126,16 +126,17 @@
-
Lista vazia
- +
+
- + diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts index 3dc4ecd16..2f1e9aa43 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts @@ -26,7 +26,7 @@ export class PedidosPage implements OnInit { serialNumber:string; skeletonLoader = true - @Input() segment:string; + segment:string; @Output() openExpedientDetail:EventEmitter = new EventEmitter(); constructor( @@ -54,10 +54,10 @@ export class PedidosPage implements OnInit { this.LoadList(); this.router.events.forEach((event) => { - if(event instanceof NavigationStart && '/home/gabinete-digital/pedidos?parecer=true'.startsWith(event.url) || + if(event instanceof NavigationStart && '/home/gabinete-digital/pedidos?parecer=true'.startsWith(event.url) || event instanceof NavigationStart && '/home/gabinete-digital/pedidos?deferimento=true'.startsWith(event.url) ) { - + if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { this.refreshing() } else { @@ -71,7 +71,7 @@ export class PedidosPage implements OnInit { this.router.navigate(['/home/gabinete-digital']); } - segmentChanged(ev: any) { + /* segmentChanged(ev: any) { let navigationExtras: NavigationExtras; @@ -84,7 +84,7 @@ export class PedidosPage implements OnInit { this.router.navigate(['/home/gabinete-digital/pedidos'], navigationExtras); // this.LoadList(); - } + } */ goToPedido(serialNumber:any){ this.router.navigate(['/home/gabinete-digital/pedidos',serialNumber,'gabinete-digital']); @@ -111,7 +111,7 @@ export class PedidosPage implements OnInit { this.skeletonLoader = false let allParecer = parecer.concat(parecerPr).reverse().filter(data => data.workflowInstanceDataFields.Status == "Active") - + this.parecerList =[]; allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active").forEach(element => { @@ -139,7 +139,7 @@ export class PedidosPage implements OnInit { else if(this.segment == 'deferimento') { this.taskType = "Pedido de Deferimento"; this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => { - + this.skeletonLoader = false console.log(result); @@ -170,8 +170,8 @@ export class PedidosPage implements OnInit { if(element.workflowInstanceDataFields.Status == "Active") { this.deferimentoList.push(task); } - - + + }); }); @@ -179,6 +179,10 @@ export class PedidosPage implements OnInit { } + segmentChanged(ev: any) { + this.LoadList(); + } + refreshing() { setTimeout(() => { this.LoadList(); diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index dcf3a08ae..e1c217d42 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -92,7 +92,7 @@
-

{{evento.DateBegin}}

+

{{getDate(evento.DateBegin)}}

{{evento.Description}}
diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index ea5c085a9..7aa457d15 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -149,7 +149,7 @@ export class PublicationsPage implements OnInit { this.showLoader = false; this.publicationEventFolderStorage.reset(this.publicationsEventFolderList) - this.publicationTravelFolderService.reset(this.publicationsEventFolderList) + this.publicationTravelFolderService.reset(this.publicationsTravelFolderList) }); diff --git a/src/app/pages/publications/view-publications/view-publications.page.ts b/src/app/pages/publications/view-publications/view-publications.page.ts index 20e13fc9c..bbc9eaabd 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.ts +++ b/src/app/pages/publications/view-publications/view-publications.page.ts @@ -19,7 +19,7 @@ export class ViewPublicationsPage implements OnInit { showLoader = true; loading: any; - publicationList: Publication[]; + publicationList: Publication[] = new Array(); item: PublicationFolder; folderId:string; error: any; @@ -54,8 +54,10 @@ export class ViewPublicationsPage implements OnInit { this.folderId = this.folderId['ProcessId'] } - this.getPublications(); this.getPublicationDetail(); + setTimeout(() => { + this.getPublications(); + }, 3000); } ngOnChanges() { @@ -64,15 +66,14 @@ export class ViewPublicationsPage implements OnInit { this.folderId = this.folderId['ProcessId'] } - this.getPublications(); this.getPublicationDetail(); + this.getPublications(); } doRefresh(event) { - this.getPublications(); - setTimeout(() => { this.getPublicationDetail(); + this.getPublications(); event.target.complete(); }, 3000); @@ -122,8 +123,7 @@ export class ViewPublicationsPage implements OnInit { "OriginalFileName": '', "FileExtension": '', } - - // this.publicationList.push(item); + this.publicationList.push(item); data.push(item) }); 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)