Lagt till så att man kan välja att visa alla events för ett år
git-svn-id: svn://svn.dsv.su.se/scipro/scipro/trunk@511 73ecded7-942e-4092-bab0-0e58ef0ee984
This commit is contained in:
parent
b2773224b5
commit
2d2da49384
src/main/java/se/su/dsv/scipro/schedule
@ -45,6 +45,12 @@ public class EventListModel extends LoadableDetachableModel<List<Event>> {
|
||||
return list;
|
||||
}
|
||||
|
||||
public void setTimeSpan(DateTime start, DateTime end){
|
||||
firstDateOfTimeSpan = start;
|
||||
lastDateOfTimeSpan = end;
|
||||
reload();
|
||||
}
|
||||
|
||||
private void setCount(int count) {
|
||||
this.count = count;
|
||||
}
|
||||
|
@ -14,7 +14,7 @@ import se.su.dsv.scipro.schedule.panels.SchedulePlannerPanel;
|
||||
public abstract class SchedulePage extends ProjectPage {
|
||||
|
||||
@SpringBean
|
||||
private ProjectDao projectDao;
|
||||
protected ProjectDao projectDao;
|
||||
|
||||
protected Project project = null;
|
||||
|
||||
|
@ -1,7 +1,6 @@
|
||||
package se.su.dsv.scipro.schedule.panels;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import org.apache.wicket.PageParameters;
|
||||
@ -17,6 +16,7 @@ import org.apache.wicket.markup.html.panel.EmptyPanel;
|
||||
import org.apache.wicket.markup.html.panel.Panel;
|
||||
import org.apache.wicket.model.Model;
|
||||
import org.apache.wicket.spring.injection.annot.SpringBean;
|
||||
import org.joda.time.DateTime;
|
||||
import org.odlabs.wiquery.core.effects.EffectSpeed;
|
||||
import org.odlabs.wiquery.ui.dialog.Dialog;
|
||||
|
||||
@ -189,8 +189,8 @@ public class SchedulePlannerPanel extends Panel implements ISchedulePlannerPanel
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@Override
|
||||
public void onSelectionChange(AjaxRequestTarget target, Date date) {
|
||||
eventsModel.setMonthFromDate(date);
|
||||
public void onSelectionChange(AjaxRequestTarget target, DateTime startDate, DateTime endDate) {
|
||||
eventsModel.setTimeSpan(startDate, endDate);
|
||||
target.addComponent(WiQueryCoreEffectsHelper.fadeIn(eventListContainer, EffectSpeed.FAST));
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user