DMC/scipro
7
0
Fork 0
Code Issues41 Pull Requests6 Actions Projects1 Releases Wiki Activity

The handling of data in the filter string has been separated to its own method.

Browse Source
This commit is contained in:
Tom Vahlman 2012-04-02 16:09:28 +02:00
parent e500293918
commit b7f52fc27d
1 changed files with 18 additions and 11 deletions

29
src/main/java/se/su/dsv/scipro/admin/panels/match/AdminSupervisorKeywordPanel.java

@ -71,6 +71,23 @@ if(!supervisorName.toString().isEmpty()) {
orderBy__.append(orderBy); orderBy__.append(orderBy);
} }
private List<Employee> addEmployeesToList(final StringBuffer supervisorName, List<Employee> employeeList) {
if(supervisorName.toString().isEmpty()) {
return employeeList;
} else {
List<Employee> employeeListName = new ArrayList<Employee>();
for(Employee employee : employeeList) {
if(employee.getNameAsString().equals(supervisorName.toString())) {
employeeListName.add(employee);
}
}
if(!employeeListName.isEmpty()) {
return employeeListName;
}
}
return employeeList;
}
private void setUpTable(final Dialog dialog, final WebMarkupContainer tableContainer, final StringBuffer supervisorName) { private void setUpTable(final Dialog dialog, final WebMarkupContainer tableContainer, final StringBuffer supervisorName) {
final StringBuffer sortDirection = new StringBuffer(); final StringBuffer sortDirection = new StringBuffer();
final StringBuffer orderBy = new StringBuffer(); final StringBuffer orderBy = new StringBuffer();
@ -88,19 +105,9 @@ if(!supervisorName.toString().isEmpty()) {
} else { } else {
sorter = new org.springframework.data.domain.Sort(org.springframework.data.domain.Sort.Direction.DESC, orderBy.toString()); sorter = new org.springframework.data.domain.Sort(org.springframework.data.domain.Sort.Direction.DESC, orderBy.toString());
} }
List<Employee> employeeList = new ArrayList<Employee>(); List<Employee> employeeList = new ArrayList<Employee>();
employeeList.addAll(supervisorService.findAllEmployees(sorter)); employeeList.addAll(supervisorService.findAllEmployees(sorter));
if(!supervisorName.toString().isEmpty()) { return addEmployeesToList(supervisorName, employeeList);
List<Employee> employeeListName = new ArrayList<Employee>();
for(Employee employee : employeeList) {
if(employee.getNameAsString().equals(supervisorName.toString())) {
employeeListName.add(employee);
}
}
return employeeListName;
}
return employeeList;
} }
}) { }) {