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

Refactor the statistics tab for sorting on name with spring data api.

Browse Source
This commit is contained in:
Tom Vahlman 2012-04-02 13:35:35 +02:00
parent 13428ff5ef
commit 4fcf67bb61
1 changed files with 20 additions and 43 deletions

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

@ -46,7 +46,6 @@ public class AdminSupervisorKeywordPanel extends Panel {
TextField<String> supervisorField = new TextField<String>("supervisorField", new Model<String>()); TextField<String> supervisorField = new TextField<String>("supervisorField", new Model<String>());
setUpTable(dialog, tableContainer, params); setUpTable(dialog, tableContainer, params);
setUpFiltering(tableContainer, params, supervisorField); setUpFiltering(tableContainer, params, supervisorField);
//addSortLink("numberOfRegulars", "keywords.size()", tableContainer, params);
} }
private void setUpFiltering(WebMarkupContainer tableContainer, SupervisorDaoParams params, TextField<String> supervisorField) { private void setUpFiltering(WebMarkupContainer tableContainer, SupervisorDaoParams params, TextField<String> supervisorField) {
@ -64,38 +63,32 @@ public class AdminSupervisorKeywordPanel extends Panel {
add(dialog.setOutputMarkupId(true)); add(dialog.setOutputMarkupId(true));
} }
private void addSortLink(String markup, final String sortField, final WebMarkupContainer allContainer, final SupervisorDaoParams params) { private org.springframework.data.domain.Sort getSortOrder(final StringBuffer nameSortDirection, final String orderBy) {
final AjaxLink<Void> sortLink = new AjaxLink<Void>(markup + "SortLink") { org.springframework.data.domain.Sort sortOrder;
if(nameSortDirection.toString().equals("ASC")) {
private static final long serialVersionUID = -8463105615994034854L; sortOrder = new org.springframework.data.domain.Sort(org.springframework.data.domain.Sort.Direction.DESC, orderBy);
nameSortDirection.delete(0, nameSortDirection.length()-1);
@Override nameSortDirection.append("DESC");
public void onClick(AjaxRequestTarget target) { } else {
if (params.getDirection().equals(Sort.ASCENDING)) { sortOrder = new org.springframework.data.domain.Sort(org.springframework.data.domain.Sort.Direction.ASC, orderBy);
params.setSortOn(sortField, Sort.DESCENDING); nameSortDirection.delete(0, nameSortDirection.length()-1);
} else { nameSortDirection.append("ASC");
params.setSortOn(sortField, Sort.ASCENDING); }
} return sortOrder;
target.addComponent(allContainer);
}
};
allContainer.add(sortLink);
} }
private void setUpTable(final Dialog dialog, final WebMarkupContainer tableContainer, final SupervisorDaoParams params) { private void setUpTable(final Dialog dialog, final WebMarkupContainer tableContainer, final SupervisorDaoParams params) {
final StringBuffer definedSortOrder = new StringBuffer(); final StringBuffer nameSortDirection = new StringBuffer();
definedSortOrder.append("user.firstName"); nameSortDirection.append("ASC");
final StringBuffer definedSortDirection = new StringBuffer(); final StringBuffer keywordsSortDirection = new StringBuffer();
definedSortDirection.append("ASC"); keywordsSortDirection.append("ASC");
final ListView<Employee> dataView = new ListView<Employee>("supervisorList", new LoadableDetachableModel<List<Employee>>() { final ListView<Employee> dataView = new ListView<Employee>("supervisorList", new LoadableDetachableModel<List<Employee>>() {
private static final long serialVersionUID = -2395796971679213814L; private static final long serialVersionUID = -2395796971679213814L;
@Override @Override
protected List<Employee> load() { protected List<Employee> load() {
return supervisorService.findAllEmployees(new org.springframework.data.domain.Sort(definedSortOrder.toString())); return supervisorService.findAllEmployees(new org.springframework.data.domain.Sort(org.springframework.data.domain.Sort.Direction.ASC, "user.lastName"));
} }
}) { }) {
@ -115,9 +108,7 @@ public class AdminSupervisorKeywordPanel extends Panel {
public void onClick(AjaxRequestTarget target) { public void onClick(AjaxRequestTarget target) {
target.addComponent(dialog); target.addComponent(dialog);
dialog.replace(new SupervisorKeywordDetailsPanel("dialogContent", supervisor) { dialog.replace(new SupervisorKeywordDetailsPanel("dialogContent", supervisor) {
private static final long serialVersionUID = -7272997720134543477L; private static final long serialVersionUID = -7272997720134543477L;
@Override @Override
public void onCloseButton(AjaxRequestTarget target) { public void onCloseButton(AjaxRequestTarget target) {
dialog.close(target); dialog.close(target);
@ -137,17 +128,7 @@ public class AdminSupervisorKeywordPanel extends Panel {
private static final long serialVersionUID = -6459164267551936706L; private static final long serialVersionUID = -6459164267551936706L;
@Override @Override
public void onClick(AjaxRequestTarget target) { public void onClick(AjaxRequestTarget target) {
org.springframework.data.domain.Sort sortOrder; dataView.setDefaultModelObject(supervisorService.findAllEmployees(getSortOrder(nameSortDirection,"user.lastName")));
if(definedSortDirection.toString().equals("ASC")) {
sortOrder = new org.springframework.data.domain.Sort(org.springframework.data.domain.Sort.Direction.DESC, "user.lastName");
definedSortDirection.delete(0, definedSortDirection.length()-1);
definedSortDirection.append("DESC");
} else {
sortOrder = new org.springframework.data.domain.Sort(org.springframework.data.domain.Sort.Direction.ASC, "user.lastName");
definedSortDirection.delete(0, definedSortDirection.length()-1);
definedSortDirection.append("ASC");
}
dataView.setDefaultModelObject(supervisorService.findAllEmployees(sortOrder));
target.addComponent(tableContainer); target.addComponent(tableContainer);
} }
}; };
@ -159,11 +140,7 @@ public class AdminSupervisorKeywordPanel extends Panel {
@Override @Override
public void onClick(AjaxRequestTarget target) { public void onClick(AjaxRequestTarget target) {
if(params.getDirection().equals(Sort.ASCENDING)) { dataView.setDefaultModelObject(supervisorService.findAllEmployees(getSortOrder(keywordsSortDirection,"keywords.getCollection().size")));
params.setSortOn("keywords.size", Sort.DESCENDING);
} else {
params.setSortOn("keywords.size", Sort.ASCENDING);
}
target.addComponent(tableContainer); target.addComponent(tableContainer);
} }
}; };