Commit b2aadf0e authored by dkasliwal's avatar dkasliwal

add if condition for to open a drill-down container in same page


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@103795 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b7dcce80
...@@ -648,6 +648,18 @@ public class ChartCreator ...@@ -648,6 +648,18 @@ public class ChartCreator
linkStringValue=new JSONString(linkType+"-detailsPopUp,"+linkedProperties+"-/ibase/dwh/GwtDashboardPage.html?metadataname@"+linkLMetadataList.get(j)+propertyStr+prevUrl.replace('=', '@')+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(j)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim()); linkStringValue=new JSONString(linkType+"-detailsPopUp,"+linkedProperties+"-/ibase/dwh/GwtDashboardPage.html?metadataname@"+linkLMetadataList.get(j)+propertyStr+prevUrl.replace('=', '@')+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(j)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim());
} }
} }
else if(linkType.equalsIgnoreCase("f"))
{
String cellValue=(""+dataStringValue).replace('"', ' ');
String urlStr="";
String parameterListString=yAxisColunList.get(j)+"&"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim();
/*if(linkLMetadataList.get(seriesCnt).trim().length()>0 )
{
linkStringValue=new JSONString("JavaScript: isJavaScriptCall=true;linkFunction('"+linkLMetadataList.get(seriesCnt)+"', '"+cellValue+"', '"+propertyStr+"','"+ urlStr+"', '"+parameterListString+"', 'Y')");
}*/
url = propertyStr+"&"+parameterListString+"&CELL_VAL="+cellValue.trim()+"&P1="+urlStr;
linkStringValue = new JSONString("JavaScript:getModuleLoad('"+linkLMetadataList.get(j)+"','"+url+"','"+currentID+"');");
}
} }
else else
{ {
...@@ -669,6 +681,18 @@ public class ChartCreator ...@@ -669,6 +681,18 @@ public class ChartCreator
linkStringValue=new JSONString(linkType+"-detailsPopUp,"+linkedProperties+"-/ibase/dwh/GwtDashboardPage.html?metadataname@"+linkLMetadataList.get(j)+propertyStr+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(j)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim()); linkStringValue=new JSONString(linkType+"-detailsPopUp,"+linkedProperties+"-/ibase/dwh/GwtDashboardPage.html?metadataname@"+linkLMetadataList.get(j)+propertyStr+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(j)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim());
} }
} }
else if(linkType.equalsIgnoreCase("f"))
{
String cellValue=(""+dataStringValue).replace('"', ' ');
String urlStr="";
String parameterListString=yAxisColunList.get(j)+"&"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim();
/*if(linkLMetadataList.get(seriesCnt).trim().length()>0 )
{
linkStringValue=new JSONString("JavaScript: isJavaScriptCall=true;linkFunction('"+linkLMetadataList.get(seriesCnt)+"', '"+cellValue+"', '"+propertyStr+"','"+ urlStr+"', '"+parameterListString+"', 'Y')");
}*/
url = propertyStr+"&"+parameterListString+"&CELL_VAL="+cellValue.trim()+"&P1="+urlStr;
linkStringValue = new JSONString("JavaScript:getModuleLoad('"+linkLMetadataList.get(j)+"','"+url+"','"+currentID+"');");
}
} }
//Window.alert("linkStringKey: "+linkStringKey+"\nlinkStringValue:"+linkStringValue); //Window.alert("linkStringKey: "+linkStringKey+"\nlinkStringValue:"+linkStringValue);
/*ended code link in stack by swati 10 aug 2015*/ /*ended code link in stack by swati 10 aug 2015*/
...@@ -929,7 +953,7 @@ public class ChartCreator ...@@ -929,7 +953,7 @@ public class ChartCreator
graphJson.put("data", barDataVal); graphJson.put("data", barDataVal);
} }
/**End of Gantt chart logic by swati dated: 04 March 2014 **/ /**End of Gantt chart logic by swati dated: 04 March 2014 **/
jsonChartVal = JSONParser.parseStrict(metaDataList.toString()); jsonChartVal = JSONParser.parseStrict(metaDataList.toString().replaceAll("TITLE", dataSource));
graphJson.put("chart", jsonChartVal); graphJson.put("chart", jsonChartVal);
//Window.alert("graphJson: "+graphJson); //Window.alert("graphJson: "+graphJson);
......
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