diff --git a/src/app/guards/home.guard.spec.ts b/src/app/guards/home.guard.spec.ts deleted file mode 100644 index b14fb3fe3..000000000 --- a/src/app/guards/home.guard.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { HomeGuard } from './home.guard'; - -describe('HomeGuard', () => { - let guard: HomeGuard; - - beforeEach(() => { - TestBed.configureTestingModule({}); - guard = TestBed.inject(HomeGuard); - }); - - it('should be created', () => { - expect(guard).toBeTruthy(); - }); -}); diff --git a/src/app/guards/home.guard.ts b/src/app/guards/home.guard.ts deleted file mode 100644 index 133cd1b45..000000000 --- a/src/app/guards/home.guard.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { Injectable } from '@angular/core'; -import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, UrlTree, Router } from '@angular/router'; -import { Observable } from 'rxjs'; -import { AuthConnstants } from '../config/auth-constants'; -import { StorageService } from '../services/storage.service'; - -@Injectable({ - providedIn: 'root' -}) -export class HomeGuard implements CanActivate { - constructor( - public storageService:StorageService, - private router:Router - ){} - - canActivate(): Promise{ - return new Promise(resolve => { - /* this.storageService.get(AuthConnstants.AUTH).then(res => { - if(res){ - resolve(true); - } - else{ - this.router.navigate(['']); - resolve(false); - } - }).catch(err =>{ - resolve(false); - }) */ - }); - } - -} diff --git a/src/app/guards/index.guard.spec.ts b/src/app/guards/index.guard.spec.ts deleted file mode 100644 index 7c19426b5..000000000 --- a/src/app/guards/index.guard.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { IndexGuard } from './index.guard'; - -describe('IndexGuard', () => { - let guard: IndexGuard; - - beforeEach(() => { - TestBed.configureTestingModule({}); - guard = TestBed.inject(IndexGuard); - }); - - it('should be created', () => { - expect(guard).toBeTruthy(); - }); -}); diff --git a/src/app/guards/index.guard.ts b/src/app/guards/index.guard.ts deleted file mode 100644 index e3ffa3eff..000000000 --- a/src/app/guards/index.guard.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { Injectable } from '@angular/core'; -import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, UrlTree, Router } from '@angular/router'; -import { Observable } from 'rxjs'; -import { AuthConnstants } from '../config/auth-constants'; -import { StorageService } from '../services/storage.service'; - -@Injectable({ - providedIn: 'root' -}) -export class IndexGuard implements CanActivate { - constructor( - public storageService:StorageService, - private router:Router - ){} - canActivate(): Promise { - return new Promise(resolve => { - /* this.storageService.get(AuthConnstants.AUTH).then(res => { - if(res){ - this.router.navigate(['home']); - resolve(false); - } - else{ - resolve(true); - } - }).catch(err =>{ - resolve(false); - }) */ - }); - } - -} diff --git a/src/app/guards/login.guard.ts b/src/app/guards/login.guard.ts index 16aa98223..363c6a7d6 100644 --- a/src/app/guards/login.guard.ts +++ b/src/app/guards/login.guard.ts @@ -15,6 +15,8 @@ export class LoginGuard implements CanActivate { route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable | Promise | boolean | UrlTree { + // console.log(SessionStore.exist, SessionStore.user.Inactivity, SessionStore.user.LoginPreference) + if(SessionStore.exist && SessionStore.user.Inactivity && SessionStore.user.LoginPreference != 'Pin' ) { this.router.navigate(['/home/events']); return false diff --git a/src/app/index/index-routing.module.ts b/src/app/index/index-routing.module.ts index 6d90f05c2..5abed4edd 100644 --- a/src/app/index/index-routing.module.ts +++ b/src/app/index/index-routing.module.ts @@ -1,6 +1,5 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { IndexGuard } from '../guards/index.guard'; import { LoginGuard } from '../guards/login.guard'; import { IndexPage } from './index.page'; diff --git a/src/app/models/agenda/AgendaEventList.ts b/src/app/models/agenda/AgendaEventList.ts index fad1343c4..a40eba19b 100644 --- a/src/app/models/agenda/AgendaEventList.ts +++ b/src/app/models/agenda/AgendaEventList.ts @@ -1,11 +1,10 @@ export interface EventListStore { - title: string startTime: Date endTime: Date allDay: boolean, event: EventList, - calendarName: string + calendarName: "Oficial" |"Pessoal" profile: "md" | "pr", id: string } @@ -27,12 +26,16 @@ export interface EventList { export interface CustomCalendarEvent { start: Date end: Date - color: { - primary: string, - secondary: string - }, id: string - index: number, - CalendarName: string event: EventList +} + + + +export interface days { + [days: string]: { + day: number + activeEvent: number + events: CustomCalendarEvent[] + } } \ No newline at end of file diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 736ecbf38..818633557 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -223,14 +223,13 @@
-
-
+
+
{{ TimelineDayEvent(events.key)}}
-
+
{{event.event.StartDate | date: 'HH:mm'}}
@@ -263,16 +262,15 @@
-
+
-
+
{{ TimelineDayEvent(events.key)}}
-
+
{{event.event.StartDate | date: 'HH:mm'}}
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 6cfc2ee4a..1f5d75c69 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -290,6 +290,7 @@ export class AgendaPage implements OnInit { // calendar change date this.eventSelectedDate = new Date(ev); + this.updateEventListBox() }; // changedate @@ -461,7 +462,7 @@ export class AgendaPage implements OnInit { // loop this.calendarService.pushEvent(response, 'md'); - this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, {}) + this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate}) this.myCal.update(); this.myCal.loadEvents(); @@ -482,7 +483,7 @@ export class AgendaPage implements OnInit { // calendar this.calendarService.pushEvent(response, 'pr'); - this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {}) + this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate}) this.myCal.update(); this.myCal.loadEvents(); @@ -508,7 +509,7 @@ export class AgendaPage implements OnInit { this.calendarService.pushEvent(response, 'pr'); - this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {}) + this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate}) this.myCal.update(); @@ -536,7 +537,7 @@ export class AgendaPage implements OnInit { this.calendarService.pushEvent(eventsList, 'md'); - this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, {}) + this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate}) this.myCal.update(); this.myCal.loadEvents(); @@ -556,7 +557,7 @@ export class AgendaPage implements OnInit { const eventsList = response.filter(data => data.CalendarName == "Pessoal"); this.calendarService.pushEvent(eventsList, 'pr'); - this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {}) + this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate}) this.myCal.update(); this.myCal.loadEvents(); @@ -607,7 +608,7 @@ export class AgendaPage implements OnInit { this.calendarService.pushEvent(eventsList, 'pr'); - this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {}) + this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate}) this.myCal.update(); this.myCal.loadEvents(); @@ -638,7 +639,7 @@ export class AgendaPage implements OnInit { // loop this.calendarService.pushEvent(eventsList, 'md'); - this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, {}) + this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate}) this.myCal.update(); this.myCal.loadEvents(); @@ -667,7 +668,7 @@ export class AgendaPage implements OnInit { this.calendarService.pushEvent(eventsList, 'pr'); - this.TimelinePRList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {}) + this.TimelinePRList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate}) this.myCal.update(); this.myCal.loadEvents(); @@ -705,7 +706,7 @@ export class AgendaPage implements OnInit { this.calendarService.pushEvent(eventsList, 'pr'); - this.TimelinePRList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {}) + this.TimelinePRList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate}) this.myCal.update(); @@ -732,174 +733,11 @@ export class AgendaPage implements OnInit { updateEventListBox() { - this.TimelinePRList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {}) - this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, {}) + this.TimelinePRList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate}) + this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate}) } - eventListBox(list, nice?) { - let days = {}; - - list.forEach( (event:any)=> { - - var startDate: any = new Date(event.start); - - var endDate: any = this.EventTretment({ - startTime: startDate, - endTime: event.end - }) - - const day = (((new Date (event.start)).getDate())).toString().padStart(2,'0') - - event.manyDays = false - - - event.todayOnly = new Date(event.start).toLocaleDateString() == new Date(event.end).toLocaleDateString() - - - - if(!days.hasOwnProperty(day)) { - days[day] = [] - } - - if (new Date(startDate).toLocaleDateString() != new Date(endDate).toLocaleDateString()) { - - // difference - const diffTime = Math.abs(endDate - startDate); - const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24)); - - if (diffDays <= 150 && !event.event.IsAllDayEvent ) { - - - if (diffDays >= 1) { - - const StartEvent = Object.assign({}, { - title: event.title, - start: event.start, - end: event.end, - color: event.color, - id: event.id, - index: event.index, - profile: event.profile, - CalendarName: event.CalendarName, - event: { - Subject: event.event.Subject, - StartDate: event.event.StartDate, - EndDate: event.event.EndDate, - Location: event.event.Location, - EventId: event.event.EventId, - CalendarName: event.event.CalendarName - }, - startMany: true, - endMany: false, - middle: false - }) - - days[day].push(StartEvent) - - let i = 1; - - while (startDate.getFullYear() != endDate.getFullYear() || - startDate.getMonth() != endDate.getMonth() || - startDate.getDate() != endDate.getDate()) { - - const newDate = startDate.setDate(startDate.getDate()+ i) - - let otherDays = (((new Date (newDate)).getDate())).toString().padStart(2,'0') - - event.other = true - - event.start = newDate - if(!days.hasOwnProperty(otherDays)) { - - days[otherDays] = [] - } - - if (!(startDate.getFullYear() != endDate.getFullYear() || - startDate.getMonth() != endDate.getMonth() || - startDate.getDate() != endDate.getDate())) { - // last push - - const EndEvent = Object.assign({}, { - title: event.title, - start: event.start, - end: event.end, - color: event.color, - id: event.id, - index: event.index, - profile: event.profile, - CalendarName: event.CalendarName, - event: { - Subject: event.event.Subject, - StartDate: event.event.StartDate, - EndDate: event.event.EndDate, - Location: event.event.Location, - EventId: event.event.EventId, - CalendarName: event.event.CalendarName - }, - Subject: event.Subject, - startMany: false, - endMany: true, - middle: false - }) - - days[otherDays].push(EndEvent) - - } else { - const EndEvent = Object.assign({}, { - title: event.title, - start: event.start, - end: event.end, - color: event.color, - id: event.id, - index: event.index, - profile: event.profile, - CalendarName: event.CalendarName, - event: { - Subject: event.event.Subject, - StartDate: event.event.StartDate, - EndDate: event.event.EndDate, - Location: event.event.Location, - EventId: event.event.EventId, - CalendarName: event.event.CalendarName - }, - Subject: event.Subject, - startMany: false, - endMany: true, - middle: true - }) - days[otherDays].push(EndEvent) - } - - } - - } else { - days[day].push(event) - - } - } else { - days[day].push(event) - - } - - } - - days[day].push(event) - - }) - - setTimeout(()=>{ - document.querySelectorAll('.EventListBox-container .EventListBox').forEach((e)=>{ - if(e.childElementCount == 0) { - e.parentElement.style.display = 'none' - } else { - e.parentElement.style.display = 'block' - } - }) - }, 10) - - return days - } get viewEventMonth () { return this.viewDate.getMonth() @@ -932,13 +770,13 @@ export class AgendaPage implements OnInit { if(this.profile == "mdgpr") { this.profile ="pr"; this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate); - this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {}) + this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate}) } else { this.profile ="mdgpr"; this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate); - this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, {}) + this.TimelineMDList = this.listBoxService.list(this.calendarService.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate}) } } @@ -1224,26 +1062,10 @@ export class AgendaPage implements OnInit { } this.showTimelineFilterState = false; - setTimeout(()=>{ - document.querySelectorAll('.EventListBox-container .EventListBox').forEach((e)=>{ - if(e.childElementCount == 0) { - e.parentElement.style.display = 'none' - } else { - e.parentElement.style.display = 'block' - } - }) - }, 10) + // THIS LINE + this.updateEventListBox() - setTimeout(()=>{ - document.querySelectorAll('.EventListBox-container .EventListBox').forEach((e)=>{ - if(e.childElementCount == 0) { - e.parentElement.style.display = 'none' - } else { - e.parentElement.style.display = 'block' - } - }) - }, 100) } diff --git a/src/app/services/ageanda/list-box.service.ts b/src/app/services/ageanda/list-box.service.ts index 5dff546f9..15d9c90cc 100644 --- a/src/app/services/ageanda/list-box.service.ts +++ b/src/app/services/ageanda/list-box.service.ts @@ -26,10 +26,23 @@ export class ListBoxService { }) } + filterSegment(eventSource: EventListStore[], segment): EventListStore[] { + return eventSource.filter( data => data.calendarName == segment) + } + + daysBetween(){ } - list(eventSource: EventListStore[], profile: 'md' | 'pr' | 'all', rangeStartDate, randEndDate, {segment = 'todo'}) { + list(eventSource: EventListStore[], profile: 'md' | 'pr' | 'all', rangeStartDate, randEndDate, {segment = 'Combinado', selectedDate= null}) { + if(selectedDate) { + eventSource = eventSource.filter(data => data.startTime.toLocaleDateString('pt')>= selectedDate.toLocaleDateString('pt')) + } + + if(segment!='Combinado') { + eventSource = this.filterSegment(eventSource, segment) + } + if(profile != 'all') { eventSource = this.filterProfile(eventSource, profile) } @@ -49,7 +62,6 @@ export class ListBoxService { display(list: CustomCalendarEvent[]) { let days = {}; - console.log(list) list.forEach( (event:CustomCalendarEvent, index)=> { @@ -127,15 +139,6 @@ export class ListBoxService { }) - setTimeout(()=>{ - document.querySelectorAll('.EventListBox-container .EventListBox').forEach((e)=>{ - if(e.childElementCount == 0) { - e.parentElement.style.display = 'none' - } else { - e.parentElement.style.display = 'block' - } - }) - }, 10) return days } @@ -149,18 +152,10 @@ export class ListBoxService { events.push({ start: new Date(element.startTime), end: new Date(element.endTime), - color: { - primary: '#0000', - secondary: '#0000' - }, id: element.id, - index: eventIndex, - CalendarName: element.calendarName, event: element.event, }); - console.log('element.event', element.event) - }); return events; @@ -169,14 +164,10 @@ export class ListBoxService { transForm(event: CustomCalendarEvent, {startMany, endMany, middle}) { return Object.assign({}, { - title: event.event.Subject, start: event.start, end: event.end, - color: event.color, id: event.id, - index: event.index, profile: event, - CalendarName: event.CalendarName, event: { Subject: event.event.Subject, StartDate: event.event.StartDate, diff --git a/src/app/store/calendar.service.ts b/src/app/store/calendar.service.ts index 0559532e6..bd9919f8e 100644 --- a/src/app/store/calendar.service.ts +++ b/src/app/store/calendar.service.ts @@ -22,7 +22,6 @@ export class CalendarService { setTimeout(()=>{ restore.forEach((element:EventListStore, eventIndex) => { this._eventSource.push({ - title: element.title, startTime: new Date(element.startTime), endTime: new Date(element.endTime), allDay: element.allDay, @@ -67,7 +66,6 @@ export class CalendarService { let news = [] eventsList.forEach((element, eventIndex) => { news.push({ - title: element.Subject, startTime: new Date(element.StartDate), endTime: new Date(element.EndDate), allDay: false,