From b2373a554699cf9b7031c5bab9e27c33c2e62bb3 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 18 Aug 2021 18:31:35 +0100 Subject: [PATCH] Total document --- src/app/home/home.page.html | 4 +- src/app/home/home.page.ts | 3 +- src/app/models/dailyworktask.model.ts | 7 +-- src/app/pages/chat/messages/messages.page.ts | 8 ++-- .../gabinete-digital.page.html | 2 +- .../gabinete-digital/gabinete-digital.page.ts | 4 ++ src/app/pages/login/login.page.ts | 2 - src/app/store/deplomas.service.ts | 1 + src/app/store/total-document.service.spec.ts | 16 +++++++ src/app/store/total-document.service.ts | 43 +++++++++++++++++++ 10 files changed, 77 insertions(+), 13 deletions(-) create mode 100644 src/app/store/total-document.service.spec.ts create mode 100644 src/app/store/total-document.service.ts diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index 306d7d197..1eb5d189e 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -15,8 +15,8 @@ - {{ documentCounterService.mdTotalDocument }} - {{ documentCounterService.prTotalDocument }} + {{ totalDocumentStore.count }} + {{ totalDocumentStore.count }} Gabinete diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 3cdeb8d43..fc8dd668e 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -13,6 +13,7 @@ import { ToastService } from '../services/toast.service'; import { ToDayEventStorage } from '../store/to-day-event-storage.service'; import { DocumentCounterService } from 'src/app/OtherService/document-counter.service' import { PermissionService } from '../OtherService/permission.service'; +import { TotalDocumentService, TotalDocumentStore } from '../store/total-document.service'; // import * as Sentry from "@sentry/browser"; @@ -42,8 +43,8 @@ export class HomePage implements OnInit { totalExpediente = 0; profile: string; - toDayEventStorage = ToDayEventStorage + totalDocumentStore = TotalDocumentStore adding: "intervenient" | "CC" = "intervenient"; mobileComponent = { diff --git a/src/app/models/dailyworktask.model.ts b/src/app/models/dailyworktask.model.ts index d180b0d38..8844e0a6c 100644 --- a/src/app/models/dailyworktask.model.ts +++ b/src/app/models/dailyworktask.model.ts @@ -11,8 +11,6 @@ export class DailyWorkTask{ Status: string; } - - export class fullTask { actions: null; activityInstanceName: string; @@ -67,7 +65,9 @@ export class fullTask { workflowInstanceID: number workflowName: string } + export class tasksList extends fullTask{} + export class customTaskList { SerialNumber: string Folio : string @@ -82,4 +82,5 @@ export class customTaskList { activityInstanceName : string Status : string } -export class customTask extends customTaskList{} \ No newline at end of file + +export class customTask extends customTaskList{} diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index e919ccfd2..be159bdd9 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -90,7 +90,7 @@ export class MessagesPage implements OnInit, AfterViewChecked { } catch(err) { } } - sendMessage(){ + sendMessage() { let body = { "message": { @@ -103,7 +103,7 @@ export class MessagesPage implements OnInit, AfterViewChecked { this.message = ""; } - loadMessages(){ + loadMessages() { this.showLoader = true; this.chatService.getRoomMessages(this.roomId).subscribe(res => { /* console.log(res); */ @@ -112,7 +112,7 @@ export class MessagesPage implements OnInit, AfterViewChecked { this.showLoader = false; }) } - getChatMembers(){ + getChatMembers() { this.showLoader = true; this.chatService.getMembers(this.roomId).subscribe(res=> { this.dmUsers = res['members'].filter(data => data.username != this.loggedUser.me.username) @@ -158,7 +158,7 @@ async openChatOptions(ev?: any) { return await popover.present(); } - async serverLongPull(){ + async serverLongPull() { this.chatService.getRoomMessages(this.roomId).subscribe(async res => { if (res == 502) { diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 15f4d9475..b172277c5 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -95,7 +95,7 @@

Todas as tarefas

-

{{count_all_processes}} Documentos

+

{{ totalDocumentStore.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 ef67fbc35..3fb1fae68 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -18,6 +18,7 @@ import { DespachosprStore } from 'src/app/store/despachospr-store.service'; import { PermissionService } from 'src/app/OtherService/permission.service'; import { removeDuplicate } from 'src/plugin/removeDuplicate.js' import { WaitForDomService } from 'src/app/services/dom/wait-for-dom.service'; +import { TotalDocumentStore } from 'src/app/store/total-document.service'; @Component({ selector: 'app-gabinete-digital', @@ -94,6 +95,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck { pedidosstore = PedidosStore; expedienteprstore = ExpedienteprStore; despachoprstore = DespachosprStore; + totalDocumentStore = TotalDocumentStore @ViewChild(ExpedientsPage) expedientesPage: ExpedientsPage; @ViewChild(PendentesPage) pendentesListPage: PendentesPage; @@ -211,6 +213,8 @@ export class GabineteDigitalPage implements OnInit, DoCheck { this.allProcessesList.push(task); this.allProcessesList = removeDuplicate( this.allProcessesList) this.allProcessesList = this.sortArrayISODate(this.allProcessesList).reverse(); + + this.totalDocumentStore.resetCount( this.allProcessesList.length) }); this.skeletonLoader = false; diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index 12f62751a..b872b042d 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -206,8 +206,6 @@ export class LoginPage implements OnInit { this.localstoreService.set('UserData', userData) - - this.localstoreService.set('PIN', encrypted) this.router.navigate(['/home/events']); diff --git a/src/app/store/deplomas.service.ts b/src/app/store/deplomas.service.ts index d91e5ac73..23794433a 100644 --- a/src/app/store/deplomas.service.ts +++ b/src/app/store/deplomas.service.ts @@ -75,6 +75,7 @@ export class DeplomasService { } saveDiplomasAssinadoList() { + setTimeout(()=>{ localstoreService.set(this.keyNameDiplomasAssinado,{ list: this._diplomasAssinadoList, diff --git a/src/app/store/total-document.service.spec.ts b/src/app/store/total-document.service.spec.ts new file mode 100644 index 000000000..587b2c9f7 --- /dev/null +++ b/src/app/store/total-document.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { TotalDocumentService } from './total-document.service'; + +describe('TotalDocumentService', () => { + let service: TotalDocumentService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(TotalDocumentService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/store/total-document.service.ts b/src/app/store/total-document.service.ts new file mode 100644 index 000000000..bfab89865 --- /dev/null +++ b/src/app/store/total-document.service.ts @@ -0,0 +1,43 @@ +import { Injectable } from '@angular/core'; +import { localstoreService } from './localstore.service' +import { AES, enc, SHA1 } from 'crypto-js' + +@Injectable({ + providedIn: 'root' +}) +export class TotalDocumentService { + + private _count = 0 + // local storage keyName + private keyName: string; + + constructor() { + this.keyName = (SHA1(this.constructor.name)).toString() + + setTimeout(()=> { + let restore = localstoreService.get(this.keyName, {}) + this._count = restore.count || 0 + }, 10) + + } + + get count() { + return this._count + } + + resetCount(value) { + this._count = value + } + + saveCount() { + setTimeout(()=> { + localstoreService.set(this.keyName, { + count: this._count + }) + }, 10) + } + +} + + +export let TotalDocumentStore = new TotalDocumentService()