From a2f5324a9889237244d9c6a1bacd4cadca11e68e Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 20 Jul 2021 19:22:56 +0100 Subject: [PATCH] Add home's data to local storage --- src/app/home/home.page.ts | 7 +-- src/app/pages/agenda/agenda.page.ts | 2 - src/app/pages/events/events.page.html | 4 +- src/app/pages/events/events.page.ts | 70 +++++++++++++++------------ 4 files changed, 43 insertions(+), 40 deletions(-) diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 873093ac6..46a5cbbad 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -47,13 +47,8 @@ export class HomePage implements OnInit { folderId: string; constructor(private zone: NgZone, - private eventService: EventsService, - private processesbackend: ProcessesService, - private router: Router, - private modalController: ModalController, + private router: Router, public modalCtrl: AlertController, - private toastService: ToastService, - private animationController: AnimationController, private notificatinsservice: NotificationsService, private platform: Platform, private activeroute: ActivatedRoute) { diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 4327ff6de..9d8a28548 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -454,8 +454,6 @@ export class AgendaPage implements OnInit { loadRangeEvents(startTime: Date, endTime: Date) { - this.eventSelectedDate = new Date(startTime); - this.showLoader = true; if(window.innerWidth < 800){ diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 51a47dbab..a3185ad29 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -45,7 +45,7 @@
-
@@ -87,7 +87,7 @@
-
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 6331158f1..92f88a67e 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -18,7 +18,8 @@ import { ExpedienteDetailPage } from '../gabinete-digital/expediente/expediente- import { EditEventPage as EventEditPage } from './edit-event/edit-event.page'; import { GabineteDigitalPage } from '../gabinete-digital/gabinete-digital.page'; import { User } from 'src/app/models/user.model'; - +import { ToDayEventStorage } from 'src/app/store/to-day-event-storage.service'; +import { ExpedienteStorage } from 'src/app/store/expediente-storage-service.service' @Component({ selector: 'app-events', templateUrl: './events.page.html', @@ -62,6 +63,10 @@ export class EventsPage implements OnInit { taskslist:DailyWorkTask[] = []; expedientList:any; + // shared data + toDayEventStorage = ToDayEventStorage + expedienteStorage = ExpedienteStorage + @Output() openExpedientListPage:EventEmitter = new EventEmitter(); loggeduser: User; @@ -85,7 +90,7 @@ export class EventsPage implements OnInit { // list this.LoadList(); - } + } ngOnInit() { this.activatedRoute.data.subscribe(data => console.log(data)); @@ -107,18 +112,17 @@ export class EventsPage implements OnInit { }); } - doRefresh(event) { this.RefreshEvents(); this.LoadList(); event.target.complete(); } - onSegmentChange(){ + onSegmentChange() { this.RefreshEvents(); } - async RefreshEvents(){ + async RefreshEvents() { this.currentEvent = ""; this.showLoader = true; @@ -127,38 +131,42 @@ export class EventsPage implements OnInit { 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"; - - if(this.loggeduser.Profile == 'MDGPR'){ + + if(this.loggeduser.Profile == 'MDGPR') { let mdOficialEvents = await this.eventService.getAllMdOficialEvents(start, end).toPromise(); let mdPessoalEvents = await this.eventService.getAllMdPessoalEvents(start, end).toPromise(); + + const list = mdOficialEvents.concat(mdPessoalEvents); + + this.toDayEventStorage.reset(list) + + if(this.toDayEventStorage.eventsList.length > 0){ + this.currentEvent = this.toDayEventStorage.eventsList[0].Subject; + this.currentHoursMinutes = this.toDayEventStorage.eventsList[0].StartDate; + } + + this.totalEvent = this.toDayEventStorage.eventsList.length; + this.showLoader = false; - this.eventsList = mdOficialEvents.concat(mdPessoalEvents); - - if(this.eventsList.length > 0){ - this.currentEvent = this.eventsList[0].Subject; - this.currentHoursMinutes = this.eventsList[0].StartDate; - } - - this.totalEvent = this.eventsList.length; - this.showLoader = false; - } - else if (this.loggeduser.Profile == 'PR'){ + else if (this.loggeduser.Profile == 'PR') { let prOficialEvents= await this.eventService.getAllPrOficialEvents(start, end).toPromise(); let prPessoalEvents= await this.eventService.getAllPrPessoalEvents(start, end).toPromise(); - this.eventsList = prOficialEvents.concat(prPessoalEvents); - console.log(this.eventsList); + + const list = prOficialEvents.concat(prPessoalEvents); - if(this.eventsList.length > 0){ - this.currentEvent = this.eventsList[0].Subject; - this.currentHoursMinutes = this.eventsList[0].StartDate; - } + this.toDayEventStorage.reset(list) - this.totalEvent = this.eventsList.length; - this.showLoader = false; - + if(this.toDayEventStorage.eventsList.length > 0) { + this.currentEvent = this.toDayEventStorage.eventsList[0].Subject; + this.currentHoursMinutes = this.toDayEventStorage.eventsList[0].StartDate; + } + + this.totalEvent = this.toDayEventStorage.eventsList.length; + this.showLoader = false; + } @@ -283,16 +291,18 @@ export class EventsPage implements OnInit { } - LoadList(){ + LoadList() { switch (this.loggeduser.Profile) { case 'MDGPR': this.processes.GetTasksList("Expediente", false).subscribe(result => { - this.expedientList = result.reverse(); + const data = result.reverse(); + this.expedienteStorage.reset(data) }); break; case 'PR': this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => { - this.expedientList = result.reverse(); + const data = result.reverse(); + this.expedienteStorage.reset(data) }); break; default: