peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-20 13:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

save

Browse Source
This commit is contained in:
tiago.kayaya
2021-02-25 11:10:30 +01:00
parent 14e9a14997
commit 7cd4a8747d
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.ts
+4 -13
View File
@@ -7,10 +7,7 @@ import { EventsService } from 'src/app/services/events.service';
import { Event } from '../../models/event.model'; import { Event } from '../../models/event.model';
import { Router, NavigationEnd } from '@angular/router'; import { Router, NavigationEnd } from '@angular/router';
import { AlertService } from 'src/app/services/alert.service'; 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' import { momentG } from 'src/plugin/momentG'
// showTimeline // showTimeline
import { setHours, setMinutes } from 'date-fns'; import { setHours, setMinutes } from 'date-fns';
import { import {
@@ -19,8 +16,11 @@ import {
CalendarView, CalendarView,
DAYS_OF_WEEK, DAYS_OF_WEEK,
} from 'angular-calendar'; } from 'angular-calendar';
import { CustomDateFormatter } from './custom-date-formatter.provider';
import { EventListPage } from '../gabinete-digital/event-list/event-list.page'; 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({ @Component({
selector: 'app-agenda', selector: 'app-agenda',
@@ -270,9 +270,6 @@ export class AgendaPage implements OnInit {
const scrollContainer = shadowRoot.querySelector('main'); const scrollContainer = shadowRoot.querySelector('main');
<<<<<<< HEAD
scrollContainer.scrollTop = timelineMarker['offsetTop'] - ((scrollContainer.offsetHeight/2) - 60);
=======
try { try {
scrollContainer.scroll({ scrollContainer.scroll({
top: timelineMarker['offsetTop'] - ((scrollContainer.offsetHeight/2) - 60), top: timelineMarker['offsetTop'] - ((scrollContainer.offsetHeight/2) - 60),
@@ -283,19 +280,13 @@ export class AgendaPage implements OnInit {
// //
} }
>>>>>>> 23f5e954c97e86ebfe04040bd90bbf2a7461da2d
}, timeout); }, timeout);
} }
// for timeline // for timeline
timelineIsCurrentDate(): Boolean { 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'); return momentG(new Date(),'dd MMMM yyyy', 'pt') == momentG(this.eventSelectedDate,'dd MMMM yyyy', 'pt');
>>>>>>> 23f5e954c97e86ebfe04040bd90bbf2a7461da2d
} }
// for timeline // for timeline