svn commit: r677758 - in /ofbiz/trunk/specialpurpose/assetmaint: script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml webapp/assetmaint/WEB-INF/controller.xml

[adrianc]

Author: adrianc
Date: Thu Jul 17 15:08:26 2008
New Revision: 677758

URL: http://svn.apache.org/viewvc?rev=677758&view=rev
Log:
Some Asset Maint fixups based on the previous commit. Now the Asset Maint calendar works better.

Modified:
    ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml
    ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml

Modified: ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml?rev=677758&r1=677757&r2=677758&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml Thu Jul 17 15:08:26 2008
@@ -23,29 +23,17 @@
 
     <simple-method method-name="createFixedAssetMaintUpdateWorkEffort" login-required="true"
         short-description="Create FixedAssetMaint and Update Schedule information in WorkEffort">
-        <if-empty field="parameters.fixedAssetId">
-            <add-error><fail-property resource="AssetMaintUiLabels" property="AccountingFixedAssetIdRequiredError"/></add-error>
-        </if-empty>
-        <if-not-empty field="parameters.fixedAssetId">
-            <set from-field="parameters.fixedAssetId" field="fixedAssetExistsMap.fixedAssetId"/>
-            <find-by-primary-key entity-name="FixedAsset" map-name="fixedAssetExistsMap" value-name="existingFixedAssset"/>
-            <if-empty field="existingFixedAssset">
-                <add-error><fail-property resource="AssetMaintUiLabels" property="AccountingFixedAssetIdInvalidError"/></add-error>
-            </if-empty>
-        </if-not-empty>
-        <check-errors/>
         <set-service-fields map-name="parameters" service-name="createFixedAssetMaint" to-map-name="createFixedAssetMaintCtx"/>
         <call-service service-name="createFixedAssetMaint" in-map-name="createFixedAssetMaintCtx">
             <result-to-field result-name="maintHistSeqId" map-name="findAssetMaintLookup" field-name="maintHistSeqId"/>
             <result-to-request result-name="maintHistSeqId"/>
         </call-service>
+        <check-errors/>
         <set from-field="parameters.fixedAssetId" field="findAssetMaintLookup.fixedAssetId"/>
         <find-by-primary-key entity-name="FixedAssetMaint" map-name="findAssetMaintLookup" value-name="findAssetMaint"/>
         <set from-field="findAssetMaint.scheduleWorkEffortId" field="updateWorkEffortCtx.workEffortId"/>
         <set-service-fields map-name="parameters" service-name="updateWorkEffort" to-map-name="updateWorkEffortCtx"/>
         <!-- Maintenance WorkEffort entity -->
-        <property-to-field field-name="workEffortNameText" resource="AssetMaintUiLabels" property="FixedAssetMaintWorkEffortName"/>
-        <set value="${workEffortNameText} ${updateWorkEffortCtx.fixedAssetId}" field="updateWorkEffortCtx.workEffortName"/>
         <set field="maintTypeLookup.productMaintTypeId" from-field="findAssetMaint.productMaintTypeId"/>
         <find-by-primary-key entity-name="ProductMaintType" map-name="maintTypeLookup" value-name="maintType"/>
         <set field="updateWorkEffortCtx.description" from-field="maintType.description"/>

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=677758&r1=677757&r2=677758&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml Thu Jul 17 15:08:26 2008
@@ -20,10 +20,11 @@
 
 <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
+    <!-- Note: The order of the following include elements is important -->
+    <include location="component://workeffort/webapp/workeffort/WEB-INF/controller.xml"/>    
     <include location="component://product/webapp/catalog/WEB-INF/controller.xml"/>    
     <include location="component://product/webapp/facility/WEB-INF/controller.xml"/>    
     <include location="component://accounting/webapp/accounting/WEB-INF/controller.xml"/>    
-    <include location="component://workeffort/webapp/workeffort/WEB-INF/controller.xml"/>    
 
     <description>Asset Maintenance Component Site Configuration File</description>
 
@@ -144,7 +145,6 @@
     <view-map name="LookupWorkEffortShort" type="screen" page="component://workeffort/widget/LookupScreens.xml#LookupWorkEffortShort"/>
 
 <!--    <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>