svn commit: r673532 - in /ofbiz/trunk: applications/accounting/data/ specialpurpose/assetmaint/ specialpurpose/assetmaint/config/ specialpurpose/assetmaint/data/ specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/ specialpurpose/assetmaint/widget/ spe...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r673532 - in /ofbiz/trunk: applications/accounting/data/ specialpurpose/assetmaint/ specialpurpose/assetmaint/config/ specialpurpose/assetmaint/data/ specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/ specialpurpose/assetmaint/widget/ spe...

adrianc
Author: adrianc
Date: Wed Jul  2 15:37:58 2008
New Revision: 673532

URL: http://svn.apache.org/viewvc?rev=673532&view=rev
Log:
Asset Maintenance improvements:

1. Demo Data.
2. Product Maintenance screen.
3. Fixed non-functional product lookup buttons

Internationalization note: this commit contains a new UI label.

Added:
    ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintDemoData.xml   (with props)
Modified:
    ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
    ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml
    ofbiz/trunk/specialpurpose/assetmaint/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml
    ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/web.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/ProductScreens.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml

Modified: ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml?rev=673532&r1=673531&r2=673532&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml Wed Jul  2 15:37:58 2008
@@ -135,7 +135,7 @@
     <Enumeration description="Manlift" enumCode="MANLIFT" enumId="FAC_MANLIFT" sequenceId="01" enumTypeId="FXAST_CLASS"/>
     <Enumeration description="Service Body" enumCode="SERVICE_BODY" enumId="FAC_SERVICE_BODY" sequenceId="01" enumTypeId="FXAST_CLASS"/>
     <Enumeration description="Tractor" enumCode="TRACTOR" enumId="FAC_TRACTOR" sequenceId="01" enumTypeId="FXAST_CLASS"/>
-    <Enumeration description="Passneger Vehicle" enumCode="PASSENGER" enumId="FAC_PASSENGER" sequenceId="01" enumTypeId="FXAST_CLASS"/>
+    <Enumeration description="Passenger Vehicle" enumCode="PASSENGER" enumId="FAC_PASSENGER" sequenceId="01" enumTypeId="FXAST_CLASS"/>
     <Enumeration description="Compressor" enumCode="COMPRESSOR" enumId="FAC_COMPRESSOR" sequenceId="01" enumTypeId="FXAST_CLASS"/>
     <Enumeration description="Trencher" enumCode="TRENCHER" enumId="FAC_TRENCHER" sequenceId="01" enumTypeId="FXAST_CLASS"/>
     <Enumeration description="Puller" enumCode="PULLER" enumId="FAC_PULLER" sequenceId="01" enumTypeId="FXAST_CLASS"/>

Modified: ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml?rev=673532&r1=673531&r2=673532&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml Wed Jul  2 15:37:58 2008
@@ -166,6 +166,9 @@
     <property key="AssetMaintParentWorkEffort">
         <value xml:lang="en">Parent Work Effort</value>
     </property>
+    <property key="AssetMaintProductMaint">
+        <value xml:lang="en">Product Maint</value>
+    </property>
     <property key="AssetMaintViewPermissionError">
         <value xml:lang="en">View Permission Error</value>
         <value xml:lang="th">แสดงข้อผิดพลาดในการอนุญาต</value>

