svn commit: r569803 - in /ofbiz/trunk: applications/workeffort/entitydef/entitymodel_view.xml specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml

[apatel-2]

Author: apatel
Date: Sun Aug 26 04:03:20 2007
New Revision: 569803

URL: http://svn.apache.org/viewvc?rev=569803&view=rev
Log:
Added few fields to WorkEffortAssocView. This makes possible to display and edit contents of workEffortTo entity from a list of children workEfforts. Fixed AssetMaint-->Maintenance -->Tasks Task Breakdown List Edit form. Now it works much better.

Modified:
    ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml

Modified: ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml?rev=569803&r1=569802&r2=569803&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml (original)
+++ ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml Sun Aug 26 04:03:20 2007
@@ -212,6 +212,12 @@
       <alias entity-alias="WETO" name="workEffortToName" field="workEffortName"/>
       <alias entity-alias="WETO" name="workEffortToSetup" field="estimatedSetupMillis"/>
       <alias entity-alias="WETO" name="workEffortToRun" field="estimatedMilliSeconds"/>
+      <alias entity-alias="WETO" name="workEffortToCurrentStatusId" field="currentStatusId"/>
+      <alias entity-alias="WETO" name="workEffortToWorkEffortPurposeTypeId" field="workEffortPurposeTypeId"/>
+      <alias entity-alias="WETO" name="workEffortToEstimatedStartDate" field="estimatedStartDate"/>
+      <alias entity-alias="WETO" name="workEffortToEstimatedCompletionDate" field="estimatedCompletionDate"/>
+      <alias entity-alias="WETO" name="workEffortToActualStartDate" field="actualStartDate"/>
+      <alias entity-alias="WETO" name="workEffortToActualCompletionDate" field="actualCompletionDate"/>
       <view-link entity-alias="WA" rel-entity-alias="WETO">
         <key-map field-name="workEffortIdTo" rel-field-name="workEffortId"/>
       </view-link>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml?rev=569803&r1=569802&r2=569803&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml Sun Aug 26 04:03:20 2007
@@ -102,9 +102,19 @@
         <field name="workEffortTypeId"><hidden/></field>
         <field name="fixedAssetId"><hidden/></field>
         <field name="maintHistSeqId"><hidden/></field>
-        <field name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}" widget-style="buttontext"><hidden/></field>
-        <field name="workEffortName" position="1" title="${uiLabelMap.CommonName}*"><text size="30"/></field>
-        <field name="currentStatusId">
+        <field name="workEffortIdTo"><hidden/></field>
+        <field name="workEffortIdFrom"><hidden/></field>
+        <field name="fromDate"><hidden/></field>
+        <field name="workEffortId" entry-name="workEffortIdTo"><hidden/></field>
+        <field name="workEffortName" entry-name="workEffortToName" position="1" title="${uiLabelMap.CommonName}*"><text size="30"/></field>
+        <field name="workEffortAssocTypeId" title="${uiLabelMap.WorkEffortWorkEffortAssocTypeId}">
+            <drop-down>
+                <entity-options entity-name="WorkEffortAssocType" description="${description}">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="currentStatusId" entry-name="workEffortToCurrentStatusId">
             <drop-down>
                 <entity-options entity-name="StatusItem" key-field-name="statusId" description="[Task] ${description}">
                     <entity-constraint name="statusTypeId" value="TASK_STATUS"/>
@@ -112,15 +122,15 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="workEffortPurposeTypeId" title="${uiLabelMap.CommonPurpose}">
+        <field name="workEffortPurposeTypeId" entry-name="workEffortToWorkEffortPurposeTypeId" title="${uiLabelMap.CommonPurpose}">
             <drop-down allow-empty="true">
                 <entity-options description="${workEffortPurposeTypeId}-${description}" entity-name="WorkEffortPurposeType" key-field-name="workEffortPurposeTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
-        <field name="actualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><date-time/></field>
-        <field name="actualCompletionDate" title="${uiLabelMap.WorkEffortActualEndDate}"><date-time/></field>
+        <field name="actualStartDate" entry-name="workEffortToActualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><date-time/></field>
+        <field name="actualCompletionDate"  entry-name="workEffortToActualCompletionDate" title="${uiLabelMap.WorkEffortActualCompletionDate}"><date-time/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
     </form>
     <form name="AddWorkEffortTimeEntry" type="single" target="createWorkEffortTimeEntry" title="">