[ofbiz-framework] branch trunk updated: Improved: Status ID checkbox for Return, Requirement and Quote forms (OFBIZ-11935)
Locked
 
|
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 001ce6a Improved: Status ID checkbox for Return, Requirement and Quote forms (OFBIZ-11935) 001ce6a is described below commit 001ce6a6c456acd25f9e86e5d17ac8d6746f9a5c Author: Akash Jain <[hidden email]> AuthorDate: Mon Aug 3 16:15:45 2020 +0530 Improved: Status ID checkbox for Return, Requirement and Quote forms (OFBIZ-11935) --- applications/order/widget/ordermgr/OrderReturnScreens.xml | 9 +++++++++ applications/order/widget/ordermgr/QuoteForms.xml | 6 +++--- applications/order/widget/ordermgr/QuoteScreens.xml | 9 +++++++++ applications/order/widget/ordermgr/RequirementForms.xml | 6 +++--- applications/order/widget/ordermgr/RequirementScreens.xml | 9 +++++++++ applications/order/widget/ordermgr/ReturnForms.xml | 6 +++--- 6 files changed, 36 insertions(+), 9 deletions(-) diff --git a/applications/order/widget/ordermgr/OrderReturnScreens.xml b/applications/order/widget/ordermgr/OrderReturnScreens.xml index 4b40484..e5832a5 100644 --- a/applications/order/widget/ordermgr/OrderReturnScreens.xml +++ b/applications/order/widget/ordermgr/OrderReturnScreens.xml @@ -46,6 +46,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="FindReturns"/> + <set field="asm_asmListItemPercentOfForm" value="110"/> + <set field="statusId.asm_multipleSelect" value="FindReturns_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="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -54,6 +60,9 @@ under the License. <container style="basic-nav"> <link style="buttontext" target="returnMain" text="${uiLabelMap.OrderCreateNewReturn}"/> </container> + <platform-specific> + <html><html-template multi-block="true" location="component://common-theme/template/includes/SetMultipleSelectJsList.ftl"/></html> + </platform-specific> <include-form name="FindReturns" location="component://order/widget/ordermgr/ReturnForms.xml"/> <include-form name="ListReturns" location="component://order/widget/ordermgr/ReturnForms.xml"/> </screenlet> diff --git a/applications/order/widget/ordermgr/QuoteForms.xml b/applications/order/widget/ordermgr/QuoteForms.xml index 00927d5..a13b128 100644 --- a/applications/order/widget/ordermgr/QuoteForms.xml +++ b/applications/order/widget/ordermgr/QuoteForms.xml @@ -20,7 +20,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="FindQuotes" target="FindQuote" title="" type="single" + <form name="FindQuotes" target="FindQuote" title="" type="single" default-map-name="parameters" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="Quote" default-field-type="find"/> <field name="quoteId" title="${uiLabelMap.OrderOrderQuoteId}"></field> @@ -42,12 +42,12 @@ under the License. </field> <field name="issueDate" title="${uiLabelMap.OrderOrderQuoteIssueDate}"></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"> - <check all-checked="false"> + <drop-down allow-multiple="true"> <entity-options entity-name="StatusItem"> <entity-constraint name="statusTypeId" operator="equals" value="QUOTE_STATUS"/> <entity-order-by field-name="sequenceId"/> </entity-options> - </check> + </drop-down> </field> <field name="currencyUomId" title="${uiLabelMap.CommonCurrency}"> <drop-down allow-empty="true" no-current-selected-key="${defaultOrganizationPartyCurrencyUomId}"> diff --git a/applications/order/widget/ordermgr/QuoteScreens.xml b/applications/order/widget/ordermgr/QuoteScreens.xml index 0564926..0d3cfdc 100644 --- a/applications/order/widget/ordermgr/QuoteScreens.xml +++ b/applications/order/widget/ordermgr/QuoteScreens.xml @@ -69,6 +69,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="FindQuotes"/> + <set field="asm_asmListItemPercentOfForm" value="110"/> + <set field="statusId.asm_multipleSelect" value="FindQuotes_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="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -77,6 +83,9 @@ under the License. <container> <link target="EditQuote" text="${uiLabelMap.OrderCreateOrderQuote}" style="buttontext"/> </container> + <platform-specific> + <html><html-template multi-block="true" location="component://common-theme/template/includes/SetMultipleSelectJsList.ftl"/></html> + </platform-specific> <include-form name="FindQuotes" location="component://order/widget/ordermgr/QuoteForms.xml"/> <include-form name="ListQuotes" location="component://order/widget/ordermgr/QuoteForms.xml"/> </screenlet> diff --git a/applications/order/widget/ordermgr/RequirementForms.xml b/applications/order/widget/ordermgr/RequirementForms.xml index 9f91795..45f4235 100644 --- a/applications/order/widget/ordermgr/RequirementForms.xml +++ b/applications/order/widget/ordermgr/RequirementForms.xml @@ -20,7 +20,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="FindRequirements" type="single" target="FindRequirements" title="" + <form name="FindRequirements" type="single" target="FindRequirements" title="" default-map-name="parameters" header-row-style="header-row" default-table-style="basic-table"> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="requirementId"><text-find/></field> @@ -30,12 +30,12 @@ under the License. </drop-down> </field> <field name="statusId"> - <check all-checked="false"> + <drop-down allow-multiple="true"> <entity-options entity-name="StatusItem"> <entity-constraint name="statusTypeId" operator="equals" value="REQUIREMENT_STATUS"/> <entity-order-by field-name="sequenceId"/> </entity-options> - </check> + </drop-down> </field> <field name="facilityId"> <drop-down allow-empty="true"> diff --git a/applications/order/widget/ordermgr/RequirementScreens.xml b/applications/order/widget/ordermgr/RequirementScreens.xml index 4184f5d..72cbbf5 100644 --- a/applications/order/widget/ordermgr/RequirementScreens.xml +++ b/applications/order/widget/ordermgr/RequirementScreens.xml @@ -88,12 +88,21 @@ 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="FindRequirements"/> + <set field="asm_asmListItemPercentOfForm" value="110"/> + <set field="statusId.asm_multipleSelect" value="FindRequirements_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="CommonRequirementsDecorator" location="${parameters.commonRequirementsDecoratorLocation}"> <decorator-section name="body"> <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <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="FindRequirements" location="component://order/widget/ordermgr/RequirementForms.xml"/> </decorator-section> <decorator-section name="search-results"> diff --git a/applications/order/widget/ordermgr/ReturnForms.xml b/applications/order/widget/ordermgr/ReturnForms.xml index 2510bef..d8a7ccc 100644 --- a/applications/order/widget/ordermgr/ReturnForms.xml +++ b/applications/order/widget/ordermgr/ReturnForms.xml @@ -120,7 +120,7 @@ under the License. <field name="statusId"><ignored/></field> </form> --> - <form name="FindReturns" type="single" target="findreturn" title="" + <form name="FindReturns" type="single" target="findreturn" title="" default-map-name="parameters" header-row-style="header-row" default-table-style="basic-table"> <field name="returnHeaderTypeId"> <drop-down allow-empty="true"> @@ -135,11 +135,11 @@ under the License. <text-find/> </field> <field name="statusId" title="${uiLabelMap.CommonStatus}"> - <check all-checked="false"> + <drop-down allow-multiple="true"> <entity-options entity-name="StatusItem"> <entity-constraint name="statusTypeId" operator="equals" value="ORDER_RETURN_STTS"/> </entity-options> - </check> + </drop-down> </field> <field name="entryDate" title="${uiLabelMap.OrderEntryDate}"> <date-find/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |