Merge pull request SORMAS-Foundation#4233 from hzi-braunschweig/3349-switch_from_column_to_bar_chart

MateStrysewske · web-flow · commit 85816ce96328 · 2021-02-04T10:45:20.000+01:00
SORMAS-Foundation#3349: read value of the "diagramType" column in the database
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/dashboard/campaigns/CampaignDashboardDiagramComponent.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/dashboard/campaigns/CampaignDashboardDiagramComponent.java
@@ -65,7 +65,7 @@ public CampaignDashboardDiagramComponent(
 			totalValuesWithoutStacks = true;
 		}
 
-		showAsColumnChart = DiagramType.values().length > 0 && DiagramType.COLUMN == DiagramType.values()[0];
+		showAsColumnChart = DiagramType.COLUMN == diagramDefinition.getDiagramType();
 		campaignColumnChart = new HighChart();
 
 		setSizeFull();

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public CampaignDashboardDiagramComponent(`
`65`	`65`	`totalValuesWithoutStacks = true;`
`66`	`66`	`}`
`67`	`67`
`68`		`- showAsColumnChart = DiagramType.values().length > 0 && DiagramType.COLUMN == DiagramType.values()[0];`
	`68`	`+ showAsColumnChart = DiagramType.COLUMN == diagramDefinition.getDiagramType();`
`69`	`69`	`campaignColumnChart = new HighChart();`
`70`	`70`
`71`	`71`	`setSizeFull();`