Commit 41d6a87f authored by dkasliwal's avatar dkasliwal

In Title display : replace with - and in title display description instead of code.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@104631 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d0ae8a97
...@@ -1112,7 +1112,10 @@ public class FilterCreator extends Composite ...@@ -1112,7 +1112,10 @@ public class FilterCreator extends Composite
if ("1".equals(filterInfo.getShowOnTitle())) if ("1".equals(filterInfo.getShowOnTitle()))
{ {
filterDescr = filterInfo.getColDescr().trim() + " : "; filterDescr = filterInfo.getColDescr().trim() + " : ";
filtrEntrdData = getMonth(parameterList.get(count + 1)); /*Add change parameter list variable for display description on title by Dhanendra on date 14-02-2017*/
//filtrEntrdData = getMonth(parameterList.get(count + 1));
filtrEntrdData = getMonth(getParameterListDtl().get(count + 1));
/*End change parameter list variable for display description on title by Dhanendra on date 14-02-2017*/
if (fltrNameNDataBfr.length() > 0) if (fltrNameNDataBfr.length() > 0)
{ {
if (filtrEntrdData.length() > 0) if (filtrEntrdData.length() > 0)
...@@ -1172,28 +1175,27 @@ public class FilterCreator extends Composite ...@@ -1172,28 +1175,27 @@ public class FilterCreator extends Composite
{ {
if (title.size() > 1) if (title.size() > 1)
{ {
titleLbl.setText(title.get(0) + " : " + getMonth(reportHeading) + title.get(1) + getMonth(parameterList.get(2))); titleLbl.setText(title.get(0) + " - " + getMonth(reportHeading) + title.get(1) + getMonth(parameterList.get(2)));
} else if (title.size() == 1 && (subTitle == "undefined") || (subTitle.equals("undefined")) || (subTitle.equalsIgnoreCase("undefined"))) } else if (title.size() == 1 && (subTitle == "undefined") || (subTitle.equals("undefined")) || (subTitle.equalsIgnoreCase("undefined")))
{ {
titleLbl.setText(title.get(0) + " : " + getMonth(parameterList.get(1))); titleLbl.setText(title.get(0) + " - " + getMonth(parameterList.get(1)));
} }
//if(subTitle.trim().length()>0) //if(subTitle.trim().length()>0)
else if ((title.size() == 1 && (subTitle != "") || (!subTitle.equals("")) || (!subTitle.equalsIgnoreCase("")))) else if ((title.size() == 1 && (subTitle != "") || (!subTitle.equals("")) || (!subTitle.equalsIgnoreCase(""))))
{ {
titleLbl.setText(subTitle + " : " + getMonth(reportHeading)); titleLbl.setText(subTitle + " - " + getMonth(reportHeading));
} else } else
{ {
/*Added Code for Remove Colon for no Filter by Dhanendra on 31-07-15*/ /*Added Code for Remove Colon for no Filter by Dhanendra on 31-07-15*/
if(parameterList.size() >2) if(parameterList.size() >2)
{ {
titleLbl.setText(title.get(0) + " : " + getMonth(reportHeading));//+ "-" + parameterList.get(2)); titleLbl.setText(title.get(0) + " - " + getMonth(reportHeading));//+ "-" + parameterList.get(2));
} }
else else
{ {
titleLbl.setText(title.get(0)) ; titleLbl.setText(title.get(0)) ;
} }
/*End Code for Remove Colon for no Filter by Dhanendra on 31-07-15*/ /*End Code for Remove Colon for no Filter by Dhanendra on 31-07-15*/
} }
} }
......
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