summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSebastian Schmelzer2012-09-11 15:23:31 +0200
committerSebastian Schmelzer2012-09-11 15:23:31 +0200
commit50ca2bafed97ea074b64210886d122bbd14c48c3 (patch)
treed788fe58af243fb23e128720cd1d64839f30cb48 /src
parentcalendar, ics import working (diff)
downloadinfoscreen-50ca2bafed97ea074b64210886d122bbd14c48c3.tar.gz
infoscreen-50ca2bafed97ea074b64210886d122bbd14c48c3.tar.xz
infoscreen-50ca2bafed97ea074b64210886d122bbd14c48c3.zip
simplify calendar
Diffstat (limited to 'src')
-rw-r--r--src/main/java/de/unifr/rz/infoscreen/Index.java2
-rw-r--r--src/main/java/de/unifr/rz/infoscreen/component/DayCalendar.java59
-rw-r--r--src/main/java/de/unifr/rz/infoscreen/component/WeekCalendar.java57
3 files changed, 5 insertions, 113 deletions
diff --git a/src/main/java/de/unifr/rz/infoscreen/Index.java b/src/main/java/de/unifr/rz/infoscreen/Index.java
index 3cedc2e..e4bfe70 100644
--- a/src/main/java/de/unifr/rz/infoscreen/Index.java
+++ b/src/main/java/de/unifr/rz/infoscreen/Index.java
@@ -29,7 +29,7 @@ public class Index extends SimpleBootstrapPage {
setPageTitle("Infoscreen");
setPageSubTitle("Videokonferenzraum");
- setMainContent(new DayCalendar("content", new IcsEventProvider("http://www.verwaltung.uni-freiburg.de/lsfserver/rds?state=verpublish&status=transform&vmfile=no&termine=165887,165887,192598,192599,200957&moduleCall=iCalendarPlan&publishConfFile=reports&publishSubDir=veranstaltung")));
+ setMainContent(new WeekCalendar("content", new IcsEventProvider("http://www.verwaltung.uni-freiburg.de/lsfserver/rds?state=verpublish&status=transform&vmfile=no&termine=165887,165887,192598,192599,200957&moduleCall=iCalendarPlan&publishConfFile=reports&publishSubDir=veranstaltung")));
}
diff --git a/src/main/java/de/unifr/rz/infoscreen/component/DayCalendar.java b/src/main/java/de/unifr/rz/infoscreen/component/DayCalendar.java
index 5ad39fc..fa11298 100644
--- a/src/main/java/de/unifr/rz/infoscreen/component/DayCalendar.java
+++ b/src/main/java/de/unifr/rz/infoscreen/component/DayCalendar.java
@@ -1,67 +1,12 @@
package de.unifr.rz.infoscreen.component;
-import java.util.Locale;
-
-import net.ftlines.wicket.fullcalendar.Config;
import net.ftlines.wicket.fullcalendar.EventProvider;
-import net.ftlines.wicket.fullcalendar.EventSource;
-import net.ftlines.wicket.fullcalendar.FullCalendar;
-
-import org.apache.wicket.markup.html.panel.Panel;
-import org.joda.time.LocalTime;
-public class DayCalendar extends Panel {
+public class DayCalendar extends AbstractCalendar {
private static final long serialVersionUID = 1L;
- private EventProvider ep;
public DayCalendar(String id, EventProvider ep) {
- super(id);
- this.setEp(ep);
-
- Config ajaxCalendarConfig = new Config();
-
- ajaxCalendarConfig.setSelectable(false);
- ajaxCalendarConfig.setSelectHelper(false);
-
- ajaxCalendarConfig.getHeader().setLeft("");
- ajaxCalendarConfig.getHeader().setCenter("");
- ajaxCalendarConfig.getHeader().setRight("");
- ajaxCalendarConfig.setDefaultView("agendaDay");
- ajaxCalendarConfig.setAllDaySlot(false);
-
- ajaxCalendarConfig.setColumnFormatWeek("dddd, d.M.");
- ajaxCalendarConfig.setColumnFormatDay("dddd, d.M.");
- ajaxCalendarConfig.setLocale(Locale.GERMANY);
-
- ajaxCalendarConfig.setMinTime(new LocalTime(6, 30));
- ajaxCalendarConfig.setMaxTime(new LocalTime(23, 00));
-
- EventSource content = new EventSource();
- content.setEventsProvider(ep);
-
- ajaxCalendarConfig.add(content);
-
- ajaxCalendarConfig.enableTimeline();
-
- FullCalendar ajaxCalendar = new FullCalendar("calendar",
- ajaxCalendarConfig) {
-
- private static final long serialVersionUID = 1L;
-
- };
-
- ajaxCalendar.setMarkupId("calendar");
- add(ajaxCalendar);
-
+ super(id, ep, ViewType.DAY);
}
-
- public EventProvider getEp() {
- return ep;
- }
-
- public void setEp(EventProvider ep) {
- this.ep = ep;
- }
-
}
diff --git a/src/main/java/de/unifr/rz/infoscreen/component/WeekCalendar.java b/src/main/java/de/unifr/rz/infoscreen/component/WeekCalendar.java
index 0011b49..6c91549 100644
--- a/src/main/java/de/unifr/rz/infoscreen/component/WeekCalendar.java
+++ b/src/main/java/de/unifr/rz/infoscreen/component/WeekCalendar.java
@@ -1,66 +1,13 @@
package de.unifr.rz.infoscreen.component;
-import java.util.Locale;
-
-import net.ftlines.wicket.fullcalendar.Config;
import net.ftlines.wicket.fullcalendar.EventProvider;
-import net.ftlines.wicket.fullcalendar.EventSource;
-import net.ftlines.wicket.fullcalendar.FullCalendar;
-
-import org.apache.wicket.markup.html.panel.Panel;
-import org.joda.time.LocalTime;
-public class WeekCalendar extends Panel {
+public class WeekCalendar extends AbstractCalendar {
private static final long serialVersionUID = 1L;
- private EventProvider ep;
public WeekCalendar(String id, EventProvider ep) {
- super(id);
- this.setEp(ep);
-
- Config ajaxCalendarConfig = new Config();
-
- ajaxCalendarConfig.setSelectable(false);
- ajaxCalendarConfig.setSelectHelper(false);
-
- ajaxCalendarConfig.getHeader().setLeft("");
- ajaxCalendarConfig.getHeader().setCenter("");
- ajaxCalendarConfig.getHeader().setRight("");
- ajaxCalendarConfig.setDefaultView("agendaWeek");
- ajaxCalendarConfig.setAllDaySlot(false);
-
- ajaxCalendarConfig.setColumnFormatWeek("dddd, d.M.");
- ajaxCalendarConfig.setLocale(Locale.GERMANY);
-
- ajaxCalendarConfig.setMinTime(new LocalTime(6, 30));
- ajaxCalendarConfig.setMaxTime(new LocalTime(23, 00));
-
- EventSource content = new EventSource();
- content.setEventsProvider(ep);
-
- ajaxCalendarConfig.add(content);
-
- ajaxCalendarConfig.enableTimeline();
-
- FullCalendar ajaxCalendar = new FullCalendar("calendar",
- ajaxCalendarConfig) {
+ super(id, ep, ViewType.WEEK);
- private static final long serialVersionUID = 1L;
-
- };
-
- ajaxCalendar.setMarkupId("calendar");
- add(ajaxCalendar);
-
- }
-
- public EventProvider getEp() {
- return ep;
- }
-
- public void setEp(EventProvider ep) {
- this.ep = ep;
}
-
}