diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html index dc3c94984..bd69174d2 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.html +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html @@ -19,7 +19,7 @@ - +
Minha agenda
Agenda do PR
Agenda do MD
@@ -40,14 +40,14 @@
-
- -
+
+ +
+ *ngFor="let event of eventoaprovacaostore.get(segment)" (click)="goToEventToApproveDetail(event.serialNumber)"> -
+

{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}

{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}

@@ -65,51 +65,19 @@
- - -
- - -
-
-

{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}

-

{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}

-
-
-

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}

-

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}

-

{{event.workflowInstanceDataFields.Subject}}

-
-
{{ event.activityInstanceName }}
-
-
-
- - -
-
-
-
+
+
Lista vazia
-
-
- Lista vazia -
-
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 ca7fda378..3c657c8fc 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 @@ -16,6 +16,7 @@ import { ThemeService } from 'src/app/services/theme.service' import { RouteService } from 'src/app/services/route.service'; import { Storage } from '@ionic/storage'; import { EventsService } from 'src/app/services/events.service'; +import { SessionStore } from 'src/app/store/session.service'; @Component({ selector: 'app-event-list', @@ -37,6 +38,8 @@ export class EventListPage implements OnInit { skeletonLoader = true eventoaprovacaostore = EventoAprovacaoStore; + eventsList: any = [] + color: 'pr' | 'mdgpr' constructor( private processes: ProcessesService, @@ -149,52 +152,53 @@ export class EventListPage implements OnInit { } async LoadToApproveEvents() { - // this.processes.GetTasksList('Agenda Oficial MDGPR', false).subscribe(async res => { - this.showLoader = true; - this.skeletonLoader = true + this.showLoader = true; + this.skeletonLoader = true + const segment = this.segment + + if(this.segment == 'MDGPR') { + // color + if(SessionStore.user.Profile == 'PR') { + this.color = 'pr' + } else { + this.color = 'mdgpr' + } + + let genericEvents = await this.processes.GetTasksList('Agendar Evento', false).toPromise(); + try { + this.eventsList = this.sortService.sortArrayByDate(genericEvents).reverse(); + } catch (error) { + this.eventsList = []; + } + + this.eventoaprovacaostore.save(segment, this.eventsList) - 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 + } else { - this.eventsMDGPRList = this.sortService.sortDate(this.eventsMDGPRList, 'taskStartDate') - this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList) - this.eventoaprovacaostore.resetmd(this.eventsMDGPRList); - - this.eventoaprovacaostore.save('MDGPR', this.eventsMDGPRList) + this.color = 'pr' - 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 - - 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(() => { - - }) - + let allEvents = await this.processes.eventsToApprove(segment).toPromise() + try { + this.eventsList = this.sortService.sortArrayByDate(allEvents).reverse(); + } catch(error) { + this.eventsList = [] } + + this.eventsList = this.eventsList + this.eventsList = this.eventsList this.showLoader = false; - this.skeletonLoader = false + this.eventoaprovacaostore.save(segment, this.eventsList) + } + + this.showLoader = false; + this.skeletonLoader = false - // }, (error) => { - // this.getEventToAproveFromDB(); - // }) } - + toDateString(e) { + return new Date(e).toDateString() + } async openApproveModal(eventSerialNumber, event) { const modal = await this.modalController.create({ diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index a6e2e9f6a..660d05984 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -242,7 +242,7 @@

Eventos para Aprovação

-

{{eventoaprovacaostore.countMd + eventoaprovacaostore.countPr}} Documentos

+

{{eventoaprovacaostore.countAll}} Documentos

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 70bea67d8..07549dd5a 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -598,7 +598,7 @@ export class GabineteDigitalPage implements OnInit { updateAllProcess = () => { this.AllProcess = this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento) - .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr).concat(this.despachoStore.list) + .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.contactList).concat(this.despachoStore.list) .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.deplomasStore.DiplomaGerarList).concat(this.pendentesstore.list) // try{ @@ -732,21 +732,21 @@ export class GabineteDigitalPage implements OnInit { this.updateAllProcess() } - let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR,Agenda Pessoal MDGPR', false).toPromise(); - let eventsMDGPRList = mdEventsOficial + // let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR,Agenda Pessoal MDGPR', false).toPromise(); + // let eventsMDGPRList = mdEventsOficial - eventsMDGPRList = eventsMDGPRList.filter((item) => item.activityInstanceName != 'Editar Evento') + // eventsMDGPRList = eventsMDGPRList.filter((item) => item.activityInstanceName != 'Editar Evento') - this.eventoaprovacaostore.countMd = eventsMDGPRList.length - this.eventoaprovacaostore.resetmd(eventsMDGPRList); + // this.eventoaprovacaostore.countMd = eventsMDGPRList.length + // this.eventoaprovacaostore.resetmd(eventsMDGPRList); this.updateAllProcess() - let prEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise(); - let eventsPRList = prEventsOficial - eventsPRList = eventsPRList.filter((item) => item.activityInstanceName != 'Editar Evento') + // let prEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise(); + // let eventsPRList = prEventsOficial + // eventsPRList = eventsPRList.filter((item) => item.activityInstanceName != 'Editar Evento') - this.eventoaprovacaostore.countPr = eventsPRList.length - this.eventoaprovacaostore.resetpr(eventsPRList); + // this.eventoaprovacaostore.countPr = eventsPRList.length + // this.eventoaprovacaostore.resetpr(eventsPRList); this.updateAllProcess() let diplomasValidar = depachoAPI.filter(data => data.activityInstanceName == "Revisar Diploma"); diff --git a/src/app/services/clear-store.service.ts b/src/app/services/clear-store.service.ts index c2343892a..21e195e39 100644 --- a/src/app/services/clear-store.service.ts +++ b/src/app/services/clear-store.service.ts @@ -20,9 +20,8 @@ export class ClearStoreService { clear() { + EventoAprovacaoStore.clear(); DespachoStore.reset([]) - EventoAprovacaoStore.resetmd([]) - EventoAprovacaoStore.resetpr([]) ExpedienteGdStore.reset([]) PendentesStore.reset([]) PedidosStore.resetdeferimento([]) diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index 6805fa35b..3c80ee4ac 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -258,12 +258,16 @@ export class EventsService { this.myCalendarNames[sharedCalendar.CalendarId] = e.FullName if(!this.calendarNamesAry.find(x => x.Role == e.Role)) { - + + let objectShared = { "Fullname": e.FullName, "Role": e.Role, + "OwnerUserId": sharedCalendar.OwnerUserId, "RoleId": sharedCalendar.CalendarRoleId } + + console.log('objectShared', objectShared) this.calendarNamesAry.push(objectShared) diff --git a/src/app/services/functions/sort.service.ts b/src/app/services/functions/sort.service.ts index d47d95c60..d8ee507ea 100644 --- a/src/app/services/functions/sort.service.ts +++ b/src/app/services/functions/sort.service.ts @@ -9,6 +9,10 @@ export class SortService { constructor(private ObjectService: ObjectService) { } sortArrayISODate(myArray: any) { + + if(!Array.isArray(myArray)) { + myArray = [] + } if(myArray.length > 0){ return myArray.sort(function (a, b) { return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0); @@ -17,7 +21,9 @@ export class SortService { } sortArrayByDate(myArray: any) { - + if(!Array.isArray(myArray)) { + myArray = [] + } if(myArray.length > 0){ return myArray.sort(function (a, b) { return (new Date(a.workflowInstanceDataFields.StartDate) < new Date(b.workflowInstanceDataFields.StartDate)) ? -1 : ((new Date(a.workflowInstanceDataFields.StartDate) > new Date(b.workflowInstanceDataFields.StartDate)) ? 1 : 0); @@ -26,7 +32,10 @@ export class SortService { } sortDate(array = [], path: string) { - + if(!Array.isArray(array)) { + array = [] + } + return array.sort( (a,b)=> { return (new Date(this.ObjectService.deepFind(a, path)) < new Date(this.ObjectService.deepFind(b, path))) ? -1 : ((new Date(this.ObjectService.deepFind(a, path)) > new Date(this.ObjectService.deepFind(b, path))) ? 1 : 0); diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts index d952907d7..408439772 100644 --- a/src/app/services/processes.service.ts +++ b/src/app/services/processes.service.ts @@ -69,6 +69,22 @@ export class ProcessesService { return this.http.get(`${geturl}`, options); } + eventsToApprove(userid) { + const geturl = environment.apiURL + 'tasks/events-to-approve'; + let params = new HttpParams(); + + params = params.set("pageNum", 1); + params = params.set("pageSize", 500); + params = params.set("userid", userid); + + let options = { + headers: this.headers, + params: params + }; + + return this.http.get(`${geturl}`, options); + } + GetTaskListExpediente(onlycount1): Observable { const processname = "Expediente" const onlycount = false diff --git a/src/app/shared/agenda/event-list/event-list.page.html b/src/app/shared/agenda/event-list/event-list.page.html index 26b4729ab..59b537378 100644 --- a/src/app/shared/agenda/event-list/event-list.page.html +++ b/src/app/shared/agenda/event-list/event-list.page.html @@ -10,10 +10,7 @@
- - +
Minha agenda
Agenda do PR
Agenda do MD
@@ -30,39 +27,17 @@ -
+
- -
-
-
-

{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}

-

{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}

-
-
-

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}

-

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}

-

{{event.workflowInstanceDataFields.Subject}}

-
-
{{ event.activityInstanceName }}
-
-
-
-
- - -
+ +
-
+

{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}

{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}

@@ -78,30 +53,9 @@
+ - -
-
-
-
-

{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}

-

{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}

-
-
-

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}

