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

added filtering on supervisor

Browse Source
This commit is contained in:
Emil Siverhall 2012-09-07 09:42:50 +02:00
parent 69dc21e121
commit a9316d0ed6
2 changed files with 24 additions and 4 deletions
src/main/java/se/su/dsv/scipro/datatables/supervisoridea
AdminSupervisorIdeaCrudPanel.htmlAdminSupervisorIdeaCrudPanel.java

10
src/main/java/se/su/dsv/scipro/datatables/supervisoridea/AdminSupervisorIdeaCrudPanel.html

@ -7,10 +7,16 @@
<div wicket:id="dialogPanel"></div>
</div>
<form wicket:id="form">
<div class="span-6">
<label>Filter by supervisor:</label>
<br/>
<input wicket:id="supervisorFilter"/>
<br/>
</div>
<label>Filter by created between:</label><br />
<div class="span-6" wicket:id="datePanel"></div>
<div class="span-6" wicket:id="dateFilter"></div>
</form>
<div wicket:id="dataTable"></div>
<div class="span-24" wicket:id="dataTable"></div>
</wicket:panel>
</body>
</html>

18
src/main/java/se/su/dsv/scipro/datatables/supervisoridea/AdminSupervisorIdeaCrudPanel.java

@ -22,6 +22,7 @@ import org.springframework.data.domain.PageRequest;
import se.su.dsv.scipro.admin.panels.AdminIdeaDetailsCrudPanel;
import se.su.dsv.scipro.components.DatePickerPanel;
import se.su.dsv.scipro.data.dataobjects.Employee;
import se.su.dsv.scipro.datatables.AjaxLinkColumn;
import se.su.dsv.scipro.datatables.ClickableIconColumn;
import se.su.dsv.scipro.datatables.DateColumn;
@ -29,10 +30,10 @@ import se.su.dsv.scipro.datatables.GenericDataPanel;
import se.su.dsv.scipro.icons.ImageIcon;
import se.su.dsv.scipro.match.dataobject.Idea.IdeaStatus;
import se.su.dsv.scipro.match.dataobject.SupervisorIdea;
import se.su.dsv.scipro.reusable.EmployeeAutoComplete;
import se.su.dsv.scipro.reusable.SafeLongToIntService;
import se.su.dsv.scipro.springdata.services.GenericService;
import se.su.dsv.scipro.springdata.services.SupervisorIdeaService;
import se.su.dsv.scipro.springdata.services.SupervisorIdeaService.FilterParams;
import se.su.dsv.scipro.util.DateFormatter;
public class AdminSupervisorIdeaCrudPanel extends Panel {
@ -184,11 +185,13 @@ public class AdminSupervisorIdeaCrudPanel extends Panel {
public FilterForm(String id) {
super(id);
params = new SupervisorIdeaService.FilterParams();
// DATE FILTERING
DateTime start = new DateTime();
start = start.minusMonths(12);
params.setCreatedAfter(start.toDate());
params.setCreatedBefore(new Date());
final DatePickerPanel datePanel = new DatePickerPanel("datePanel", start.toDate(), null) {
final DatePickerPanel datePanel = new DatePickerPanel("dateFilter", start.toDate(), null) {
private static final long serialVersionUID = -411662653140866688L;
@Override
@ -204,6 +207,17 @@ public class AdminSupervisorIdeaCrudPanel extends Panel {
}
};
add(datePanel);
// SUPERVISOR FILTERING
add(new EmployeeAutoComplete("supervisorFilter") {
private static final long serialVersionUID = -3364194384925083087L;
@Override
protected void action(AjaxRequestTarget pTarget, Employee newSelection) {
params.setSupervisor(newSelection);
pTarget.addComponent(genericDataPanel.getWMC());
}
});
}
}