Author: jleroux
Date: Wed Feb 21 11:31:34 2007
New Revision: 510162
URL: http://svn.apache.org/viewvc?view=rev&rev=510162
Log:
A patch from Anil K Patel "New WorkEffort look up with only few fields in Find
form" (https://issues.apache.org/jira/browse/OFBIZ-709).
Modified:
ofbiz/trunk/applications/workeffort/widget/LookupForms.xml
ofbiz/trunk/applications/workeffort/widget/LookupScreens.xml
Modified: ofbiz/trunk/applications/workeffort/widget/LookupForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/LookupForms.xml?view=diff&rev=510162&r1=510161&r2=510162
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/LookupForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/LookupForms.xml Wed Feb 21
11:31:34 2007
@@ -88,6 +88,48 @@
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't
there then with all fields empty no query will be done --></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}"
widget-style="buttontext"><submit button-type="text-link"/></field>
</form>
+ <form name="lookupWorkEffortShort" target="LookupWorkEffortShort" title=""
type="single"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext"
default-widget-style="inputBox">
+ <field name="workEffortId"
title="${uiLabelMap.WorkEffortWorkEffortId}"><text-find/></field>
+ <field name="workEffortParentId"><text-find/></field>
+ <field name="workEffortName"><text-find/></field>
+ <field name="workEffortTypeId">
+ <drop-down allow-empty="true">
+ <entity-options description="${description}"
entity-name="WorkEffortType" key-field-name="workEffortTypeId">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="workEffortPurposeTypeId" >
+ <drop-down allow-empty="true">
+ <entity-options description="${description}"
entity-name="WorkEffortPurposeType" key-field-name="workEffortPurposeTypeId">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+
+ <field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="StatusItem"
key-field-name="statusId" description="[General] ${description}">
+ <entity-constraint name="statusTypeId"
value="CALENDAR_STATUS"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ <entity-options entity-name="StatusItem"
key-field-name="statusId" description="[Task] ${description}">
+ <entity-constraint name="statusTypeId"
value="TASK_STATUS"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ <entity-options entity-name="StatusItem"
key-field-name="statusId" description="[Event] ${description}">
+ <entity-constraint name="statusTypeId"
value="EVENT_STATUS"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </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="noConditionFind"><hidden value="Y"/><!-- if this isn't
there then with all fields empty no query will be done --></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}"
widget-style="buttontext"><submit button-type="text-link"/></field>
+ </form>
<form name="listLookupWorkEffort" list-name="listIt" target=""
paginate-target="LookupWorkEffort" title="" type="list"
default-title-style="tableheadtext" default-tooltip-style="tabletext"
default-widget-style="tabletext">
<actions>
Modified: ofbiz/trunk/applications/workeffort/widget/LookupScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/LookupScreens.xml?view=diff&rev=510162&r1=510161&r2=510162
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/LookupScreens.xml Wed Feb 21
11:31:34 2007
@@ -71,4 +71,31 @@
</widgets>
</section>
</screen>
+
+ <screen name="LookupWorkEffortShort">
+ <section>
+ <condition>
+ <or>
+ <if-has-permission permission="WORKEFFORTMGR"
action="_VIEW"/>
+ </or>
+ </condition>
+ <actions>
+ <property-map resource="WorkEffortUiLabels"
map-name="uiLabelMap" global="true"/>
+
+ <set field="title"
value="${uiLabelMap.PageTitleLookupWorkEffort}"/>
+ <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"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="LookupDecorator"
location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="body">
+ <include-form name="lookupWorkEffortShort"
location="component://workeffort/widget/LookupForms.xml"/>
+ <include-form name="listLookupWorkEffort"
location="component://workeffort/widget/LookupForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
</screens>
