Commit d40f71f1 authored by dkasliwal's avatar dkasliwal

append selected value of graph grill down to title name.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@104703 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c3b8d776
...@@ -491,8 +491,10 @@ public class ChartCreator ...@@ -491,8 +491,10 @@ public class ChartCreator
if(url=="undefined" || url.equals("undefined") || url.equalsIgnoreCase("undefined")) if(url=="undefined" || url.equals("undefined") || url.equalsIgnoreCase("undefined"))
{ {
if((FilterCreator.title).size()>0) if((FilterCreator.title).size()>0)
{
url="&titleName@"+(FilterCreator.title).get(0)+(""+jsnStringValue).replace('"', ' ').trim(); url="&titleName@"+(FilterCreator.title).get(0)+(""+jsnStringValue).replace('"', ' ').trim();
} }
}
else else
{ {
url="&titleName@"+url+":"+(FilterCreator.title).get(0)+(""+jsnStringValue).replace('"', ' ').trim(); url="&titleName@"+url+":"+(FilterCreator.title).get(0)+(""+jsnStringValue).replace('"', ' ').trim();
...@@ -652,12 +654,17 @@ public class ChartCreator ...@@ -652,12 +654,17 @@ public class ChartCreator
} }
if(url=="undefined" || url.equals("undefined") || url.equalsIgnoreCase("undefined")) if(url=="undefined" || url.equals("undefined") || url.equalsIgnoreCase("undefined"))
{ {
url="&titleName@"+(FilterCreator.title).get(0); //url="&titleName@"+(FilterCreator.title).get(0); // Comment line and add if condition by Dhanendra 17-02-2017
if((FilterCreator.title).size()>0)
{
url="&titleName@"+(FilterCreator.title).get(0)+(""+jsnStringValue).replace('"', ' ').trim();
}
} }
else else
{ {
url="&titleName@"+url+":"+(FilterCreator.title).get(0)+(""+jsnStringValue).replace('"', ' ').trim(); url="&titleName@"+url+":"+(FilterCreator.title).get(0)+(""+jsnStringValue).replace('"', ' ').trim();
} }
String linkType=linkTypeList.get(j).trim(); String linkType=linkTypeList.get(j).trim();
if((prevUrl).trim().length()>1) if((prevUrl).trim().length()>1)
{ {
...@@ -842,9 +849,10 @@ public class ChartCreator ...@@ -842,9 +849,10 @@ public class ChartCreator
} }
if(url=="undefined" || url.equals("undefined") || url.equalsIgnoreCase("undefined")) if(url=="undefined" || url.equals("undefined") || url.equalsIgnoreCase("undefined"))
{ {
//url="&titleName@"+(FilterCreator.title).get(0); // Comment line and add if condition by Dhanendra 17-02-2017
if((FilterCreator.title).size()>0) if((FilterCreator.title).size()>0)
{ {
url="&titleName@"+(FilterCreator.title).get(0); url="&titleName@"+(FilterCreator.title).get(0)+(""+jsnStringValue).replace('"', ' ').trim();
} }
} }
else else
......
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