save

src/app/pages/agenda/agenda.page.ts

@@ -7,10 +7,7 @@ import { EventsService } from 'src/app/services/events.service';
 import { Event } from '../../models/event.model';
 import { Router, NavigationEnd } from '@angular/router';
 import { AlertService } from 'src/app/services/alert.service';
-import { NewEventPage } from './new-event/new-event.page';
-import { ViewEventPage } from './view-event/view-event.page';
 import { momentG }  from 'src/plugin/momentG'
-
 // showTimeline
 import { setHours, setMinutes } from 'date-fns';
 import {
@@ -19,8 +16,11 @@ import {
   CalendarView,
   DAYS_OF_WEEK,
 } from 'angular-calendar';
-import { CustomDateFormatter } from './custom-date-formatter.provider';
+
 import { EventListPage } from '../gabinete-digital/event-list/event-list.page';
+import { CustomDateFormatter } from './custom-date-formatter.provider';
+import { ViewEventPage } from './view-event/view-event.page';
+import { NewEventPage } from './new-event/new-event.page';
 
 @Component({
   selector: 'app-agenda',
@@ -270,9 +270,6 @@ export class AgendaPage implements OnInit {
 
       const scrollContainer = shadowRoot.querySelector('main');
 
-<<<<<<< HEAD
-      scrollContainer.scrollTop = timelineMarker['offsetTop'] - ((scrollContainer.offsetHeight/2) - 60);
-=======
       try {
         scrollContainer.scroll({
           top: timelineMarker['offsetTop'] - ((scrollContainer.offsetHeight/2) - 60),
@@ -283,19 +280,13 @@ export class AgendaPage implements OnInit {
         //
       }
       
->>>>>>> 23f5e954c97e86ebfe04040bd90bbf2a7461da2d
       
     }, timeout);
   }
 
   // for timeline
   timelineIsCurrentDate(): Boolean {
-<<<<<<< HEAD
-    return true;
-    //return formatDate(new Date(),'dd MMMM yyyy', 'pt') == formatDate(this.eventSelectedDate,'dd MMMM yyyy', 'pt');
-=======
     return momentG(new Date(),'dd MMMM yyyy', 'pt') == momentG(this.eventSelectedDate,'dd MMMM yyyy', 'pt');
->>>>>>> 23f5e954c97e86ebfe04040bd90bbf2a7461da2d
   }
 
   // for timeline