Skip to content

B
business-java
Commit 485b07bb authored by sdhaul's avatar sdhaul
Browse files
Options

Updated to read width of columns and send column_group list. 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@183830 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 7c44821a
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 33 deletions
webitm-dashboard/ibase/dashboard/common/hibernate/dao/DashboardUtil.java
View file @ 485b07bb
...@@ -243,8 +243,6 @@ public class DashboardUtil ...@@ -243,8 +243,6 @@ public class DashboardUtil
public JSONObject getColumnsData(JSONObject componentData,UserInfoBean userInfo) throws NamingException, Exception{ public JSONObject getColumnsData(JSONObject componentData,UserInfoBean userInfo) throws NamingException, Exception{
JSONArray finalDataArray = new JSONArray(); JSONArray finalDataArray = new JSONArray();
String componentType=componentData.optString("component_type");
System.out.println("componentType:::"+componentType);
String responseStr = ""; String responseStr = "";
String objName=componentData.optString("obj_name"); String objName=componentData.optString("obj_name");
...@@ -259,7 +257,7 @@ public class DashboardUtil ...@@ -259,7 +257,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);
...@@ -270,60 +268,68 @@ public class DashboardUtil ...@@ -270,60 +268,68 @@ 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.optJSONObject("columns").optJSONArray("column") instanceof JSONArray) {
JSONArray columsArray=columsObj.optJSONArray("columns"); 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++) { for(int j = 0, sizeColumns = columsArray.length(); j < sizeColumns; j++) {
JSONObject columsArrayObj=columsArray.optJSONObject(j); JSONObject columsArrayObj=columsArray.optJSONObject(j);
JSONObject columArray=columsArrayObj.optJSONObject("column"); //JSONObject columArray=columsArrayObj.optJSONObject("column");
System.out.println("columArray>>>>>>"+columArray); System.out.println("columsArrayObj>>>>>>"+columsArrayObj);
if(columArray != null) { JSONObject columnData = new JSONObject();
String id=columArray.optString("id");
String value=columArray.optString("value"); if(columsArrayObj != null) {
finalData.put("uniqueName", id); String id=columsArrayObj.optString("id");
finalData.put("caption", value); 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>>>>>>"+finalData); System.out.println("finalData>>>>>>"+columnData);
finalDataArray.put(finalData); finalDataArray.put(columnData);
System.out.println("finalDataArray::::::::"+finalDataArray); System.out.println("finalDataArray::::::::"+finalDataArray);
} }
} }
else {
JSONObject columsArrayObj=columsObj.optJSONObject("columns");
JSONObject columArray=columsArrayObj.optJSONObject("column");
System.out.println("columArray>>>>>>"+columArray);
if(columArray != null) {
String id=columArray.optString("id");
String value=columArray.optString("value");
finalData.put("uniqueName", id);
finalData.put("caption", value);
}
System.out.println("finalData>>>>>>"+finalData);
finalDataArray.put(finalData);
System.out.println("finalDataArray::::::::"+finalDataArray);
}
} }
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);
...@@ -336,8 +342,14 @@ public class DashboardUtil ...@@ -336,8 +342,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);
...@@ -349,8 +361,15 @@ public class DashboardUtil ...@@ -349,8 +361,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);
...@@ -365,8 +384,15 @@ public class DashboardUtil ...@@ -365,8 +384,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);
...@@ -375,7 +401,7 @@ public class DashboardUtil ...@@ -375,7 +401,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);
...@@ -619,7 +645,7 @@ public class DashboardUtil ...@@ -619,7 +645,7 @@ public class DashboardUtil
filter.put("is_pophelp", true); filter.put("is_pophelp", true);
filter.put("auto_fil_len", checkNull(pophelpData.getAutoFillLen())); filter.put("auto_fil_len", checkNull(pophelpData.getAutoFillLen()));
filter.put("help_option", checkNull(pophelpData.getHelpOption())); filter.put("help_option", checkNull(pophelpData.getHelpOption()));
filter.put("multi_option", checkNull(pophelpData.getMultiOpt())); filter.put("multi_opt", checkNull(pophelpData.getMultiOpt()));
filter.put("key_string", checkNull(pophelpData.getSqlInput())); filter.put("key_string", checkNull(pophelpData.getSqlInput()));
filter.put("data_model_name", checkNull(pophelpData.getDataModelName())); filter.put("data_model_name", checkNull(pophelpData.getDataModelName()));
} }
......
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