Feature/epic 12880 dashboard disease clickable details

sormas-api/src/main/java/de/symeda/sormas/api/dashboard/BaseDashboardCriteria.java

@@ -22,6 +22,7 @@
 import de.symeda.sormas.api.infrastructure.district.DistrictReferenceDto;
 import de.symeda.sormas.api.infrastructure.region.RegionReferenceDto;
 import de.symeda.sormas.api.utils.criteria.BaseCriteria;
+import de.symeda.sormas.api.caze.NewCaseDateType;
 
 public class BaseDashboardCriteria<SELF extends BaseDashboardCriteria<?>> extends BaseCriteria {
 
@@ -34,6 +35,7 @@ public class BaseDashboardCriteria<SELF extends BaseDashboardCriteria<?>> extend
 	private Date dateTo;
 	private Date previousDateFrom;
 	private Date previousDateTo;
+	protected NewCaseDateType dateTypeClass;
 
 	protected BaseDashboardCriteria(final Class<SELF> selfClass) {
 		self = selfClass.cast(this);

sormas-api/src/main/java/de/symeda/sormas/api/dashboard/DashboardCriteria.java

@@ -2,6 +2,9 @@
 
 import de.symeda.sormas.api.CaseMeasure;
 import de.symeda.sormas.api.utils.criteria.CriteriaDateType;
+import de.symeda.sormas.api.caze.CaseClassification;
+import de.symeda.sormas.api.caze.CaseOutcome;
+import de.symeda.sormas.api.caze.NewCaseDateType;
 
 public class DashboardCriteria extends BaseDashboardCriteria<DashboardCriteria> {
 
@@ -10,6 +13,9 @@ public class DashboardCriteria extends BaseDashboardCriteria<DashboardCriteria>
 	private boolean showMinimumEntries;
 	private CaseMeasure caseMeasure;
 	private boolean includeNotACaseClassification;
+	private CaseClassification caseClassification;
+	private NewDateFilterType dateFilterType;
+	private CaseOutcome outcome;
 
 	public DashboardCriteria() {
 		super(DashboardCriteria.class);
@@ -48,4 +54,42 @@ public boolean isShowMinimumEntries() {
 	public CaseMeasure getCaseMeasure() {
 		return caseMeasure;
 	}
+
+	public CaseClassification getCaseClassification() {
+
+		return caseClassification;
+	}
+
+	public DashboardCriteria caseClassification(CaseClassification caseClassification) {
+
+		this.caseClassification = caseClassification;
+		return this;
+	}
+
+	public NewDateFilterType getDateFilterType() {
+
+		return dateFilterType;
+	}
+
+	public DashboardCriteria dateFilterType(NewDateFilterType dateFilterType) {
+
+		this.dateFilterType = dateFilterType;
+		return this;
+	}
+
+	public void setOutcome(CaseOutcome outcome) {
+
+		this.outcome = outcome;
+	}
+
+	public CaseOutcome getOutcome() {
+
+		return outcome;
+	}
+
+	public DashboardCriteria setDateTypeClass(NewCaseDateType dateTypeClass) {
+
+		this.dateTypeClass = dateTypeClass;
+		return this;
+	}
 }

sormas-api/src/main/java/de/symeda/sormas/api/dashboard/DashboardFacade.java

@@ -15,6 +15,7 @@
 import de.symeda.sormas.api.person.PresentCondition;
 import de.symeda.sormas.api.sample.PathogenTestResultType;
 import de.symeda.sormas.api.utils.criteria.CriteriaDateType;
+import de.symeda.sormas.api.Disease;
 
 @Remote
 public interface DashboardFacade {
@@ -59,4 +60,28 @@ List<DiseaseBurdenDto> getDiseaseBurden(
 		Date previousFromDate,
 		Date previousToDate,
 		CriteriaDateType newCaseDateType);
+
+	DiseaseBurdenDto getDiseaseForDashboard(
+			RegionReferenceDto regionRef,
+			DistrictReferenceDto districtRef,
+			Disease disease,
+			Date fromDate,
+			Date toDate,
+			Date previousFromDate,
+			Date previousToDate,
+			CriteriaDateType newCaseDateType,
+			CaseClassification caseClassification
+	);
+
+	DiseaseBurdenDto getDiseaseGridForDashboard(
+			RegionReferenceDto regionRef,
+			DistrictReferenceDto districtRef,
+			Disease disease,
+			Date from,
+			Date to,
+			Date previousFromDate,
+			Date previousToDate,
+			CriteriaDateType newCaseDateType,
+			CaseClassification caseClassification
+	);
 }

sormas-api/src/main/java/de/symeda/sormas/api/dashboard/NewDateFilterType.java

@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * Copyright © 2016-2018 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *******************************************************************************/
+package de.symeda.sormas.api.dashboard;
+
+public enum NewDateFilterType {
+    TODAY,
+    YESTERDAY,
+    THIS_WEEK,
+    LAST_WEEK,
+    THIS_YEAR,
+    CUSTOM;
+}