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

[jacopoc]

Author: jacopoc
Date: Sun Mar 11 03:49:44 2007
New Revision: 516882

URL: http://svn.apache.org/viewvc?view=rev&rev=516882
Log:
Manufacturing Calendar screens cleanups.

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

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=516882&r1=516881&r2=516882
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml Sun Mar 11 03:49:44 2007
@@ -20,6 +20,17 @@
 
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd">
+    <form name="ListTechDataCalendars" type="list" title="" list-name="techDataCalendars">
+        <field name="calendarId" title="${uiLabelMap.ManufacturingCalendarWeekId}"><display/></field>
+        <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
+        <field name="calendarWeekId" title="${uiLabelMap.ManufacturingCalendarId}"><display/></field>
+        <field name="updateLink" title="" widget-style="buttontext">
+            <hyperlink target="EditCalendar?calendarId=${calendarId}" description="${uiLabelMap.CommonUpdate}" />
+        </field>
+        <field name="deleteLink" title="" widget-style="buttontext">
+            <hyperlink target="RemoveCalendar?calendarId=${calendarId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+        </field>
+    </form>
     <form name="ListCalendarWeek" type="list" target="UpdateCalendarWeek" title="" list-name="calendarWeeks">
         <field name="calendarWeekId" title="${uiLabelMap.ManufacturingCalendarWeekId}"><display/></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>

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=516882&r1=516881&r2=516882
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml Sun Mar 11 03:49:44 2007
@@ -77,19 +77,19 @@
                 <set field="title" value="Find a Calendar"/>
                 <set field="titleProperty" value="PageTitleFindCalendar"/>
                 <set field="tabButtonItem" value="Calendar"/>
-                <!--<set field="labelTitleProperty" value="ProductProductBom"/>-->
                 <set field="headerItem" value="calendar"/>
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
 
-                <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/routing/FindCalendar.bsh"/>
+                <entity-and list-name="techDataCalendars" entity-name="TechDataCalendar"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonCalendarDecorator">
                     <decorator-section name="body">
-                        <platform-specific>
-                            <html><html-template location="component://manufacturing/webapp/manufacturing/routing/FindCalendar.ftl"/></html>
-                        </platform-specific>
+                        <container>
+                            <link style="buttontext" target="EditCalendar" text="${uiLabelMap.ManufacturingNewCalendar}"/>
+                        </container>
+                        <include-form name="ListTechDataCalendars" location="component://manufacturing/webapp/manufacturing/routing/CalendarForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -101,17 +101,19 @@
                 <set field="title" value="List Calendar Weeks"/>
                 <set field="titleProperty" value="PageTitleListCalendarWeek"/>
                 <set field="tabButtonItem" value="CalendarWeek"/>
-                <!--<set field="labelTitleProperty" value="ProductProductBom"/>-->
                 <set field="headerItem" value="calendar"/>
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
 
-                <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/routing/ListCalendarWeek.bsh"/>
+                <entity-and list-name="calendarWeeks" entity-name="TechDataCalendarWeek"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonCalendarDecorator">
                     <decorator-section name="body">
-                        <platform-specific>
-                            <html><html-template location="component://manufacturing/webapp/manufacturing/routing/ListCalendarWeek.ftl"/></html>
-                        </platform-specific>
+                        <container>
+                            <link style="buttontext" target="EditCalendarWeek" text="${uiLabelMap.ManufacturingNewCalendarWeek}"/>
+                        </container>
+                        <include-form name="ListCalendarWeek" location="component://manufacturing/webapp/manufacturing/routing/CalendarForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -123,7 +125,6 @@
                 <set field="title" value="Edit a Calendar Week"/>
                 <set field="titleProperty" value="PageTitleEditCalendarWeek"/>
                 <set field="tabButtonItem" value="CalendarWeek"/>
-                <!--<set field="labelTitleProperty" value="ProductProductBom"/>-->
                 <set field="headerItem" value="calendar"/>
 
                 <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarWeek.bsh"/>