DMC/scipro
7
0
Fork 0
Code Issues27 Pull Requests6 Actions Projects1 Wiki Activity

added research area filter but not hooked

Browse Source
This commit is contained in:
fred-fri 2012-10-01 12:27:33 +09:00
parent 7147547489
commit a7f7e0f3f5
2 changed files with 28 additions and 13 deletions
src/main/java/se/su/dsv/scipro/project/panels
ProjectIdeaOverviewPanel.htmlProjectIdeaOverviewPanel.java

27
src/main/java/se/su/dsv/scipro/project/panels/ProjectIdeaOverviewPanel.html

@ -6,23 +6,24 @@
</head>
<body>
<wicket:panel>
<div wicket:id="dialog">
<div wicket:id="dialog">
<div wicket:id="dialogPanel"></div>
</div>
<!--<div class="info-box rounded-box last">-->
<!--<b>Project idea submission is now open for the following project levels:</b><br /><br />-->
<!--<div wicket:id="noLabel"></div>-->
<!--<div wicket:id="periodList">-->
<!--<div>-->
<!--<span wicket:id="levelName"></span><span wicket:id="dates"></span>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<b>Project idea submission is now open for the following project levels:</b><br /><br />-->
<!--<div wicket:id="noLabel"></div>-->
<!--<div wicket:id="periodList">-->
<!--<div>-->
<!--<span wicket:id="levelName"></span><span wicket:id="dates"></span>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<div wicket:id="tableMarkup">
<form wicket:id="form">
<div class="span-5" wicket:id="levelFilter"></div>
</form>
<div class="span-24 prepend-top" wicket:id="dataPanel"></div>
<form wicket:id="form">
<div class="span-5" wicket:id="levelFilter"></div>
<div class="span-10" wicket:id="areaFilter"></div>
</form>
<div class="span-24 prepend-top" wicket:id="dataPanel"></div>
</div>
</wicket:panel>
</body>

14
src/main/java/se/su/dsv/scipro/project/panels/ProjectIdeaOverviewPanel.java

@ -25,6 +25,7 @@ import se.su.dsv.scipro.datatables.GenericDataPanel;
import se.su.dsv.scipro.match.dataobject.ApplicationPeriod;
import se.su.dsv.scipro.match.dataobject.Idea.IdeaStatus;
import se.su.dsv.scipro.match.dataobject.SupervisorIdea;
import se.su.dsv.scipro.match.panel.FilterFormAreaPanel;
import se.su.dsv.scipro.match.panel.FilterFormCheckBoxPanel;
import se.su.dsv.scipro.reusable.SafeLongToIntService;
import se.su.dsv.scipro.springdata.services.ApplicationPeriodService;
@ -157,6 +158,19 @@ public class ProjectIdeaOverviewPanel extends Panel {
};
params.setLevels(levelFilter.getSelection());
add(levelFilter);
//RESEARCH AREA FILTERING
final FilterFormAreaPanel areaFilter = new FilterFormAreaPanel("areaFilter", false) {
private static final long serialVersionUID = 2213213403070359265L;
@Override
public void ajaxUpdate(AjaxRequestTarget target) {
params.setResearchArea(getArea());
target.addComponent(genericDataPanel.getWMC());
}
};
add(areaFilter);
}