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

Fixe ageanda timeline centalizer and header profile

Browse Source
This commit is contained in:
Peter Maquiran
2021-05-12 11:34:28 +01:00
parent 3df73c063a
commit 695bd3a6df
7 changed files with 60 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.ts
+23 -21
View File
@@ -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 `
<div class="overflow-hidden timeline-box timeline-box-event-${eventIndex} timeline-${profile_}-box-${calendarName} calendar-top${top}">
<div class="overflow-hidden timeline-box timeline-box-event-${eventIndex} timeline-${profile_}-box-${calendarName} calendar-top${top}">
<div>
<span class="timeline-start-time">${startHours.toString().padStart(2, '0')}:${startMinutos.toString().padStart(2, '0')}</span><span class="timeline-location">${eventlocation}</span>
</div>
@@ -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.");
}
src/app/shared/header-pr/header-pr.page.html
+4
View File
@@ -8,6 +8,10 @@
</div>
<div class="div-profile">
<ion-icon src='assets/images/icons-profile-pr.svg'></ion-icon>
<ion-icon class="font-45" *ngIf="loggeduser.Profile == 'MDGPR'" src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon class="font-45" *ngIf="loggeduser.Profile == 'PR' " src='assets/images/icons-profile-pr-header.svg'></ion-icon>
</div>
</div>
</ion-toolbar>
src/app/shared/header-pr/header-pr.page.ts
+9 -1
View File
@@ -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 {
src/app/shared/header/header.page.html
+4 -4
View File
@@ -12,10 +12,10 @@
</div>
<div class="div-profile">
<button class="btn-no-color" (click)="openProfile()">
<ion-icon class="font-45" *ngIf="profile == 'mdgpr' " src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon class="font-45" *ngIf="loggeduser.Profile == 'MDGPR'" src='assets/images/icons-profile.svg'></ion-icon>
</button>
<button class="btn-no-color" (click)="openProfile()">
<ion-icon class="font-45" *ngIf="profile == 'pr' " src='assets/images/icons-profile-pr-header.svg'></ion-icon>
<ion-icon class="font-45" *ngIf="loggeduser.Profile == 'PR' " src='assets/images/icons-profile-pr-header.svg'></ion-icon>
</button>
</div>
</div>
@@ -81,8 +81,8 @@
</div>
<div class="div-profile justify-end d-flex cursor-pointer" (click)="openProfile()">
<ion-icon class="font-45" *ngIf="profile == 'mdgpr' " src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon class="font-45" *ngIf="profile == 'pr' " src='assets/images/icons-profile-pr-header.svg'></ion-icon>
<ion-icon class="font-45" *ngIf="loggeduser.Profile == 'MDGPR'" src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon class="font-45" *ngIf="loggeduser.Profile == 'PR' " src='assets/images/icons-profile-pr-header.svg'></ion-icon>
</div>
</div>
</div>
src/app/shared/header/header.page.ts
+7 -6
View File
@@ -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) => {
src/app/shared/headers/header-no-search/header-no-search.page.html
+4 -2
View File
@@ -10,7 +10,8 @@
</div>
<div class="div-profile" (click)="openProfile()">
<ion-icon class="font-45" src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon class="font-45" *ngIf="loggeduser.Profile == 'MDGPR'" src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon class="font-45" *ngIf="loggeduser.Profile == 'PR' " src='assets/images/icons-profile-pr-header.svg'></ion-icon>
</div>
</div>
@@ -56,7 +57,8 @@
</div> -->
<div class="div-profile cursor-pointer" (click)="openProfile()">
<ion-icon src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon class="font-45" *ngIf="loggeduser.Profile == 'MDGPR'" src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon class="font-45" *ngIf="loggeduser.Profile == 'PR' " src='assets/images/icons-profile-pr-header.svg'></ion-icon>
</div>
</div>
</div>
src/app/shared/headers/header-no-search/header-no-search.page.ts
+9 -1
View File
@@ -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() {
}