diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 970df85e1..a08be14a4 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -108,26 +108,54 @@ -
- - - - - - - - - +
+ + + + +
+ + +
+ +

{{ viewTitle }}

- - - - - - - - - + + +
+ +
+ + + + + + + + + + + + + + @@ -165,35 +193,64 @@ -
- {{view.dates[row*7+col].label}} -
- -
+
+ +
+ {{ view.dates[row*7+col].label }} +
+
- +
-
- - - - - - - - - +
+ + + + +
+ + +
+ +

{{ viewTitle }}

- - - - - - - - - + + +
+ +
+ + + + + + + + + + + + + +
@@ -228,15 +285,17 @@ > + -
- {{view.dates[row*7+col].label}} -
- -
+
+ +
+ {{ view.dates[row*7+col].label }} +
+
- +
@@ -270,10 +329,11 @@
    -
  • Todos
    • -
  • Oficial
    • -
  • Pessoal
    • +
  • Todos
    • +
  • Oficial
    • +
  • Pessoal
+ diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 2254f325e..8ee28339d 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -474,10 +474,6 @@ export class AgendaPage implements OnInit { this.showTimelineFilterState = false; -/* if( profile =='md'){ - console.log('eventsList: ', eventsList); - } */ - eventsList.forEach((element, eventIndex) => { // timeline start @@ -491,7 +487,6 @@ export class AgendaPage implements OnInit { console.log('mdEvent:', element,eventIndex); } - // console.log( element.CalendarName); events.push({ title: this.timeLineTemplate(startHours, element.Location, element.Body, element.CalendarName, element.Subject,startHoursOtherFormate,EndHoursOtherFormate, eventIndex, profile), start: setHours(setMinutes(new Date(element.StartDate), 0), parseInt(startHours)), @@ -502,16 +497,18 @@ export class AgendaPage implements OnInit { }, id: element.EventId, index: eventIndex, - profile: profile + profile: profile, + CalendarName: element.CalendarName, }); }); - // this.onCurrentChanged(this.eventSelectedDate); return events; } + eventFilter(){} + loadRangeEvents(startTime: Date, endTime: Date){ this.showLoader = true; @@ -526,7 +523,7 @@ export class AgendaPage implements OnInit { this.eventSource=[]; - if(this.profile == "mdgpr"){ + if(this.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') ).subscribe( response => { @@ -550,6 +547,7 @@ export class AgendaPage implements OnInit { const list = this.timelineFilter(this.timelineFilterState, this.eventsList, 'md'); this.events = list; + // optional this.TimelineMD = list; this.myCal.update(); @@ -560,11 +558,10 @@ export class AgendaPage implements OnInit { this.timelineBoxCorrectHeight(500); this.centralizeTimeline(500); - }); } - else{ + else { this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe( response => { @@ -596,11 +593,13 @@ export class AgendaPage implements OnInit { this.myCal.update(); this.myCal.loadEvents(); + this.showLoader = false; this.showTimeline = true; this.timelineBoxCorrectHeight(500); this.centralizeTimeline(500); + }); } @@ -613,24 +612,27 @@ export class AgendaPage implements OnInit { this.eventService.getAllMdEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(response => { this.eventSource=[]; + this.eventsListPessoal = response.filter(data => data.CalendarName == "Pessoal"); - this.eventsListPessoal.forEach(element => { - + // loop + this.eventsListPessoal.forEach((element, eventIndex) => { + this.eventSource.push({ title: element.Subject, startTime: new Date(element.StartDate), endTime: new Date(element.EndDate), allDay: false, event: element, + calendarName: element.CalendarName, profile: 'md' }); }); - + const list = this.timelineFilter(this.timelineFilterState, this.eventsList, 'md'); this.events = list; this.TimelineMD = list; - + this.myCal.update(); this.myCal.loadEvents(); @@ -657,9 +659,21 @@ export class AgendaPage implements OnInit { profile: 'pr' }); }); + + const list = this.timelineFilter(this.timelineFilterState, this.eventsListOficial, 'pr'); + + this.events = list; + // optional + this.TimelinePR = list; + this.myCal.update(); this.myCal.loadEvents(); + this.showLoader = false; + this.showTimeline = true; + + this.timelineBoxCorrectHeight(500); + this.centralizeTimeline(500); }); } break; @@ -667,7 +681,9 @@ export class AgendaPage implements OnInit { case "Oficial": //Inicializa o array eventSource this.eventSource=[]; - if(this.profile == "mdgpr"){ + this.eventsListOficial = []; + + if(this.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')).subscribe(res => { this.eventSource=[]; this.eventsListOficial = res.filter(data => data.CalendarName == "Oficial"); @@ -678,11 +694,11 @@ export class AgendaPage implements OnInit { endTime: new Date(element.EndDate), allDay: false, event: element, - profile: 'pr' + profile: 'md' }); }); - const list = this.timelineFilter(this.timelineFilterState, this.eventsList, 'pr'); + const list = this.timelineFilter(this.timelineFilterState, this.eventsListOficial, 'pr'); this.events = list; this.TimelinePR = list; @@ -696,7 +712,7 @@ export class AgendaPage implements OnInit { this.timelineBoxCorrectHeight(500); this.centralizeTimeline(500); }); - }else{ + } else { this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(res => { this.eventSource=[]; this.eventsListOficial = res.filter(data => data.CalendarName == "Oficial"); @@ -710,9 +726,23 @@ export class AgendaPage implements OnInit { profile: 'pr' }); }); + + + const list = this.timelineFilter(this.timelineFilterState, this.eventsListOficial, 'pr'); + + + this.events = list; + // optional + this.TimelinePR = list; + this.myCal.update(); this.myCal.loadEvents(); + this.showLoader = false; + this.showTimeline = true; + + this.timelineBoxCorrectHeight(500); + this.centralizeTimeline(500); }); } break; @@ -731,8 +761,15 @@ export class AgendaPage implements OnInit { this.TimelineMD = []; - this.eventsList = response; - // loop + if(this.segment == 'Oficial') { + this.eventsList = response.filter(data => data.CalendarName == "Oficial"); + } else if (this.segment == 'Pessoal') { + this.eventsList = response.filter(data => data.CalendarName == "Pessoal"); + } else { + this.eventsList = response; + } + + // loop this.eventsList.forEach((element, eventIndex) => { // calendar @@ -768,7 +805,14 @@ export class AgendaPage implements OnInit { this.TimelinePR = []; - this.eventsList = response; + if(this.segment == 'Oficial') { + this.eventsList = response.filter(data => data.CalendarName == "Oficial"); + } else if (this.segment == 'Pessoal') { + this.eventsList = response.filter(data => data.CalendarName == "Pessoal"); + } else { + this.eventsList = response; + } + this.eventsList.forEach((element, eventIndex) => { // calendar @@ -802,9 +846,7 @@ export class AgendaPage implements OnInit { } - actions(){ - - } + actions(){} doRefresh(ev: any){ this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate); @@ -1064,4 +1106,17 @@ export class AgendaPage implements OnInit { this.postEvent = false; } + + + async changeSegment(segments: "Combinado" | "Pessoal" | "Oficial") { + this.segment = segments; + + if(segments=='Combinado'){ + this.timelineFilterState = 'Todo' + } else { + this.timelineFilterState = segments + } + } + + } \ No newline at end of file diff --git a/src/app/shared/agenda/edit-event/edit-event.component.ts b/src/app/shared/agenda/edit-event/edit-event.component.ts index 965bd374d..4f9569bdf 100644 --- a/src/app/shared/agenda/edit-event/edit-event.component.ts +++ b/src/app/shared/agenda/edit-event/edit-event.component.ts @@ -141,7 +141,6 @@ export class EditEventComponent implements OnInit { } } - restoreTemporaryData(): boolean{ const restoredData = window['temp.path:/home/agenda/edit-event.component.ts']