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

changed from keyword unit to unit in admin match manage supervisor list, must also change the filter thingie

Browse Source
This commit is contained in:
fred-fri 2012-05-29 13:03:52 +09:00
parent 10d7c2aeff
commit a56ec1cc8a
1 changed files with 3 additions and 6 deletions

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

@ -144,11 +144,6 @@ public class AdminManageSupervisorPanel extends Panel {
@Override @Override
protected void populateItem(final Item<Employee> item) { protected void populateItem(final Item<Employee> item) {
final Employee supervisor = item.getModelObject(); final Employee supervisor = item.getModelObject();
List<Keyword> keywords = supervisor.getKeywords().getFiltered(KeywordTypeDao.TYPE.UNIT.toDbName());
String unit = "";
if (!keywords.isEmpty()) {
unit += keywords.get(0).getKeyword();
}
Availability bachelorAvalibality = supervisorDao.getAvailability(supervisor, projectClassDao.getProjectClass(ProjectClass.BACHELOR)); Availability bachelorAvalibality = supervisorDao.getAvailability(supervisor, projectClassDao.getProjectClass(ProjectClass.BACHELOR));
Availability masterAvalibality = supervisorDao.getAvailability(supervisor, projectClassDao.getProjectClass(ProjectClass.MASTER)); Availability masterAvalibality = supervisorDao.getAvailability(supervisor, projectClassDao.getProjectClass(ProjectClass.MASTER));
@ -168,7 +163,9 @@ public class AdminManageSupervisorPanel extends Panel {
}; };
detailsLink.add(new Label("supervisor", supervisor.getNameAsString())); detailsLink.add(new Label("supervisor", supervisor.getNameAsString()));
item.add(detailsLink); item.add(detailsLink);
item.add(new Label("unit", new Model<String>(unit)));
item.add(new Label("unit", new PropertyModel<Employee>(supervisor, "unit.title")));
item.add(createDropDown(new Model<Availability>(bachelorAvalibality), "numCapable", "targetBachelor")); item.add(createDropDown(new Model<Availability>(bachelorAvalibality), "numCapable", "targetBachelor"));
item.add(createDropDown(new Model<Availability>(masterAvalibality), "numCapable", "targetMaster")); item.add(createDropDown(new Model<Availability>(masterAvalibality), "numCapable", "targetMaster"));