This is an automated email from the ASF dual-hosted git repository.
akashjain pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new ea37e0f Improved: Status ID checkbox for FindWorkEffort,
FindProductionRun and FindShipment forms (OFBIZ-11939)
ea37e0f is described below
commit ea37e0fed36d934730a467a414f3ee0621fc2e79
Author: Akash Jain <[email protected]>
AuthorDate: Mon Aug 3 16:22:26 2020 +0530
Improved: Status ID checkbox for FindWorkEffort, FindProductionRun and
FindShipment forms (OFBIZ-11939)
---
.../manufacturing/widget/manufacturing/JobshopScreens.xml | 9 +++++++++
.../manufacturing/widget/manufacturing/ProductionRunForms.xml | 6 +++---
applications/product/widget/facility/ShipmentForms.xml | 6 +++---
applications/product/widget/facility/ShipmentScreens.xml | 9 +++++++++
applications/workeffort/widget/WorkEffortForms.xml | 6 +++---
applications/workeffort/widget/WorkEffortScreens.xml | 9 +++++++++
6 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
b/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
index 5dfef44..496b026 100644
--- a/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
+++ b/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
@@ -691,6 +691,12 @@ under the License.
<set field="viewIndex" from-field="parameters.VIEW_INDEX"
type="Integer"/>
<set field="viewSizeDefaultValue" value="${groovy:
modelTheme.getDefaultViewSize()}" type="Integer"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE"
type="Integer" default-value="${viewSizeDefaultValue}"/>
+ <set field="asm_multipleSelectForm" value="FindProductionRun"/>
+ <set field="asm_asmListItemPercentOfForm" value="110"/>
+ <set field="currentStatusId.asm_multipleSelect"
value="FindProductionRun_currentStatusId"/>
+ <set field="currentStatusId.asm_sortable" value="true"/>
+ <set field="currentStatusId.asm_title" value=" "/>
+ <set field="asm_listField[]" from-field="currentStatusId"/>
</actions>
<widgets>
<decorator-screen name="CommonManufacturingDecorator"
location="${parameters.commonManufacturingDecoratorLocation}">
@@ -704,6 +710,9 @@ under the License.
</container>
</decorator-section>
<decorator-section name="search-options">
+ <platform-specific>
+ <html><html-template
multi-block="true"
location="component://common-theme/template/includes/SetMultipleSelectJsList.ftl"/></html>
+ </platform-specific>
<include-form name="FindProductionRun"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
diff --git
a/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
b/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
index ae91b28..7035068 100644
--- a/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
+++ b/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
@@ -67,16 +67,16 @@ under the License.
</field>
<field name="submitButton"
title="${uiLabelMap.CommonSubmit}"><submit/></field>
</form>
- <form name="FindProductionRun" target="FindProductionRun" title=""
type="single"
+ <form name="FindProductionRun" target="FindProductionRun" title=""
type="single" default-map-name="parameters"
header-row-style="header-row" default-table-style="basic-table">
<field name="workEffortTypeId"><hidden
value="PROD_ORDER_HEADER"/></field>
<field name="workEffortId"
title="${uiLabelMap.ManufacturingProductionRunId}"><text-find/></field>
<field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
- <check all-checked="false">
+ <drop-down allow-multiple="true">
<entity-options entity-name="StatusItem"
key-field-name="statusId">
<entity-constraint name="statusTypeId"
value="PRODUCTION_RUN"/>
</entity-options>
- </check>
+ </drop-down>
</field>
<field name="productId" title="${uiLabelMap.ProductProductId}"><lookup
target-form-name="LookupProduct"/></field>
<field name="workEffortName"
title="${uiLabelMap.ManufacturingProductionRunName}"><text-find/></field>
diff --git a/applications/product/widget/facility/ShipmentForms.xml
b/applications/product/widget/facility/ShipmentForms.xml
index 5053fa1..75171d9 100644
--- a/applications/product/widget/facility/ShipmentForms.xml
+++ b/applications/product/widget/facility/ShipmentForms.xml
@@ -21,7 +21,7 @@ under the License.
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://ofbiz.apache.org/Widget-Form";
xsi:schemaLocation="http://ofbiz.apache.org/Widget-Form
http://ofbiz.apache.org/dtds/widget-form.xsd";>
- <form name="FindShipment" type="single" target="FindShipment"
+ <form name="FindShipment" type="single" target="FindShipment"
default-map-name="parameters"
header-row-style="header-row" default-table-style="basic-table">
<field name="shipmentId"
title="${uiLabelMap.ProductShipmentId}"><text-find/></field>
<field name="noConditionFind"><hidden value="Y"/></field>
@@ -47,12 +47,12 @@ under the License.
</drop-down>
</field>
<field name="statusId" title="${uiLabelMap.CommonStatus}">
- <check all-checked="false">
+ <drop-down allow-multiple="true">
<entity-options description="${description}"
entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId"
value="SHIPMENT_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
- </check>
+ </drop-down>
</field>
<field name="estimatedShipDate"
title="${uiLabelMap.ProductEstimatedShipDate}"><date-find/></field>
<field name="entryDate"
title="${uiLabelMap.FormFieldTitle_entryDate}"><date-find/></field>
diff --git a/applications/product/widget/facility/ShipmentScreens.xml
b/applications/product/widget/facility/ShipmentScreens.xml
index 732f08b..e3ae2ea 100644
--- a/applications/product/widget/facility/ShipmentScreens.xml
+++ b/applications/product/widget/facility/ShipmentScreens.xml
@@ -51,12 +51,21 @@ under the License.
<actions>
<set field="titleProperty" value="ProductFindShipment"/>
<set field="headerItem" value="shipment"/>
+ <set field="asm_multipleSelectForm" value="FindShipment"/>
+ <set field="asm_asmListItemPercentOfForm" value="110"/>
+ <set field="statusId.asm_multipleSelect"
value="FindShipment_statusId"/>
+ <set field="statusId.asm_sortable" value="true"/>
+ <set field="statusId.asm_title" value=" "/>
+ <set field="asm_listField[]" from-field="statusId"/>
</actions>
<widgets>
<decorator-screen name="CommonShipmentMainDecorator"
location="${parameters.commonShipmentDecoratorLocation}">
<decorator-section name="body">
<link target="EditShipment"
text="${uiLabelMap.ProductNewShipment}" style="buttontext"></link>
<screenlet title="${uiLabelMap.ProductFindShipment}">
+ <platform-specific>
+ <html><html-template multi-block="true"
location="component://common-theme/template/includes/SetMultipleSelectJsList.ftl"/></html>
+ </platform-specific>
<include-form name="FindShipment"
location="component://product/widget/facility/ShipmentForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.ProductShipmentsFound}">
diff --git a/applications/workeffort/widget/WorkEffortForms.xml
b/applications/workeffort/widget/WorkEffortForms.xml
index 1a96493..324ce5d 100644
--- a/applications/workeffort/widget/WorkEffortForms.xml
+++ b/applications/workeffort/widget/WorkEffortForms.xml
@@ -186,7 +186,7 @@ under the License.
</sort-order>
</form>
- <form name="FindWorkEffort" default-map-name="workEffort"
target="FindWorkEffort" type="single">
+ <form name="FindWorkEffort" default-map-name="parameters"
target="FindWorkEffort" type="single">
<field name="workEffortId"
title="${uiLabelMap.WorkEffortWorkEffortId}"><text-find/></field>
<field name="workEffortParentId" position="2"><text-find/></field>
<field name="workEffortTypeId" title="${uiLabelMap.CommonType}">
@@ -204,7 +204,7 @@ under the License.
</drop-down>
</field>
<field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
- <check all-checked="false">
+ <drop-down allow-multiple="true">
<entity-options entity-name="StatusItem"
key-field-name="statusId" description="[${uiLabelMap.WorkEffortGeneral}]
${description}">
<entity-constraint name="statusTypeId"
value="CALENDAR_STATUS"/>
<entity-order-by field-name="description"/>
@@ -217,7 +217,7 @@ under the License.
<entity-constraint name="statusTypeId"
value="EVENT_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
- </check>
+ </drop-down>
</field>
<field name="priority" position="2">
<drop-down allow-empty="true">
diff --git a/applications/workeffort/widget/WorkEffortScreens.xml
b/applications/workeffort/widget/WorkEffortScreens.xml
index f44c2e9..37ef5ef 100644
--- a/applications/workeffort/widget/WorkEffortScreens.xml
+++ b/applications/workeffort/widget/WorkEffortScreens.xml
@@ -130,6 +130,12 @@ under the License.
<set field="headerItem" value="workeffort"/>
<set field="titleProperty" value="PageTitleFindWorkEffort"/>
<set field="donePage" from-field="parameters.DONE_PAGE"/>
+ <set field="asm_multipleSelectForm" value="FindWorkEffort"/>
+ <set field="asm_asmListItemPercentOfForm" value="110"/>
+ <set field="currentStatusId.asm_multipleSelect"
value="FindWorkEffort_currentStatusId"/>
+ <set field="currentStatusId.asm_sortable" value="true"/>
+ <set field="currentStatusId.asm_title" value=" "/>
+ <set field="asm_listField[]" from-field="currentStatusId"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
@@ -144,6 +150,9 @@ under the License.
</container>
</decorator-section>
<decorator-section name="search-options">
+ <platform-specific>
+ <html><html-template multi-block="true"
location="component://common-theme/template/includes/SetMultipleSelectJsList.ftl"/></html>
+ </platform-specific>
<include-form name="FindWorkEffort"
location="component://workeffort/widget/WorkEffortForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
