keywords are in order now
This commit is contained in:
parent
92b1908d5b
commit
22f9617896
@ -105,7 +105,7 @@ public class ProfilePanel extends Panel {
|
|||||||
|
|
||||||
add(new Label("emptylabel", "You do not have any active/existing research areas selected in Daisy. Please make sure that you select at least one active/existing research area in Daisy ASAP.").setVisible(employeeModel.getObject().getKeywords().getFiltered(areaType) == null || employeeModel.getObject().getKeywords().getFiltered(areaType).isEmpty() || !atLeastOneActive));
|
add(new Label("emptylabel", "You do not have any active/existing research areas selected in Daisy. Please make sure that you select at least one active/existing research area in Daisy ASAP.").setVisible(employeeModel.getObject().getKeywords().getFiltered(areaType) == null || employeeModel.getObject().getKeywords().getFiltered(areaType).isEmpty() || !atLeastOneActive));
|
||||||
|
|
||||||
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.findAllFromType(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) {
|
||||||
@ -145,7 +145,7 @@ public class ProfilePanel extends Panel {
|
|||||||
|
|
||||||
final KeywordType regularType = keywordTypeDao.findByType(KeywordTypeDao.TYPE.REGULAR);
|
final KeywordType regularType = keywordTypeDao.findByType(KeywordTypeDao.TYPE.REGULAR);
|
||||||
|
|
||||||
ListView<Keyword> regularListView = new ListView<Keyword>("regularlistview", new ArrayList<Keyword>(keywordDao.getKeywords(regularType, false))){
|
ListView<Keyword> regularListView = new ListView<Keyword>("regularlistview", new ArrayList<Keyword>(keywordDao.findAllFromType(regularType, 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) {
|
||||||
@ -179,7 +179,7 @@ public class ProfilePanel extends Panel {
|
|||||||
};
|
};
|
||||||
regularContainer.add(regularListView);
|
regularContainer.add(regularListView);
|
||||||
|
|
||||||
ListView<Keyword> regularListView2 = new ListView<Keyword>("regularlistview2", new ArrayList<Keyword>(keywordDao.getKeywords(regularType, false))){
|
ListView<Keyword> regularListView2 = new ListView<Keyword>("regularlistview2", new ArrayList<Keyword>(keywordDao.findAllFromType(regularType, 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) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user