Added: ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintDemoData.xml?rev=673532&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintDemoData.xml (added)
+++ ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintDemoData.xml Wed Jul  2 15:37:58 2008
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<entity-engine-xml>
+    <!-- Asset Maintenance demo data -->
+    <Product productId="FORKLIFT_PROPANE" productTypeId="ASSET_USAGE" productName="Forklift - Propane" internalName="Forklift - Propane" description="Forklift - Propane Powered."/>
+    <Product productId="FORKLIFT_BATTERY" productTypeId="ASSET_USAGE" productName="Forklift - Battery" internalName="Forklift - Battery" description="Forklift - Battery Powered."/>
+    <Product productId="COMPANY_VEHICLE" productTypeId="ASSET_USAGE" productName="Company Vehicle" internalName="Company Vehicle" description="Company Vehicle."/>
+    <Product productId="HVAC_UNIT" productTypeId="ASSET_USAGE" primaryProductCategoryId="FAM_PRODUCTS" productName="Heating/Cooling Unit" internalName="Heating/Cooling Unit" description="Heating/Cooling Unit."/>
+    <ProductMaintType description="Tune Up" productMaintTypeId="TUNE_UP" parentTypeId="VEHICLE_MAINT"/>
+    <ProductMaintType description="Check Battery" productMaintTypeId="CHECK_BATTERY" parentTypeId="VEHICLE_MAINT"/>
+    <ProductMaintType description="Chassis Lubrication" productMaintTypeId="CHASSIS_LUBE" parentTypeId="VEHICLE_MAINT"/>
+    <ProductMaintType description="Rotate Tires" productMaintTypeId="ROTATE_TIRES" parentTypeId="VEHICLE_MAINT"/>
+    <ProductMaintType description="HVAC Maintenance" productMaintTypeId="HVAC_MAINT"/>
+    <ProductMaintType description="Replace Air Filter" productMaintTypeId="HVAC_REPLACE_FILTER" parentTypeId="HVAC_MAINT"/>
+    <ProductMaintType description="Check/Recharge Refrigerant" productMaintTypeId="HVAC_CHECK_REFR" parentTypeId="HVAC_MAINT"/>
+    <FixedAsset fixedAssetId="DEMO_FORKLIFT_01" instanceOfProductId="FORKLIFT_PROPANE" fixedAssetName="Forklift #1" fixedAssetTypeId="EQUIPMENT"/>
+    <FixedAsset fixedAssetId="DEMO_FORKLIFT_02" instanceOfProductId="FORKLIFT_BATTERY" fixedAssetName="Forklift #2" fixedAssetTypeId="EQUIPMENT"/>
+    <FixedAsset fixedAssetId="DEMO_VEHICLE_01" instanceOfProductId="COMPANY_VEHICLE" fixedAssetName="Company Pickup Truck" fixedAssetTypeId="EQUIPMENT"/>
+    <FixedAsset fixedAssetId="DEMO_VEHICLE_02" instanceOfProductId="COMPANY_VEHICLE" fixedAssetName="Company Delivery Van" fixedAssetTypeId="EQUIPMENT"/>
+    <FixedAsset fixedAssetId="DEMO_HVAC_01" instanceOfProductId="HVAC_UNIT" fixedAssetName="HVAC Unit - First Floor" fixedAssetTypeId="EQUIPMENT"/>
+    <FixedAsset fixedAssetId="DEMO_HVAC_02" instanceOfProductId="HVAC_UNIT" fixedAssetName="HVAC Unit - Second Floor" fixedAssetTypeId="EQUIPMENT"/>
+    <ProductMeterType description="Odometer" productMeterTypeId="ODOMETER"/>
+    <ProductMaint productId="FORKLIFT_PROPANE" productMaintSeqId="seq01" productMaintTypeId="TUNE_UP" maintName="Tune Up" intervalQuantity="1000" intervalMeterTypeId="ODOMETER"/>
+    <ProductMaint productId="FORKLIFT_BATTERY" productMaintSeqId="seq01" productMaintTypeId="CHECK_BATTERY" maintName="Check Battery" intervalQuantity="1000" intervalMeterTypeId="ODOMETER"/>
+    <ProductMaint productId="COMPANY_VEHICLE" productMaintSeqId="seq01" productMaintTypeId="OIL_CHANGE" maintName="Oil Change - Post Break-in" intervalQuantity="2500" intervalMeterTypeId="ODOMETER" repeatCount="1"/>
+    <ProductMaint productId="COMPANY_VEHICLE" productMaintSeqId="seq02" productMaintTypeId="OIL_CHANGE" maintName="Oil Change" intervalQuantity="5000" intervalMeterTypeId="ODOMETER"/>
+    <ProductMaint productId="COMPANY_VEHICLE" productMaintSeqId="seq03" productMaintTypeId="ROTATE_TIRES" maintName="Rotate Tires" intervalQuantity="10000" intervalMeterTypeId="ODOMETER"/>
+</entity-engine-xml>

