Merge branch 'development' of https://github.com/hzi-braunschweig/SORMAS-Project into 3110-Incorrect_behavior_on_Person_forms_related_to_Facility_fields

sergiupacurariu · sergiupacurariu · commit fe47731f22c3 · 2020-10-13T10:16:05.000+03:00
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
@@ -138,7 +138,7 @@ public void buildDiagramChart(String title) {
 		}
 		if (stackMap.size() > 1) {
 			hcjs.append(
-					", stackLabels: {enabled: true,verticalAlign: 'bottom',crop: false, rotation: 45, x:20,y: 20, overflow: 'none',y: 20,formatter: function() {  return this.stack;},style: {  color: 'grey'}}");
+					", stackLabels: {enabled: true,verticalAlign: 'bottom', allowOverlap: true, crop: false, rotation: 45, x:20,y: 20, overflow: 'none',y: 20,formatter: function() {  return this.stack;},style: {  color: 'grey'}}");
 		}
 		hcjs.append("},");
 		//@formatter:on

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ public void buildDiagramChart(String title) {`
`138`	`138`	`}`
`139`	`139`	`if (stackMap.size() > 1) {`
`140`	`140`	`hcjs.append(`
`141`		`- ", stackLabels: {enabled: true,verticalAlign: 'bottom',crop: false, rotation: 45, x:20,y: 20, overflow: 'none',y: 20,formatter: function() { return this.stack;},style: { color: 'grey'}}");`
	`141`	`+ ", stackLabels: {enabled: true,verticalAlign: 'bottom', allowOverlap: true, crop: false, rotation: 45, x:20,y: 20, overflow: 'none',y: 20,formatter: function() { return this.stack;},style: { color: 'grey'}}");`
`142`	`142`	`}`
`143`	`143`	`hcjs.append("},");`
`144`	`144`	`//@formatter:on`