From 439fb12b6eb1ca8f4329a9711b93d0c4094a0330 Mon Sep 17 00:00:00 2001
From: Roland Schneider <rschneider@ucs.at>
Date: Sun, 3 Oct 2021 09:30:51 +0200
Subject: [PATCH] improve navigation active color; fix calendar dropdown
 initialization

---
 customer/app/src/app/app.module.ts            |  1 -
 .../fit-navigation.component.ts               |  2 +-
 .../month-calendar.component.ts               | 10 ++++++++-
 customer/app/src/styles.scss                  |  1 +
 customer/app/src/styles/event.themes.scss     |  2 +-
 customer/app/src/styles/fit-navbar.theme.scss | 22 +++++++++++++++++++
 6 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 customer/app/src/styles/fit-navbar.theme.scss

diff --git a/customer/app/src/app/app.module.ts b/customer/app/src/app/app.module.ts
index 9fbc8dc..7556864 100644
--- a/customer/app/src/app/app.module.ts
+++ b/customer/app/src/app/app.module.ts
@@ -12,7 +12,6 @@ import { LoginComponent } from './pages/login/login.component';
 import { ProfileComponent } from './pages/profile/profile.component';
 import { JwtInterceptor, ErrorInterceptor } from './_helpers';
 import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
-import { fakeBackendProvider } from './_helpers';
 import {ReactiveFormsModule} from "@angular/forms";
 import { EventsComponent } from './pages/events/events.component';
 import { FitEventTypesComponent } from './components/fit-event-types/fit-event-types.component';
diff --git a/customer/app/src/app/components/fit-navigation/fit-navigation.component.ts b/customer/app/src/app/components/fit-navigation/fit-navigation.component.ts
index 0aa2e73..7d3611e 100644
--- a/customer/app/src/app/components/fit-navigation/fit-navigation.component.ts
+++ b/customer/app/src/app/components/fit-navigation/fit-navigation.component.ts
@@ -13,7 +13,7 @@ export class FitNavigationComponent implements OnInit {
   items: MenuItem[] = [
     {
       route: '/home',
-      label: 'Órarend',
+      label: 'Naptár',
       roles: ['*']
     },
     // {
diff --git a/customer/app/src/app/components/month-calendar/month-calendar.component.ts b/customer/app/src/app/components/month-calendar/month-calendar.component.ts
index c5b8517..f9258ab 100644
--- a/customer/app/src/app/components/month-calendar/month-calendar.component.ts
+++ b/customer/app/src/app/components/month-calendar/month-calendar.component.ts
@@ -51,7 +51,6 @@ export class MonthCalendarComponent implements OnInit  {
 
   ngOnInit() {
     this.initialized = false ;
-    console.info("init", this.timeTableFilter);
     moment.locale('hu');
     this.formTimeTable.patchValue({
       "idTrainer": this._timeTableFilter.idTrainer,
@@ -63,6 +62,14 @@ export class MonthCalendarComponent implements OnInit  {
   @Input()
   set timeTableFilter(timeTableFilter: TimeTableFilter){
     this._timeTableFilter = timeTableFilter;
+    let idTrainer = timeTableFilter?.idTrainer == null ? "-1" : timeTableFilter?.idTrainer;
+    let idEventType = timeTableFilter?.idEventType == null ? "-1" : timeTableFilter?.idEventType;
+    console.info("run time table filter", timeTableFilter, idTrainer,idEventType);
+
+    this.formTimeTable.patchValue({
+      "idTrainer": idTrainer,
+      "idEventType": idEventType
+    })
     this.loadData();
   }
 
@@ -126,6 +133,7 @@ export class MonthCalendarComponent implements OnInit  {
     return filteredDays;
   }
 
+
   private loadData(){
     if ( !this._eventsAvailableResponse ){
       return ;
diff --git a/customer/app/src/styles.scss b/customer/app/src/styles.scss
index 6f5e9c1..80dc2b7 100644
--- a/customer/app/src/styles.scss
+++ b/customer/app/src/styles.scss
@@ -56,6 +56,7 @@ $btn-border-radius: $border-radius-0;
 @import "styles/bootstrap-custom";
 @import "styles/fonts";
 @import "styles/event.themes";
+@import "styles/fit-navbar.theme";
 html{
   height: 100%;
 }
diff --git a/customer/app/src/styles/event.themes.scss b/customer/app/src/styles/event.themes.scss
index 3539b40..e444a2d 100644
--- a/customer/app/src/styles/event.themes.scss
+++ b/customer/app/src/styles/event.themes.scss
@@ -37,7 +37,7 @@ $event-themes: (
 
 @each $name, $color in $event-themes {
 
-  @debug "event theme - divider offset:";
+  //@debug "event theme - divider offset:";
 
   .event-theme-normal-#{$name} {
     .event-bar{
diff --git a/customer/app/src/styles/fit-navbar.theme.scss b/customer/app/src/styles/fit-navbar.theme.scss
new file mode 100644
index 0000000..5f56a32
--- /dev/null
+++ b/customer/app/src/styles/fit-navbar.theme.scss
@@ -0,0 +1,22 @@
+$navbar-color: $primary;
+.fit-navbar .navbar-nav > .nav-item > .nav-link:hover, .fit-navbar .navbar-nav > .nav-item > .nav-link:focus {
+  color: $navbar-color !important;
+}
+
+.fit-navbar .navbar-nav > .nav-item.active > a {
+  color: $navbar-color !important;
+}
+
+.fit-navbar .navbar-nav > .nav-item.active > a:after {
+  opacity: 1;
+  background: $navbar-color !important;
+}
+
+.fit-navbar .navbar-nav > .nav-item.active > a {
+  color: $navbar-color !important;
+}
+
+.fit-navbar .navbar-nav > .nav-item.active > a:after {
+  opacity: 1;
+  background: $navbar-color !important;
+}