Merge pull request #36 from xdev-software/add-bardataset-stack

Add bardataset stack

Author: AB-xdev

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.0.1
+* Added support for [stacked bar chart with groups](https://www.chartjs.org/docs/latest/samples/bar/stacked-groups.html)
+
 ## 1.0.0
 Initial release
 

chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/BarDataset.java

@@ -29,7 +29,7 @@ public class BarDataset extends BackgroundBorderHoverDataset<BarDataset, BigDeci
 	private String xAxisID;
 	private String yAxisID;
 	private final List<BorderSkipped> borderSkipped = new OptionalArray<>();
-	
+	private String stack;
 
 	public String getLabel()
 	{
@@ -84,4 +84,15 @@ public BarDataset setBorderSkipped(final List<BorderSkipped> borderSkipped)
 		}
 		return this;
 	}
+	
+	public String getStack()
+	{
+		return this.stack;
+	}
+	
+	public BarDataset setStack(final String stack)
+	{
+		this.stack = stack;
+		return this;
+	}
 }

chartjs-java-model/src/test/java/software/xdev/chartjs/model/BarChartTest.java

@@ -90,8 +90,8 @@ void testStacked()
 			.addDataset(dataset1)
 			.addDataset(dataset2);
 
-		final BarOptions options = new BarOptions();
-		options.setAnimation(false);
+		final BarOptions options = new BarOptions()
+			.setAnimation(false);
 		options
 			.getScales()
 			.addScale(Scales.ScaleAxis.X, new BarScale<>().setStacked(true))
@@ -120,8 +120,8 @@ void testTicked()
 			.setMax(100)
 			.setStepSize(5);
 
-		final BarOptions options = new BarOptions();
-		options.setAnimation(false);
+		final BarOptions options = new BarOptions()
+			.setAnimation(false);
 		options
 			.getScales()
 			.addScale(Scales.ScaleAxis.Y, new BarScale<LinearTicks>().setTicks(ticks));
@@ -150,9 +150,9 @@ void testStackedHorizontal()
 			.addDataset(dataset1)
 			.addDataset(dataset2);
 
-		final BarOptions options = new BarOptions();
-		options.setAnimation(false);
-		options.setIndexAxis(BarOptions.IndexAxis.Y);
+		final BarOptions options = new BarOptions()
+			.setAnimation(false)
+			.setIndexAxis(BarOptions.IndexAxis.Y);
 		options
 			.getScales()
 			.addScale(Scales.ScaleAxis.X, new BarScale<>().setStacked(true))
@@ -164,4 +164,47 @@ void testStackedHorizontal()
 			"StackedHorizontal"
 		);
 	}
+	
+	@Test
+	void testStackedWithGroups()
+	{
+		// This test orients itself on https://www.chartjs.org/docs/4.4.0/samples/bar/stacked-groups.html
+		final BarDataset dataset1 = new BarDataset()
+			.setLabel("First stack")
+			.setData(65, 59, 80)
+			.addBackgroundColors(Color.RED, Color.RED, Color.RED)
+			.setStack("Stack 1");
+		
+		final BarDataset dataset2 = new BarDataset()
+			.setLabel("Second stack")
+			.setData(28, 45, 10)
+			.addBackgroundColors(Color.GREEN, Color.GREEN, Color.GREEN)
+			.setStack("Stack 1");
+		
+		final BarDataset dataset3 = new BarDataset()
+			.setLabel("Third stack")
+			.setData(10, 23, 45)
+			.addBackgroundColors(Color.BLUE, Color.BLUE, Color.BLUE)
+			.setStack("Stack 2");
+		
+		final BarData data = new BarData()
+			.addLabels("First", "Second", "Third")
+			.addDataset(dataset1)
+			.addDataset(dataset2)
+			.addDataset(dataset3);
+		
+		final BarOptions options = new BarOptions()
+			.setAnimation(false)
+			.setIndexAxis(BarOptions.IndexAxis.Y);
+		options
+			.getScales()
+			.addScale(Scales.ScaleAxis.X, new BarScale<>().setStacked(true))
+			.addScale(Scales.ScaleAxis.Y, new BarScale<>().setStacked(true));
+		
+		this.createScreenshotAndCompare(
+			new BarChart(data, options),
+			this.getWebContainer(),
+			"StackedWithGroups"
+		);
+	}
 }