svn commit: r791960 - in /ofbiz/trunk/applications/workeffort: config/WorkEffortUiLabels.xml webapp/workeffort/WEB-INF/icalendar-controller.xml widget/WorkEffortForms.xml widget/WorkEffortMenus.xml widget/WorkEffortScreens.xml

[adrianc]

Author: adrianc
Date: Tue Jul  7 19:54:37 2009
New Revision: 791960

URL: http://svn.apache.org/viewvc?rev=791960&view=rev
Log:
Added the ability to add/edit the raw iCalendar data. This can be useful for users who want to use OFBiz to publish public calendars - like US Holidays.

Modified:
    ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
    ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/icalendar-controller.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml

Modified: ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml?rev=791960&r1=791959&r2=791960&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml (original)
+++ ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml Tue Jul  7 19:54:37 2009
@@ -1933,9 +1933,15 @@
     <property key="WorkEffortICalendarAddFixedAsset">
         <value xml:lang="en">Add iCalendar Fixed Asset</value>
     </property>
+    <property key="WorkEffortICalendarData">
+        <value xml:lang="en">Data</value>
+    </property>
     <property key="WorkEffortICalendarEdit">
         <value xml:lang="en">Edit iCalendar</value>
     </property>
+    <property key="WorkEffortICalendarEditData">
+        <value xml:lang="en">Edit iCalendar Data</value>
+    </property>
     <property key="WorkEffortICalendarFind">
         <value xml:lang="en">Find iCalendars</value>
     </property>

Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/icalendar-controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/icalendar-controller.xml?rev=791960&r1=791959&r2=791960&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/icalendar-controller.xml (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/icalendar-controller.xml Tue Jul  7 19:54:37 2009
@@ -42,6 +42,10 @@
         <security https="true" auth="true"/>
         <response name="success" type="view" value="EditICalendar"/>
     </request-map>
+    <request-map uri="EditICalendarData">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditICalendarData"/>
+    </request-map>
     <request-map uri="ICalendarChildren">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="ICalendarChildren"/>
@@ -74,6 +78,18 @@
         <response name="success" type="view-home" value="EditICalendar"/>
         <response name="error" type="view" value="EditICalendar"/>
     </request-map>
+    <request-map uri="createICalendarData">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createWorkEffortICalData"/>
+        <response name="success" type="view-home" value="EditICalendarData"/>
+        <response name="error" type="view" value="EditICalendarData"/>
+    </request-map>
+    <request-map uri="updateICalendarData">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateWorkEffortICalData"/>
+        <response name="success" type="view-home" value="EditICalendarData"/>
+        <response name="error" type="view" value="EditICalendarData"/>
+    </request-map>
     <request-map uri="createICalendarPartyAssign">
         <security https="true" auth="true"/>
         <event type="service" invoke="assignPartyToWorkEffort"/>
@@ -102,6 +118,7 @@
     <!-- View Mappings -->
 
     <view-map name="EditICalendar" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#EditICalendar"/>
+    <view-map name="EditICalendarData" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#EditICalendarData"/>
     <view-map name="ICalendarChildren" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ICalendarChildren"/>
     <view-map name="ICalendarParties" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ICalendarParties"/>
     <view-map name="ICalendarFixedAssets" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ICalendarFixedAssets"/>

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=791960&r1=791959&r2=791960&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Tue Jul  7 19:54:37 2009
@@ -1355,6 +1355,13 @@
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
 
+    <form name="EditICalendarData" default-map-name="iCalData" target="updateICalendarData" type="single">
+        <alt-target target="createICalendarData" use-when="iCalData==null"/>
+        <field name="workEffortId"><hidden value="${workEffortId}"></hidden></field>
+        <field name="icalData" title="${uiLabelMap.WorkEffortICalendarData}"><textarea/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+
     <form name="EditICalendarPartyAssign" target="createICalendarPartyAssign" type="single">
         <actions>
             <!-- Clear parameters from prior create/update event -->

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml?rev=791960&r1=791959&r2=791960&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml Tue Jul  7 19:54:37 2009
@@ -236,6 +236,11 @@
                 <parameter param-name="workEffortId"/>
             </link>
         </menu-item>
+        <menu-item name="ICalendarData" title="${uiLabelMap.WorkEffortICalendarData}">
+            <link target="EditICalendarData">
+                <parameter param-name="workEffortId"/>
+            </link>
+        </menu-item>
         <menu-item name="ICalendarHelp" title="${uiLabelMap.CommonHelp}">
             <link target="ICalendarHelp">
                 <parameter param-name="workEffortId"/>

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml?rev=791960&r1=791959&r2=791960&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Tue Jul  7 19:54:37 2009
@@ -949,6 +949,30 @@
         </section>
     </screen>
 
+    <screen name="EditICalendarData">
+        <section>
+            <actions>
+                <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap"/>
+                <set field="tabButtonItem" value="ICalendarData"/>
+                <set field="workEffortId" from-field="parameters.workEffortId"/>
+                <entity-one entity-name="WorkEffort" value-field="workEffort"/>
+                <get-related-one value-field="workEffort" relation-name="WorkEffortIcalData" to-value-field="iCalData"/>
+                <set field="title" value="${uiLabelMap.WorkEffortICalendarEditData} - ${workEffort.workEffortName}"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="iCalendarDecorator" location="${parameters.iCalendarDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>
+                            <widgets>
+                                <include-form name="EditICalendarData" location="component://workeffort/widget/WorkEffortForms.xml"/>
+                            </widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
     <screen name="ICalendarChildren">
         <section>
             <actions>