Skip to content

B
business-java
Commit 45feea04 authored by dkasliwal's avatar dkasliwal
Browse files
Options

add caption in drill-down for pie chart url 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@104082 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 70634f41
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
webitm-dashboard/GWT-Component/src/ibase/client/ChartCreator.java
View file @ 45feea04
...@@ -480,18 +480,18 @@ public class ChartCreator ...@@ -480,18 +480,18 @@ public class ChartCreator
{ {
if(linkLMetadataList.get(seriesCnt).trim().contains("/")) if(linkLMetadataList.get(seriesCnt).trim().contains("/"))
{ {
linkStringValue=new JSONString(linkType+"-"+linkLMetadataList.get(seriesCnt)+propertyStr+prevUrl.replace('=', '@')+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(seriesCnt)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim()); linkStringValue=new JSONString(linkType+"-"+linkLMetadataList.get(seriesCnt)+propertyStr+prevUrl.replace('=', '@')+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(seriesCnt)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim()+"&caption"+"@"+dataSource);
}else { }else {
linkStringValue=new JSONString(linkType+"-"+"/ibase/dwh/GwtDashboardPage.html?metadataname@"+linkLMetadataList.get(seriesCnt)+propertyStr+prevUrl.replace('=', '@')+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(seriesCnt)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim()); linkStringValue=new JSONString(linkType+"-"+"/ibase/dwh/GwtDashboardPage.html?metadataname@"+linkLMetadataList.get(seriesCnt)+propertyStr+prevUrl.replace('=', '@')+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(seriesCnt)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim()+"&caption"+"@"+dataSource);
} }
} }
else if(linkType.equalsIgnoreCase("p")) else if(linkType.equalsIgnoreCase("p"))
{ {
if(linkLMetadataList.get(seriesCnt).trim().contains("/")) if(linkLMetadataList.get(seriesCnt).trim().contains("/"))
{ {
linkStringValue=new JSONString(linkType+"-detailsPopUp,"+linkedProperties+"-"+linkLMetadataList.get(seriesCnt)+propertyStr+prevUrl.replace('=', '@')+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(seriesCnt)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim()); linkStringValue=new JSONString(linkType+"-detailsPopUp,"+linkedProperties+"-"+linkLMetadataList.get(seriesCnt)+propertyStr+prevUrl.replace('=', '@')+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(seriesCnt)+"@"+(""+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(seriesCnt)+propertyStr+prevUrl.replace('=', '@')+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(seriesCnt)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim()); linkStringValue=new JSONString(linkType+"-detailsPopUp,"+linkedProperties+"-/ibase/dwh/GwtDashboardPage.html?metadataname@"+linkLMetadataList.get(seriesCnt)+propertyStr+prevUrl.replace('=', '@')+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(seriesCnt)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim()+"&caption"+"@"+dataSource);
} }
} }
/*Added code to open new chart in frame by swati 18 Aug 2015*/ /*Added code to open new chart in frame by swati 18 Aug 2015*/
...@@ -499,7 +499,7 @@ public class ChartCreator ...@@ -499,7 +499,7 @@ public class ChartCreator
{ {
String cellValue=(""+dataStringValue).replace('"', ' '); String cellValue=(""+dataStringValue).replace('"', ' ');
String urlStr=""; String urlStr="";
String parameterListString=yAxisColunList.get(seriesCnt)+"&"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim(); String parameterListString=yAxisColunList.get(seriesCnt)+"&"+(""+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')");
...@@ -518,18 +518,18 @@ public class ChartCreator ...@@ -518,18 +518,18 @@ public class ChartCreator
{ {
if(linkLMetadataList.get(seriesCnt).trim().contains("/")) if(linkLMetadataList.get(seriesCnt).trim().contains("/"))
{ {
linkStringValue=new JSONString(linkType+"-"+linkLMetadataList.get(seriesCnt)+propertyStr+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(seriesCnt)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim()); linkStringValue=new JSONString(linkType+"-"+linkLMetadataList.get(seriesCnt)+propertyStr+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(seriesCnt)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim()+"&caption"+"@"+dataSource);
}else { }else {
linkStringValue=new JSONString(linkType+"-"+"/ibase/dwh/GwtDashboardPage.html?metadataname@"+linkLMetadataList.get(seriesCnt)+propertyStr+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(seriesCnt)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim()); linkStringValue=new JSONString(linkType+"-"+"/ibase/dwh/GwtDashboardPage.html?metadataname@"+linkLMetadataList.get(seriesCnt)+propertyStr+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(seriesCnt)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim()+"&caption"+"@"+dataSource);
} }
} }
else if(linkType.equalsIgnoreCase("p")) else if(linkType.equalsIgnoreCase("p"))
{ {
if(linkLMetadataList.get(seriesCnt).trim().contains("/")) if(linkLMetadataList.get(seriesCnt).trim().contains("/"))
{ {
linkStringValue=new JSONString(linkType+"-detailsPopUp,"+linkedProperties+"-"+linkLMetadataList.get(seriesCnt)+propertyStr+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(seriesCnt)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim()); linkStringValue=new JSONString(linkType+"-detailsPopUp,"+linkedProperties+"-"+linkLMetadataList.get(seriesCnt)+propertyStr+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(seriesCnt)+"@"+(""+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(seriesCnt)+propertyStr+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(seriesCnt)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim()); linkStringValue=new JSONString(linkType+"-detailsPopUp,"+linkedProperties+"-/ibase/dwh/GwtDashboardPage.html?metadataname@"+linkLMetadataList.get(seriesCnt)+propertyStr+"&"+prdFilter+"@"+period+url+"&"+yAxisColunList.get(seriesCnt)+"@"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim()+"&caption"+"@"+dataSource);
} }
} }
/*Added code to open new chart in frame by swati 18 Aug 2015*/ /*Added code to open new chart in frame by swati 18 Aug 2015*/
...@@ -539,7 +539,7 @@ public class ChartCreator ...@@ -539,7 +539,7 @@ public class ChartCreator
//String metadataName=parameterList.get(0); //String metadataName=parameterList.get(0);
String cellValue=(""+dataStringValue).replace('"', ' '); String cellValue=(""+dataStringValue).replace('"', ' ');
String urlStr=""; String urlStr="";
String parameterListString=yAxisColunList.get(seriesCnt)+"&"+(""+dataStringValue).replace('"', ' ').trim()+"&"+xAxisColunList.get(0)+"@"+(""+jsnStringValue).replace('"', ' ').trim(); String parameterListString=yAxisColunList.get(seriesCnt)+"&"+(""+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