Author: jleroux
Date: Tue Nov 14 09:55:31 2017
New Revision: 1815194
URL: http://svn.apache.org/viewvc?rev=1815194&view=rev
Log:
Implemented: Refactor list related form widgets in various WorkEffort screens
(OFBIZ-9415)
Refactoring various list forms into grids
Refactoring various list form references in screens
Thanks: Pierre Smits
Modified:
ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/CustRequestForms.xml
ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/CustRequestScreens.xml
ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/LookupForms.xml
ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/LookupScreens.xml
ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/TimesheetForms.xml
ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/TimesheetScreens.xml
ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml
ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/WorkEffortScreens.xml
Modified:
ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/CustRequestForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/CustRequestForms.xml?rev=1815194&r1=1815193&r2=1815194&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/CustRequestForms.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/CustRequestForms.xml
Tue Nov 14 09:55:31 2017
@@ -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="ListRequests" type="list" use-row-submit="true" title=""
list-name="custRequestAndRoles" paginate-target="requestlist"
+ <grid name="ListRequests" use-row-submit="true" title=""
list-name="custRequestAndRoles" paginate-target="requestlist"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="custRequestId" widget-style="buttontext">
<hyperlink description="${custRequestId}" target-type="inter-app"
target="/ordermgr/control/ViewRequest">
@@ -37,6 +37,6 @@ under the License.
<field name="roleTypeId">
<display-entity also-hidden="false" entity-name="RoleType"/>
</field>
- </form>
+ </grid>
</forms>
Modified:
ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/CustRequestScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/CustRequestScreens.xml?rev=1815194&r1=1815193&r2=1815194&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/CustRequestScreens.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/CustRequestScreens.xml
Tue Nov 14 09:55:31 2017
@@ -38,7 +38,7 @@ under the License.
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.WorkEffortMyRequestList}">
- <include-form name="ListRequests"
location="component://workeffort/widget/CustRequestForms.xml"/>
+ <include-grid name="ListRequests"
location="component://workeffort/widget/CustRequestForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
Modified:
ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/LookupForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/LookupForms.xml?rev=1815194&r1=1815193&r2=1815194&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/LookupForms.xml
(original)
+++ ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/LookupForms.xml
Tue Nov 14 09:55:31 2017
@@ -132,7 +132,8 @@ under the License.
<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="" title=""
type="list" paginate-target="LookupWorkEffort"
+
+ <grid name="ListLookupWorkEffort" list-name="listIt" target="" title=""
paginate-target="LookupWorkEffort"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<actions>
<service service-name="performFind" result-map="result"
result-map-list="listIt">
@@ -150,7 +151,7 @@ under the License.
<field name="workEffortTypeId"><display-entity
entity-name="WorkEffortType"/></field>
<field name="contactMechTypeId"><display-entity
entity-name="ContactMechType"/></field>
<field name="marketingCampaignId"><display-entity
description="${campaignName}" entity-name="MarketingCampaign"/></field>
- </form>
+ </grid>
<!-- Timesheet Lookup forms -->
<form name="LookupTimesheet" target="LookupTimesheet" title=""
type="single"
@@ -163,7 +164,8 @@ under the License.
<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="button"/></field>
</form>
- <form name="ListLookupTimesheet" list-name="listIt" target="" title=""
type="list" paginate-target="LookupPerson"
+
+ <grid name="ListLookupTimesheet" list-name="listIt" target="" title=""
paginate-target="LookupPerson"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<actions>
<service service-name="performFind" result-map="result"
result-map-list="listIt">
@@ -179,5 +181,5 @@ under the License.
</field>
<field name="partyId"><display-entity entity-name="PartyNameView"
description="${firstName} ${middleName} ${lastName} ${groupName}
[${partyId}]"/></field>
<field name="clientPartyId"><display-entity
entity-name="PartyNameView" key-field-name="partyId" description="${firstName}
${middleName} ${lastName} ${groupName} [${partyId}]"/></field>
- </form>
+ </grid>
</forms>
Modified:
ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/LookupScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/LookupScreens.xml?rev=1815194&r1=1815193&r2=1815194&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/LookupScreens.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/LookupScreens.xml
Tue Nov 14 09:55:31 2017
@@ -41,7 +41,7 @@ under the License.
<include-form name="LookupWorkEffort"
location="component://workeffort/widget/LookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="ListLookupWorkEffort"
location="component://workeffort/widget/LookupForms.xml"/>
+ <include-grid name="ListLookupWorkEffort"
location="component://workeffort/widget/LookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -69,7 +69,7 @@ under the License.
<include-form name="LookupTimesheet"
location="component://workeffort/widget/LookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="ListLookupTimesheet"
location="component://workeffort/widget/LookupForms.xml"/>
+ <include-grid name="ListLookupTimesheet"
location="component://workeffort/widget/LookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified:
ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/TimesheetForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/TimesheetForms.xml?rev=1815194&r1=1815193&r2=1815194&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/TimesheetForms.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/TimesheetForms.xml
Tue Nov 14 09:55:31 2017
@@ -19,7 +19,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="ListMyTimesheets" target="" title="" type="list"
list-name="timesheets" paginate-target="MyTimesheets" paginate="true"
+ <grid name="ListMyTimesheets" target="" title="" list-name="timesheets"
paginate-target="MyTimesheets" paginate="true"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<actions>
<entity-and entity-name="Timesheet" list="timesheets">
@@ -35,8 +35,9 @@ under the License.
</field>
<field name="partyId"><hidden/></field>
<field name="clientPartyId"><display-entity
entity-name="PartyNameView" key-field-name="partyId" description="${firstName}
${middleName} ${lastName} ${groupName} [${partyId}]"/></field>
- </form>
- <form name="ListMyRates" target="" title="" type="list"
list-name="partyRates" paginate="false"
+ </grid>
+
+ <grid name="ListMyRates" target="" title="" list-name="partyRates"
paginate="false"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<actions>
<entity-and entity-name="PartyRate" list="partyRates">
@@ -47,7 +48,8 @@ under the License.
<auto-fields-entity entity-name="PartyRate"
default-field-type="display"/>
<field name="rateTypeId"
title="${uiLabelMap.WorkEffortTimesheetRateType}"><display-entity
entity-name="RateType"/></field>
<field name="partyId"><hidden/></field>
- </form>
+ </grid>
+
<form name="QuickCreateTimeEntry" target="createQuickTimeEntry" title=""
type="single"
header-row-style="header-row" default-table-style="basic-table">
<field name="timesheetId" map-name="currentTimesheet"><hidden/></field>
@@ -74,7 +76,8 @@ under the License.
<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="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ListFindTimesheet" target="" title="" type="list"
list-name="listIt" paginate-target="FindTimesheet" paginate="true"
+
+ <grid name="ListTimesheets" target="" title="" list-name="listIt"
paginate-target="FindTimesheet" paginate="true"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<actions>
<service result-map-list="listIt" result-map="result"
service-name="performFind">
@@ -91,7 +94,7 @@ under the License.
</hyperlink>
</field>
<field name="partyId" title="${uiLabelMap.PartyParty}"><display-entity
entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName}
${groupName} [${partyId}]"/></field>
- </form>
+ </grid>
<form name="EditTimesheet" default-map-name="timesheet"
target="updateTimesheet" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
@@ -115,7 +118,8 @@ under the License.
</field>
<field name="submitButton" title="${uiLabelMap.CommonSave}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="DisplayTimesheetEntries" type="list"
list-name="timesheetEntries"
+
+ <grid name="DisplayTimesheetEntries" list-name="timesheetEntries"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<actions>
<entity-condition entity-name="TimeEntry">
@@ -144,7 +148,8 @@ under the License.
<parameter param-name="invoiceId"/>
</hyperlink>
</field>
- </form>
+ </grid>
+
<form name="AddTimesheetToInvoice" target="addTimesheetToInvoice" title=""
type="single"
header-row-style="header-row" default-table-style="basic-table">
<field name="timesheetId"><hidden/></field>
@@ -160,7 +165,7 @@ under the License.
</form>
<!-- TimesheetRole -->
- <form name="ListTimesheetRoles" type="list" list-name="timesheetRoles"
target=""
+ <grid name="ListTimesheetRoles" list-name="timesheetRoles" target=""
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<actions>
<entity-condition entity-name="TimesheetRole">
@@ -180,7 +185,8 @@ under the License.
<parameter param-name="roleTypeId"/>
</hyperlink>
</field>
- </form>
+ </grid>
+
<form name="AddTimesheetRole" type="single" target="createTimesheetRole"
title=""
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createTimesheetRole"/>
@@ -198,7 +204,7 @@ under the License.
</form>
<!-- TimesheetEntry -->
- <form name="ListTimesheetEntries" type="list" list-name="timesheetEntries"
target="updateTimesheetEntry"
+ <grid name="ListTimesheetEntries" list-name="timesheetEntries"
target="updateTimesheetEntry"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<actions>
<entity-condition entity-name="TimeEntry">
@@ -243,7 +249,8 @@ under the License.
<parameter param-name="timeEntryId"/>
</hyperlink>
</field>
- </form>
+ </grid>
+
<form name="AddTimesheetEntry" type="single" target="createTimesheetEntry"
title=""
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createTimeEntry"/>
Modified:
ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/TimesheetScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/TimesheetScreens.xml?rev=1815194&r1=1815193&r2=1815194&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/TimesheetScreens.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/TimesheetScreens.xml
Tue Nov 14 09:55:31 2017
@@ -116,10 +116,10 @@ under the License.
</screenlet>
<!-- createQuickTimeEntry -->
<screenlet title="${uiLabelMap.WorkEffortMyRates}">
- <include-form name="ListMyRates"
location="component://workeffort/widget/TimesheetForms.xml"/>
+ <include-grid name="ListMyRates"
location="component://workeffort/widget/TimesheetForms.xml"/>
</screenlet>
<screenlet
title="${uiLabelMap.WorkEffortMyTimesheets}">
- <include-form name="ListMyTimesheets"
location="component://workeffort/widget/TimesheetForms.xml"/>
+ <include-grid name="ListMyTimesheets"
location="component://workeffort/widget/TimesheetForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -150,7 +150,7 @@ under the License.
<include-form name="FindTimesheet"
location="component://workeffort/widget/TimesheetForms.xml"/>
</screenlet>
<screenlet
title="${uiLabelMap.PageTitleFindTimesheet}">
- <include-form name="ListFindTimesheet"
location="component://workeffort/widget/TimesheetForms.xml"/>
+ <include-grid name="ListTimesheets"
location="component://workeffort/widget/TimesheetForms.xml"/>
</screenlet>
</widgets>
<fail-widgets>
@@ -193,7 +193,7 @@ under the License.
</screenlet>
<screenlet
title="${uiLabelMap.PageTitleDisplayTimesheetEntries}">
<container><link
text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet"
style="buttontext"/></container>
- <include-form
name="DisplayTimesheetEntries"
location="component://workeffort/widget/TimesheetForms.xml"/>
+ <include-grid
name="DisplayTimesheetEntries"
location="component://workeffort/widget/TimesheetForms.xml"/>
</screenlet>
<screenlet
title="${uiLabelMap.PageTitleAddTimesheetToNewInvoice}">
<include-form
name="AddTimesheetToNewInvoice"
location="component://workeffort/widget/TimesheetForms.xml"/>
@@ -219,7 +219,7 @@ under the License.
<decorator-screen name="CommonTimesheetDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleEditTimesheetRoles}">
- <include-form name="ListTimesheetRoles"
location="component://workeffort/widget/TimesheetForms.xml"/>
+ <include-grid name="ListTimesheetRoles"
location="component://workeffort/widget/TimesheetForms.xml"/>
</screenlet>
<screenlet
title="${uiLabelMap.PageTitleAddTimesheetRoles}">
<include-form name="AddTimesheetRole"
location="component://workeffort/widget/TimesheetForms.xml"/>
@@ -243,7 +243,7 @@ under the License.
<decorator-screen name="CommonTimesheetDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleEditTimesheetEntries}">
- <include-form name="ListTimesheetEntries"
location="component://workeffort/widget/TimesheetForms.xml"/>
+ <include-grid name="ListTimesheetEntries"
location="component://workeffort/widget/TimesheetForms.xml"/>
</screenlet>
<screenlet
title="${uiLabelMap.PageTitleAddTimesheetEntries}">
<include-form name="AddTimesheetEntry"
location="component://workeffort/widget/TimesheetForms.xml"/>
Modified:
ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml?rev=1815194&r1=1815193&r2=1815194&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml
Tue Nov 14 09:55:31 2017
@@ -19,7 +19,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="ListWorkEffortCommEvents" separate-columns="false"
target="updateCommunicationEventWorkEff" title="" type="list"
+ <grid name="ListWorkEffortCommEvents" separate-columns="false"
target="updateCommunicationEventWorkEff" title=""
odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="WorkEffortCommunicationEventView">
@@ -45,7 +45,8 @@ under the License.
<parameter param-name="communicationEventId"/>
</hyperlink>
</field>
- </form>
+ </grid>
+
<form name="AddWorkEffortCommEvent" default-map-name="communicationEvent"
target="createWorkEffortCommEvent" title="" type="single"
extends="EditCommEvent"
extends-resource="component://party/widget/partymgr/CommunicationEventForms.xml"
header-row-style="header-row" default-table-style="basic-table">
<actions>
Modified:
ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/WorkEffortScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/WorkEffortScreens.xml?rev=1815194&r1=1815193&r2=1815194&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/WorkEffortScreens.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/WorkEffortScreens.xml
Tue Nov 14 09:55:31 2017
@@ -385,7 +385,7 @@ under the License.
<screenlet id="AddWorkEffortCommEventsPanel"
title="${uiLabelMap.PageTitleAddWorkEffortCommEvent}" collapsible="true">
<include-form name="AddWorkEffortCommEvent"
location="component://workeffort/widget/WorkEffortCommEventForms.xml"/>
</screenlet>
- <include-form name="ListWorkEffortCommEvents"
location="component://workeffort/widget/WorkEffortCommEventForms.xml"/>
+ <include-grid name="ListWorkEffortCommEvents"
location="component://workeffort/widget/WorkEffortCommEventForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
