Modify BuildChart.js and GaugeChartBuilder.java.

change gauge chart id logic to show multiple gauge chart.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98550 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dashboard/GWT-Component/src/ibase/client/GaugeChartBuilder.java

@@ -14,8 +14,9 @@ public class GaugeChartBuilder
 
 	public JSONObject buildGaugeChart(ArrayList<ArrayList<String>> graphDtlList, JSONObject jsonObjGraph, String dataSource)
 	{
-			
+		//Window.alert("jsonObjGraph =="+jsonObjGraph);	
 		JSONObject jsonObjFrGraph = (JSONObject) jsonObjGraph.get(dataSource);
+		//Window.alert("jsonObjFrGraph =="+jsonObjFrGraph);
 		JSONObject fetchRowWiseVal = null;
 		JSONObject graphJson = new JSONObject();
 
@@ -95,21 +96,28 @@ public class GaugeChartBuilder
 		
 		
 		
-		for (int jsnCnt = 0; jsnCnt < jsonObjFrGraph.size(); jsnCnt++)
-		{
-			barMap = new LinkedHashMap<JSONValue, JSONValue>();
-			fetchRowWiseVal = (JSONObject) jsonObjFrGraph.get(String.valueOf(jsnCnt));
-			for (String idName : dataList)
-			{
-				 data = fetchRowWiseVal.get(idName).toString().replace('"', ' ');
-				if (data.trim().length() != 0)
+				
+				for (int jsnCnt = 0; jsnCnt < jsonObjFrGraph.size(); jsnCnt++)
 				{
-					barMap.put(new JSONString(idName), fetchRowWiseVal.get(idName));
+					barMap = new LinkedHashMap<JSONValue, JSONValue>();
+					fetchRowWiseVal = (JSONObject) jsonObjFrGraph.get(String.valueOf(jsnCnt));
+					
+					for (String idName : dataList)
+						{
+							if (fetchRowWiseVal.get(idName) != null)
+							{
+								data = fetchRowWiseVal.get(idName).toString().replace('"', ' ');
+							if (data.trim().length() != 0)
+							{
+								barMap.put(new JSONString("refresh"), fetchRowWiseVal.get(idName));
+							}
+						}
+				 }
+					if (!barMap.isEmpty())
+					{
+					allDataList.add(barMap);
+					}
 				}
-			}
-			allDataList.add(barMap);
-		}
-		
 		
 		
 		/*barMap.put(new JSONString("refresh"),new JSONString("70"));

webitm-dashboard/GWT-Component/war/FusionChart/js/BuildChart.js

@@ -505,12 +505,12 @@ function createGaugeChart(jsonObj, chartContainer, height, width) {
 	
 	var parsedData = JSON.parse(jsonObj);
 	var innerDiv = document.createElement('canvas');
-	innerDiv.id = "canvasDiv"
+	innerDiv.id = "canvasDiv"+chartContainer;
 	innerDiv.width = parsedData.metaData[0].width;
 	innerDiv.height = parsedData.metaData[0].height;
 
 	document.getElementById(chartContainer).appendChild(innerDiv);
-	var aGauge = aGauge = new AquaGauge('canvasDiv');
+	var aGauge = aGauge = new AquaGauge('canvasDiv'+chartContainer);
 
 	aGauge.props.minValue = parsedData.metaData[0].minValue;
 	aGauge.props.maxvalue = parsedData.metaData[0].maxValue;