Commit 68ed6313 authored by pborate's avatar pborate

Updated common dashboard jar changes for pophelp data

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@184257 ce508802-f39f-4f6c-b175-0d175dae99d5
parent f3bc0cba
...@@ -80,12 +80,15 @@ public class Pophelp implements java.io.Serializable ...@@ -80,12 +80,15 @@ public class Pophelp implements java.io.Serializable
@Column(name="HELP_OPTION") @Column(name="HELP_OPTION")
private String helpOption; private String helpOption;
@Column(name="LAYOUT")
private String layout;
public Pophelp() { public Pophelp() {
} }
public Pophelp(String fieldName, String modName, String sqlInput, String multiOpt, String autoFillLen, String dataModelName, public Pophelp(String fieldName, String modName, String sqlInput, String multiOpt, String autoFillLen, String dataModelName,
String distOpt, String filterString, Integer defaultCol, String thumbObj, String thumbImageCol, String distOpt, String filterString, Integer defaultCol, String thumbObj, String thumbImageCol,
String thumbAltCol, String objNameDs, String validateData, String itemChange, String helpOption) { String thumbAltCol, String objNameDs, String validateData, String itemChange, String helpOption,String layout) {
super(); super();
this.fieldName = fieldName; this.fieldName = fieldName;
this.modName = modName; this.modName = modName;
...@@ -103,6 +106,7 @@ public class Pophelp implements java.io.Serializable ...@@ -103,6 +106,7 @@ public class Pophelp implements java.io.Serializable
this.validateData = validateData; this.validateData = validateData;
this.itemChange = itemChange; this.itemChange = itemChange;
this.helpOption=helpOption; this.helpOption=helpOption;
this.layout=layout;
} }
public String getHelpOption() { public String getHelpOption() {
...@@ -233,6 +237,14 @@ public class Pophelp implements java.io.Serializable ...@@ -233,6 +237,14 @@ public class Pophelp implements java.io.Serializable
this.itemChange = itemChange; this.itemChange = itemChange;
} }
public String getLayout() {
return layout;
}
public void setLayout(String layout) {
this.layout = layout;
}
@Override @Override
public String toString(){ public String toString(){
return "\n Pophelp.toString >> [" + new JSONObject(this).toString() + "]"; return "\n Pophelp.toString >> [" + new JSONObject(this).toString() + "]";
......
...@@ -690,6 +690,7 @@ public class DashboardUtil ...@@ -690,6 +690,7 @@ public class DashboardUtil
filter.put("multi_opt", 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()));
filter.put("layout", checkNull(pophelpData.getLayout()));
} }
else { else {
filter.put("is_pophelp", false); filter.put("is_pophelp", false);
......
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