svn commit: r521992 - in /ofbiz/trunk/applications/manufacturing: webapp/manufacturing/WEB-INF/ webapp/manufacturing/WEB-INF/actions/routing/ webapp/manufacturing/routing/ widget/manufacturing/

[jacopoc]

Author: jacopoc
Date: Sat Mar 24 01:40:16 2007
New Revision: 521992

URL: http://svn.apache.org/viewvc?view=rev&rev=521992
Log:
Refactored EditCalendarWeek screen to use widgets instead of ftl/bsh: the old screen was not working properly.

Removed:
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarWeek.bsh
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarWeek.ftl
Modified:
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml
    ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml?view=diff&rev=521992&r1=521991&r2=521992
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml Sat Mar 24 01:40:16 2007
@@ -164,13 +164,13 @@
         <security https="true" auth="true"/>
         <response name="success" type="view" value="ListCalendarWeek"/>
     </request-map>
-    <request-map uri="CreateCalendarWeek">
+    <request-map uri="createCalendarWeek">
         <security https="true" auth="true"/>
         <event type="service" invoke="createCalendarWeek"/>
         <response name="success" type="view" value="EditCalendarWeek"/>
         <response name="error" type="view" value="EditCalendarWeek"/>
     </request-map>
-    <request-map uri="UpdateCalendarWeek">
+    <request-map uri="updateCalendarWeek">
         <security https="true" auth="true"/>
         <event type="service" invoke="updateCalendarWeek"/>
         <response name="success" type="view" value="EditCalendarWeek"/>

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml?view=diff&rev=521992&r1=521991&r2=521992
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml Sat Mar 24 01:40:16 2007
@@ -130,4 +130,26 @@
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
     </form>
+    
+    <form name="UpdateCalendarWeek" type="single" target="updateCalendarWeek" title="">
+        <alt-target use-when="calendarWeek==null" target="createCalendarWeek"/>
+        <auto-fields-service service-name="updateCalendarWeek" map-name="calendarWeek"/>
+        <field name="calendarWeekId" use-when="calendarWeek!=null"><display/></field>
+        <field name="mondayStartTime" position="1"><text/></field>
+        <field name="mondayCapacity" position="2"><text/></field>
+        <field name="tuesdayStartTime" position="1"><text/></field>
+        <field name="tuesdayCapacity" position="2"><text/></field>
+        <field name="wednesdayStartTime" position="1"><text/></field>
+        <field name="wednesdayCapacity" position="2"><text/></field>
+        <field name="thursdayStartTime" position="1"><text/></field>
+        <field name="thursdayCapacity" position="2"><text/></field>
+        <field name="fridayStartTime" position="1"><text/></field>
+        <field name="fridayCapacity" position="2"><text/></field>
+        <field name="saturdayStartTime" position="1"><text/></field>
+        <field name="saturdayCapacity" position="2"><text/></field>
+        <field name="sundayStartTime" position="1"><text/></field>
+        <field name="sundayCapacity" position="2"><text/></field>
+        <field name="submitButton"><submit button-type="button"/></field>
+    </form>
+
  </forms>

Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml?view=diff&rev=521992&r1=521991&r2=521992
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml Sat Mar 24 01:40:16 2007
@@ -127,14 +127,15 @@
                 <set field="tabButtonItem" value="CalendarWeek"/>
                 <set field="headerItem" value="calendar"/>
 
-                <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarWeek.bsh"/>
+                <entity-one entity-name="TechDataCalendarWeek" value-name="calendarWeek"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonCalendarDecorator">
                     <decorator-section name="body">
-                        <platform-specific>
-                            <html><html-template location="component://manufacturing/webapp/manufacturing/routing/EditCalendarWeek.ftl"/></html>
-                        </platform-specific>
+                        <container>
+                            <link style="buttontext" target="EditCalendarWeek" text="${uiLabelMap.ManufacturingNewCalendarWeek}"/>
+                        </container>
+                        <include-form name="UpdateCalendarWeek" location="component://manufacturing/webapp/manufacturing/routing/CalendarForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>