Much more optimized bubble tree
[contractdashboard.git] / displayBubbletree.php
blob:a/displayBubbletree.php -> blob:b/displayBubbletree.php
--- a/displayBubbletree.php
+++ b/displayBubbletree.php
@@ -51,7 +51,7 @@
 
 $catthreesresult = $conn->prepare('SELECT substr( "categoryUNSPSC"::text, 0, 4 ) as cat , SUM( "value" ) as value
 FROM contractnotice
-WHERE "childCN" = 0 and "categoryUNSPSC" IS NOT NULL
+WHERE "childCN" is null and "categoryUNSPSC" IS NOT NULL
 GROUP BY cat order by cat ;');
 $catthreesresult->execute();
 		foreach ($catthreesresult->fetchAll() as $threerow) { 
@@ -59,7 +59,7 @@
 		}
 $nodes = Array();
 foreach ($cats as $catNum) {
-$catColor = $color->hsl2hex(Array($catNum/10, .7, .5));
+$catColor = $color->hsv2hex(Array($catNum/10, .7, abs(($catNum*(1/10))-.5) + .5));
 	$catName = $unspsc[$catNum . "0000000"] . $catNum;
 	$subnodes = Array();
 	$catValue = 0;
@@ -67,13 +67,13 @@
 		$subcatName = $unspsc[$twoCatNum. "000000"] .$twoCatNum;
 		$subsubnodes = Array();
 	$subCatValue = 0;
-		$subCatColor = $color->hsl2hex(Array($catNum/10, rand(1,10)/10, .5));
+		$subCatColor = $color->hsv2hex(Array($catNum/10, rand(1,10)/10, abs(($catNum*(1/10))-.5) + .5));
 		foreach ($catthrees[$twoCatNum] as $threerow) {
 			$subsubcatName = $unspsc[$threerow['cat'] . "00000"] . $threerow['cat'];
 			$subsubnodes[] = Array(
 				"label" => $subsubcatName,
 				"amount" => $threerow['value'],
-				"color" => "#".$subCatColor
+				//"color" => "#".$subCatColor
 			);
 			$subCatValue += $threerow['value'];
 		}