Propchange: ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintDemoData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: ofbiz/trunk/specialpurpose/assetmaint/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/ofbiz-component.xml?rev=673532&r1=673531&r2=673532&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/ofbiz-component.xml Wed Jul  2 15:37:58 2008
@@ -36,6 +36,7 @@
     <entity-resource type="group" reader-name="main" loader="main" location="entitydef/entitygroup.xml"/>  
     <entity-resource type="data" reader-name="seed" loader="main" location="data/AssetMaintSecurityData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/AssetMaintSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/AssetMaintDemoData.xml"/>
 
     <!-- service resources: model(s), eca(s) and group definitions -->
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>

Modified: ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml?rev=673532&r1=673531&r2=673532&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml Wed Jul  2 15:37:58 2008
@@ -156,13 +156,37 @@
         <response name="error" type="view" value="EditItemIssuances"/>
     </request-map>
 
-   <!-- ================ Lookup Requests ================= -->
+    <!-- ================ ProductMaints Requests ================= -->
+    <request-map uri="EditProductMaints">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditProductMaints"/>
+    </request-map>
+    <request-map uri="createProductMaint">
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="createProductMaint"/>
+        <response name="success" type="view" value="EditProductMaints"/>
+        <response name="error" type="view" value="EditProductMaints"/>
+    </request-map>
+    <request-map uri="updateProductMaint">
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="updateProductMaint"/>
+        <response name="success" type="view" value="EditProductMaints"/>
+        <response name="error" type="view" value="EditProductMaints"/>
+    </request-map>
+    <request-map uri="deleteProductMaint">
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="deleteProductMaint"/>
+        <response name="success" type="view" value="EditProductMaints"/>
+        <response name="error" type="view" value="EditProductMaints"/>
+    </request-map>
+
+    <!-- ================ Lookup Requests ================= -->
     <request-map uri="LookupFixedAsset"><security auth="true" https="true"/><response name="success" type="view" value="LookupFixedAsset"/></request-map>
     <request-map uri="LookupPartyName"><security auth="true" https="true"/><response name="success" type="view" value="LookupPartyName"/></request-map>
     <request-map uri="LookupPerson"><security https="true" auth="true"/><response name="success" type="view" value="LookupPerson"/></request-map>
     <request-map uri="LookupPartyGroup"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyGroup"/></request-map>
     <request-map uri="LookupOrderHeader"><security https="true" auth="true"/><response name="success" type="view" value="LookupOrderHeader"/></request-map>
-    <request-map uri="LookupProduct"><security auth="true" https="true"/><response name="success" type="view" value="LookupVehicleTypeProduct"/></request-map>
+    <request-map uri="LookupProduct"><security auth="true" https="true"/><response name="success" type="view" value="LookupProduct"/></request-map>
     <request-map uri="LookupFacility"><security https="true" auth="true"/><response name="success" type="view" value="LookupFacility"/></request-map>
     <request-map uri="LookupFacilityLocation"><security auth="true" https="true"/><response name="success" type="view" value="LookupFacilityLocation"/></request-map>
     <request-map uri="LookupPartsProduct"><security auth="true" https="true"/><response name="success" type="view" value="LookupPartsProduct"/></request-map>
@@ -192,5 +216,6 @@
 
     <view-map name="EditWorkEffort" type="screen" page="component://assetmaint/widget/AssetmaintScreens.xml#EditFixedAssetMaint"/>
     <view-map name="WorkEffortSummary" type="screen" page="component://assetmaint/widget/AssetmaintScreens.xml#EditWorkEfforts"/>
+    <view-map name="EditProductMaints" type="screen" page="component://assetmaint/widget/ProductScreens.xml#EditProductMaints"/>
     <!-- end of view mappings -->
 </site-conf>

Modified: ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/web.xml?rev=673532&r1=673531&r2=673532&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/web.xml Wed Jul  2 15:37:58 2008
@@ -36,17 +36,22 @@
     <context-param>
         <param-name>mainDecoratorLocation</param-name>
         <param-value>component://assetmaint/widget/CommonScreens.xml</param-value>
