Merge pull request SORMAS-Foundation#2965 from hzi-braunschweig/feature-2528-campaign-diagram-percentages

Feature 2528 campaign diagram percentages

Author: MateStrysewske

sormas-api/src/main/java/de/symeda/sormas/api/campaign/data/CampaignFormDataCriteria.java

@@ -15,15 +15,15 @@
 
 package de.symeda.sormas.api.campaign.data;
 
-import java.io.Serializable;
-
 import de.symeda.sormas.api.BaseCriteria;
 import de.symeda.sormas.api.campaign.CampaignReferenceDto;
 import de.symeda.sormas.api.campaign.form.CampaignFormMetaReferenceDto;
 import de.symeda.sormas.api.region.CommunityReferenceDto;
 import de.symeda.sormas.api.region.DistrictReferenceDto;
 import de.symeda.sormas.api.region.RegionReferenceDto;
 
+import java.io.Serializable;
+
 public class CampaignFormDataCriteria extends BaseCriteria implements Serializable {
 
 	public static final String CAMPAIGN = "campaign";

sormas-api/src/main/java/de/symeda/sormas/api/campaign/data/CampaignFormDataFacade.java

@@ -20,15 +20,14 @@
 
 package de.symeda.sormas.api.campaign.data;
 
-import java.util.List;
-
-import javax.ejb.Remote;
-
 import de.symeda.sormas.api.campaign.diagram.CampaignDiagramCriteria;
 import de.symeda.sormas.api.campaign.diagram.CampaignDiagramDataDto;
 import de.symeda.sormas.api.campaign.diagram.CampaignDiagramSeries;
 import de.symeda.sormas.api.utils.SortProperty;
 
+import javax.ejb.Remote;
+import java.util.List;
+
 @Remote
 public interface CampaignFormDataFacade {
 
@@ -50,5 +49,5 @@ public interface CampaignFormDataFacade {
 
 	long count(CampaignFormDataCriteria criteria);
 
-	List<CampaignDiagramDataDto> getDiagramData(List<CampaignDiagramSeries> diagramSeriesList, CampaignDiagramCriteria campaignDiagramCriteria);
+	List<CampaignDiagramDataDto> getDiagramData(List<CampaignDiagramSeries> diagramSeries, CampaignDiagramCriteria campaignDiagramCriteria);
 }

sormas-api/src/main/java/de/symeda/sormas/api/campaign/diagram/CampaignDiagramDataDto.java

@@ -10,7 +10,7 @@ public class CampaignDiagramDataDto implements Serializable {
 	private String formId;
 	private String fieldId;
 	private String fieldCaption;
-	private Object valueSum;
+	private Number valueSum;
 	private Object groupingKey;
 	private String groupingCaption;
 
@@ -19,7 +19,7 @@ public CampaignDiagramDataDto(
 		String formId,
 		String fieldId,
 		String fieldCaption,
-		Object valueSum,
+		Number valueSum,
 		Object groupingKey,
 		String groupingCaption) {
 		this.formMetaUuid = formMetaUuid;
@@ -64,11 +64,11 @@ public void setFieldCaption(String fieldCaption) {
 		this.fieldCaption = fieldCaption;
 	}
 
-	public Object getValueSum() {
+	public Number getValueSum() {
 		return valueSum;
 	}
 
-	public void setValueSum(Object valueSum) {
+	public void setValueSum(Number valueSum) {
 		this.valueSum = valueSum;
 	}
 

sormas-api/src/main/java/de/symeda/sormas/api/campaign/diagram/CampaignDiagramDefinitionDto.java

@@ -1,15 +1,17 @@
 package de.symeda.sormas.api.campaign.diagram;
 
-import java.util.List;
-
 import de.symeda.sormas.api.EntityDto;
 
+import java.util.List;
+
 public class CampaignDiagramDefinitionDto extends EntityDto {
 
 	private String diagramId;
 	private String diagramCaption;
 	private DiagramType diagramType;
-	private List<CampaignDiagramSeries> campaignDiagramSeriesList;
+	private List<CampaignDiagramSeries> campaignDiagramSeries;
+	private List<CampaignDiagramSeries> campaignSeriesTotal;
+	private boolean percentageDefault;
 
 	public String getDiagramId() {
 		return diagramId;
@@ -35,11 +37,27 @@ public void setDiagramType(DiagramType diagramType) {
 		this.diagramType = diagramType;
 	}
 
-	public List<CampaignDiagramSeries> getCampaignDiagramSeriesList() {
-		return campaignDiagramSeriesList;
+	public List<CampaignDiagramSeries> getCampaignDiagramSeries() {
+		return campaignDiagramSeries;
+	}
+
+	public void setCampaignDiagramSeries(List<CampaignDiagramSeries> campaignDiagramSeries) {
+		this.campaignDiagramSeries = campaignDiagramSeries;
+	}
+
+	public List<CampaignDiagramSeries> getCampaignSeriesTotal() {
+		return campaignSeriesTotal;
+	}
+
+	public void setCampaignSeriesTotal(List<CampaignDiagramSeries> campaignSeriesTotal) {
+		this.campaignSeriesTotal = campaignSeriesTotal;
+	}
+
+	public boolean isPercentageDefault() {
+		return percentageDefault;
 	}
 
-	public void setCampaignDiagramSeriesList(List<CampaignDiagramSeries> campaignDiagramSeriesList) {
-		this.campaignDiagramSeriesList = campaignDiagramSeriesList;
+	public void setPercentageDefault(boolean percentageDefault) {
+		this.percentageDefault = percentageDefault;
 	}
 }

sormas-api/src/main/java/de/symeda/sormas/api/campaign/diagram/CampaignDiagramSeries.java

@@ -9,16 +9,16 @@ public class CampaignDiagramSeries implements Serializable {
 
 	private String fieldId;
 	private String formId;
-	private String fieldValue;
+	private String referenceValue;
 	private String stack;
 
 	public CampaignDiagramSeries() {
 	}
 
-	public CampaignDiagramSeries(String fieldId, String formId, String fieldValue, String stack) {
+	public CampaignDiagramSeries(String fieldId, String formId, String referenceValue, String stack) {
 		this.fieldId = fieldId;
 		this.formId = formId;
-		this.fieldValue = fieldValue;
+		this.referenceValue = referenceValue;
 		this.stack = stack;
 	}
 
@@ -38,12 +38,12 @@ public void setFormId(String formId) {
 		this.formId = formId;
 	}
 
-	public String getFieldValue() {
-		return fieldValue;
+	public String getReferenceValue() {
+		return referenceValue;
 	}
 
-	public void setFieldValue(String fieldValue) {
-		this.fieldValue = fieldValue;
+	public void setReferenceValue(String referenceValue) {
+		this.referenceValue = referenceValue;
 	}
 
 	public String getStack() {
@@ -56,17 +56,19 @@ public void setStack(String stack) {
 
 	@Override
 	public boolean equals(Object o) {
-		if (this == o) return true;
-		if (o == null || getClass() != o.getClass()) return false;
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
 		CampaignDiagramSeries that = (CampaignDiagramSeries) o;
-		return Objects.equals(fieldId, that.fieldId) &&
-				Objects.equals(formId, that.formId) &&
-				Objects.equals(fieldValue, that.fieldValue) &&
-				Objects.equals(stack, that.stack);
+		return Objects.equals(fieldId, that.fieldId)
+			&& Objects.equals(formId, that.formId)
+			&& Objects.equals(referenceValue, that.referenceValue)
+			&& Objects.equals(stack, that.stack);
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(fieldId, formId, fieldValue, stack);
+		return Objects.hash(fieldId, formId, referenceValue, stack);
 	}
 }

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java

@@ -617,7 +617,9 @@ public interface Captions {
 	String dashboardShowEvents = "dashboardShowEvents";
 	String dashboardShowFirstDiseases = "dashboardShowFirstDiseases";
 	String dashboardShowMinimumEntries = "dashboardShowMinimumEntries";
+	String dashboardShowPercentageValues = "dashboardShowPercentageValues";
 	String dashboardShowRegions = "dashboardShowRegions";
+	String dashboardShowTotalValues = "dashboardShowTotalValues";
 	String dashboardShowUnconfirmedContacts = "dashboardShowUnconfirmedContacts";
 	String dashboardSuspect = "dashboardSuspect";
 	String dashboardSymptomatic = "dashboardSymptomatic";

sormas-api/src/main/resources/captions.properties

@@ -715,6 +715,8 @@ dashboardLastReportedDistrict=Last reported district
 dashboardFollowUpStatusChart=Follow-up Status Chart
 dashboardContactClassificationChart=Contact Classification Chart
 dashboardFollowUpUntilChart=Follow-Up Until Chart
+dashboardShowPercentageValues=Show percentage values
+dashboardShowTotalValues=Show total values
 
 defaultRegion=Default Region
 defaultDistrict=Default District

sormas-api/src/main/resources/captions_de-DE.properties

@@ -699,6 +699,8 @@ dashboardLastReportedDistrict=Zuletzt gemeldeter Landkreis
 dashboardFollowUpStatusChart=Nachverfolgungs-Statusdiagramm
 dashboardContactClassificationChart=Kontakt-Definitionskategorien-Diagramm
 dashboardFollowUpUntilChart=Nachverfolgung bis- Diagramm
+dashboardShowPercentageValues=Prozentwerte anzeigen
+dashboardShowTotalValues=Gesamtwerte anzeigen
 
 defaultRegion=Voreingestellte Bundesländer
 defaultDistrict=Voreingestellter Landkreis