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

some fixes

Browse Source
This commit is contained in:
Fredrik Friis 2012-02-27 11:39:24 +09:00
parent d5c228389c
commit 981e8dc5cc
2 changed files with 27 additions and 15 deletions
src/main/java/se/su/dsv/scipro/supervisor/panels
ProfilePanel.htmlProfilePanel.java

27
src/main/java/se/su/dsv/scipro/supervisor/panels/ProfilePanel.html

@ -5,35 +5,38 @@
<wicket:panel> <wicket:panel>
<form wicket:id="form"> <form wicket:id="form">
<div class="append-bottom"> <div class="append-bottom">
<label>Unit:</label> <label>Unit: (imported from Daisy)</label>
<div wicket:id="unitlabel"></div> <div wicket:id="unitlabel"></div>
</div> </div>
<div class="append-bottom"> <div class="append-bottom">
<label>Languages: </label> <label>Research areas: (imported from Daisy)</label>
<div wicket:id="emptylabel"></div>
<div wicket:id="arealistview">
<span wicket:id="arealabel"></span>
<!-- <input type="checkbox" wicket:id="areacheckbox" /> -->
</div>
</div>
<div class="append-bottom">
<label>Select what languages you can supervise in: </label>
<div wicket:id="languagelistview"> <div wicket:id="languagelistview">
<span wicket:id="languagelabel"></span> <input type="checkbox" <span wicket:id="languagelabel"></span> <input type="checkbox"
wicket:id="languagecheckbox" /> wicket:id="languagecheckbox" />
</div> </div>
</div> </div>
<div class="append-bottom">
<label>Research areas: </label>
<div wicket:id="arealistview">
<span wicket:id="arealabel"></span> <input type="checkbox"
wicket:id="areacheckbox" />
</div>
</div>
<div><label>Regular: </label></div> <div><label>Select keywords: </label></div>
<div class="span-22 last" wicket:id="regularcontainer"> <div class="span-22 last" wicket:id="regularcontainer">
<div class="span-11"> <div class="span-11">
<label>Available: </label> <label>Available</label>
<div wicket:id="regularlistview"> <div wicket:id="regularlistview">
<span wicket:id="regularlabel"></span> <input type="checkbox" <span wicket:id="regularlabel"></span> <input type="checkbox"
wicket:id="regularcheckbox" /> wicket:id="regularcheckbox" />
</div> </div>
</div> </div>
<div class="span-11 last"> <div class="span-11 last">
<label>Selected: </label> <label>Selected</label>
<div wicket:id="regularlistview2"> <div wicket:id="regularlistview2">
<span wicket:id="regularlabel"></span> <input type="checkbox" <span wicket:id="regularlabel"></span> <input type="checkbox"
wicket:id="regularcheckbox" /> wicket:id="regularcheckbox" />

15
src/main/java/se/su/dsv/scipro/supervisor/panels/ProfilePanel.java

@ -87,19 +87,25 @@ public class ProfilePanel extends Panel {
final KeywordType unitType = keywordTypeDao.findByType(KeywordTypeDao.TYPE.UNIT); final KeywordType unitType = keywordTypeDao.findByType(KeywordTypeDao.TYPE.UNIT);
if (employeeModel.getObject().getKeywords().getFiltered(unitType) == null || employeeModel.getObject().getKeywords().getFiltered(unitType).isEmpty()){ if (employeeModel.getObject().getKeywords().getFiltered(unitType) == null || employeeModel.getObject().getKeywords().getFiltered(unitType).isEmpty()){
add(new Label("unitlabel", "You aren't registered under any existing/active unit in Daisy. Please make sure you are registered under an existing/active unit in Daisy ASAP.")); add(new Label("unitlabel", "You are not registered under any existing/active unit in Daisy. Please make sure you are registered under an existing/active unit in Daisy ASAP."));
} }
else { else {
add(new Label("unitlabel", employeeModel.getObject().getKeywords().getFiltered(unitType).get(0).getKeyword() + " (imported from Daisy)")); add(new Label("unitlabel", employeeModel.getObject().getKeywords().getFiltered(unitType).get(0).getKeyword()));
} }
final KeywordType areaType = keywordTypeDao.findByType(KeywordTypeDao.TYPE.RESEARCH_AREA); final KeywordType areaType = keywordTypeDao.findByType(KeywordTypeDao.TYPE.RESEARCH_AREA);
add(new Label("emptylabel", "You do not have any research areas selected in Daisy. Please make sure that you select at least one research area in Daisy ASAP.").setVisible(employeeModel.getObject().getKeywords().getFiltered(areaType) == null || employeeModel.getObject().getKeywords().getFiltered(areaType).isEmpty()));
ListView<Keyword> areaListView = new ListView<Keyword>("arealistview", new ArrayList<Keyword>(keywordDao.getKeywords(areaType, false))){ ListView<Keyword> areaListView = new ListView<Keyword>("arealistview", new ArrayList<Keyword>(keywordDao.getKeywords(areaType, false))){
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Override @Override
protected void populateItem(ListItem<Keyword> item) { protected void populateItem(ListItem<Keyword> item) {
final Keyword kw = item.getModelObject(); final Keyword kw = item.getModelObject();
item.add(new Label("arealabel", kw.getKeyword())); item.add(new Label("arealabel", kw.getKeyword()));
if (!employeeModel.getObject().getKeywords().getFiltered(areaType).contains(kw)){
item.setVisible(false);
}
item.add(new AjaxCheckBox("areacheckbox", new Model<Boolean>(employeeModel.getObject().getKeywords().getFiltered(areaType).contains(kw))){ item.add(new AjaxCheckBox("areacheckbox", new Model<Boolean>(employeeModel.getObject().getKeywords().getFiltered(areaType).contains(kw))){
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Override @Override
@ -117,13 +123,16 @@ public class ProfilePanel extends Panel {
employeeModel.getObject().getKeywords().setKeywords(oldKeywords); employeeModel.getObject().getKeywords().setKeywords(oldKeywords);
employeeModel.setObject(employeeDao.save(employeeModel.getObject())); employeeModel.setObject(employeeDao.save(employeeModel.getObject()));
target.addComponent(regularContainer); target.addComponent(regularContainer);
} }
}); });
} }
}; };
add(areaListView); add(areaListView);
// }
regularContainer = new WebMarkupContainer("regularcontainer"); regularContainer = new WebMarkupContainer("regularcontainer");
regularContainer.setOutputMarkupId(true); regularContainer.setOutputMarkupId(true);