From f21f2afc65cd5eb098a5d41ec16c87a2b7a5e99f Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 30 Jul 2021 17:45:17 +0100 Subject: [PATCH] Improve change to camelcase --- .../OtherService/document-counter.service.ts | 18 +++++++++--------- src/app/pages/agenda/agenda.page.ts | 3 --- .../agenda/edit-event/edit-event.page.ts | 2 -- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/app/OtherService/document-counter.service.ts b/src/app/OtherService/document-counter.service.ts index 79827fbe4..c350c9521 100644 --- a/src/app/OtherService/document-counter.service.ts +++ b/src/app/OtherService/document-counter.service.ts @@ -13,21 +13,21 @@ import { DespachosprStore } from 'src/app/store/despachospr-store.service'; }) export class DocumentCounterService { - expedientegbstore = ExpedienteGdStore; - pendentesstore = PendentesStore; + expedienteGbStore = ExpedienteGdStore; + pendentesStore = PendentesStore; despachoStore = DespachoStore; - eventoaprovacaostore = EventoAprovacaoStore; - pedidosstore = PedidosStore; - expedienteprstore = ExpedienteprStore; - despachoprstore = DespachosprStore; + eventoAprovacaoStore = EventoAprovacaoStore; + pedidosStore = PedidosStore; + expedientePrStore = ExpedienteprStore; + despachoPrStore = DespachosprStore; constructor() { } // falta a contagem dos deplomas get mdTotalDocument() { - return this.despachoStore.count + this.expedientegbstore.count + this.pedidosstore.countdeferimento - + this.pedidosstore.countparecer + this.expedienteprstore.count + this.despachoprstore.count + this.pendentesstore.count - + this.eventoaprovacaostore.count + return this.despachoStore.count + this.expedienteGbStore.count + this.pedidosStore.countdeferimento + + this.pedidosStore.countparecer + this.expedientePrStore.count + this.despachoPrStore.count + this.pendentesStore.count + + this.eventoAprovacaoStore.count } get prTotalDocument() { diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index f187c8671..c6e316c79 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -82,8 +82,6 @@ export class AgendaPage implements OnInit { /* List of events of our calendar */ eventSource : eventSource[] = [] - - /* The title of the calendar */ viewTitle: string; @@ -590,7 +588,6 @@ export class AgendaPage implements OnInit { if(this.profile == "mdgpr" && this.loggeduser.Profile == 'MDGPR') { this.eventService.getAllMdEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).then((res:any) => { - this.calendarService.removeRange(startTime, endTime, 'md') const eventsList = res.filter(data => data.CalendarName == "Oficial"); diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts index 0a8e7c9a2..fdef4a5bd 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -422,10 +422,8 @@ export class EditEventPage implements OnInit { this.loadedEventAttachments[index]['remove'] = true } - } - async getDoc() { const modal = await this.modalController.create({