From a56ec1cc8a0c420d630e45e88db7eff9dbbbc0b7 Mon Sep 17 00:00:00 2001
From: fred-fri <fred-fri@dsv.su.se>
Date: Tue, 29 May 2012 13:03:52 +0900
Subject: [PATCH] changed from keyword unit to unit in admin match manage
supervisor list, must also change the filter thingie
---
.../scipro/match/panel/AdminManageSupervisorPanel.java | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/main/java/se/su/dsv/scipro/match/panel/AdminManageSupervisorPanel.java b/src/main/java/se/su/dsv/scipro/match/panel/AdminManageSupervisorPanel.java
index edf53a4b41..75d38de666 100644
--- a/src/main/java/se/su/dsv/scipro/match/panel/AdminManageSupervisorPanel.java
+++ b/src/main/java/se/su/dsv/scipro/match/panel/AdminManageSupervisorPanel.java
@@ -144,11 +144,6 @@ public class AdminManageSupervisorPanel extends Panel {
@Override
protected void populateItem(final Item<Employee> item) {
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 masterAvalibality = supervisorDao.getAvailability(supervisor, projectClassDao.getProjectClass(ProjectClass.MASTER));
@@ -168,7 +163,9 @@ public class AdminManageSupervisorPanel extends Panel {
};
detailsLink.add(new Label("supervisor", supervisor.getNameAsString()));
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>(masterAvalibality), "numCapable", "targetMaster"));