-

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}

-

{{event.workflowInstanceDataFields.Subject}}

-
-
{{ event.activityInstanceName }}
-
-
-
-
-
-
+ + 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 26cb45f05..e4df8e799 100644 --- a/src/app/shared/agenda/event-list/event-list.page.ts +++ b/src/app/shared/agenda/event-list/event-list.page.ts @@ -21,6 +21,8 @@ export class EventListPage implements OnInit { eventsPRList: any = [] eventsMDGPRList: any = [] eventsGenericList: any = [] + + eventsList: any = [] eventPerson: EventPerson; eventBody: EventBody; categories: string[]; @@ -28,6 +30,7 @@ export class EventListPage implements OnInit { loggeduser: LoginUserRespose; segment:string; eventoaprovacaostore = EventoAprovacaoStore; + color: 'pr' | 'mdgpr' @Input() profile:string; @Input() showComponent:string; @@ -78,79 +81,49 @@ export class EventListPage implements OnInit { async LoadToApproveEvents() { this.showLoader = true; - - 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(); - - let allEvents = mdEventsOficial.concat(mdEventsPessoal); - if(allEvents.length > 0) { - 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 - - if(allEvents.length > 0) { - this.eventsPRList = this.sortService.sortArrayByDate(allEvents).reverse(); - } - this.showLoader = false; + const segment = this.segment - this.eventoaprovacaostore.save(segment, this.eventsMDGPRList) + if(this.segment == 'MDGPR') { + // color + if(SessionStore.user.Profile == 'PR') { + this.color = 'pr' } else { - let genericEvents = await this.processes.GetTasksList('Agendar Evento', false).toPromise(); - if(genericEvents.length > 0) { - this.eventsGenericList = this.sortService.sortArrayByDate(genericEvents).reverse(); - } - this.showLoader = false; + this.color = 'mdgpr' + } + + let genericEvents = await this.processes.GetTasksList('Agendar Evento', false).toPromise(); + try { + this.eventsList = this.sortService.sortArrayByDate(genericEvents).reverse(); + } catch (error) { + this.eventsList = []; + } + + this.eventoaprovacaostore.save(segment, this.eventsList) + + } else { + + this.color = 'pr' + + let allEvents = await this.processes.eventsToApprove(segment).toPromise() + try { + this.eventsList = this.sortService.sortArrayByDate(allEvents).reverse(); + } catch(error) { + this.eventsList = [] } - } catch(erro) { - this.showLoader = false; + this.eventsList = this.eventsList + this.eventsList = this.eventsList + this.eventoaprovacaostore.save(segment, this.eventsList) } + this.showLoader = false; } async LoadToApproveEventsNoLoader() { - try { - if(this.segment == 'MDGPR') { - let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR,Agenda Pessoal MDGPR', false).toPromise(); - - let allEvents = mdEventsOficial - if(allEvents.length > 0) { - this.eventsMDGPRList = this.sortService.sortArrayByDate(allEvents).reverse(); - } - this.showLoader = false; - } - else if(this.segment == 'PR') { - let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise(); - let allEvents = prEventsOficial - - if(allEvents.length > 0) { - this.eventsPRList = this.sortService.sortArrayByDate(allEvents).reverse(); - } - this.showLoader = false; - } else { - let genericEvents = await this.processes.GetTasksList('Agendar Evento', false).toPromise(); - if(genericEvents.length > 0) { - this.eventsGenericList = this.sortService.sortArrayByDate(genericEvents).reverse(); - } - this.showLoader = false; - } - - } catch(erro) { - this.showLoader = false; - } - + this.LoadToApproveEvents() } diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts index a26b1fd2f..0be6a4e27 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts @@ -83,7 +83,7 @@ export class AllProcessesPage implements OnInit { updateAllProcess = () => { this.AllProcess = this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento) - .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr).concat(this.despachoStore.list) + .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.contactList).concat(this.despachoStore.list) .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.deplomasStore.DiplomaGerarList).concat(this.pendentesstore.list) } 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 2b4923736..c67296ad0 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 @@ -12,11 +12,12 @@ - + +
Minha agenda
-
Agenda do PR
+
Agenda do PR {{ i.OwnerUserIds }}
Agenda do MD
-
Agenda do {{calendars.Fullname}}
+
Agenda do {{calendars.Fullname }}
@@ -27,20 +28,20 @@ -
+
-
+
-
+
- +
-
+

{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}

{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}

@@ -55,10 +56,10 @@
-
+
-
-
+
+
Lista vazia @@ -67,41 +68,7 @@
-
-
- -
-
-
-
-

{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}

-

{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}

-
-
-

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}

-

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}

-

{{event.workflowInstanceDataFields.Subject}}

-
-
-
-
- -
- -
-
-
- Lista vazia -
-
-
-
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 c49eb4b39..f07aed64f 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 @@ -31,6 +31,10 @@ export class EventsToApprovePage implements OnInit { segment:string; eventaprovacaostore = EventoAprovacaoStore; + eventsList: any = [] + color: 'pr' | 'mdgpr' + eventoaprovacaostore = EventoAprovacaoStore; + constructor( private processes:ProcessesService, private modalController: ModalController, @@ -68,37 +72,54 @@ export class EventsToApprovePage implements OnInit { async LoadToApproveEvents() { this.showLoader = true; - - this.getFromDB(); - if(this.segment != 'PR') { - let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR,Agenda Pessoal MDGPR', false).toPromise(); - this.eventsMDGPRList = mdEventsOficial - this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList) - this.eventsMDGPRList = ( this.eventsMDGPRList || []).filter(function(item) { + const segment = this.segment + console.log(this.eventService.calendarNamesAry) + + if(this.segment == 'MDGPR') { + // color + if(SessionStore.user.Profile == 'PR') { + this.color = 'pr' + } else { + this.color = 'mdgpr' + } + + let genericEvents = await this.processes.GetTasksList('Agendar Evento', false).toPromise(); + try { + this.eventsList = this.sortService.sortArrayByDate(genericEvents).reverse(); + } catch (error) { + this.eventsList = []; + } + + this.eventsList = this.eventsList.filter(function(item) { return item.activityInstanceName != 'Editar Evento' }) || [] - this.storage.set('event-to-aproveMD',this.eventsMDGPRList).then(() => { - - }) + this.eventoaprovacaostore.save(segment, this.eventsList) + } else { - this.eventaprovacaostore.resetmd(this.sortService.sortDate(this.eventsMDGPRList, 'CreateDate')); - } - else if(this.segment == 'PR') { - let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise(); - // console.log(prEventsOficial) - // console.log(prEventsPessoal) - this.eventsPRList = prEventsOficial - this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList) - this.eventsPRList = (this.eventsPRList || []).filter(function(item) { + + + this.color = 'pr' + + let allEvents = await this.processes.eventsToApprove(segment).toPromise() + + console.log('allEvents', allEvents) + try { + this.eventsList = this.sortService.sortArrayByDate(allEvents).reverse(); + } catch(error) { + this.eventsList = [] + } + + this.eventsList = this.eventsList.filter(function(item) { return item.activityInstanceName != 'Editar Evento' - }) - - this.storage.set('event-to-aprovePR',this.eventsPRList).then(() => { - - }) - this.eventaprovacaostore.resetpr(this.sortService.sortDate(this.eventsPRList, 'CreateDate')); + }) || [] + + this.eventsList = this.eventsList + this.eventsList = this.eventsList + this.showLoader = false; + this.eventoaprovacaostore.save(segment, this.eventsList) } + this.showLoader = false; } diff --git a/src/app/store/eventoaprovacao-store.service.ts b/src/app/store/eventoaprovacao-store.service.ts index 02280150f..b9550096e 100644 --- a/src/app/store/eventoaprovacao-store.service.ts +++ b/src/app/store/eventoaprovacao-store.service.ts @@ -9,114 +9,36 @@ import { isArray } from 'ionic-angular/umd/util/util'; export class EventoaprovacaoStoreService { // main data - private _listPr: any[] = [] - private _listMd: any[] = [] private _list: {[key: string]: any[]} = {} + private _concatList = [] // 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 constructor() { - this.keyNamemd = (SHA1("EventoaprovacaoStoreService"+"md")).toString() - this.keyNamepr = (SHA1("EventoaprovacaoStoreService"+"pr")).toString() this.keyNameAll = (SHA1("EventoaprovacaoStoreService"+"all")).toString() setTimeout(()=>{ - let restoreMd = localstoreService.get(this.keyNamemd, []) - let restorePr = localstoreService.get(this.keyNamepr, []) + let {list , counts} = localstoreService.get(this.keyNameAll, {}) - this._listPr = restorePr.listPr || [] - this._listMd = restoreMd.lisMd || [] - this._countMd = parseInt(restoreMd.countListMd) || 0 - this._countPr = parseInt(restorePr.countListPr) || 0 - this._count = (this._countMd + this._countPr) || 0 + this._list = list || {} + + this.updateCount(); }, 10) } - get listpr() { return this._listPr || [] } - get listmd() { return this._listMd || [] } - - get count() { return this._count || 0 } - set count(value: number) { - this._count = value + get countAll() { + return this._countsAll } - get countPr() { return this._countPr || 0 } - set countPr (value: number) { - this._countPr = value - } - - get countMd() { return this._countMd || 0 } - set countMd (value) { - this._countMd = value - } - - resetpr(eventsList: any) { - if(Array.isArray(eventsList)) { - this._listPr = eventsList - - this.countPr = this._listPr.length - this.count = this.countPr + this.countMd - - this.savePr() - - if(window['all-process']) { - window['all-process']() - } - if(window['all-process-gabinete']) { - window['all-process-gabinete']() - } - } - - } - - resetmd(eventsList: any) { - if(Array.isArray(eventsList)) { - this._listMd = eventsList - - this.countMd = this._listMd.length - this.count = this.countPr + this.countMd - this.saveMd() - - - if(window['all-process']) { - window['all-process']() - } - if(window['all-process-gabinete']) { - window['all-process-gabinete']() - } - } - } - - private saveMd() { - setTimeout(()=>{ - localstoreService.set(this.keyNamemd,{ - lisMd: this._listMd, - countListMd: this._countMd - }) - }, 10) - - } - - private savePr() { - setTimeout(()=>{ - localstoreService.set(this.keyNamepr,{ - listPr: this._listPr, - countListPr: this._countPr - }) - }, 10) - + get contactList() { + return this._concatList } @@ -134,8 +56,28 @@ export class EventoaprovacaoStoreService { setTimeout(() => { localstoreService.set(this.keyNameAll,{ - _list: this._list, - _counts: this._counts + list: this._list, + counts: this._counts + }) + }, 10) + + + if(window['all-process']) { + window['all-process']() + } + if(window['all-process-gabinete']) { + window['all-process-gabinete']() + } + } + + clear() { + this._list = {} + this._counts = {} + + setTimeout(() => { + localstoreService.set(this.keyNameAll,{ + list: this._list, + counts: this._counts }) }, 10) } @@ -145,13 +87,18 @@ export class EventoaprovacaoStoreService { } updateCount() { - let count = 0 + + let allList = [] + for(let [name, value] of Object.entries(this._list)) { - count = count + value.length + allList = allList.concat(value) } - this._countsAll = count + + this._countsAll = allList.length + this._concatList = allList } + } export const EventoAprovacaoStore = new EventoaprovacaoStoreService() diff --git a/version/git-version.ts b/version/git-version.ts index b22a7db73..922e59ed0 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "f9bc1ae15", - "SHA": "f9bc1ae153f98c00bdc1b7f0eb1078f5574ed9f5", + "shortSHA": "9c540d38b", + "SHA": "9c540d38b0e4146fa71545686a971d10951020bf", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Wed Feb 22 09:35:20 2023 +0100'", - "lastCommitMessage": "remove alert", - "lastCommitNumber": "4815", + "lastCommitTime": "'Wed Feb 22 10:08:50 2023 +0100'", + "lastCommitMessage": "fix eventos", + "lastCommitNumber": "4816", "change": "", - "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", + "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.html\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/services/clear-store.service.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/app/services/functions/sort.service.ts\n\tmodified: src/app/services/processes.service.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.html\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/store/eventoaprovacao-store.service.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file