-        <description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
+        <description>The location of the main-decorator screen to use for this webapp.</description>
     </context-param>
     <context-param>
         <param-name>commonFacilityDecoratorLocation</param-name>
         <param-value>component://assetmaint/widget/CommonScreens.xml</param-value>
-        <description>The location of the CommonFacilityDecorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
+        <description>The location of the CommonFacilityDecorator screen to use for this webapp.</description>
+    </context-param>
+    <context-param>
+        <param-name>fixedAssetDecoratorLocation</param-name>
+        <param-value>component://assetmaint/widget/CommonScreens.xml</param-value>
+        <description>The location of the CommonFixedAssetDecorator screen to use for this webapp.</description>
     </context-param>
     <context-param>
         <param-name>fixedAssetMaintDecoratorLocation</param-name>
         <param-value>component://assetmaint/widget/AssetMaintScreens.xml</param-value>
-        <description>The location of the CommonFixedAssetMaintDecorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
+        <description>The location of the CommonFixedAssetMaintDecorator screen to use for this webapp.</description>
     </context-param>
 
     <filter>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml?rev=673532&r1=673531&r2=673532&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml Wed Jul  2 15:37:58 2008
@@ -87,5 +87,52 @@
         </section>
     </screen>
 
+    <screen name="CommonFixedAssetDecorator">
+        <section>
+            <actions>
+                <set field="headerItem" value="ListFixedAssets"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="pre-body">
+                        <section>
+                            <condition>
+                                <not><if-empty field-name="fixedAssetId"/></not>
+                            </condition>
+                            <widgets>
+                                <include-menu name="FixedAssetTabBar" location="component://assetmaint/widget/Menus.xml"/>
+                            </widgets>
+                        </section>
+                        <decorator-section-include name="pre-body"/>
+                    </decorator-section>
+                    <decorator-section name="body">
+                        <section>
+                            <condition>
+                                <if-service-permission service-name="fixedAssetPermissionCheck" main-action="VIEW"/>
+                            </condition>
+                            <widgets>
+                                <section>
+                                    <condition>
+                                        <not><if-empty field-name="fixedAssetId"/></not>
+                                    </condition>
+                                    <widgets>
+                                        <container style="h1"><label text="${uiLabelMap.${titleProperty}} ${uiLabelMap.CommonFor} ${fixedAsset.fixedAssetName} [${fixedAssetId}]  ${${extraFunctionName}}"/></container>
+                                    </widgets>
+                                    <fail-widgets>
+                                        <container style="h1"><label text="${uiLabelMap.${titleProperty}}"/></container>
+                                    </fail-widgets>
+                                </section>
+                                <decorator-section-include name="body"/>
+                            </widgets>
+                            <fail-widgets>
+                                <label style="h3" text="${uiLabelMap.AcccountingViewPermissionError}"/>
+                            </fail-widgets>
+                        </section>                    
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
 </screens>
         

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml?rev=673532&r1=673531&r2=673532&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml Wed Jul  2 15:37:58 2008
@@ -21,6 +21,13 @@
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
     
+    <menu name="FixedAssetTabBar" extends="FixedAssetTabBar" extends-resource="component://accounting/widget/Menus.xml">
+        <menu-item name="EditProductMaints" title="${uiLabelMap.AssetMaintProductMaint}">
+            <condition><not><if-empty field-name="fixedAsset.instanceOfProductId"/></not></condition>
+            <link target="EditProductMaints?fixedAssetId=${fixedAsset.fixedAssetId}&amp;productId=${fixedAsset.instanceOfProductId}"/>
+        </menu-item>
+    </menu>
+
     <menu name="FixedAssetMaintTabBar" extends="FixedAssetMaintTabBar" extends-resource="component://accounting/widget/Menus.xml">
         <menu-item name="EditWorkEfforts" title="${uiLabelMap.WorkEffortAllTasks}">
             <link target="EditWorkEfforts?fixedAssetId=${fixedAssetMaint.fixedAssetId}&amp;maintHistSeqId=${fixedAssetMaint.maintHistSeqId}&amp;workEffortId=${fixedAssetMaint.scheduleWorkEffortId}"/>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/ProductScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/ProductScreens.xml?rev=673532&r1=673531&r2=673532&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/ProductScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/ProductScreens.xml Wed Jul  2 15:37:58 2008
