Updated Dashboardutil.java class

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

webitm-dashboard/ibase/dashboard/common/hibernate/dao/DashboardUtil.java

@@ -330,9 +330,64 @@ public class DashboardUtil
 		}
 		finalDataObj.put("measures", pivotValueArray);
 		//finalDataObj1.put("slice", finalDataObj);
-		System.out.println("component type pivot-grid column:::: "+finalDataObj);
+		
+		/*
+		showTotals – String. 
+		Specifies how to show totals: 
+			in rows ("rows"), 
+			in columns ("columns"), 
+			in rows and columns ("on") 
+			or hide them ("off"). 
+		Default value is "off".
+		*/
+		String subtotalsRow = pivotRowObj.optString("subtotals");
+		String subtotalsCol = pivotColObj.optString("subtotals");
+		String showTotals = "off";
 
+		if( "true".equalsIgnoreCase(subtotalsRow) && "true".equalsIgnoreCase(subtotalsCol) )
+		{
+			showTotals = "on";
+		}
+		else if( "true".equalsIgnoreCase(subtotalsRow) )
+		{
+			showTotals = "rows";
+		}
+		else if( "true".equalsIgnoreCase(subtotalsCol) )
+		{
+			showTotals = "columns";
+		}
+		
+		finalDataObj.put("showTotals", showTotals);
+		
+		/*
+		showGrandTotals – String. 
+		Specifies how to show grand totals: 
+			in rows ("rows"), 
+			in columns ("columns"), 
+			in rows and columns ("on") 
+			or hide them ("off"). 
+		Default value is "on".
+		*/
+		String grandtotalsRow = pivotRowObj.optString("grandtotals");
+		String grandtotalsCol = pivotColObj.optString("grandtotals");
+		String showGrandTotals = "off";
+		
+		if( "true".equalsIgnoreCase(grandtotalsRow) && "true".equalsIgnoreCase(grandtotalsCol) )
+		{
+			showGrandTotals = "on";
+		}
+		else if( "true".equalsIgnoreCase(grandtotalsRow) )
+		{
+			showGrandTotals = "rows";
+		}
+		else if( "true".equalsIgnoreCase(grandtotalsCol) )
+		{
+			showGrandTotals = "columns";
+		}
 
+		finalDataObj.put("showGrandTotals", showGrandTotals);
+		
+		System.out.println("component type pivot-grid column:::: "+finalDataObj);
 
 		return finalDataObj;
 	}
@@ -428,6 +483,7 @@ public class DashboardUtil
 			filter.put("help_option", checkNull(pophelpData.getHelpOption()));
 			filter.put("multi_option", checkNull(pophelpData.getMultiOpt()));
 			filter.put("key_string", checkNull(pophelpData.getSqlInput()));
+			filter.put("data_model_name", checkNull(pophelpData.getDataModelName()));
 		}
 		else {
 			filter.put("is_pophelp", false);