[contractdashboard.git] / displayBubbletree.php
--- a/displayBubbletree.php
+++ b/displayBubbletree.php
@@ -1,4 +1,6 @@
-
+<?php
+include_once ("lib/common.inc.php");
+?>
 <!DOCTYPE html> 
 <html xmlns="http://www.w3.org/1999/xhtml"> 
 <head> 
@@ -17,9 +19,7 @@
 	<script type="text/javascript"> 
        
 		$(function() {
-		<?php
-include_once ("lib/common.inc.php");
-
+<?php
 include("lib/Color.php");
 $color = new Lux_Color();
 
@@ -60,29 +60,29 @@
 $nodes = Array();
 foreach ($cats as $catNum) {
 $catColor = $color->hsv2hex(Array($catNum/10, .7, abs(($catNum*(1/10))-.5) + .5));
-	$catName = substr($unspsc[$catNum . "000000"],0,18) . $catNum;
+	$catName = substr($unspsc[$catNum . "000000"],0,18);
 	$subnodes = Array();
 	$catValue = 0;
 	foreach ($cattwos[$catNum] as $twoCatNum) {
-		$subcatName = $unspsc[$twoCatNum. "0000"] .$twoCatNum;
+		$subcatName = $unspsc[$twoCatNum. "0000"];
 		$subsubnodes = Array();
-	$subCatValue = 1;
+		$subCatValue = 1;
 		$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'] . "00"] . $threerow['cat'];
+			/*$subsubcatName = $unspsc[$threerow['cat'] . "00"];
 			$subsubnodes[] = Array(
 				"label" => $subsubcatName,
 				"amount" => $threerow['value'],
 				"color" => "#".$subCatColor
-			);
+			);*/
 			$subCatValue += $threerow['value'];
 		}
-		$subnodes[] = Array(
+		/*$subnodes[] = Array(
 			"label" => $subcatName,
 			"amount" => $subCatValue,
 			"color" => "#".$subCatColor,
 			"children" => $subsubnodes
-		);
+		);*/
 		$catValue += $subCatValue;
 	}
 	$nodes[] = Array(
@@ -99,7 +99,7 @@
 	"color" => "#000000",
 	"children" => $nodes
 );
-echo "var data =eval('('+'" . json_encode($data) . "'+')');";
+echo "var data = JSON.parse('" . str_replace(",",",",json_encode($data)) . "');";
 ?>
 
 			new BubbleTree({