diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index bcb98f1d2..65ddf319d 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -198,7 +198,7 @@ export class AgendaPage implements OnInit { } //Go to the next view of the calendar month/week/day - next(){ + next() { this.myCal.slideNext(); this.centralizeTimeline(500); } @@ -352,11 +352,10 @@ export class AgendaPage implements OnInit { setTimeout(() => { const timelineMarker = document.querySelector('.cal-current-time-marker'); const scrollContainer = document.querySelector('.timeline-wrapper'); - try { scrollContainer.scroll({ - top: timelineMarker['offsetTop'] - ((scrollContainer['offsetHeight']/2) - 60), + top: parseInt(timelineMarker['style']['top'].replace('px','')) - ((scrollContainer['offsetHeight']/2) - 60), left: 0, behavior: 'smooth' }) @@ -402,7 +401,7 @@ export class AgendaPage implements OnInit { const profile_ = profile == 'md'? 'mdgpr': 'pr'; return ` -
+
${startHours.toString().padStart(2, '0')}:${startMinutos.toString().padStart(2, '0')}${eventlocation}
@@ -888,32 +887,34 @@ export class AgendaPage implements OnInit { setTimeout(()=>{ - if(this.eventSelectedDate.toLocaleDateString('en-US') != (new Date()).toLocaleDateString('en-US')) { - 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'); - }); - - console.log('Event -- ',filterDate[filterDate.length - 1]); - const firstEventStartHours = new Date(filterDate[filterDate.length - 1].startTime).getHours(); + let sortedDate = this.eventSource.sort((a,b) =>{ + return (b.startTime) -(a.startTime); + }); - console.log('firstEventStartHours-- ', firstEventStartHours) - + + let filterDate = sortedDate.filter((e) => { + console.log( e.startTime.toLocaleDateString('en-US'),' == ',this.eventSelectedDate.toLocaleDateString('en-US')); + return e.startTime.toLocaleDateString('en-US') == this.eventSelectedDate.toLocaleDateString('en-US'); + }); + + console.log('Event -- ',filterDate[filterDate.length - 1], filterDate['startTime']); + + const firstEventStartHours = new Date(filterDate[filterDate.length - 1].startTime).getHours(); + + console.log('firstEventStartHours-- ', firstEventStartHours) + + if(firstEventStartHours) { const scrollContainer = document.querySelector('.timeline-wrapper'); - + scrollContainer.scroll({ top: firstEventStartHours*60, left: 0, behavior: 'smooth' }) - + } - + }, 500); } @@ -926,6 +927,7 @@ export class AgendaPage implements OnInit { ev.target.complete(); }, 250) } + showAlert(){ this.alertController.presentAlert("Funcionalidade em desenvolvimento."); } diff --git a/src/app/shared/header-pr/header-pr.page.html b/src/app/shared/header-pr/header-pr.page.html index 1ed376188..7327d7daf 100644 --- a/src/app/shared/header-pr/header-pr.page.html +++ b/src/app/shared/header-pr/header-pr.page.html @@ -8,6 +8,10 @@
+ + + +
diff --git a/src/app/shared/header-pr/header-pr.page.ts b/src/app/shared/header-pr/header-pr.page.ts index 2dbde5587..ea0fbe3c3 100644 --- a/src/app/shared/header-pr/header-pr.page.ts +++ b/src/app/shared/header-pr/header-pr.page.ts @@ -1,4 +1,6 @@ import { Component, OnInit } from '@angular/core'; +import { User } from 'src/app/models/user.model'; +import { AuthService } from 'src/app/services/auth.service'; @Component({ selector: 'app-header-pr', @@ -7,9 +9,15 @@ import { Component, OnInit } from '@angular/core'; }) export class HeaderPrPage implements OnInit { - constructor() { } + loggeduser: User; + + constructor(authService: AuthService) { + + this.loggeduser = authService.ValidatedUser; + } ngOnInit() { + } locationPathname(): string { diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index 5e8cf8dbf..754680eac 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -12,10 +12,10 @@
@@ -81,8 +81,8 @@
- - + +
diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts index 2c5795cfd..f7b4c8a49 100644 --- a/src/app/shared/header/header.page.ts +++ b/src/app/shared/header/header.page.ts @@ -3,6 +3,8 @@ import { AnimationController, ModalController } from '@ionic/angular'; import { SearchPage } from 'src/app/pages/search/search.page'; import { Router } from '@angular/router'; import { ProfileComponent } from '../headers/header-no-search/profile/profile.component'; +import { AuthService } from 'src/app/services/auth.service'; +import { User } from 'src/app/models/user.model'; @Component({ selector: 'app-header', @@ -11,17 +13,16 @@ import { ProfileComponent } from '../headers/header-no-search/profile/profile.co }) export class HeaderPage implements OnInit { - profile: string = 'mdgpr'; searchSubject: string = ''; showSearch=false; - + loggeduser: User; + constructor( private router: Router,private modalController: ModalController, - private animationController: AnimationController,) { + private animationController: AnimationController, + authService: AuthService) { - window['header'] = (profile:string) => { - this.profile = profile; - } + this.loggeduser = authService.ValidatedUser; router.events.subscribe((val) => { diff --git a/src/app/shared/headers/header-no-search/header-no-search.page.html b/src/app/shared/headers/header-no-search/header-no-search.page.html index 5f4722282..6342cc93d 100644 --- a/src/app/shared/headers/header-no-search/header-no-search.page.html +++ b/src/app/shared/headers/header-no-search/header-no-search.page.html @@ -10,7 +10,8 @@
- + +
@@ -56,7 +57,8 @@ -->
- + +
diff --git a/src/app/shared/headers/header-no-search/header-no-search.page.ts b/src/app/shared/headers/header-no-search/header-no-search.page.ts index 2eb9191cc..f793c1c79 100644 --- a/src/app/shared/headers/header-no-search/header-no-search.page.ts +++ b/src/app/shared/headers/header-no-search/header-no-search.page.ts @@ -4,6 +4,8 @@ import { SearchPage } from 'src/app/pages/search/search.page'; import { MenuController } from '@ionic/angular'; import { ProfileComponent } from './profile/profile.component'; import { Router } from '@angular/router'; +import { AuthService } from 'src/app/services/auth.service'; +import { User } from 'src/app/models/user.model'; @Component({ selector: 'app-header-no-search', templateUrl: './header-no-search.page.html', @@ -11,10 +13,16 @@ import { Router } from '@angular/router'; }) export class HeaderNoSearchPage implements OnInit { + loggeduser: User; + constructor(private modalController: ModalController, private menu: MenuController, private animationController: AnimationController, - private router: Router) { } + private router: Router, + authService: AuthService) { + + this.loggeduser = authService.ValidatedUser; + } ngOnInit() { }