Skip to content

Commit

Permalink
CEGEP modifications
Browse files Browse the repository at this point in the history
  • Loading branch information
JayanthyChengan committed Apr 15, 2024
1 parent 935f64a commit e311ccc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -836,6 +836,9 @@ public List<String> getAffiliationList() {
affiliationList.clear();
ResourceBundle bundle = BundleUtil.getResourceBundle("affiliation");
affiliationList = affiliationServiceBean.getValues(bundle);

affiliationList.stream().filter(str -> !str.equals("true")); // Skip "true"

affiliationList.sort((String o1, String o2) -> {
o1 = Normalizer.normalize(o1, Normalizer.Form.NFD);
o2 = Normalizer.normalize(o2, Normalizer.Form.NFD);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ public List<String> getAffiliationList() {
affiliationGroups = affGroupProvider.getAffiliationGroups();
}
List<String> existing = affiliationGroups.stream().map(a -> a.getDisplayName()).collect(Collectors.toList());
values.stream().filter(str -> !str.equals("true")); // Skip "true"
values.removeAll(existing);
values.sort((String o1, String o2) -> {
o1 = Normalizer.normalize(o1, Normalizer.Form.NFD);
Expand Down

0 comments on commit e311ccc

Please sign in to comment.