Commit 86ccebc5 authored by sbade's avatar sbade

added filter functionality by which if no filter tag is present in metadata...

added filter functionality by which if no filter tag is present in metadata xml , analysis scope image will not be shown.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98470 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 127ff317
...@@ -93,7 +93,13 @@ public class FilterCreator extends Composite ...@@ -93,7 +93,13 @@ public class FilterCreator extends Composite
horizontlPnl.setSpacing(10); horizontlPnl.setSpacing(10);
horizontlPnl.add(lablePnl); horizontlPnl.add(lablePnl);
if(parameterList.size()>2 )
{
horizontlPnl.add(fltrImgPnl); horizontlPnl.add(fltrImgPnl);
}
this.metaDataJsnObj = metaDataJsnObj; this.metaDataJsnObj = metaDataJsnObj;
openFltrImg.addClickHandler(new FilterBtnActionHandler()); openFltrImg.addClickHandler(new FilterBtnActionHandler());
initWidget(horizontlPnl); initWidget(horizontlPnl);
...@@ -1107,9 +1113,18 @@ public class FilterCreator extends Composite ...@@ -1107,9 +1113,18 @@ public class FilterCreator extends Composite
{ {
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*/
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
{
titleLbl.setText(title.get(0)) ;
}
/*End Code for Remove Colon for no Filter by Dhanendra on 31-07-15*/
}
} }
} }
......
...@@ -107,10 +107,10 @@ public class GWTDashBoardReport implements EntryPoint ...@@ -107,10 +107,10 @@ public class GWTDashBoardReport implements EntryPoint
} }
} }
} }
else /*else
{ {
parameterList.add(Window.Location.getParameter("metadataname")); parameterList.add(Window.Location.getParameter("metadataname"));
} }*/
parameterList.add(this.getDefaultView(metaDataJsnObj)); parameterList.add(this.getDefaultView(metaDataJsnObj));
E12DashBoardPage e12DashBoardPage = new E12DashBoardPage(parameterList,metaDataJsnObj); E12DashBoardPage e12DashBoardPage = new E12DashBoardPage(parameterList,metaDataJsnObj);
RootPanel.get("filterDiv").add(e12DashBoardPage); RootPanel.get("filterDiv").add(e12DashBoardPage);
......
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