Commit ae688476 authored by dkasliwal's avatar dkasliwal

Add caption in link url


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@103936 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 22a9d439
...@@ -558,7 +558,7 @@ public class ChartCreator ...@@ -558,7 +558,7 @@ public class ChartCreator
barDataVal = JSONParser.parseStrict(barValueList.toString().replace('=', ':')); barDataVal = JSONParser.parseStrict(barValueList.toString().replace('=', ':'));
} }
} }
CommonUtils.printOnConsole("***** barDataVal ********** :"+barDataVal); //CommonUtils.printOnConsole("***** barDataVal ********** :"+barDataVal);
graphJson.put("data", barDataVal); graphJson.put("data", barDataVal);
} }
} }
...@@ -634,25 +634,25 @@ public class ChartCreator ...@@ -634,25 +634,25 @@ public class ChartCreator
{ {
if(linkLMetadataList.get(j).trim().contains("/")) if(linkLMetadataList.get(j).trim().contains("/"))
{ {
linkStringValue=new JSONString(linkType+"-"+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+"-"+linkLMetadataList.get(j)+propertyStr+prevUrl.replace('=', '@')+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(j)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim()+"&caption"+"@"+dataSource);
}else { }else {
linkStringValue=new JSONString(linkType+"-"+"/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+"-"+"/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()+"&caption"+"@"+dataSource);
} }
} }
else if(linkType.equalsIgnoreCase("p")) else if(linkType.equalsIgnoreCase("p"))
{ {
if(linkLMetadataList.get(j).trim().contains("/")) if(linkLMetadataList.get(j).trim().contains("/"))
{ {
linkStringValue=new JSONString(linkType+"-detailsPopUp,"+linkedProperties+"-"+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+"-"+linkLMetadataList.get(j)+propertyStr+prevUrl.replace('=', '@')+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(j)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim()+"&caption"+"@"+dataSource);
}else { }else {
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()+"&caption"+"@"+dataSource);
} }
} }
else if(linkType.equalsIgnoreCase("f")) else if(linkType.equalsIgnoreCase("f"))
{ {
String cellValue=(""+dataStringValue).replace('"', ' '); String cellValue=(""+dataStringValue).replace('"', ' ');
String urlStr=""; String urlStr="";
String parameterListString=yAxisColunList.get(j)+"&"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim(); String parameterListString=yAxisColunList.get(j)+"&"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim()+"&caption"+"@"+dataSource;
/*if(linkLMetadataList.get(seriesCnt).trim().length()>0 ) /*if(linkLMetadataList.get(seriesCnt).trim().length()>0 )
{ {
linkStringValue=new JSONString("JavaScript: isJavaScriptCall=true;linkFunction('"+linkLMetadataList.get(seriesCnt)+"', '"+cellValue+"', '"+propertyStr+"','"+ urlStr+"', '"+parameterListString+"', 'Y')"); linkStringValue=new JSONString("JavaScript: isJavaScriptCall=true;linkFunction('"+linkLMetadataList.get(seriesCnt)+"', '"+cellValue+"', '"+propertyStr+"','"+ urlStr+"', '"+parameterListString+"', 'Y')");
...@@ -667,25 +667,25 @@ public class ChartCreator ...@@ -667,25 +667,25 @@ public class ChartCreator
{ {
if(linkLMetadataList.get(j).trim().contains("/")) if(linkLMetadataList.get(j).trim().contains("/"))
{ {
linkStringValue=new JSONString(linkType+"-"+linkLMetadataList.get(j)+propertyStr+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(j)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim()); linkStringValue=new JSONString(linkType+"-"+linkLMetadataList.get(j)+propertyStr+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(j)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim()+"&caption"+"@"+dataSource);
}else { }else {
linkStringValue=new JSONString(linkType+"-"+"/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+"-"+"/ibase/dwh/GwtDashboardPage.html?metadataname@"+linkLMetadataList.get(j)+propertyStr+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(j)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim()+"&caption"+"@"+dataSource);
} }
} }
else if(linkType.equalsIgnoreCase("p")) else if(linkType.equalsIgnoreCase("p"))
{ {
if(linkLMetadataList.get(j).trim().contains("/")) if(linkLMetadataList.get(j).trim().contains("/"))
{ {
linkStringValue=new JSONString(linkType+"-detailsPopUp,"+linkedProperties+"-"+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+"-"+linkLMetadataList.get(j)+propertyStr+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(j)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim()+"&caption"+"@"+dataSource);
}else { }else {
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()+"&caption"+"@"+dataSource);
} }
} }
else if(linkType.equalsIgnoreCase("f")) else if(linkType.equalsIgnoreCase("f"))
{ {
String cellValue=(""+dataStringValue).replace('"', ' '); String cellValue=(""+dataStringValue).replace('"', ' ');
String urlStr=""; String urlStr="";
String parameterListString=yAxisColunList.get(j)+"&"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim(); String parameterListString=yAxisColunList.get(j)+"&"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim()+"&caption"+"@"+dataSource;
/*if(linkLMetadataList.get(seriesCnt).trim().length()>0 ) /*if(linkLMetadataList.get(seriesCnt).trim().length()>0 )
{ {
linkStringValue=new JSONString("JavaScript: isJavaScriptCall=true;linkFunction('"+linkLMetadataList.get(seriesCnt)+"', '"+cellValue+"', '"+propertyStr+"','"+ urlStr+"', '"+parameterListString+"', 'Y')"); linkStringValue=new JSONString("JavaScript: isJavaScriptCall=true;linkFunction('"+linkLMetadataList.get(seriesCnt)+"', '"+cellValue+"', '"+propertyStr+"','"+ urlStr+"', '"+parameterListString+"', 'Y')");
......
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