DMC/scipro
7
0
Fork 0
Code Issues40 Pull Requests7 Actions Projects1 Releases Wiki Activity

Sorting on name now works in the statistics panel (for the spring data api).

Browse Source
This commit is contained in:
Tom Vahlman 2012-04-02 15:55:44 +02:00
parent a2eb60184b
commit 4403257d16
1 changed files with 19 additions and 7 deletions

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

@ -1,5 +1,6 @@
package se.su.dsv.scipro.admin.panels.match; package se.su.dsv.scipro.admin.panels.match;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.ajax.markup.html.AjaxLink;
@ -59,12 +60,12 @@ public class AdminSupervisorKeywordPanel extends Panel {
if(!supervisorName.toString().isEmpty()) { if(!supervisorName.toString().isEmpty()) {
String addToSearch = "true"; String addToSearch = "true";
} }
if (sortDirection.toString().isEmpty() || sortDirection.toString().equals("DESC")) { if (sortDirection.toString().isEmpty() || sortDirection.toString().equals("ASC")) {
sortDirection.delete(0, sortDirection.length());
sortDirection.append("ASC");
} else {
sortDirection.delete(0, sortDirection.length()); sortDirection.delete(0, sortDirection.length());
sortDirection.append("DESC"); sortDirection.append("DESC");
} else {
sortDirection.delete(0, sortDirection.length());
sortDirection.append("ASC");
} }
orderBy__.delete(0, orderBy__.length()); orderBy__.delete(0, orderBy__.length());
orderBy__.append(orderBy); orderBy__.append(orderBy);
@ -82,13 +83,24 @@ if(!supervisorName.toString().isEmpty()) {
org.springframework.data.domain.Sort sorter; org.springframework.data.domain.Sort sorter;
if (sortDirection.toString().isEmpty()) { if (sortDirection.toString().isEmpty()) {
sorter = new org.springframework.data.domain.Sort(org.springframework.data.domain.Sort.Direction.ASC, "user.lastName"); sorter = new org.springframework.data.domain.Sort(org.springframework.data.domain.Sort.Direction.ASC, "user.lastName");
} } else if (sortDirection.toString().equals("ASC")) {
else if (sortDirection.toString().equals("ASC")) {
sorter = new org.springframework.data.domain.Sort(org.springframework.data.domain.Sort.Direction.ASC, orderBy.toString()); sorter = new org.springframework.data.domain.Sort(org.springframework.data.domain.Sort.Direction.ASC, orderBy.toString());
} 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());
} }
return supervisorService.findAllEmployees(sorter);
List<Employee> employeeList = new ArrayList<Employee>();
employeeList.addAll(supervisorService.findAllEmployees(sorter));
if(!supervisorName.toString().isEmpty()) {
List<Employee> employeeListName = new ArrayList<Employee>();
for(Employee employee : employeeList) {
if(employee.getNameAsString().equals(supervisorName.toString())) {
employeeListName.add(employee);
}
}
return employeeListName;
}
return employeeList;
} }
}) { }) {