From 7d890164addd498d7d23f27abe84c876728f5f3e Mon Sep 17 00:00:00 2001 From: quasi Date: Tue, 22 Sep 2009 13:03:26 +0000 Subject: [PATCH] =?UTF-8?q?Anpassung=20f=C3=BCr=20DateWidgets=20in=20Event?= =?UTF-8?q?,=20so=20da=C3=9F=20das=20Jahresfeld=20per=20Parameter=20einges?= =?UTF-8?q?tellt=20werden=20kann.=20Es=20l=C3=A4=C3=9Ft=20sich=20das=20Anf?= =?UTF-8?q?angsjahr=20einstellen=20und=20ein=20Deltawert=20f=C3=BCr=20das?= =?UTF-8?q?=20Endjahr=20definieren.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@266 8810af33-2d31-482b-a856-94f89814c4df --- .../cms/contenttypes/EventConfig.java | 105 +++++++++++------- .../EventConfig_parameter.properties | 11 ++ .../contenttypes/ui/EventPropertyForm.java | 7 ++ 3 files changed, 82 insertions(+), 41 deletions(-) diff --git a/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventConfig.java b/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventConfig.java index 2dda77497..48c427e9c 100755 --- a/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventConfig.java +++ b/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventConfig.java @@ -21,6 +21,9 @@ package com.arsdigita.cms.contenttypes; import com.arsdigita.runtime.AbstractConfig; import com.arsdigita.util.parameter.Parameter; import com.arsdigita.util.parameter.BooleanParameter; +import com.arsdigita.util.parameter.IntegerParameter; +import java.util.Calendar; +import java.util.GregorianCalendar; public class EventConfig extends AbstractConfig { @@ -30,65 +33,85 @@ public class EventConfig extends AbstractConfig { private final Parameter m_hideLinkToMap; private final Parameter m_hideCost; private final Parameter m_useHtmlDateDescription; - + private final Parameter m_startYear; + private final Parameter m_endYearDelta; + public EventConfig() { m_hideDateDescription = new BooleanParameter( - "com.arsdigita.cms.contenttypes.event.hide_date_description", - Parameter.REQUIRED, - new Boolean(false)); - - m_hideMainContributor = new BooleanParameter( - "com.arsdigita.cms.contenttypes.event.hide_main_contributor", - Parameter.REQUIRED, - new Boolean(false)); - - m_hideEventType = new BooleanParameter( - "com.arsdigita.cms.contenttypes.event.hide_event_type", - Parameter.REQUIRED, - new Boolean(false)); - - m_hideLinkToMap = new BooleanParameter( - "com.arsdigita.cms.contenttypes.event.hide_link_to_map", - Parameter.REQUIRED, - new Boolean(false)); - - m_hideCost = new BooleanParameter( - "com.arsdigita.cms.contenttypes.event.hide_cost", - Parameter.REQUIRED, - new Boolean(false)); - + "com.arsdigita.cms.contenttypes.event.hide_date_description", + Parameter.REQUIRED, + new Boolean(false)); + + m_hideMainContributor = new BooleanParameter( + "com.arsdigita.cms.contenttypes.event.hide_main_contributor", + Parameter.REQUIRED, + new Boolean(false)); + + m_hideEventType = new BooleanParameter( + "com.arsdigita.cms.contenttypes.event.hide_event_type", + Parameter.REQUIRED, + new Boolean(false)); + + m_hideLinkToMap = new BooleanParameter( + "com.arsdigita.cms.contenttypes.event.hide_link_to_map", + Parameter.REQUIRED, + new Boolean(false)); + + m_hideCost = new BooleanParameter( + "com.arsdigita.cms.contenttypes.event.hide_cost", + Parameter.REQUIRED, + new Boolean(false)); + m_useHtmlDateDescription = new BooleanParameter( - "com.arsdigita.cms.contenttypes.event.use_html_date_description", - Parameter.REQUIRED, - new Boolean(true)); // depricated, may be false in future releases - + "com.arsdigita.cms.contenttypes.event.use_html_date_description", + Parameter.REQUIRED, + new Boolean(true)); // depricated, may be false in future releases + + m_startYear = new IntegerParameter( + "com.arsdigita.cms.contenttypes.event.start_year", + Parameter.REQUIRED, + new Integer(GregorianCalendar.getInstance().get(Calendar.YEAR) - 1)); + + m_endYearDelta = new IntegerParameter( + "com.arsdigita.cms.contenttypes.event.end_year_delta", + Parameter.REQUIRED, + new Integer(3)); + register(m_hideDateDescription); - register(m_hideMainContributor); - register(m_hideEventType); - register(m_hideLinkToMap); - register(m_hideCost); + register(m_hideMainContributor); + register(m_hideEventType); + register(m_hideLinkToMap); + register(m_hideCost); register(m_useHtmlDateDescription); - + register(m_startYear); + register(m_endYearDelta); + loadInfo(); } public final boolean getHideDateDescription() { - return ((Boolean) get(m_hideDateDescription)).booleanValue(); + return ((Boolean) get(m_hideDateDescription)).booleanValue(); } public final boolean getHideMainContributor() { - return ((Boolean) get(m_hideMainContributor)).booleanValue(); + return ((Boolean) get(m_hideMainContributor)).booleanValue(); } public final boolean getHideEventType() { - return ((Boolean) get(m_hideEventType)).booleanValue(); + return ((Boolean) get(m_hideEventType)).booleanValue(); } public final boolean getHideLinkToMap() { - return ((Boolean) get(m_hideLinkToMap)).booleanValue(); + return ((Boolean) get(m_hideLinkToMap)).booleanValue(); } public final boolean getHideCost() { - return ((Boolean) get(m_hideCost)).booleanValue(); + return ((Boolean) get(m_hideCost)).booleanValue(); } public final boolean getUseHtmlDateDescription() { - return ((Boolean) get(m_useHtmlDateDescription)).booleanValue(); + return ((Boolean) get(m_useHtmlDateDescription)).booleanValue(); + } + public final int getStartYear() { + return ((Integer) get(m_startYear)).intValue(); + } + public final int getEndYearDelta() { + return ((Integer) get(m_endYearDelta)).intValue(); } } - + diff --git a/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventConfig_parameter.properties b/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventConfig_parameter.properties index 4f6fab585..0cad1d464 100755 --- a/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventConfig_parameter.properties +++ b/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventConfig_parameter.properties @@ -27,3 +27,14 @@ com.arsdigita.cms.contenttypes.event.use_html_date_description.title=Use HTML fo com.arsdigita.cms.contenttypes.event.use_html_date_description.purpose=Use the HTML Editor to edit the Date Description. Current default is true for backwards compatibility, but may be false in future releases. com.arsdigita.cms.contenttypes.event.use_html_date_description.example=true com.arsdigita.cms.contenttypes.event.use_html_date_description.format=[boolean] + +com.arsdigita.cms.contenttypes.event.start_year.title=Start Year +com.arsdigita.cms.contenttypes.event.start_year.purpose=Start year for the year select box +com.arsdigita.cms.contenttypes.event.start_year.example=2008 +com.arsdigita.cms.contenttypes.event.start_year.format=[integer] + +com.arsdigita.cms.contenttypes.event.end_year_delta.title=End Year +com.arsdigita.cms.contenttypes.event.end_year_delta.purpose=End year delta for the year select box +com.arsdigita.cms.contenttypes.event.end_year_delta.example=3 +com.arsdigita.cms.contenttypes.event.end_year_delta.format=[integer] + diff --git a/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/ui/EventPropertyForm.java b/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/ui/EventPropertyForm.java index 1f6db22a2..e0f3e00c3 100755 --- a/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/ui/EventPropertyForm.java +++ b/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/ui/EventPropertyForm.java @@ -41,6 +41,8 @@ import com.arsdigita.cms.contenttypes.Event; import com.arsdigita.cms.ui.authoring.BasicPageForm; import com.arsdigita.cms.contenttypes.util.EventGlobalizationUtil; import com.arsdigita.cms.ui.CMSDHTMLEditor; +import java.util.Calendar; +import java.util.GregorianCalendar; /** * Form to edit the basic properties of an Event object. Used by @@ -127,6 +129,9 @@ public class EventPropertyForm extends BasicPageForm // Use bebop date instead of java.util.date com.arsdigita.bebop.form.Date startDate = new com.arsdigita.bebop.form.Date(eventStartDateParam); + // Set the upper und lower boundary of the year select box + startDate.setYearRange(Event.getConfig().getStartYear(), + GregorianCalendar.getInstance().get(Calendar.YEAR) + Event.getConfig().getEndYearDelta()); add(startDate); ParameterModel eventStartTimeParam = new TimeParameter(START_TIME); @@ -143,6 +148,8 @@ public class EventPropertyForm extends BasicPageForm // Use bebop date instead of java.util.date com.arsdigita.bebop.form.Date endDate = new com.arsdigita.bebop.form.Date(eventEndDateParam); + endDate.setYearRange(Event.getConfig().getStartYear(), + GregorianCalendar.getInstance().get(Calendar.YEAR) + Event.getConfig().getEndYearDelta()); add(endDate); ParameterModel eventEndTimeParam = new TimeParameter(END_TIME);