Merge branch 'develop' into bugfix/timeseriesLegendFix

Author: DanielSteger

frontend/src/app/modules/time-series/components/time-series-line-chart/time-series-line-chart.component.ts

@@ -30,11 +30,14 @@ export class TimeSeriesLineChartComponent implements AfterContentInit, OnChanges
   @ViewChild("svg")
   svgElement: ElementRef;
 
+  public ngxSmartModalService;
+
   private _resizeTimeoutId: number;
 
   constructor(private lineChartService: LineChartService,
-              private ngxSmartModalService: NgxSmartModalService,
-              private spinnerService: SpinnerService) {
+              private spinnerService: SpinnerService,
+              ngxSmartModalService: NgxSmartModalService) {
+    this.ngxSmartModalService = ngxSmartModalService;
   }
 
   ngAfterContentInit(): void {

frontend/src/app/modules/time-series/time-series.component.ts

@@ -15,8 +15,7 @@ import {BehaviorSubject} from 'rxjs';
 })
 export class TimeSeriesComponent implements OnInit {
 
-  private showTimeSeriesChart = false;
-
+  public showTimeSeriesChart = false;
   public results$ = new BehaviorSubject<EventResultDataDTO>(new EventResultData());
 
   constructor(private linechartDataService: LinechartDataService, private resultSelectionStore: ResultSelectionStore) { }