From 49142391e976d3355966b1acedcfbd108817639a Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 30 Jan 2023 16:27:33 +0100 Subject: [PATCH] clear count --- .../expediente-detail/expediente-detail.page.html | 2 +- .../pages/gabinete-digital/gabinete-digital.page.ts | 1 - src/app/shared/agenda/event-list/event-list.page.ts | 3 +++ .../opts-expediente/opts-expediente.page.html | 2 +- src/app/store/despacho-store.service.ts | 2 +- src/app/store/despachospr-store.service.ts | 9 ++------- src/app/store/expedientegd-store.service.ts | 8 +------- version/git-version.ts | 12 ++++++------ 8 files changed, 15 insertions(+), 24 deletions(-) diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index 25f620413..7b14d99c9 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -99,7 +99,7 @@
Outras opções
- + diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index cc0791984..72e782a4b 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -637,7 +637,6 @@ export class GabineteDigitalPage implements OnInit { expedientes = expedientes.map((element) => this.expedienteTaskPipe.transform(element)); - this.expedientegbstore.count = expedientes.length; this.expedientegbstore.reset(expedientes); this.updateAllProcess() 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 73e14aaab..788f91137 100644 --- a/src/app/shared/agenda/event-list/event-list.page.ts +++ b/src/app/shared/agenda/event-list/event-list.page.ts @@ -58,6 +58,9 @@ export class EventListPage implements OnInit { ngOnChanges() { this.LoadToApproveEvents(); + setTimeout(() => { + this.LoadToApproveEvents(); + }, 3000) } segmentChanged(ev: any) { diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.html b/src/app/shared/popover/opts-expediente/opts-expediente.page.html index d2b1e2096..1cadf082d 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.html +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.html @@ -16,7 +16,7 @@ - + diff --git a/src/app/store/despacho-store.service.ts b/src/app/store/despacho-store.service.ts index 74abcc7e4..af4871c7e 100644 --- a/src/app/store/despacho-store.service.ts +++ b/src/app/store/despacho-store.service.ts @@ -98,7 +98,7 @@ export class DespachoStoreService { } get count() { - return this._count || 0 + return this._list.length || 0 } set count(value: number) { diff --git a/src/app/store/despachospr-store.service.ts b/src/app/store/despachospr-store.service.ts index 22be82eb8..684c80161 100644 --- a/src/app/store/despachospr-store.service.ts +++ b/src/app/store/despachospr-store.service.ts @@ -11,7 +11,6 @@ export class DespachosprStoreService { private _list: [] = [] // local storage keyName private keyName: string; -private _count = 0 constructor() { @@ -21,7 +20,6 @@ constructor() { setTimeout(()=>{ let restore = localstoreService.get(this.keyName, {}) this._list = restore.list || [] - this._count = parseInt(restore.count) || 0 }, 10) } @@ -30,9 +28,8 @@ get list() { return this._list || [] } -get count() { return this._count || 0 } +get count() { return this._list.length || 0 } set count(value: number) { - this._count = value this.save() } @@ -46,11 +43,9 @@ reset(eventsList: any) { private save() { setTimeout(()=>{ localstoreService.set(this.keyName,{ - list: this._list, - count:this._count + list: this._list }) }, 10) - } } diff --git a/src/app/store/expedientegd-store.service.ts b/src/app/store/expedientegd-store.service.ts index 396e19637..4c12344be 100644 --- a/src/app/store/expedientegd-store.service.ts +++ b/src/app/store/expedientegd-store.service.ts @@ -30,17 +30,11 @@ export class ExpedientegdStoreService { return this._list } get count() { - return this._count || 0 - } - set count(value: number) { - this._count = value - this.save() + return this._list.length || 0 } reset(eventsList: any) { this._list = eventsList - - this.count = this._list.length this.save() } diff --git a/version/git-version.ts b/version/git-version.ts index 3fd9ada45..803e67c20 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "31fa9fe87", - "SHA": "31fa9fe87c98776b5e9b0b63a24b73ad82ba3989", + "shortSHA": "261478a20", + "SHA": "261478a20448ec09c13fdc649a9ea39c63bcae90", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Jan 30 14:04:57 2023 +0100'", - "lastCommitMessage": "Despacho", - "lastCommitNumber": "4691", + "lastCommitTime": "'Mon Jan 30 15:24:37 2023 +0100'", + "lastCommitMessage": "improve", + "lastCommitNumber": "4692", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/chat/chat.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.html\n\tmodified: src/app/store/despacho-store.service.ts\n\tmodified: src/app/store/despachospr-store.service.ts\n\tmodified: src/app/store/expedientegd-store.service.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file