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

Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop

Browse Source
This commit is contained in:
Emil Siverhall 2012-07-30 08:53:16 +02:00
commit a248518f66
2 changed files with 38 additions and 8 deletions
src/main/java/se/su/dsv/scipro/supervisor/panels
WatsonInfoPanel.htmlWatsonInfoPanel.java

8
src/main/java/se/su/dsv/scipro/supervisor/panels/WatsonInfoPanel.html

@ -12,10 +12,10 @@
<b>Matched to:</b> <span wicket:id="matchedTo"></span>
<br>
<b>Matched supervisors research areas:</b> <span wicket:id="listview"><span wicket:id="label"></span></span>
<b>Matched supervisors research areas:</b> <span wicket:id="listview1"><span wicket:id="label"></span></span>
<br>
<b>Matched supervisors keywords:</b> <span wicket:id="listview2"><span wicket:id="label"></span></span>
<br>
<b>Title:</b> <span wicket:id="title"></span>
<br>
<b>Level:</b> <span wicket:id="level"></span>
@ -23,6 +23,8 @@
<!--<b>Author(s):</b> <span wicket:id="authors"></span>-->
<b>Author(s):</b> <span wicket:id="authorsListView"><span wicket:id="name"></span> <span wicket:id="email"></span> </span>
<br>
<b>Research areas:</b> <span wicket:id="ras"><span wicket:id="label"></span></span>
<br>
<b>Keywords:</b> <span wicket:id="keywords"></span>
<br>

38
src/main/java/se/su/dsv/scipro/supervisor/panels/WatsonInfoPanel.java

@ -73,18 +73,25 @@ public class WatsonInfoPanel extends Panel {
}.setVisible(visible));
final KeywordType areaType = keywordTypeDao.findByType(KeywordTypeDao.TYPE.RESEARCH_AREA);
final KeywordType regularType = keywordTypeDao.findByType(KeywordTypeDao.TYPE.REGULAR);
final ArrayList<Keyword> list = new ArrayList<Keyword>();
final ArrayList<Keyword> list1 = new ArrayList<Keyword>();
final ArrayList<Keyword> list2 = new ArrayList<Keyword>();
if (projectIdea.getMatch().getSupervisor()!= null){
if (projectIdea.getMatch().getSupervisor().getKeywords().getFiltered(areaType)!=null){
for (Keyword kw : projectIdea.getMatch().getSupervisor().getKeywords().getFiltered(areaType)){
list.add(kw);
list1.add(kw);
}
}
if (projectIdea.getMatch().getSupervisor().getKeywords().getFiltered(regularType)!=null){
for (Keyword kw : projectIdea.getMatch().getSupervisor().getKeywords().getFiltered(areaType)){
list2.add(kw);
}
}
}
ListView<Keyword> listView = new ListView<Keyword>("listview", list) {
ListView<Keyword> listView1 = new ListView<Keyword>("listview1", list1) {
@Override
protected void populateItem(ListItem<Keyword> listItem) {
listItem.add(new Label("label", listItem.getModelObject().getKeyword() + ", "));
@ -92,10 +99,31 @@ public class WatsonInfoPanel extends Panel {
@Override
public boolean isVisible(){
return list!=null && !list.isEmpty();
return list1!=null && !list1.isEmpty();
}
};
add(listView);
add(listView1);
ListView<Keyword> listView2 = new ListView<Keyword>("listview2", list2) {
@Override
protected void populateItem(ListItem<Keyword> listItem) {
listItem.add(new Label("label", listItem.getModelObject().getKeyword() + ", "));
}
@Override
public boolean isVisible(){
return list2!=null && !list2.isEmpty();
}
};
add(listView2);
ListView<Keyword> ras = new ListView<Keyword>("ras", projectIdea.getKeywords().getFiltered(regularType)) {
@Override
protected void populateItem(ListItem<Keyword> item) {
item.add(new Label("label", item.getModelObject().getKeyword()));
}
};
add(ras);
if (projectIdea.getMatch().getSupervisor()!=null){
add(new Label("matchedTo", projectIdea.getMatch().getSupervisor().getUser().getFullName()));