Merge branch 'develop' into feature/#38_remember_last_position_on_screen

Death111 · Death111 · commit 1e14e9e06bc5 · 2020-06-14T22:01:33.000+02:00
diff --git a/src/main/java/de/doubleslash/keeptime/view/ReportController.java b/src/main/java/de/doubleslash/keeptime/view/ReportController.java
@@ -132,7 +132,6 @@ private void initialize() {
       currentReportDate = LocalDate.now();
 
       colorTimeLine = new ColorTimeLine(colorTimeLineCanvas);
-      loadCalenderWidget();
       initTableView();
    }
 
@@ -243,6 +242,8 @@ private void updateReport(final LocalDate dateToShow) {
       this.currentDayTimeLabel.setText(DateFormatter.secondsToHHMMSS(currentSeconds));
       this.currentDayWorkTimeLabel.setText(DateFormatter.secondsToHHMMSS(currentWorkSeconds));
 
+      loadCalenderWidget();
+
    }
 
    private void loadCalenderWidget() {

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,6 @@ private void initialize() {`
`132`	`132`	`currentReportDate = LocalDate.now();`
`133`	`133`
`134`	`134`	`colorTimeLine = new ColorTimeLine(colorTimeLineCanvas);`
`135`		`- loadCalenderWidget();`
`136`	`135`	`initTableView();`
`137`	`136`	`}`
`138`	`137`
`@@ -243,6 +242,8 @@ private void updateReport(final LocalDate dateToShow) {`
`243`	`242`	`this.currentDayTimeLabel.setText(DateFormatter.secondsToHHMMSS(currentSeconds));`
`244`	`243`	`this.currentDayWorkTimeLabel.setText(DateFormatter.secondsToHHMMSS(currentWorkSeconds));`
`245`	`244`
	`245`	`+ loadCalenderWidget();`
	`246`	`+`
`246`	`247`	`}`
`247`	`248`
`248`	`249`	`private void loadCalenderWidget() {`