You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2009/06/03 22:39:52 UTC
svn commit: r781534 - in /ofbiz/trunk/applications/workeffort/widget:
WorkEffortForms.xml WorkEffortScreens.xml WorkEffortTrees.xml
Author: adrianc
Date: Wed Jun 3 20:39:50 2009
New Revision: 781534
URL: http://svn.apache.org/viewvc?rev=781534&view=rev
Log:
Some work on the Work Effort screens:
1. Fixed Children screen that didn't work.
2. Commented out WorkEffort form fields that shouldn't be used.
3. Layout cleanup
Modified:
ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
ofbiz/trunk/applications/workeffort/widget/WorkEffortTrees.xml
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=781534&r1=781533&r2=781534&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Wed Jun 3 20:39:50 2009
@@ -124,9 +124,9 @@
</field>
- <field name="workEffortParentId"><lookup target-form-name="LookupWorkEffort"/></field>
+<!-- <field name="workEffortParentId"><lookup target-form-name="LookupWorkEffort"/></field> -->
<field name="facilityId"><lookup target-form-name="LookupFacility"/></field>
- <field name="fixedAssetId"><lookup target-form-name="LookupFixedAsset"/></field>
+<!-- <field name="fixedAssetId"><lookup target-form-name="LookupFixedAsset"/></field> -->
<field name="moneyUomId" title="${uiLabelMap.CommonCurrency}">
<drop-down allow-empty="true">
<entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml?rev=781534&r1=781533&r2=781534&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Wed Jun 3 20:39:50 2009
@@ -103,7 +103,6 @@
<set field="titleProperty" value="PageTitleEditWorkEffort"/>
<set field="tabButtonItem" value="WorkEffort"/>
<set field="labelTitleProperty" value="PageTitleEditWorkEffort"/>
-
<set field="donePage" from-field="parameters.DONE_PAGE" default-value="/workeffort/control/ListWorkEfforts"/>
<set field="workEffortId" from-field="parameters.workEffortId"/>
<set field="thisWorkEffortId" from-field="parameters.workEffortId"/>
@@ -117,41 +116,18 @@
<if-empty field="workEffort"/>
</condition>
<widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleAddWorkEffort}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="EditWorkEffort" location="component://workeffort/widget/WorkEffortForms.xml"/>
- </widgets>
- </section>
- </container>
+ <container style="h1">
+ <label text="${uiLabelMap.PageTitleAddWorkEffort}"/>
</container>
+ <include-form name="EditWorkEffort" location="component://workeffort/widget/WorkEffortForms.xml"/>
</widgets>
<fail-widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditWorkEffort}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container>
- <link text="${uiLabelMap.WorkEffortCreate}" target="EditWorkEffort" style="buttontext">
- <parameter param-name="DONE_PAGE" from-field="donePage"/>
- </link>
- </container>
- <include-form name="EditWorkEffort" location="component://workeffort/widget/WorkEffortForms.xml"/>
- </widgets>
- </section>
- </container>
+ <container style="button-bar">
+ <link text="${uiLabelMap.WorkEffortCreate}" target="EditWorkEffort" style="buttontext">
+ <parameter param-name="DONE_PAGE" from-field="donePage"/>
+ </link>
</container>
+ <include-form name="EditWorkEffort" location="component://workeffort/widget/WorkEffortForms.xml"/>
</fail-widgets>
</section>
<container style="screenlet">
@@ -229,92 +205,38 @@
</widgets>
</section>
</screen>
+
<screen name="ChildWorkEfforts">
<section>
<actions>
<set field="titleProperty" value="PageTitleTreeWorkEfforts"/>
<set field="tabButtonItem" value="WorkEffortAssocs"/>
<set field="labelTitleProperty" value="PageTitleListWorkEfforts"/>
- <set field="trail" from-field="parameters.trail" default-value="${parameters.workEffortId}"/>
- <set field="workEffortId" from-field="parameters.trail"/>
+ <set field="trail" from-field="requestParameters.trail"/>
+ <set field="workEffortId" from-field="parameters.workEffortId"/>
+ <set field="donePage" from-field="parameters.DONE_PAGE" default-value="ChildWorkEfforts?workEffortId=${parameters.workEffortId}"/>
</actions>
<widgets>
<decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleTreeWorkEfforts}"/>
+ <section>
+ <widgets>
+ <container style="button-bar">
+ <link target="AddWorkEffortAndAssoc" text="${uiLabelMap.WorkEffortAddChild}" style="buttontext">
+ <parameter param-name="workEffortIdFrom" from-field="workEffortId"/>
+ </link>
+ <link target="AddWorkEffortAssoc" text="${uiLabelMap.WorkEffortAddExistingWorkEffortChild}" style="buttontext">
+ <parameter param-name="workEffortIdFrom" from-field="workEffortId"/>
+ </link>
</container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container>
- <link text="${uiLabelMap.WorkEffortCreate}" target="EditWorkEffort" style="buttontext">
- <parameter param-name="DONE_PAGE" from-field="donePage"/>
- </link>
- </container>
- <include-tree name="TreeWorkEffort" location="component://workeffort/widget/WorkEffortTrees.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <include-tree name="TreeWorkEffort" location="component://workeffort/widget/WorkEffortTrees.xml"/>
+ </widgets>
+ </section>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
- <screen name="WorkEffortTreeLine">
- <section>
- <actions>
- <set field="workEffortId" from-field="workEffortIdFrom" default-value="${workEffort.workEffortId}"/>
- <entity-one entity-name="WorkEffort" value-field="workEffort"/>
- <set field="donePage" from-field="parameters.DONE_PAGE" default-value="ChildWorkEfforts?workEffortId=${workEffort.workEffortId}"/>
- </actions>
- <widgets>
- <label text=" ${workEffort.workEffortName} - ${workEffort.description}" style="tabletext"/>
- <link target="EditWorkEffort" text="${workEffort.workEffortId}" style="buttontext">
- <parameter param-name="workEffortId" from-field="workEffort.workEffortId"/>
- </link>
- <link target="AddWorkEffortAndAssoc" text="${uiLabelMap.WorkEffortAddChild}" style="buttontext">
- <parameter param-name="workEffortIdFrom" from-field="workEffort.workEffortId"/>
- </link>
- <link target="AddWorkEffortAssoc" text="${uiLabelMap.WorkEffortAddExistingWorkEffortChild}" style="buttontext">
- <parameter param-name="workEffortIdFrom" from-field="workEffort.workEffortId"/>
- </link>
- <section>
- <condition><not><if-empty field="workEffortAssoc"/></not></condition>
- <widgets>
- <link target="EditWorkEffortAssoc" text="${uiLabelMap.WorkEffortEditAssoc}" style="buttontext">
- <parameter param-name="workEffortIdFrom" from-field="workEffortAssoc.workEffortIdFrom"/>
- <parameter param-name="workEffortIdTo" from-field="workEffortAssoc.workEffortIdTo"/>
- <parameter param-name="workEffortAssocTypeId" from-field="workEffortAssoc.workEffortAssocTypeId"/>
- <parameter param-name="fromDate" from-field="workEffortAssoc.fromDate"/>
- <parameter param-name="DONE_PAGE" from-field="donePage"/>
- </link>
- <link target="EditWorkEffortAndAssoc" text="${uiLabelMap.WorkEffortEditAssocDetail}" style="buttontext">
- <parameter param-name="workEffortIdFrom" from-field="workEffortAssoc.workEffortIdFrom"/>
- <parameter param-name="workEffortIdTo" from-field="workEffortAssoc.workEffortIdTo"/>
- <parameter param-name="workEffortAssocTypeId" from-field="workEffortAssoc.workEffortAssocTypeId"/>
- <parameter param-name="fromDate" from-field="workEffortAssoc.fromDate"/>
- <parameter param-name="DONE_PAGE" from-field="donePage"/>
- </link>
- </widgets>
- </section>
- </widgets>
- </section>
- </screen>
- <screen name="WorkEffortTreeLineForm">
- <section>
- <actions>
- <set field="listIt[]" from-field="workEffort" type="Object"/>
- </actions>
- <widgets>
- <include-form name="WorkEffortTreeLine" location="component://workeffort/widget/WorkEffortForms.xml"/>
- </widgets>
- </section>
- </screen>
<screen name="AddWorkEffortAndAssoc">
<section>
@@ -322,8 +244,7 @@
<set field="titleProperty" value="PageTitleEditWorkEffort"/>
<set field="tabButtonItem" value="WorkEffort"/>
<set field="labelTitleProperty" value="PageTitleEditWorkEffort"/>
-
- <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/workeffort/control/ListWorkEfforts"/>
+ <set field="donePage" from-field="parameters.DONE_PAGE" default-value="ChildWorkEfforts?workEffortId=${parameters.workEffortIdFrom}"/>
<set field="workEffortIdFrom" from-field="parameters.workEffortIdFrom"/>
<set field="workEffortAssocTypeId" value=""/>
<set field="fromDate" from-field="nowTimestamp"/>
@@ -331,32 +252,22 @@
<widgets>
<decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleAddWorkEffort} ${uiLabelMap.WorkEffortAssociatedFromParentToChild}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddWorkEffortAndAssoc" location="component://workeffort/widget/WorkEffortForms.xml"/>
- </widgets>
- </section>
- </container>
+ <container style="h1">
+ <label text="${uiLabelMap.PageTitleAddWorkEffort} ${uiLabelMap.WorkEffortAssociatedFromParentToChild}"/>
</container>
+ <include-form name="AddWorkEffortAndAssoc" location="component://workeffort/widget/WorkEffortForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
+
<screen name="EditWorkEffortAndAssoc">
<section>
<actions>
<set field="titleProperty" value="PageTitleEditWorkEffort"/>
<set field="tabButtonItem" value="WorkEffort"/>
<set field="labelTitleProperty" value="PageTitleEditWorkEffort"/>
-
<set field="donePage" from-field="parameters.DONE_PAGE"/>
<set field="workEffortIdTo" from-field="parameters.workEffortIdTo"/>
<set field="workEffortIdFrom" from-field="parameters.workEffortIdFrom"/>
@@ -370,20 +281,7 @@
<widgets>
<decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditWorkEffort}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="EditWorkEffortAndAssoc" location="component://workeffort/widget/WorkEffortForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <include-form name="EditWorkEffortAndAssoc" location="component://workeffort/widget/WorkEffortForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -403,20 +301,10 @@
<widgets>
<decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditWorkEffortAssoc}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddWorkEffortAssoc" location="component://workeffort/widget/WorkEffortForms.xml"/>
- </widgets>
- </section>
- </container>
+ <container style="h1">
+ <label text="${uiLabelMap.PageTitleEditWorkEffortAssoc}"/>
</container>
+ <include-form name="AddWorkEffortAssoc" location="component://workeffort/widget/WorkEffortForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortTrees.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortTrees.xml?rev=781534&r1=781533&r2=781534&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortTrees.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortTrees.xml Wed Jun 3 20:39:50 2009
@@ -20,22 +20,25 @@
<trees xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-tree.xsd">
- <tree name="TreeWorkEffort" root-node-name="node-root" entity-name="WorkEffort"
- default-render-style="simple" default-wrap-style="treeWrapper">
- <node name="node-root" entity-name="WorkEffort" render-style="expand-collapse">
+ <tree name="TreeWorkEffort" root-node-name="node-root" entity-name="WorkEffort" expand-collapse-request="ChildWorkEfforts?workEffortId=${workEffortId}"
+ default-render-style="expand-collapse" default-wrap-style="treeWrapper">
+ <node name="node-root" entity-name="WorkEffort" >
<entity-one entity-name="WorkEffort" value-field="workEffort"/>
- <include-screen name="WorkEffortTreeLine" location="component://workeffort/widget/WorkEffortScreens.xml"/>
<sub-node node-name="node-list">
<entity-condition entity-name="WorkEffortAssoc">
<condition-expr field-name="workEffortIdFrom" operator="equals" from-field="workEffortId"/>
</entity-condition>
</sub-node>
</node>
- <node name="node-list" entry-name="workEffortAssoc" entity-name="WorkEffortAssoc" join-field-name="workEffortIdTo" render-style="expand-collapse">
+ <node name="node-list" entry-name="workEffortAssoc" entity-name="WorkEffortAssoc" join-field-name="workEffortIdTo">
<entity-one entity-name="WorkEffort" value-field="workEffort">
<field-map field-name="workEffortId" from-field="workEffortAssoc.workEffortIdTo"/>
</entity-one>
- <include-screen name="WorkEffortTreeLine" location="component://workeffort/widget/WorkEffortScreens.xml"/>
+ <link target="EditWorkEffortAndAssoc" text="${workEffort.workEffortName} - ${workEffort.description} [${workEffort.workEffortId}]">
+ <parameter param-name="workEffortIdTo" from-field="workEffortAssoc.workEffortIdTo"/>
+ <parameter param-name="workEffortIdFrom" from-field="workEffortAssoc.workEffortIdFrom"/>
+ <parameter param-name="workEffortAssocTypeId" from-field="workEffortAssoc.workEffortAssocTypeId"/>
+ </link>
<sub-node node-name="node-list">
<entity-condition entity-name="WorkEffortAssoc">
<condition-expr field-name="workEffortIdFrom" operator="equals" from-field="workEffortAssoc.workEffortIdTo"/>