DMC/scipro
7
0
Fork 0
Code Issues42 Pull Requests4 Actions Projects1 Releases Wiki Activity

inactive keywords no longer presented to authors and supervisors

Browse Source
This commit is contained in:
Fredrik Friis 2012-02-15 12:21:11 +09:00
parent 3122c686a1
commit a98c214bcd
6 changed files with 9 additions and 8 deletions
src
main/java/se/su/dsv/scipro
io/facade
ImporterFacade.java
match
dataprovider
KeywordsDataProvider.java
panel
AdminManageSupervisorPanel.javaFilterFormKeywordPanel.java
project/panels
KeywordSelectionPanel.java
test/java/se/su/dsv/scipro/match/dao
TestKeywordDao.java

3
src/main/java/se/su/dsv/scipro/io/facade/ImporterFacade.java

@ -422,7 +422,8 @@ public class ImporterFacade {
@Transactional
public void addUnexistingUnitsAsKeywords(final Set<UnitDTO> subunits) {
final Set<Keyword> currentUnits = keywordDao.getKeywords(keywordTypeDao.findByType(KeywordTypeDao.TYPE.UNIT));
//include deleted keywords set to true, should it be like that? /Friis
final Set<Keyword> currentUnits = keywordDao.getKeywords(keywordTypeDao.findByType(KeywordTypeDao.TYPE.UNIT), true);
final Set<UnitDTO> remoteUnits = new HashSet<UnitDTO>(subunits);
for (Keyword unit : currentUnits) {
UnitDTO translatedUnit = dtoFromUnitKeyword(unit);

4
src/main/java/se/su/dsv/scipro/match/dataprovider/KeywordsDataProvider.java

@ -31,13 +31,13 @@ public class KeywordsDataProvider extends SortableDataProvider<Keyword>{
}
public Iterator<Keyword> iterator(int first, int count) {
Iterator<Keyword> iter = keywordDao.getKeywords(keywordType).iterator();
Iterator<Keyword> iter = keywordDao.getKeywords(keywordType, true).iterator();
return iter;
}
@Override
public int size() {
return keywordDao.getKeywords(keywordType).size();
return keywordDao.getKeywords(keywordType, true).size();
}
}

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

@ -211,7 +211,7 @@ public class AdminManageSupervisorPanel extends Panel {
keywords.addAll(researchAreaPanel.getSelectedKeywords());
KeywordType kwType = keywordTypeDao.findByType(KeywordTypeDao.TYPE.REGULAR);
Set<Keyword> tmpWords = keywordDao.getKeywords(kwType);
Set<Keyword> tmpWords = keywordDao.getKeywords(kwType, true);
for(Keyword k : tmpWords){
if(k.getKeyword().equalsIgnoreCase(keywordField.getModelObject())){
keywords.add(k);

2
src/main/java/se/su/dsv/scipro/match/panel/FilterFormKeywordPanel.java

@ -47,7 +47,7 @@ public class FilterFormKeywordPanel extends Panel {
KeywordType kwType = keywordTypeDao.findByType(type);
Set<Keyword> tmpWords = keywordDao.getKeywords(kwType);
Set<Keyword> tmpWords = keywordDao.getKeywords(kwType, true);
keywords = new ArrayList<Keyword>(tmpWords);
CompoundPropertyModel<List<Keyword>> keyWordModel = new CompoundPropertyModel<List<Keyword>>(keywords);

4
src/main/java/se/su/dsv/scipro/project/panels/KeywordSelectionPanel.java

@ -125,7 +125,7 @@ public class KeywordSelectionPanel extends Panel {
if (keywordProvider.getObject() != null) {
ideaAreaKeywords = new ArrayList<Keyword>(keywordProvider.getObject().getKeywords().getFiltered(area));
}
Set<Keyword> areaKeySet = keywordDao.getKeywords(area);
Set<Keyword> areaKeySet = keywordDao.getKeywords(area, false);
List<Keyword> areaKeyList = new ArrayList<Keyword>(areaKeySet);
CompoundPropertyModel<List<Keyword>> listModel = new CompoundPropertyModel<List<Keyword>>(areaKeyList);
@ -153,7 +153,7 @@ public class KeywordSelectionPanel extends Panel {
if(!selectedWords.isEmpty())
ideaKeywords = new ArrayList<Keyword>(selectedWords);
Set<Keyword> keySet = keywordDao.getKeywords(keyword);
Set<Keyword> keySet = keywordDao.getKeywords(keyword, false);
regularKeywordsPalette = new Palette<Keyword>("keywordPalette",
new ListModel<Keyword>(ideaKeywords),
new CollectionModel<Keyword>(keySet),

2
src/test/java/se/su/dsv/scipro/match/dao/TestKeywordDao.java

@ -66,7 +66,7 @@ public class TestKeywordDao {
@Transactional
@Rollback
public void testShouldGetAllKeywordsOfACertainType() {
Set<Keyword> keywords = target.getKeywords(standard);
Set<Keyword> keywords = target.getKeywords(standard, true);
Assert.assertEquals(new HashSet<Keyword>(
Arrays.asList(new Keyword[] { keyword1, keyword2 })), keywords);
}