DMC/scipro
7
0
Fork 0
Code Issues43 Pull Requests9 Actions Projects1 Releases Wiki Activity

removed filter by keyword unit thingie. will leave it without that filtering capacity until we remake this into a new datapanel

Browse Source
This commit is contained in:
fred-fri 2012-05-29 13:06:38 +09:00
parent a56ec1cc8a
commit 25d1ccbdc9
2 changed files with 10 additions and 10 deletions
src/main/java/se/su/dsv/scipro/match/panel
AdminManageSupervisorPanel.htmlAdminManageSupervisorPanel.java

8
src/main/java/se/su/dsv/scipro/match/panel/AdminManageSupervisorPanel.html

@ -43,10 +43,10 @@
<!--</div>--> <!--</div>-->
<!--</div>--> <!--</div>-->
<div class="span-20"> <div class="span-20">
<div class="span-8"> <!--<div class="span-8">-->
<label for="unitPanel">Filter by unit:</label><br/> <!--<label for="unitPanel">Filter by unit:</label><br/>-->
<span wicket:id="unitPanel"></span> <!--<span wicket:id="unitPanel"></span>-->
</div> <!--</div>-->
<div class="span-10"> <div class="span-10">
<label for="researchAreaPanel">Filter by research area:</label> <label for="researchAreaPanel">Filter by research area:</label>
<span wicket:id="researchAreaPanel"></span> <span wicket:id="researchAreaPanel"></span>

12
src/main/java/se/su/dsv/scipro/match/panel/AdminManageSupervisorPanel.java

@ -259,7 +259,7 @@ public class AdminManageSupervisorPanel extends Panel {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private TextField<String> supervisorField, keywordField; private TextField<String> supervisorField, keywordField;
private FilterKeywordDropdownPanel researchAreaPanel, unitPanel; private FilterKeywordDropdownPanel researchAreaPanel; //, unitPanel;
public FilterForm(String id) { public FilterForm(String id) {
super(id); super(id);
@ -269,9 +269,9 @@ public class AdminManageSupervisorPanel extends Panel {
add(keywordField); add(keywordField);
researchAreaPanel = new FilterKeywordDropdownPanel("researchAreaPanel", KeywordTypeDao.TYPE.RESEARCH_AREA); researchAreaPanel = new FilterKeywordDropdownPanel("researchAreaPanel", KeywordTypeDao.TYPE.RESEARCH_AREA);
unitPanel = new FilterKeywordDropdownPanel("unitPanel", KeywordTypeDao.TYPE.UNIT); // unitPanel = new FilterKeywordDropdownPanel("unitPanel", KeywordTypeDao.TYPE.UNIT);
add(unitPanel); // add(unitPanel);
add(researchAreaPanel); add(researchAreaPanel);
AjaxButton filterButton = new AjaxButton("filterButton", new Model<String>("Filter")) { AjaxButton filterButton = new AjaxButton("filterButton", new Model<String>("Filter")) {
@ -281,9 +281,9 @@ public class AdminManageSupervisorPanel extends Panel {
protected void onSubmit(AjaxRequestTarget target, Form<?> form) { protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
Set<Keyword> keywords = new HashSet<Keyword>(); Set<Keyword> keywords = new HashSet<Keyword>();
if(unitPanel.getSelectedKeywords()!=null&&!unitPanel.getSelectedKeywords().isEmpty()){ // if(unitPanel.getSelectedKeywords()!=null&&!unitPanel.getSelectedKeywords().isEmpty()){
keywords.addAll(unitPanel.getSelectedKeywords()); // keywords.addAll(unitPanel.getSelectedKeywords());
} // }
if(researchAreaPanel.getSelectedKeywords()!=null&&!researchAreaPanel.getSelectedKeywords().isEmpty()) { if(researchAreaPanel.getSelectedKeywords()!=null&&!researchAreaPanel.getSelectedKeywords().isEmpty()) {
keywords.addAll(researchAreaPanel.getSelectedKeywords()); keywords.addAll(researchAreaPanel.getSelectedKeywords());
} }