Skip to content
Snippets Groups Projects

Resolve "Netid search is case-sensitive"

Files

@@ -148,10 +148,11 @@ public class EditionController {
Map<Long, CourseSummaryDTO> courses = editions.stream()
.collect(Collectors.toMap(EditionDetailsDTO::getId, e -> e.getCourse()));
if (q != null) {
String filter = q.toLowerCase();
roles = roles.stream()
.filter(r -> r.getEdition().getName().contains(q)
|| courses.get(r.getEdition().getId()).getName().contains(q)
|| courses.get(r.getEdition().getId()).getCode().contains(q))
.filter(r -> r.getEdition().getName().toLowerCase().contains(filter)
|| courses.get(r.getEdition().getId()).getName().toLowerCase().contains(filter)
|| courses.get(r.getEdition().getId()).getCode().toLowerCase().contains(filter))
.collect(Collectors.toList());
}
@@ -237,9 +238,10 @@ public class EditionController {
EditionDetailsDTO edition = editionService.getEdition(id);
List<MemberViewDTO> roles = roleService.getStudentRolesOfEdition(id, true);
if (q != null) {
roles = roles.stream().filter(r -> r.getPerson().getUsername().contains(q) ||
r.getPerson().getDisplayName().contains(q) ||
r.getPerson().getNumber().toString().contains(q)).collect(Collectors.toList());
String filter = q.toLowerCase();
roles = roles.stream().filter(r -> r.getPerson().getUsername().toLowerCase().contains(filter) ||
r.getPerson().getDisplayName().toLowerCase().contains(filter) ||
r.getPerson().getNumber().toString().contains(filter)).collect(Collectors.toList());
}
model.addAttribute("edition", edition);
@@ -269,9 +271,10 @@ public class EditionController {
EditionDetailsDTO edition = editionService.getEdition(id);
List<MemberViewDTO> roles = roleService.getStaffRolesOfEdition(id, staff);
if (q != null) {
roles = roles.stream().filter(r -> r.getPerson().getUsername().contains(q) ||
r.getPerson().getDisplayName().contains(q) ||
r.getPerson().getNumber().toString().contains(q)).collect(Collectors.toList());
String filter = q.toLowerCase();
roles = roles.stream().filter(r -> r.getPerson().getUsername().toLowerCase().contains(filter) ||
r.getPerson().getDisplayName().toLowerCase().contains(filter) ||
r.getPerson().getNumber().toString().contains(filter)).collect(Collectors.toList());
}
model.addAttribute("edition", edition);
Loading