DMC/scipro
7
0
Fork 0
Code Issues45 Pull Requests5 Actions Projects1 Releases Wiki Activity

Added clear button in the search GUI for unmatched p-ideas.

Browse Source
This commit is contained in:
Tom Vahlman 2012-03-20 16:43:58 +01:00
parent 25bff96bd7
commit b02e7363ae
3 changed files with 15 additions and 21 deletions

27
src/main/java/se/su/dsv/scipro/match/panel/FilterFormProjectClassPanel.java

@ -28,19 +28,16 @@ public class FilterFormProjectClassPanel extends Panel {
@SpringBean
private ProjectClassDao projectClassDao;
private List<ProjectClass> projectClasses = new ArrayList<ProjectClass>();
private final CheckGroup<ProjectClass> checkGroup;
public FilterFormProjectClassPanel(String id, final List<ProjectClass> projectClassesToSet) {
private final CheckGroup<ProjectClass> checkGroup;
public FilterFormProjectClassPanel(String id, final List<ProjectClass> projectClassesToSet) {
super(id);
projectClasses = projectClassDao.findAll();
CompoundPropertyModel<List<ProjectClass>> projectClassModel = new CompoundPropertyModel<List<ProjectClass>>(projectClasses);
checkGroup = new CheckGroup<ProjectClass>("checkGroup",projectClassesToSet /*new ArrayList<ProjectClass>()*/);
setOutputMarkupId(true);
List<ProjectClass> projectClasses1 = projectClassDao.findAll();
CompoundPropertyModel<List<ProjectClass>> projectClassModel = new CompoundPropertyModel<List<ProjectClass>>(projectClasses1);
checkGroup = new CheckGroup<ProjectClass>("checkGroup",projectClassesToSet);
final WebMarkupContainer container = new WebMarkupContainer("container");
container.setOutputMarkupId(true);
ListView<ProjectClass> projectClasses = new ListView<ProjectClass>("projectClasses", projectClassModel) {
@ -49,11 +46,7 @@ public class FilterFormProjectClassPanel extends Panel {
@Override
protected void populateItem(ListItem<ProjectClass> item) {
Check<ProjectClass> projectClassCheckBox = new Check<ProjectClass>("projectClassCheckBox", item.getModel());
/*if(projectClassesToSet.contains(item.getModelObject())){
projectClassCheckBox.
}*/
item.add(projectClassCheckBox);
Label projectClassName = new Label("projectClassName", item.getModel().getObject().getName());
item.add(projectClassName);
@ -67,5 +60,5 @@ public class FilterFormProjectClassPanel extends Panel {
public List<ProjectClass> getSelectedprojectClasses(){
return (List<ProjectClass>) checkGroup.getModelObject();
}
}
}

6
src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorUnmatchedThesisPanel.html

@ -41,11 +41,11 @@
<div class="span-3" wicket:id="projectClassPanel">
</div>
<div class="span-5">
<div class="span-2">
<div><input wicket:id="filterButton" type="submit"/></div>
</div>
<div class="span-5">
<div><button wicket:id="clearSearchTermsButton">Clear search terms</button></div>
<div class="span-2">
<div><button wicket:id="clearSearchTermsButton">Clear</button></div>
</div>
</div>
</form>

3
src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorUnmatchedThesisPanel.java

@ -315,9 +315,10 @@ public class SupervisorUnmatchedThesisPanel extends Panel {
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
((ListView) keyWordsContainer.get("keywordList")).setModelObject(null);
titleField.setModelObject(null);
projectClassPanel.getSelectedprojectClasses().clear();
target.addComponent(keyWordsContainer);
target.addComponent(titleField);
//projectClassPanel => för att noll-ställa
target.addComponent(projectClassPanel);
}
});
}