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

changed unit label on supervisor profile to point to the unit attribute

Browse Source
This commit is contained in:
fred-fri 2012-05-29 12:31:05 +09:00
parent b3d228e83b
commit f4358c4d5d
1 changed files with 2 additions and 3 deletions

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

@ -89,12 +89,11 @@ public class ProfilePanel extends Panel {
};
add(languageListView);
final KeywordType unitType = keywordTypeDao.findByType(KeywordTypeDao.TYPE.UNIT);
if (employeeModel.getObject().getKeywords().getFiltered(unitType) == null || employeeModel.getObject().getKeywords().getFiltered(unitType).isEmpty()){
if (employeeModel.getObject().getUnit() == null){
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 {
add(new Label("unitlabel", employeeModel.getObject().getKeywords().getFiltered(unitType).get(0).getKeyword()));
add(new Label("unitlabel", employeeModel.getObject().getUnit().getTitle()));
}
final KeywordType areaType = keywordTypeDao.findByType(KeywordTypeDao.TYPE.RESEARCH_AREA);