diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index cbba18d51..fb1a28344 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -3,7 +3,7 @@ - {{totalEvent}} + {{toDayEventStorage.eventsList.length}} InĂ­cio diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 46a5cbbad..d60cc0446 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -10,6 +10,7 @@ import { NotificationsService } from '../services/notifications.service'; import { ModalController, AlertController, AnimationController, Platform } from '@ionic/angular'; import { NavigationExtras,Router,ActivatedRoute } from '@angular/router'; import { ToastService } from '../services/toast.service'; +import { ToDayEventStorage } from '../store/to-day-event-storage.service'; @Component({ selector: 'app-home', @@ -25,6 +26,9 @@ export class HomePage implements OnInit { totalExpediente = 0; profile: string; + + toDayEventStorage = ToDayEventStorage + adding: "intervenient" | "CC" = "intervenient"; mobileComponent = { showAddNewEvent: false, @@ -71,33 +75,6 @@ export class HomePage implements OnInit { this.mobilefirstConnect(); this.notificatinsservice.onReceviNotification(); } - this.count(); - - } - - async count() { - - // let date = new Date(); - // date.setMonth(date.getMonth() + 1); - // let start = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds(); - // let end = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " 23:59:59"; - - // this.profile = "mdgpr"; - // if (this.profile == "mdgpr") { - - // let mdOficialEvents = await this.eventService.getAllPrOficialEvents(start, end).toPromise(); - // let mdPessoalEvents = await this.eventService.getAllPrPessoalEvents(start, end).toPromise(); - // this.eventsList = mdOficialEvents.concat(mdPessoalEvents) - // this.totalEvent = this.eventsList.length; - - // } - // else { - // let prOficialEvents = await this.eventService.getAllPrOficialEvents(start, end).toPromise(); - // let prPessoalEvents = await this.eventService.getAllPrPessoalEvents(start, end).toPromise(); - // this.eventsList = prOficialEvents.concat(prPessoalEvents) - // this.totalEvent = this.eventsList.length; - - // } } diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index b7058ac9f..ad7abdaa8 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -5,6 +5,7 @@ import { ProcessesService } from 'src/app/services/processes.service'; import { ModalController } from '@ionic/angular'; import { AlertService } from 'src/app/services/alert.service'; import { ToastService } from 'src/app/services/toast.service'; +import { ExpedienteStorage } from 'src/app/store/expediente-storage-service.service'; @Component({ selector: 'app-expediente', @@ -21,6 +22,8 @@ export class ExpedientePage implements OnInit { taskslist:DailyWorkTask[] = []; serialNumber:string; + expedienteStorage = ExpedienteStorage + constructor( private processes:ProcessesService, private modalController: ModalController, diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index 0a6339a93..d864f1321 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -7,7 +7,6 @@ import { NewActionPage } from './new-action/new-action.page'; import { ViewPublicationsPage } from './view-publications/view-publications.page'; import { AnimationController } from '@ionic/angular'; -import { LoadingService } from 'src/app/services/loading.service'; import { Publication } from 'src/app/models/publication'; import { ActionsOptionsPage } from 'src/app/shared/popover/actions-options/actions-options.page'; import { EditActionPage } from './edit-action/edit-action.page'; diff --git a/src/app/pages/publications/view-publications/view-publications.page.ts b/src/app/pages/publications/view-publications/view-publications.page.ts index ad9fa0fa1..d523f38c3 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.ts +++ b/src/app/pages/publications/view-publications/view-publications.page.ts @@ -5,7 +5,6 @@ import { Publication } from 'src/app/models/publication'; import { PublicationFolder } from 'src/app/models/publicationfolder'; import { LoadingService } from 'src/app/services/loading.service'; import { PublicationsService } from 'src/app/services/publications.service'; -import { PresidentialActionsStore } from 'src/app/store/presidential-actions-store.service'; import { PublicationEventFolderStorage } from 'src/app/store/publication-event-folder.service'; import { PublicationListStorage } from 'src/app/store/publication-list.service'; import { PublicationTravelFolderStore } from 'src/app/store/publication-travel-folder.service'; diff --git a/src/app/store/expediente-storage-service.service.ts b/src/app/store/expediente-storage-service.service.ts index d4c91a99d..9ea26c882 100644 --- a/src/app/store/expediente-storage-service.service.ts +++ b/src/app/store/expediente-storage-service.service.ts @@ -12,6 +12,7 @@ class ExpedienteStorageServiceService { // main data private _list: Event[] + private _count = 0 // local storage keyName private keyName: string; @@ -21,7 +22,8 @@ class ExpedienteStorageServiceService { setTimeout(()=>{ let restore = localstoreService.get(this.keyName, []) - this._list = restore + this._list = restore.list + this._count = restore.count }, 10) } @@ -30,15 +32,26 @@ class ExpedienteStorageServiceService { return this._list } + get count() { + return this._count + } + set count(value) { + this._count = value + } + reset(list: any) { this._list = list + this.count = this._list.length this.save(this._list) } private save(list: any) { setTimeout(()=>{ - localstoreService.set(this.keyName, list) + localstoreService.set(this.keyName, { + list: list, + count: this.count + }) }, 10) }