diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index e7852477f..2cddad43e 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -89,6 +89,10 @@ const routes: Routes = [ path: 'emend-message-modal', loadChildren: () => import('../pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.module').then( m => m.ApproveEventModalPageModule) }, + { + path: 'view-event', + loadChildren: () => import('../pages/agenda/view-event/view-event.module').then( m => m.ViewEventPageModule) + }, ] }, { 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..35448c226 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -351,6 +351,7 @@ export class AgendaPage implements OnInit { }) } catch (error) { // + this.selectFirstEventOfTheDay(); } }, timeout); @@ -474,10 +475,6 @@ export class AgendaPage implements OnInit { this.showTimelineFilterState = false; -/* if( profile =='md'){ - console.log('eventsList: ', eventsList); - } */ - eventsList.forEach((element, eventIndex) => { // timeline start @@ -491,7 +488,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,18 +498,22 @@ 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.eventSelectedDate = new Date(startTime); + this.showLoader = true; if(window.innerWidth < 1024){ @@ -526,7 +526,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 => { @@ -543,13 +543,15 @@ export class AgendaPage implements OnInit { allDay: false, event: element, calendarName: element.CalendarName, - profile: 'md' + profile: 'md', + id: element.EventId, }); }); const list = this.timelineFilter(this.timelineFilterState, this.eventsList, 'md'); this.events = list; + // optional this.TimelineMD = list; this.myCal.update(); @@ -560,11 +562,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 => { @@ -582,7 +583,8 @@ export class AgendaPage implements OnInit { allDay: false, event: element, calendarName: element.CalendarName, - profile: 'pr' + profile: 'pr', + id: element.EventId, }); }); @@ -596,11 +598,13 @@ export class AgendaPage implements OnInit { this.myCal.update(); this.myCal.loadEvents(); + this.showLoader = false; this.showTimeline = true; this.timelineBoxCorrectHeight(500); this.centralizeTimeline(500); + }); } @@ -609,28 +613,33 @@ export class AgendaPage implements OnInit { case "Pessoal": //Inicializa o array eventSource 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 => { this.eventSource=[]; + this.eventsListPessoal= []; + 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, - profile: 'md' + calendarName: element.CalendarName, + profile: 'md', + id: element.EventId, }); }); - - const list = this.timelineFilter(this.timelineFilterState, this.eventsList, 'md'); + + const list = this.timelineFilter(this.timelineFilterState, this.eventsListPessoal, 'md'); this.events = list; this.TimelineMD = list; - + this.myCal.update(); this.myCal.loadEvents(); @@ -654,12 +663,25 @@ export class AgendaPage implements OnInit { endTime: new Date(element.EndDate), allDay: false, event: element, - profile: 'pr' + profile: 'pr', + id: element.EventId, }); }); + + const list = this.timelineFilter(this.timelineFilterState, this.eventsListPessoal, '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,10 +689,13 @@ 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"); + this.eventsListOficial.forEach(element => { this.eventSource.push({ title: element.Subject, @@ -678,11 +703,12 @@ export class AgendaPage implements OnInit { endTime: new Date(element.EndDate), allDay: false, event: element, - profile: 'pr' + profile: 'md', + id: element.EventId, }); }); - const list = this.timelineFilter(this.timelineFilterState, this.eventsList, 'pr'); + const list = this.timelineFilter(this.timelineFilterState, this.eventsListOficial, 'md'); this.events = list; this.TimelinePR = list; @@ -696,7 +722,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"); @@ -707,12 +733,27 @@ export class AgendaPage implements OnInit { endTime: new Date(element.EndDate), allDay: false, event: element, - profile: 'pr' + profile: 'pr', + id: element.EventId, }); }); + + + 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 +772,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 @@ -744,7 +792,8 @@ export class AgendaPage implements OnInit { allDay: false, event: element, calendarName: element.CalendarName, - profile: 'md' + profile: 'md', + id: element.EventId, }); }); @@ -768,7 +817,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 @@ -780,7 +836,8 @@ export class AgendaPage implements OnInit { allDay: false, event: element, calendarName: element.CalendarName, - profile:'pr' + profile:'pr', + id: element.EventId, }); }); @@ -796,15 +853,41 @@ export class AgendaPage implements OnInit { this.centralizeTimeline(500); this.showLoader = false; + }); } + } + + // for timeline select the first event in the timeline + selectFirstEventOfTheDay(){ + + setTimeout(()=>{ + + let sortedDate = this.eventSource.sort((a,b) =>{ + return (b.startTime) -(a.startTime); + }); + + + let filterDate = sortedDate.filter((e) => { + return e.startTime.toLocaleDateString('en-US') == this.eventSelectedDate.toLocaleDateString('en-US'); + }); + + const firstEventStartHours = new Date(filterDate[filterDate.length - 1].startTime).getHours(); + + const scrollContainer = document.querySelector('.timeline-wrapper'); + + scrollContainer.scroll({ + top: firstEventStartHours*60, + left: 0, + behavior: 'smooth' + }) + + }, 500); } - actions(){ - - } + actions(){} doRefresh(ev: any){ this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate); @@ -1064,4 +1147,17 @@ export class AgendaPage implements OnInit { this.postEvent = false; } + + + async changeSegment(segments: "Combinado" | "Pessoal" | "Oficial") { + this.segment = segments; + + if(segments=='Combinado'){ + this.timelineFilterState = 'Todos' + } else { + this.timelineFilterState = segments + } + } + + } \ No newline at end of file diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html index 8e989f58d..7718d0c99 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -133,51 +133,51 @@ -
-
-
-
- + +
+
+
+ +
+
+
+ + + Adicionar intervenientes + {{participant.Name}} + +
-
-
- - - Adicionar intervenientes - {{participant.Name}} - - -
-
- -
+
+
- -
-
-
- -
-
-
- - - Adicionar intervenientes - {{participant.Name}} - - -
-
- -
-
-
-
-
+ +
+
+
+ +
+
+
+ + + Adicionar intervenientes + {{participant.Name}} + + +
+
+ +
+
+
+
+ +
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts index a9b3dd04a..ef0829112 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -71,6 +71,7 @@ export class EditEventPage implements OnInit { ngOnInit() { + window.onresize = (event) => { // if not mobile remove all component if( window.innerWidth >= 800){ diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index a6a473665..78d2638de 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -39,7 +39,7 @@
"{{currentEvent}}"
--> -
+
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html index b2869674c..9b898211a 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html @@ -183,7 +183,7 @@
-
+
{ - console.log(res); res.Categories.forEach( e => { e['Active'] = false; @@ -234,14 +237,12 @@ export class SearchPage implements OnInit { this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender ,this.searchOrganicEntiry, this.searchDocTypeId, '361').subscribe(res=>{ - console.log(res); res.Categories.forEach( e => { e['Active'] = false; this.searchCategories.push(e) }); - // bind respose this.sortArrayISODate(res.Documents).forEach(e => { this.searchDocuments.push(e) @@ -259,6 +260,7 @@ export class SearchPage implements OnInit { this.showLoader = false; this.loadWordCloud(); }); + } else if (window.location.pathname == '/home/publications'){ this.showLoader = true; 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 30af0bd18..0f584a9de 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']