Add smart Filter selected value parameter in buildChartData method and pass to...

Add smart Filter selected value parameter in buildChartData method and pass to the drill down level dashboard. and check JSON String is null condition in bubble chart method.


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

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

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 
@@ -19,7 +20,7 @@ import com.google.gwt.xml.client.XMLParser;
 
 public class ChartCreator
 {
-	public static JSONObject buildChartData(ArrayList<ArrayList<String>> graphDtlList, JSONObject jsonObjGraph, String dataSource,ArrayList<String> parameterList,ArrayList<FilterInfo> filterList, String currentID)
+	public static JSONObject buildChartData(ArrayList<ArrayList<String>> graphDtlList, JSONObject jsonObjGraph, String dataSource,ArrayList<String> parameterList,ArrayList<FilterInfo> filterList, String currentID,HashMap<String, ArrayList<String>> selectedDataMap)
 	{
 		String key = "";
 		String currentvalue = "";
@@ -189,6 +190,32 @@ public class ChartCreator
 			toolTextDataList = new ArrayList<String>();
 			samePageOpenContainer = new SamePageOpenContainer();
 			
+			/*Added code for create Str of smart filter parameter by Dhanendra on date 06-01-2017*/
+			String smartFilterParameterStr = "";
+			if(selectedDataMap!=null)
+			{
+				for(Map.Entry<String, ArrayList<String>> entry:selectedDataMap.entrySet())
+				{
+					String colName = entry.getKey();
+					ArrayList<String> colValueList = selectedDataMap.get(colName);
+					String smtFilterParameterStrTemp = null;
+					for(String value:colValueList)
+					{
+						CommonUtils.printOnConsole("value :"+value);
+						if(smtFilterParameterStrTemp==null)
+						{
+							smtFilterParameterStrTemp = value;
+						}else
+						{
+							smtFilterParameterStrTemp = smtFilterParameterStrTemp+"," +value;
+						}
+					}
+					smartFilterParameterStr =smartFilterParameterStr+"&"+(colName+"@"+smtFilterParameterStrTemp);
+				}
+				CommonUtils.printOnConsole("smartFilterParameterStr :"+smartFilterParameterStr);	
+					
+			}
+			/*Ended code for create Str of smart filter parameter by Dhanendra on date 06-01-2017*/
 			
 			for (FilterInfo filterInfo : filterList)
 			{
@@ -615,6 +642,10 @@ public class ChartCreator
 											}
 											cnt1++;
 										}
+										
+										propertyStr = propertyStr + smartFilterParameterStr;
+										CommonUtils.printOnConsole("******* propertyStr ******* :"+propertyStr);
+										
 										if(prdFilterName.length()>0)
 										{
 											prdFilter=prdFilterName;
@@ -1638,10 +1669,14 @@ public class ChartCreator
 	public static JSONObject getBubbleChart(ArrayList<ArrayList<String>> graphDtlList, JSONObject jsonObjGraph, String dataSource)
 	{
 		JSONObject bubbleChartJson = new JSONObject();
+		if(jsonObjGraph!=null)
+		{
+			
 			JSONObject jsonObjFrGraph = (JSONObject) jsonObjGraph.get(dataSource);
 			
 			ArrayList<String> dataList = new ArrayList<String>();
 			ArrayList<String> labelList = new ArrayList<String>();
+			
 			ArrayList<LinkedHashMap<JSONValue, JSONValue>> allDataList = null;
 			ArrayList<LinkedHashMap<JSONValue, String>> dataListMap = null;
 			LinkedHashMap<JSONValue, String> dataMap = null;
@@ -1659,6 +1694,8 @@ public class ChartCreator
 				{
 					dataList = (ArrayList<String>) graphDtlList.get(i);
 				}
+				
+				
 			}
 			
 			dataListMap = new ArrayList<LinkedHashMap<JSONValue,String>>();
@@ -1721,6 +1758,7 @@ public class ChartCreator
 				allDataList.add(datasetMap);
 			}
 			bubbleChartJson.put("datasets", JSONParser.parseStrict(allDataList.toString().replace('=', ':')));
+		}
 		
 		return bubbleChartJson;
 	}