diff --git a/android/.idea/runConfigurations.xml b/android/.idea/runConfigurations.xml new file mode 100644 index 000000000..7f68460d8 --- /dev/null +++ b/android/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 1b9ecc95a..d19105c05 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -192,7 +192,7 @@ - + @@ -202,7 +202,7 @@ -
+
- - \ No newline at end of file diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index 8976ca2d6..e6d46a248 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -400,7 +400,7 @@ label{ padding: 0px 0px; } -.right-icons{ +.right-icons, .calendar-profile{ padding: 0px 9px } diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index f6edb9c43..fd75a9ce8 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -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 ` -
+
${startTime}${eventlocation}
@@ -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() { diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index bb8995fb1..679df1102 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -15,7 +15,8 @@
- + +
diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts index 6ad2ac28a..bda88e1b1 100644 --- a/src/app/shared/header/header.page.ts +++ b/src/app/shared/header/header.page.ts @@ -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() { } diff --git a/src/assets/images/icons-profile-calendar-md.svg b/src/assets/images/icons-profile-calendar-md.svg index c00684e68..50467ae8d 100644 --- a/src/assets/images/icons-profile-calendar-md.svg +++ b/src/assets/images/icons-profile-calendar-md.svg @@ -1,6 +1,6 @@ - + diff --git a/src/assets/images/icons-profile-calendar-pr.svg b/src/assets/images/icons-profile-calendar-pr.svg index c377a04b7..4cd7a439d 100644 --- a/src/assets/images/icons-profile-calendar-pr.svg +++ b/src/assets/images/icons-profile-calendar-pr.svg @@ -1,6 +1,6 @@ - - - + + + diff --git a/src/assets/images/icons-profile-pr-header.svg b/src/assets/images/icons-profile-pr-header.svg new file mode 100644 index 000000000..44951d8f4 --- /dev/null +++ b/src/assets/images/icons-profile-pr-header.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + PR + + + + + + diff --git a/src/global.scss b/src/global.scss index 2d929b05c..4bd338052 100644 --- a/src/global.scss +++ b/src/global.scss @@ -46,17 +46,19 @@ td.monthview-current{ justify-content: center; align-items: center; text-align: center; - color: white; + /* color: white; */ } } .monthview-secondary-with-event, .monthview-secondary-with-event[_ngcontent-dwf-c153] { background-color: white !important; + color: black !important; } +// selected date td.monthview-selected { background-color: #42b9fe30 !important; - color: black !important; + color: white !important; } .event-detail-container{ @@ -125,15 +127,27 @@ td.monthview-selected { } -.timeline-box-Pessoal{ +.timeline-pr-box-Pessoal{ + + border-left: 5px solid #99e47b !important; + height: 100%; +} +.timeline-pr-box-Oficial{ + + border-left: 5px solid #958bfc !important; + height: 100%; +} + + +.timeline-mdgpr-box-Oficial{ border-left: 5px solid #ffb703 !important; - height: 100%; } -.timeline-box-Oficial{ +.timeline-mdgpr-box-Pessoal{ border-left: 5px solid #f05d5e !important; - height: 100%; } + + .table-bordered, .table-bordered{ border: none !important; td, th { @@ -147,40 +161,46 @@ td.monthview-selected { .timeline-box-{} -.calendar-event-type-Oficial{ - border-right: 3px solid #f05d5e !important; +.calendar-event-border{ border-radius: 21px !important; color: black !important; margin: 0px auto !important; width: 35px !important; } - -.calendar-event-type-Pessoal{ +.calendar-mdgpr-event-type-Oficial{ + border-right: 3px solid #f05d5e !important; +} +.calendar-mdgpr-event-type-Pessoal{ border-left: 3px solid #ffb703 !important; - border-radius: 21px !important; - color: black !important; - margin: 0px auto !important; - width: 35px !important; +} +.calendar-mdgpr-event-type-both{ + border-left: 3px solid #ffb703 !important; + border-right: 3px solid #f05d5e !important; +} +.calendar-pr-event-type-both{ + border-left: 3px solid #99e47b !important; + border-right: 3px solid #958bfc !important; } -.calendar-event-type-both{ - border-radius: 21px !important; - border-left: 3px solid #ffb703 !important; - border-bottom: none !important; - border-right: 3px solid #f05d5e !important; - color: black !important; - margin: 0px auto !important; - width: 35px !important; +.calendar-pr-event-type-Oficial{ + border-left: 3px solid #99e47b !important; +} +.calendar-pr-event-type-Pessoal{ + border-left: 3px solid #958bfc !important; } .cal-hour-segment { border-bottom: none !important; } - - +// current day td.monthview-current{ border-bottom: 1px solid #3a87ad !important; + color: black !important; +} + +.calendar-profile{ + font-size: 36px } /* angular-cli file: src/styles.css */