Merge pull request #214 from wmde/fix_color_order

Fix color order in pie chart.
wmde · Feb 15, 2016 · bc21143 · bc21143
2 parents 77bc155 + 0b15ea0
commit bc21143
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/app/Phragile/PieChart.php b/app/Phragile/PieChart.php
@@ -36,7 +36,7 @@ private function sortByCssClass(array $data)
 	{
 		uasort($data, function($a, $b)
 		{
-			return $a < $b ? 1 : -1;
+			return $a['cssClass'] > $b['cssClass'] ? 1 : -1;
 		});
 
 		return $data;

diff --git a/tests/unit/PieChartTest.php b/tests/unit/PieChartTest.php
@@ -72,4 +72,23 @@ public function testHasCssClassAsKeys()
 		$this->assertArrayHasKey('closed deployed', $colorMap);
 		$this->assertArrayHasKey('closed wontfix', $colorMap);
 	}
+
+	public function testOrdersByCssClass()
+	{
+		$chart = new PieChart(
+			[
+				'Done' => ['points' => 10],
+				'Doing' => ['points' => 11],
+				'Blocked By Others' => ['points' => 12],
+				'Deployed' => ['points' => 13]
+			],
+			new StatusCssClassService(true, ['Done', 'Deployed'])
+		);
+
+		$colorMap = array_values($chart->getData());
+		$this->assertSame($colorMap[0]['cssClass'], 'closed deployed');
+		$this->assertSame($colorMap[1]['cssClass'], 'closed done');
+		$this->assertSame($colorMap[2]['cssClass'], 'open blocked-by-others');
+		$this->assertSame($colorMap[3]['cssClass'], 'open doing');
+	}
 }