diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 9385a293e..3f01d43e2 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -776,8 +776,7 @@ 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.TimelineMD = []; + if(this.segment == 'Oficial') { this.eventsList = response.filter(data => data.CalendarName == "Oficial"); @@ -803,6 +802,7 @@ export class AgendaPage implements OnInit { profile: 'md', id: element.EventId, }); + }); const MDEventList = this.timelineFilter(this.timelineFilterState, this.eventsList, 'md'); @@ -826,8 +826,7 @@ export class AgendaPage implements OnInit { 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 => { - - this.TimelinePR = []; + if(this.segment == 'Oficial') { this.eventsList = response.filter(data => data.CalendarName == "Oficial"); @@ -881,7 +880,7 @@ export class AgendaPage implements OnInit { setTimeout(()=>{ - if(this.eventSelectedDate.toLocaleDateString('en-US') != (new Date()).toLocaleDateString('en-US')){ + if(this.eventSelectedDate.toLocaleDateString('en-US') != (new Date()).toLocaleDateString('en-US')) { let sortedDate = this.eventSource.sort((a,b) =>{ return (b.startTime) -(a.startTime); }); @@ -890,8 +889,12 @@ export class AgendaPage implements OnInit { let filterDate = sortedDate.filter((e) => { return e.startTime.toLocaleDateString('en-US') == this.eventSelectedDate.toLocaleDateString('en-US'); }); - + + console.log('Event -- ',filterDate[filterDate.length - 1]); + const firstEventStartHours = new Date(filterDate[filterDate.length - 1].startTime).getHours(); + + console.log('firstEventStartHours-- ', firstEventStartHours) const scrollContainer = document.querySelector('.timeline-wrapper'); diff --git a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts index 08fd13170..039847646 100644 --- a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts +++ b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts @@ -44,7 +44,7 @@ export class ApproveEventModalPage implements OnInit { window.onresize = (event) => { // if not mobile remove all component - if( window.innerWidth >= 1024){ + if( window.innerWidth >= 800){ this.modalController.dismiss(null); } }; 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 d06db79b8..1085550c6 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -56,7 +56,7 @@ export class EditEventPage implements OnInit { } } - if(this.postEvent.Attendees == null){ + if(this.postEvent.Attendees == null) { this.taskParticipants = [] } else { @@ -86,10 +86,10 @@ export class EditEventPage implements OnInit { window.onresize = (event) => { // if not mobile remove all component - if( window.innerWidth >= 800){ + if( window.innerWidth >= 1024) { this.modalController.dismiss(); } - }; + } } diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts index 9b152a129..f302bc868 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -107,6 +107,7 @@ export class NewEventPage implements OnInit { this.modalController.dismiss(); } }; + } close(){ this.modalController.dismiss(); diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index 76db81f7d..34604f5f5 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -67,7 +67,7 @@ export class ViewEventPage implements OnInit { window.onresize = (event) => { // if not mobile remove all component - if( window.innerWidth >= 1024){ + if( window.innerWidth >= 1024) { this.modalController.dismiss(this.isEventEdited); } }; diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index 8cd69c7ec..86e28603f 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -196,6 +196,7 @@ export class ExpedientTaskModalPage implements OnInit { DispatchFolder: this.dispatchFolder, AttachmentList: docs } + console.log(JSON.stringify(this.postData)) console.log('this.postData', this.postData, this.taskType); this.taskResult = await this.processes.postDespatcho(this.postData); break;