Author: jleroux
Date: Tue Mar 14 15:47:52 2017
New Revision: 1786915
URL: http://svn.apache.org/viewvc?rev=1786915&view=rev
Log:
Improved: refactor list related forms in BillingAccount widgets
(OFBIZ-9215)
Refactoring various list forms into grids
Refactoring various list form references in screen widgets
Thanks: Pierre Smits
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/widget/BillingAccountForms.xml
ofbiz/ofbiz-framework/trunk/applications/accounting/widget/BillingAccountScreens.xml
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/widget/BillingAccountForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/BillingAccountForms.xml?rev=1786915&r1=1786914&r2=1786915&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/accounting/widget/BillingAccountForms.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/accounting/widget/BillingAccountForms.xml
Tue Mar 14 15:47:52 2017
@@ -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="ListBillingAccounts" type="list" list-name="listIt"
paginate-target="FindBillingAccount" default-entity-name="BillingAccount"
+ <grid name="ListBillingAccounts" list-name="listIt"
paginate-target="FindBillingAccount" default-entity-name="BillingAccount"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<actions>
<service service-name="performFind" result-map="result"
result-map-list="listIt">
@@ -41,9 +41,9 @@ under the License.
<field name="description"><display/></field>
<field name="fromDate"><display/></field>
<field name="thruDate"><display/></field>
- </form>
+ </grid>
- <form name="ListBillingAccountsByParty" type="list"
list-name="billingAccounts" paginate-target="FindBillingAccount"
+ <grid name="ListBillingAccountsByParty" list-name="billingAccounts"
paginate-target="FindBillingAccount"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="billingAccountId" widget-style="buttontext">
<hyperlink description="${billingAccountId}"
target="EditBillingAccount">
@@ -59,9 +59,9 @@ under the License.
<field name="thruDate"><display/></field>
<field name="partyId" title="${uiLabelMap.PartyPartyId}"><display
description="${parameters.partyId}"/></field>
<field name="roleTypeId"
title="${uiLabelMap.AccountingRoleType}"><display-entity
entity-name="RoleType"/></field>
- </form>
+ </grid>
- <form name="ListBillingAccountInvoices" type="list"
list-name="billingAccountInvoices" paginate-target="BillingAccountInvoices"
default-entity-name="Invoice"
+ <grid name="ListBillingAccountInvoices" list-name="billingAccountInvoices"
paginate-target="BillingAccountInvoices" default-entity-name="Invoice"
odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="Invoice"
list="billingAccountInvoices">
@@ -112,7 +112,7 @@ under the License.
</hyperlink>
</field>
<field name="capture"
use-when="${groovy:paidInvoice}"><display/></field>
- </form>
+ </grid>
<form name="EditBillingAccount" type="single"
target="updateBillingAccount" title=""
header-row-style="header-row" default-table-style="basic-table">
@@ -157,7 +157,7 @@ under the License.
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"
use-when="billingAccount!=null" widget-style="smallSubmit"><submit
button-type="button"/></field>
</form>
- <form name="ListBillingAccountRoles" type="list"
list-name="billingAccountRoleList" target="updateBillingAccountRole"
+ <grid name="ListBillingAccountRoles" list-name="billingAccountRoleList"
target="updateBillingAccountRole"
odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar"
paginate-target="EditBillingAccountRoles" separate-columns="true">
<actions>
@@ -191,7 +191,8 @@ under the License.
<parameter param-name="fromDate"/>
</hyperlink>
</field>
- </form>
+ </grid>
+
<form name="AddBillingAccountRole" type="single"
target="createBillingAccountRole" title="" default-map-name="billingAccountRole"
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createBillingAccountRole"/>
@@ -208,7 +209,7 @@ under the License.
<field name="submitButton" title="${uiLabelMap.CommonAdd}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ListBillingAccountTerms" type="list"
list-name="billingAccountTermsList" default-entity-name="BillingAccountTerm"
paginate-target="EditBillingAccountTerms"
+ <grid name="ListBillingAccountTerms" list-name="billingAccountTermsList"
default-entity-name="BillingAccountTerm"
paginate-target="EditBillingAccountTerms"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<actions>
<entity-condition entity-name="BillingAccountTerm"
list="billingAccountTermsList">
@@ -235,7 +236,8 @@ under the License.
<parameter param-name="billingAccountTermId"/>
</hyperlink>
</field>
- </form>
+ </grid>
+
<form name="EditBillingAccountTerms" type="single"
target="updateBillingAccountTerm" title="" default-map-name="billingAccountTerm"
header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="billingAccountTermId==null"
target="createBillingAccountTerm"/>
@@ -259,7 +261,7 @@ under the License.
<field name="termValue" title="${uiLabelMap.PartyTermValue}"><text
size="10"/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ListBillingAccountPayments" type="list" list-name="payments"
paginate-target="BillingAccountPayments"
+ <grid name="ListBillingAccountPayments" list-name="payments"
paginate-target="BillingAccountPayments"
odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="PaymentAndApplication"
list="payments">
@@ -283,7 +285,8 @@ under the License.
<field name="amount">
<display type="currency" currency="${currencyUomId}"/>
</field>
- </form>
+ </grid>
+
<form name="CreateIncomingBillingAccountPayment" type="single"
target="createPaymentAndAssociateToBillingAccount" title=""
header-row-style="header-row" default-table-style="basic-table">
<actions>
@@ -320,7 +323,8 @@ under the License.
<submit button-type="button"/>
</field>
</form>
- <form name="ListBillingAccountOrders" type="list"
list-name="orderPaymentPreferencesList" paginate-target="BillingAccountOrders"
+
+ <grid name="ListBillingAccountOrders"
list-name="orderPaymentPreferencesList" paginate-target="BillingAccountOrders"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="billingAccountId"><hidden/></field>
<field name="orderId" widget-style="buttontext">
@@ -338,7 +342,8 @@ under the License.
<field name="maxAmount">
<display type="currency" currency="${currencyUomId}"/>
</field>
- </form>
+ </grid>
+
<form name="FindBillingAccounts" type="single" target="FindBillingAccount"
header-row-style="header-row" default-table-style="basic-table">
<field name="billingAccountId"><text-find ignore-case="true"/></field>
<field name="description"><text-find ignore-case="true"/></field>
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/widget/BillingAccountScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/BillingAccountScreens.xml?rev=1786915&r1=1786914&r2=1786915&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/accounting/widget/BillingAccountScreens.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/accounting/widget/BillingAccountScreens.xml
Tue Mar 14 15:47:52 2017
@@ -86,7 +86,7 @@ under the License.
<include-form
name="FindBillingAccounts"
location="component://accounting/widget/BillingAccountForms.xml"/>
</decorator-section>
<decorator-section
name="search-results">
- <include-form
name="ListBillingAccounts"
location="component://accounting/widget/BillingAccountForms.xml"/>
+ <include-grid
name="ListBillingAccounts"
location="component://accounting/widget/BillingAccountForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -104,7 +104,7 @@ under the License.
<parameter
param-name="partyId" from-field="parameters.partyId"/>
<parameter
param-name="roleTypeId" value="BILL_TO_CUSTOMER"/>
</link>
- <include-form
name="ListBillingAccountsByParty"
location="component://accounting/widget/BillingAccountForms.xml"/>
+ <include-grid
name="ListBillingAccountsByParty"
location="component://accounting/widget/BillingAccountForms.xml"/>
</screenlet>
</widgets>
</section>
@@ -158,7 +158,7 @@ under the License.
<screenlet id="BllingAccountRolePanel"
title="${uiLabelMap.PageTitleAddBillingAccountRoles}" collapsible="true">
<include-form name="AddBillingAccountRole"
location="component://accounting/widget/BillingAccountForms.xml"/>
</screenlet>
- <include-form name="ListBillingAccountRoles"
location="component://accounting/widget/BillingAccountForms.xml"/>
+ <include-grid name="ListBillingAccountRoles"
location="component://accounting/widget/BillingAccountForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -179,7 +179,7 @@ under the License.
<decorator-screen name="CommonBillingAccountDecorator"
location="${parameters.billingAccountDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleEditBillingAccountTerms} -
${uiLabelMap.AccountingAccountId} ${billingAccount.billingAccountId}">
- <include-form name="ListBillingAccountTerms"
location="component://accounting/widget/BillingAccountForms.xml"/>
+ <include-grid name="ListBillingAccountTerms"
location="component://accounting/widget/BillingAccountForms.xml"/>
</screenlet>
<section>
<condition>
@@ -221,7 +221,7 @@ under the License.
<screenlet id="BillingAccountInvoicePanel"
title="${uiLabelMap.AccountingFindInvoices}" collapsible="true">
<include-form name="LookupInvoicesStatus"
location="component://accounting/widget/InvoiceForms.xml"/>
</screenlet>
- <include-form name="ListBillingAccountInvoices"
location="component://accounting/widget/BillingAccountForms.xml"/>
+ <include-grid name="ListBillingAccountInvoices"
location="component://accounting/widget/BillingAccountForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -242,7 +242,7 @@ under the License.
<decorator-screen name="CommonBillingAccountDecorator"
location="${parameters.billingAccountDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleEditBillingAccountOrders}">
- <include-form name="ListBillingAccountOrders"
location="component://accounting/widget/BillingAccountForms.xml"/>
+ <include-grid name="ListBillingAccountOrders"
location="component://accounting/widget/BillingAccountForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -272,7 +272,7 @@ under the License.
<screenlet id="BillingAccountPaymentPanel"
title="${uiLabelMap.AccountingCreatePayment}" collapsible="true">
<include-form
name="CreateIncomingBillingAccountPayment"
location="component://accounting/widget/BillingAccountForms.xml"/>
</screenlet>
- <include-form name="ListBillingAccountPayments"
location="component://accounting/widget/BillingAccountForms.xml"/>
+ <include-grid name="ListBillingAccountPayments"
location="component://accounting/widget/BillingAccountForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
