SORMAS-Foundation#3354 - Fixed wrong comparison calculation for this year

MateStrysewske · MateStrysewske · commit c696df3e3d7e · 2020-11-05T12:54:26.000+01:00
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/dashboard/DashboardFilterLayout.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/dashboard/DashboardFilterLayout.java
@@ -515,7 +515,7 @@ private void setDateFilter(Date from, Date to) {
 	}
 
 	private void updateComparisonDates() {
-		if (activeComparisonButton == btnPeriodBefore) {
+		if (currentDateFilterType != DateFilterType.THIS_YEAR && activeComparisonButton == btnPeriodBefore) {
 			int activePeriodLength = currentDateFilterType == DateFilterType.THIS_WEEK
 				? 7
 				: DateHelper.getDaysBetween(dashboardDataProvider.getFromDate(), dashboardDataProvider.getToDate());

Original file line number	Diff line number	Diff line change
`@@ -515,7 +515,7 @@ private void setDateFilter(Date from, Date to) {`
`515`	`515`	`}`
`516`	`516`
`517`	`517`	`private void updateComparisonDates() {`
`518`		`- if (activeComparisonButton == btnPeriodBefore) {`
	`518`	`+ if (currentDateFilterType != DateFilterType.THIS_YEAR && activeComparisonButton == btnPeriodBefore) {`
`519`	`519`	`int activePeriodLength = currentDateFilterType == DateFilterType.THIS_WEEK`
`520`	`520`	`? 7`
`521`	`521`	`: DateHelper.getDaysBetween(dashboardDataProvider.getFromDate(), dashboardDataProvider.getToDate());`