Merge remote-tracking branch 'origin/feature/calendar' into developer

This commit is contained in:
tiago.kayaya
2021-02-02 09:28:36 +01:00
10 changed files with 120 additions and 38 deletions
+2 -4
View File
@@ -192,7 +192,7 @@
</div>
</div>
</ion-header>
<ion-content>
<ion-content class="timeline">
<!-- Progress bar -->
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
@@ -202,7 +202,7 @@
</ion-refresher>
<!-- Timeline -->
<div *ngIf="showTimeline">
<div class="timeline-container" *ngIf="showTimeline">
<mwl-demo-utils-calendar-header class="timeline"
[(view)]="view"
[(viewDate)]="viewDate"
@@ -220,6 +220,4 @@
</mwl-calendar-day-view>
</div>
</div>
</ion-content>
+1 -1
View File
@@ -400,7 +400,7 @@ label{
padding: 0px 0px;
}
.right-icons{
.right-icons, .calendar-profile{
padding: 0px 9px
}
+23 -3
View File
@@ -151,6 +151,21 @@ export class AgendaPage implements OnInit {
setCookie('searchModalAPPType','0', 99999999);
this.showLoader = false;
// auto scroll
setTimeout(() => {
const timelineMarker = document.querySelector('.cal-current-time-marker');
const timelineContainer = document.querySelectorAll('ion-content')[2];
const shadowRoot = timelineContainer.shadowRoot;
const scrollContainer = shadowRoot.querySelector('main');
scrollContainer.scrollTop = timelineMarker['offsetTop'] - (window.screen.availHeight - (91 + 337 +56+140));
}, 2000);
}
ngOnInit() {
@@ -208,9 +223,9 @@ export class AgendaPage implements OnInit {
eventTypeNum = (Object.keys(eventType)).length
if (eventTypeNum == 2) {
return 'calendar-event-type-both';
return `calendar-${this.profile}-event-type-both`;
} else {
return 'calendar-event-type-'+(Object.keys(eventType))[0];
return `calendar-${this.profile}-event-type-`+(Object.keys(eventType))[0];
}
}
@@ -295,7 +310,7 @@ export class AgendaPage implements OnInit {
timeLineTemplate(startTime: string, eventlocation: string, eventDiscription: any, calendarName: string, subject: string): string{
return `
<div class="timeline-box timeline-box-${calendarName}">
<div class="timeline-box timeline-${this.profile}-box-${calendarName}">
<div>
<span class="timeline-start-time">${startTime}</span><span class="timeline-location">${eventlocation}</span>
</div>
@@ -501,6 +516,7 @@ export class AgendaPage implements OnInit {
this.alertCrontroller.presentAlert("Funcionalidade em desenvolvimento.");
}
changeProfile(){
if(this.profile == "mdgpr"){
console.log('pr');
this.profile ="pr";
@@ -511,6 +527,10 @@ export class AgendaPage implements OnInit {
this.profile ="mdgpr";
this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
}
// change header profile picture
window['header'](this.profile);
}
async openAddEvent() {
+2 -1
View File
@@ -15,7 +15,8 @@
</ion-col>
<ion-col>
<div class="div-profile">
<ion-icon src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon *ngIf="profile == 'mdgpr' " src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon *ngIf="profile == 'pr' " src='assets/images/icons-profile-pr-header.svg'></ion-icon>
</div>
</ion-col>
</ion-row>
+9 -1
View File
@@ -9,7 +9,15 @@ import { SearchPage } from 'src/app/pages/search/search.page';
})
export class HeaderPage implements OnInit {
constructor(private modalController: ModalController) { }
profile: string = 'mdgpr';
constructor(private modalController: ModalController) {
window['header'] = (profile:string) => {
this.profile = profile;
}
}
ngOnInit() {
}