Skip to content

B
business-java
Commit ed8c0ae8 authored by prumde's avatar prumde
Browse files
Options

Updated and merged Changes check-in by Saitej and Priyanka 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@183893 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 8201e6c0
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 9 deletions
webitm-dashboard/ibase/dashboard/common/hibernate/dao/DashboardUtil.java
View file @ ed8c0ae8
...@@ -263,7 +263,7 @@ public class DashboardUtil ...@@ -263,7 +263,7 @@ public class DashboardUtil
System.out.println("response for dbAccess"+responseStr); System.out.println("response for dbAccess"+responseStr);
} }
if(componentType.equalsIgnoreCase("pivot-grid")) { if(componentData.has("pivotrows") && componentData.has("pivotvalues") && componentData.has("pivotcolumns")) {
JSONObject pivotTableData=new JSONObject(); JSONObject pivotTableData=new JSONObject();
pivotTableData=getPivotTableData(componentData); pivotTableData=getPivotTableData(componentData);
componentData.put("slice", pivotTableData); componentData.put("slice", pivotTableData);
...@@ -274,19 +274,27 @@ public class DashboardUtil ...@@ -274,19 +274,27 @@ public class DashboardUtil
JSONArray columnGroup=componentData.optJSONArray("column_group"); JSONArray columnGroup=componentData.optJSONArray("column_group");
if(columnGroup !=null) { if(columnGroup !=null) {
int idx = 0;
for(int i = 0, size = columnGroup.length(); i < size; i++) { for(int i = 0, size = columnGroup.length(); i < size; i++) {
JSONObject finalData = new JSONObject(); JSONObject finalData = new JSONObject();
System.out.println("columnGroup if>>>>>>>>>"); System.out.println("columnGroup if>>>>>>>>>");
//System.out.println("filter>>>>>>"+columnGroup); //System.out.println("filter>>>>>>"+columnGroup);
JSONObject columsObj= columnGroup.optJSONObject(i); JSONObject columsObj= columnGroup.optJSONObject(i);
System.out.println("columsObj>>>>>>"+columsObj); System.out.println("columsObj>>>>>>"+columsObj);
if(columsObj.optJSONArray("columns") instanceof JSONArray) { // if(columsObj.optJSONArray("columns") instanceof JSONArray) {
JSONArray columsArray=columsObj.optJSONArray("columns"); // JSONArray columsArray=columsObj.optJSONArray("columns");
if(columsObj.optJSONObject("columns").optJSONArray("column") instanceof JSONArray)
{
JSONArray columsArray = columsObj.optJSONObject("columns").optJSONArray("column");
columnGroup.optJSONObject(i).put("columns", columsArray);
System.out.println("columsArray>>>>>>"+columsArray); System.out.println("columsArray>>>>>>"+columsArray);
if(columsArray != null) if(columsArray != null)
{ {
for(int j = 0, sizeColumns = columsArray.length(); j < sizeColumns; j++) { /*
JSONObject columsArrayObj=columsArray.optJSONObject(j); for(int j = 0, sizeColumns = columsArray.length(); j < sizeColumns; j++) {
JSONObject columsArrayObj=columsArray.optJSONObject(j);
JSONObject columArray=columsArrayObj.optJSONObject("column"); JSONObject columArray=columsArrayObj.optJSONObject("column");
System.out.println("columArray>>>>>>"+columArray); System.out.println("columArray>>>>>>"+columArray);
if(columArray != null) { if(columArray != null) {
...@@ -299,7 +307,32 @@ public class DashboardUtil ...@@ -299,7 +307,32 @@ public class DashboardUtil
finalDataArray.put(finalData); finalDataArray.put(finalData);
System.out.println("finalDataArray::::::::"+finalDataArray); System.out.println("finalDataArray::::::::"+finalDataArray);
} }
*///TOBE REMOVE
for(int j = 0, sizeColumns = columsArray.length(); j < sizeColumns; j++) {
JSONObject columsArrayObj=columsArray.optJSONObject(j);
//JSONObject columArray=columsArrayObj.optJSONObject("column");
System.out.println("columsArrayObj>>>>>>"+columsArrayObj);
JSONObject columnData = new JSONObject();
if(columsArrayObj != null) {
String id=columsArrayObj.optString("id");
String value=columsArrayObj.optString("value");
String width=columsArrayObj.optString("width");
columnData.put("uniqueName", id);
columnData.put("caption", value);
if(width != "") {
columnData.put("idx", idx);
columnData.put("width", width);
}
idx++;
}
System.out.println("finalData>>>>>>"+columnData);
finalDataArray.put(columnData);
System.out.println("finalDataArray::::::::"+finalDataArray);
}
} }
/*
else { else {
JSONObject columsArrayObj=columsObj.optJSONObject("columns"); JSONObject columsArrayObj=columsObj.optJSONObject("columns");
JSONObject columArray=columsArrayObj.optJSONObject("column"); JSONObject columArray=columsArrayObj.optJSONObject("column");
...@@ -309,25 +342,36 @@ public class DashboardUtil ...@@ -309,25 +342,36 @@ public class DashboardUtil
String value=columArray.optString("value"); String value=columArray.optString("value");
finalData.put("uniqueName", id); finalData.put("uniqueName", id);
finalData.put("caption", value); finalData.put("caption", value);
} }
System.out.println("finalData>>>>>>"+finalData); System.out.println("finalData>>>>>>"+finalData);
finalDataArray.put(finalData); finalDataArray.put(finalData);
System.out.println("finalDataArray::::::::"+finalDataArray); System.out.println("finalDataArray::::::::"+finalDataArray);
} }
*///TOBE REMOVE
} }
else else
{ {
JSONObject columsArray=columsObj.optJSONObject("columns"); JSONObject columsArray=columsObj.optJSONObject("columns");
System.out.println("columsArray>>>>>>else"+columsArray); System.out.println("columsArray>>>>>>else"+columsArray);
JSONObject columArray=columsArray.optJSONObject("column"); JSONObject columArray=columsArray.optJSONObject("column");
JSONArray colArray = new JSONArray();
colArray.put(columArray);
columnGroup.optJSONObject(i).put("columns", colArray);
System.out.println("columArray>>>>>>"+columArray); System.out.println("columArray>>>>>>"+columArray);
if(columArray != null) { if(columArray != null) {
String id=columArray.optString("id"); String id=columArray.optString("id");
String value=columArray.optString("value"); String value=columArray.optString("value");
String width=columArray.optString("width");
finalData.put("uniqueName", id); finalData.put("uniqueName", id);
finalData.put("caption", value); finalData.put("caption", value);
if(width != "") {
finalData.put("idx", idx);
finalData.put("width", width);
}
idx++;
} }
System.out.println("finalData>>>>>>"+finalData); System.out.println("finalData>>>>>>"+finalData);
finalDataArray.put(finalData); finalDataArray.put(finalData);
...@@ -340,8 +384,14 @@ public class DashboardUtil ...@@ -340,8 +384,14 @@ public class DashboardUtil
{ {
System.out.println("componentData else>>>>>>>>>"+componentData); System.out.println("componentData else>>>>>>>>>"+componentData);
JSONObject columnGroupObj=componentData.optJSONObject("column_group"); JSONObject columnGroupObj=componentData.optJSONObject("column_group");
JSONArray colGroupArray = new JSONArray();
colGroupArray.put(columnGroupObj);
componentData.put("column_group", colGroupArray);
if(columnGroupObj != null) { if(columnGroupObj != null) {
JSONObject finalData = new JSONObject(); JSONObject finalData = new JSONObject();
int idx = 0;
System.out.println("columnGroup else>>>>>>>>>"+columnGroupObj); System.out.println("columnGroup else>>>>>>>>>"+columnGroupObj);
JSONArray columnsArray =columnGroupObj.optJSONArray("columns"); JSONArray columnsArray =columnGroupObj.optJSONArray("columns");
System.out.println("columnsArray else>>>>>>>>>"+columnsArray); System.out.println("columnsArray else>>>>>>>>>"+columnsArray);
...@@ -353,8 +403,15 @@ public class DashboardUtil ...@@ -353,8 +403,15 @@ public class DashboardUtil
if(columArray != null) { if(columArray != null) {
String id=columArray.optString("id"); String id=columArray.optString("id");
String value=columArray.optString("value"); String value=columArray.optString("value");
String width=columArray.optString("width");
finalData.put("uniqueName", id); finalData.put("uniqueName", id);
finalData.put("caption", value); finalData.put("caption", value);
if(width != "") {
finalData.put("idx", idx);
finalData.put("width", width);
}
idx++;
} }
System.out.println("finalData>>>>>>"+finalData); System.out.println("finalData>>>>>>"+finalData);
finalDataArray.put(finalData); finalDataArray.put(finalData);
...@@ -369,8 +426,15 @@ public class DashboardUtil ...@@ -369,8 +426,15 @@ public class DashboardUtil
if(columArray != null) { if(columArray != null) {
String id=columArray.optString("id"); String id=columArray.optString("id");
String value=columArray.optString("value"); String value=columArray.optString("value");
String width=columArray.optString("width");
finalData.put("uniqueName", id); finalData.put("uniqueName", id);
finalData.put("caption", value); finalData.put("caption", value);
if(width != "") {
finalData.put("idx", idx);
finalData.put("width", width);
}
idx++;
} }
System.out.println("finalData>>>>>>"+finalData); System.out.println("finalData>>>>>>"+finalData);
finalDataArray.put(finalData); finalDataArray.put(finalData);
...@@ -379,7 +443,7 @@ public class DashboardUtil ...@@ -379,7 +443,7 @@ public class DashboardUtil
componentData.put("columns", finalDataArray); componentData.put("columns", finalDataArray);
} }
} }
componentData.remove("column_group"); //componentData.remove("column_group");
System.out.println("componentData::::::::"+componentData); System.out.println("componentData::::::::"+componentData);
// finalDataObj=getPivotTableData(componentData); // finalDataObj=getPivotTableData(componentData);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment