svn commit: r677731 - in /ofbiz/trunk/applications/accounting: config/ script/org/ofbiz/accounting/fixedasset/ servicedef/ webapp/accounting/WEB-INF/ webapp/accounting/fixedasset/ widget/

[adrianc]

Author: adrianc
Date: Thu Jul 17 14:23:43 2008
New Revision: 677731

URL: http://svn.apache.org/viewvc?rev=677731&view=rev
Log:
Better integration of the WorkEffort calendar into the Fixed Asset component. This also includes some bug fixes.

Internationalization note: this commit contains a new UI label.

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml
    ofbiz/trunk/applications/accounting/servicedef/services_fixedasset.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml
    ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
    ofbiz/trunk/applications/accounting/widget/Menus.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=677731&r1=677730&r2=677731&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Thu Jul 17 14:23:43 2008
@@ -2287,6 +2287,9 @@
         <value xml:lang="th">การบำรุงรักษา</value>
         <value xml:lang="zh">维修保养</value>
     </property>
+    <property key="AccountingFixedAssetMaintWorkEffortName">
+        <value xml:lang="en">Maintenance of Fixed Asset ${fixedAsset.fixedAssetName} [${fixedAsset.fixedAssetId}]</value>
+    </property>
     <property key="AccountingFixedAssetMaintIntervalMeterType">
         <value xml:lang="ar">نوع مقياس المجال</value>
         <value xml:lang="en">Interval Meter Type</value>

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml?rev=677731&r1=677730&r2=677731&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml Thu Jul 17 14:23:43 2008
@@ -217,13 +217,19 @@
             <set field="newEntity.scheduleWorkEffortId" from-field="duplicateTemplateWorkEffortMap.workEffortId"/>
             
             <else>
-                <!-- Create the WorkEfforts, dates not specified -->
+                <!-- Create the WorkEffort -->
                 <!-- Maintenance WorkEffort entity -->
-                <set value="Maintenance of Fixed Asset #${newEntity.fixedAssetId} " field="maintWorkEffortMap.workEffortName"/>
+                <entity-one value-name="fixedAsset" entity-name="FixedAsset"/>
+                <property-to-field field-name="workEffortName" resource="AccountingUiLabels" property="AccountingFixedAssetMaintWorkEffortName"/>
+                <set from-field="workEffortName" field="maintWorkEffortMap.workEffortName"/>
                 <set value="TASK" field="maintWorkEffortMap.workEffortTypeId"/>
                 <set value="WEPT_MAINTENANCE" field="maintWorkEffortMap.workEffortPurposeTypeId"/>
                 <set value="CAL_TENTATIVE" field="maintWorkEffortMap.currentStatusId"/>
                 <set from-field="userLogin.partyId" field="maintWorkEffortMap.quickAssignPartyId"/>
+                <set from-field="newEntity.fixedAssetId" field="maintWorkEffortMap.fixedAssetId"/>
+                <!-- Optional dates supplied by Fixed Asset Calendar -->
+                <set from-field="parameters.estimatedStartDate" field="maintWorkEffortMap.estimatedStartDate"/>
+                <set from-field="parameters.estimatedCompletionDate" field="maintWorkEffortMap.estimatedCompletionDate"/>
                 <call-service service-name="createWorkEffort" in-map-name="maintWorkEffortMap">
                     <result-to-field result-name="workEffortId" field-name="newEntity.scheduleWorkEffortId"/>
                 </call-service>