@@ -24,16 +24,12 @@
     <screen name="LookupPartsProduct">
         <section>
             <condition>
-                <or>
-                    <if-has-permission permission="OFBTOOLS" action="_VIEW"/>
-                </or>
+                <if-has-permission permission="ASSETMAINT" action="_VIEW"/>
             </condition>
             <actions>
                 <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="title" value="${uiLabelMap.PageTitleLookupProduct}"/>
                 <set field="queryString" from-field="result.queryString"/>
-                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
-                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
                 <set field="primaryProductCategoryId" value="PARTS"/>
                 <set field="submitTarget" value="LookupPartsProduct"/>
             </actions>
@@ -49,4 +45,31 @@
             </widgets>
         </section>
     </screen>
+
+    <screen name="EditProductMaints">
+        <section>
+            <actions>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+                <set field="titleProperty" value="PageTitleEditProductMaintenance"/>
+                <set field="labelTitleProperty" value="ProductMaintenance"/>
+                <set field="tabButtonItem" value="EditProductMaints"/>
+                <set field="productId" from-field="parameters.productId"/>
+                <entity-one entity-name="Product" value-name="product"/>
+                <set field="productName" from-field="product.productName"/>                
+                <set field="fixedAssetId" from-field="parameters.fixedAssetId"/>
+                <entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}">
+                    <decorator-section name="body">
+                        <screenlet id="addProductMaint" title="${uiLabelMap.PageTitleAddProductMaintenance}" collapsible="true">
+                            <include-form name="AddProductMaint" location="component://assetmaint/widget/forms/ProductForms.xml"/>
+                        </screenlet>            
+                        <include-form name="ListProductMaints" location="component://assetmaint/widget/forms/ProductForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
 </screens>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml?rev=673532&r1=673531&r2=673532&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml Wed Jul  2 15:37:58 2008
@@ -103,4 +103,39 @@
             <hyperlink also-hidden="false" target-type="plain" description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct?productId=${productId}"/>
         </field>
     </form>
+
+    <form name="AddProductMaint" extends="AddProductMaint" extends-resource="component://product/webapp/catalog/product/ProductForms.xml">
+        <field name="fixedAssetId"><hidden value="${parameters.fixedAssetId}"></hidden></field>
+    </form>
+
+    <form name="ListProductMaints" type="list" list-name="listIt" target="updateProductMaint" paginate-target="EditProductMaints"
+        header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table">
+        <actions>
+            <entity-condition entity-name="ProductMaint" list-name="listIt">
+                <condition-expr field-name="productId" env-name="productId"/>
+            </entity-condition>
+        </actions>
+        <field name="fixedAssetId"><hidden value="${parameters.fixedAssetId}"></hidden></field>
+        <field name="productId"><hidden/></field>
+        <field name="productMaintSeqId"><hidden/></field>
+        <field name="productMaintTypeId">
+            <display-entity entity-name="ProductMaintType" key-field-name="productMaintTypeId" description="${description}"/>
+        </field>
+        <field name="maintName"><display/></field>
+        <field name="intervalMeterTypeId">
+            <display-entity entity-name="ProductMeterType" key-field-name="productMeterTypeId" description="${description}"/>
+        </field>
+        <field name="intervalUomId">
+            <display-entity entity-name="Uom" key-field-name="uomId" description="${description}"/>
+        </field>
+        <field name="intervalQuantity"><text/></field>
+        <field name="repeatCount"><text/></field>
+        <field name="maintTemplateWorkEffortId"><lookup target-form-name="LookupWorkEffort"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
+            <hyperlink target="deleteProductMaint?fixedAssetId=${parameters.fixedAssetId}&amp;productId=${productId}&amp;productMaintSeqId=${productMaintSeqId}"
+                description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+        </field>
+    </form>
+
 </forms>
\ No newline at end of file