diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts index 21365a0f8..ca7fda378 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts @@ -36,7 +36,6 @@ export class EventListPage implements OnInit { serialnumber: string; skeletonLoader = true - eventaprovacaostore = EventoAprovacaoStore; eventoaprovacaostore = EventoAprovacaoStore; constructor( @@ -156,6 +155,7 @@ export class EventListPage implements OnInit { if (this.segment != 'PR') { + const segment = this.segment let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR,Agenda Pessoal MDGPR', false).toPromise(); this.eventsMDGPRList = mdEventsOficial @@ -163,12 +163,15 @@ export class EventListPage implements OnInit { this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList) this.eventoaprovacaostore.resetmd(this.eventsMDGPRList); + this.eventoaprovacaostore.save('MDGPR', this.eventsMDGPRList) + this.storage.set('event-to-aproveMD',this.eventsMDGPRList).then(() => { }) } else if (this.segment == 'PR') { + const segment = this.segment let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise(); this.eventsPRList = prEventsOficial @@ -176,6 +179,7 @@ export class EventListPage implements OnInit { this.eventsPRList = this.sortService.sortDate(this.eventsPRList, 'taskStartDate') this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList) this.eventoaprovacaostore.resetpr(this.eventsPRList); + this.eventoaprovacaostore.save('PR', this.eventsPRList) this.storage.set('event-to-aprovePR',this.eventsPRList).then(() => { diff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/shared/agenda/event-list/event-list.page.ts index e6c11f299..26cb45f05 100644 --- a/src/app/shared/agenda/event-list/event-list.page.ts +++ b/src/app/shared/agenda/event-list/event-list.page.ts @@ -7,6 +7,7 @@ import { LoginUserRespose } from 'src/app/models/user.model'; import { SortService } from 'src/app/services/functions/sort.service'; import { SessionStore } from 'src/app/store/session.service'; import { EventsService } from 'src/app/services/events.service'; +import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.service'; @Component({ selector: 'app-event-list', @@ -26,6 +27,7 @@ export class EventListPage implements OnInit { serialnumber:string; loggeduser: LoginUserRespose; segment:string; + eventoaprovacaostore = EventoAprovacaoStore; @Input() profile:string; @Input() showComponent:string; @@ -79,6 +81,7 @@ export class EventListPage implements OnInit { try { if(this.segment == 'MDGPR') { + const segment = this.segment let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise(); let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise(); @@ -87,8 +90,11 @@ export class EventListPage implements OnInit { this.eventsMDGPRList = this.sortService.sortArrayByDate(allEvents).reverse(); } this.showLoader = false; + + this.eventoaprovacaostore.save(segment, this.eventsMDGPRList) } else if(this.segment == 'PR') { + const segment = this.segment let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise(); let allEvents = prEventsOficial @@ -96,6 +102,8 @@ export class EventListPage implements OnInit { this.eventsPRList = this.sortService.sortArrayByDate(allEvents).reverse(); } this.showLoader = false; + + this.eventoaprovacaostore.save(segment, this.eventsMDGPRList) } else { let genericEvents = await this.processes.GetTasksList('Agendar Evento', false).toPromise(); if(genericEvents.length > 0) { diff --git a/src/app/store/eventoaprovacao-store.service.ts b/src/app/store/eventoaprovacao-store.service.ts index d6d5ce341..02280150f 100644 --- a/src/app/store/eventoaprovacao-store.service.ts +++ b/src/app/store/eventoaprovacao-store.service.ts @@ -11,9 +11,15 @@ export class EventoaprovacaoStoreService { // main data private _listPr: any[] = [] private _listMd: any[] = [] + private _list: {[key: string]: any[]} = {} + // local storage keyName private keyNamemd: string; private keyNamepr: string; + private keyNameAll: string; + + private _counts : {[key: string]: number} = {} + private _countsAll = 0 private _count = 0 private _countPr = 0 private _countMd = 0 @@ -22,6 +28,7 @@ export class EventoaprovacaoStoreService { this.keyNamemd = (SHA1("EventoaprovacaoStoreService"+"md")).toString() this.keyNamepr = (SHA1("EventoaprovacaoStoreService"+"pr")).toString() + this.keyNameAll = (SHA1("EventoaprovacaoStoreService"+"all")).toString() setTimeout(()=>{ @@ -112,6 +119,39 @@ export class EventoaprovacaoStoreService { } + + save(segment, value: []) { + + if(!this._list[segment]) { + this._list[segment] = [] + this._counts[segment] = 0 + } + + this._list[segment] = value + this._counts[segment] = value.length + + this.updateCount(); + + setTimeout(() => { + localstoreService.set(this.keyNameAll,{ + _list: this._list, + _counts: this._counts + }) + }, 10) + } + + get(segment) { + return this._list[segment] || [] + } + + updateCount() { + let count = 0 + for(let [name, value] of Object.entries(this._list)) { + count = count + value.length + } + this._countsAll = count + } + } export const EventoAprovacaoStore = new EventoaprovacaoStoreService() diff --git a/version/git-version.ts b/version/git-version.ts index 60754450c..b22a7db73 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "31f74933b", - "SHA": "31f74933b7b957486549777797c99efb12fce735", + "shortSHA": "f9bc1ae15", + "SHA": "f9bc1ae153f98c00bdc1b7f0eb1078f5574ed9f5", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Wed Feb 22 09:31:14 2023 +0100'", + "lastCommitTime": "'Wed Feb 22 09:35:20 2023 +0100'", "lastCommitMessage": "remove alert", - "lastCommitNumber": "4814", + "lastCommitNumber": "4815", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/assets/www/pdfjs/web/viewer.js", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/store/eventoaprovacao-store.service.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file