Modified: ofbiz/trunk/applications/accounting/servicedef/services_fixedasset.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_fixedasset.xml?rev=677731&r1=677730&r2=677731&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_fixedasset.xml (original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_fixedasset.xml Thu Jul 17 14:23:43 2008
@@ -149,6 +149,8 @@
         <permission-service service-name="fixedAssetPermissionCheck" main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
+        <attribute name="estimatedStartDate" mode="IN" type="String" optional="true"/>
+        <attribute name="estimatedCompletionDate" mode="IN" type="String" optional="true"/>
         <attribute name="maintTemplateWorkEffortId" mode="IN" type="String" optional="true"/>
         <override name="maintHistSeqId" mode="OUT"/> <!-- make this OUT rather than IN, we will automatically generate the next sub-sequence ID -->        
     </service>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=677731&r1=677730&r2=677731&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Thu Jul 17 14:23:43 2008
@@ -879,18 +879,27 @@
         <security https="true" auth="true" />
         <response name="success" type="view" value="LookupOrderHeader" />
     </request-map>
-    <request-map uri="FixedAssetDay">
+    <!-- FixedAssetMaintenance Calendar -->
+    <request-map uri="day">
         <security https="true" auth="true" />
         <response name="success" type="view" value="FixedAssetDay" />
     </request-map>
-    <request-map uri="FixedAssetWeek">
+    <request-map uri="week">
         <security https="true" auth="true" />
         <response name="success" type="view" value="FixedAssetWeek" />
     </request-map>
-    <request-map uri="FixedAssetMonth">
+    <request-map uri="month">
         <security https="true" auth="true" />
         <response name="success" type="view" value="FixedAssetMonth" />
     </request-map>
+    <request-map uri="EditWorkEffort">
+        <security https="true" auth="true" />
+        <response name="success" type="view" value="EditFixedAssetMaint" />
+    </request-map>
+    <request-map uri="WorkEffortSummary">
+        <security https="true" auth="true" />
+        <response name="success" type="view" value="WorkEffortSummary" />
+    </request-map>
     <!-- FixedAssetMaintenance Order -->
     <request-map uri="EditFixedAssetMaintOrders">
         <security https="true" auth="true"/>
@@ -1964,6 +1973,7 @@
     <view-map name="FixedAssetDay" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#CalendarDay"/>
     <view-map name="FixedAssetWeek" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#CalendarWeek"/>
     <view-map name="FixedAssetMonth" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#CalendarMonth"/>
+    <view-map name="WorkEffortSummary" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#WorkEffortSummary"/>
 
     <!-- Depreciation Calculation   -->
     <view-map name="ShowFixedAssetDepreciation" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#ShowFixedAssetDepreciation"/>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml?rev=677731&r1=677730&r2=677731&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml Thu Jul 17 14:23:43 2008
@@ -172,6 +172,26 @@
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
 
+    <form name="WorkEffortSummary" type="single" default-map-name="workEffort"
+        header-row-style="header-row" default-table-style="basic-table">
+        <field name="workEffortId"><display/></field>
+        <field name="workEffortName" title="${uiLabelMap.CommonName}"><display/></field>
+        <field name="workEffortTypeId" title="${uiLabelMap.CommonType}">
+            <display-entity entity-name="WorkEffortType" description="${description}"/>
+        </field>
+        <field name="workEffortPurposeTypeId" title="${uiLabelMap.CommonPurpose}">
+            <display-entity entity-name="WorkEffortPurposeType" description="${description}"/>
+        </field>
+        <field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
+            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+        </field>
+        <field name="percentComplete"><display/></field>
+        <field name="estimatedStartDate"><display/></field>
+        <field name="estimatedCompletionDate"><display/></field>
+        <field name="actualStartDate"><display/></field>
+        <field name="actualCompletionDate"><display/></field>
+    </form>
+
     <form name="ListFixedAssetStdCosts" list-name="fixedAssetStdCosts" type="list" target="updateFixedAssetStdCost" title="" paginate-target="EditFixedAssetStdCosts"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
@@ -313,6 +333,8 @@
         header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="fixedAssetMaint==null" target="createFixedAssetMaint"/>
         <field name="fixedAssetId"><hidden/></field>
+        <field name="estimatedStartDate"><hidden value="${parameters.estimatedStartDate}"/></field>
+        <field name="estimatedCompletionDate"><hidden value="${parameters.estimatedCompletionDate}"/></field>
         <field use-when="fixedAssetMaint==null" name="maintHistSeqId"><ignored/></field>
         <field use-when="fixedAssetMaint!=null" name="maintHistSeqId"><display/></field>
         <field use-when="fixedAssetMaint!=null" title="${uiLabelMap.CommonCreated}" name="createdStamp"><display/></field>

Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml?rev=677731&r1=677730&r2=677731&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml Thu Jul 17 14:23:43 2008
@@ -248,6 +248,24 @@
         </section>
     </screen>
 
+    <screen name="WorkEffortSummary">
+        <section>
+            <actions>
+                <set field="tabButtonItem" value="ListFixedAssetCalendar"/>
+                <set field="titleProperty" value="PageTitleWorkEffortRelatedSummary"/>
+                <entity-one entity-name="WorkEffort" value-name="workEffort"/>
+                <set field="fixedAssetId" from-field="workEffort.fixedAssetId"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}">
+                    <decorator-section name="body">
+                        <include-form name="WorkEffortSummary" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
     <screen name="EditFixedAssetStdCosts">
         <section>
             <actions>

Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=677731&r1=677730&r2=677731&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Thu Jul 17 14:23:43 2008
@@ -384,7 +384,7 @@
             <link target="ListFixedAssetProducts?fixedAssetId=${fixedAssetId}"/>
         </menu-item>
         <menu-item name="ListFixedAssetCalendar" title="${uiLabelMap.AccountingFixedAssetCalendar}">
-            <link target="FixedAssetMonth?fixedAssetId=${fixedAssetId}"/>
+            <link target="month?fixedAssetId=${fixedAssetId}"/>
         </menu-item>
         <menu-item name="EditFixedAssetStdCosts" title="${uiLabelMap.AccountingFixedAssetStdCosts}">
             <link target="EditFixedAssetStdCosts?fixedAssetId=${fixedAssetId}"/>
@@ -412,13 +412,13 @@
     <menu name="FixedAssetCalendarTabBar" selected-menuitem-context-field-name="parameters.viewMode"
          type="simple" default-selected-style="selected" menu-container-style="button-bar tab-bar">
         <menu-item name="D" title="${uiLabelMap.CommonDay}">
-            <link target="FixedAssetDay?fixedAssetId=${fixedAssetId}"/>
+            <link target="day?fixedAssetId=${fixedAssetId}"/>
         </menu-item>
         <menu-item name="W" title="${uiLabelMap.CommonWeek}">
-            <link target="FixedAssetWeek?fixedAssetId=${fixedAssetId}"/>
+            <link target="week?fixedAssetId=${fixedAssetId}"/>
         </menu-item>
         <menu-item name="M" title="${uiLabelMap.CommonMonth}">
-            <link target="FixedAssetMonth?fixedAssetId=${fixedAssetId}"/>
+            <link target="month?fixedAssetId=${fixedAssetId}"/>
         </menu-item>
     </menu>