This is an automated email from the ASF dual-hosted git repository.
jleroux 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 1f3229c Improved: List and Grid (OFBIZ-11345) (#467)
1f3229c is described below
commit 1f3229c3f9fec199d6d8d63b523a664d164cf298
Author: Pierre Smits <pierre.sm...@orrtiz.com>
AuthorDate: Mon Jan 31 11:49:18 2022 +0100
Improved: List and Grid (OFBIZ-11345) (#467)
According to the definition in widget-form.xsd the
use of a combination of a form with type="list" is
deprecated in favour of a grid.
Refactor various list forms into grids.
Refactor various list form references in screens.
Modified:
PersonTrainingForms.xml: from form definition with list
ref to grid definition with list ref, additional clean-up
EmployeeScreens.xml: from form ref to grid ref , additional cleanup
PersonTrainingScreens.xml: from form ref to grid ref , additional cleanup
---
applications/humanres/widget/EmployeeScreens.xml | 6 +--
.../humanres/widget/PersonTrainingScreens.xml | 6 +--
.../humanres/widget/forms/PersonTrainingForms.xml | 44 +++++++++++-----------
3 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/applications/humanres/widget/EmployeeScreens.xml
b/applications/humanres/widget/EmployeeScreens.xml
index 062b6f6..ff05474 100644
--- a/applications/humanres/widget/EmployeeScreens.xml
+++ b/applications/humanres/widget/EmployeeScreens.xml
@@ -325,17 +325,15 @@ under the License.
</widgets>
</section>
</screen>
-
<screen name="trainingsList">
<section>
<widgets>
<screenlet title="${uiLabelMap.HumanResTrainings}">
- <include-form name="SimpleListTrainingStatus"
location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
+ <include-grid name="SimpleListTrainingStatus"
location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
</screenlet>
</widgets>
</section>
</screen>
-
<screen name="PayrollHistory">
<section>
<actions>
@@ -382,7 +380,7 @@ under the License.
</actions>
<widgets>
<screenlet title="${uiLabelMap.HumanResMyTrainings}">
- <include-form name="ListEmplTrainings"
location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
+ <include-grid name="ListEmplTrainings"
location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
</screenlet>
</widgets>
</section>
diff --git a/applications/humanres/widget/PersonTrainingScreens.xml
b/applications/humanres/widget/PersonTrainingScreens.xml
index a1cbee2..ea4c815 100644
--- a/applications/humanres/widget/PersonTrainingScreens.xml
+++ b/applications/humanres/widget/PersonTrainingScreens.xml
@@ -160,7 +160,7 @@
</container>
<container style="righthalf">
<label style="h1"
text="${uiLabelMap.WorkEffortParticipants}"/>
- <include-form
name="ListTrainingParticipants"
location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
+ <include-grid
name="ListTrainingParticipants"
location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
<section>
<condition>
<and>
@@ -208,7 +208,7 @@
<include-form name="FindTrainingApprovals"
location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="ListTrainingApprovals"
location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
+ <include-grid name="ListTrainingApprovals"
location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
</decorator-section>
</decorator-screen>
</decorator-section>
@@ -255,7 +255,7 @@
<include-form name="FindTrainingStatus"
location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="ListTrainingStatus"
location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
+ <include-grid name="ListTrainingStatus"
location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
</decorator-section>
</decorator-screen>
</decorator-section>
diff --git a/applications/humanres/widget/forms/PersonTrainingForms.xml
b/applications/humanres/widget/forms/PersonTrainingForms.xml
index 7984c82..1d350b7 100644
--- a/applications/humanres/widget/forms/PersonTrainingForms.xml
+++ b/applications/humanres/widget/forms/PersonTrainingForms.xml
@@ -63,7 +63,8 @@ under the License.
<field name="roleTypeId"> <hidden value="CAL_ATTENDEE"/></field>
<field name="add" title="${uiLabelMap.CommonAdd}"><submit/></field>
</form>
- <form name="ListTrainingParticipants" list-name="listIt" title=""
type="list" odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
+ <grid name="ListTrainingParticipants" list-name="listIt"
+ odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
<actions>
<service service-name="performFind" result-map="result"
result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
@@ -80,10 +81,10 @@ under the License.
</sub-hyperlink>
</display-entity>
</field>
- <field name="approvalStatus"><display-entity entity-name="StatusItem"
key-field-name="statusId"/></field>
+ <field name="approvalStatus"
title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"
key-field-name="statusId"/></field>
<field name="trainingRequestId"
widget-style="buttontext"><display/></field>
<field name="trainingClassTypeId"><display-entity
entity-name="TrainingClassType"/></field>
- </form>
+ </grid>
<form name="FindTrainingApprovals" target="FindTrainingApprovals" title=""
type="single" default-title-style="tableheadtext"
default-widget-style="inputBox">
<auto-fields-entity entity-name="PersonTraining"
default-field-type="find"/>
<field name="partyId"
title="${uiLabelMap.FormFieldTitle_employeePartyId}"><lookup
target-form-name="LookupPartyName"/></field>
@@ -99,7 +100,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="ListTrainingApprovals" type="list" list-name="listIt"
target="updateTrainingStatus" title="" odd-row-style="alternate-row"
header-row-style="header-row-2" default-table-style="basic-table hover-bar">
+ <grid name="ListTrainingApprovals" list-name="listIt"
target="updateTrainingStatus"
+ odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
<actions>
<service service-name="performFind" result-map="result"
result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
@@ -133,9 +135,9 @@ under the License.
<parameter param-name="fromDate"/>
</hyperlink>
</field>
- <field name="approvalStatus"><display-entity entity-name="StatusItem"
key-field-name="statusId"/></field>
+ <field name="approvalStatus"
title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"
key-field-name="statusId"/></field>
<field name="trainingClassTypeId"><display-entity
entity-name="TrainingClassType"/></field>
- </form>
+ </grid>
<form name="EditTrainingApprovals" type="single"
target="updateTrainingStatus" default-map-name="personTraining">
<auto-fields-service service-name="updateTrainingStatus"
default-field-type="display"/>
<field name="partyId"
title="${uiLabelMap.FormFieldTitle_employeePartyId}"/>
@@ -169,7 +171,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.CommonSearch}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ListTrainingStatus" list-name="listIt" title="" type="list"
odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
+ <grid name="ListTrainingStatus" list-name="listIt"
+ odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
<actions>
<service service-name="performFind" result-map="result"
result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
@@ -193,13 +196,13 @@ under the License.
</sub-hyperlink>
</display-entity>
</field>
- <field name="trainingRequestId" widget-style="buttontext"/>
+ <field name="trainingRequestId" title="${uiLabelMap.CommmonRequest}"
widget-style="buttontext"/>
<field name="trainingClassTypeId"
title="${uiLabelMap.HumanResTrainingClassType}"/>
- <field name="approvalStatus"><display-entity entity-name="StatusItem"
key-field-name="statusId"/></field>
+ <field name="approvalStatus"
title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"
key-field-name="statusId"/></field>
<field name="trainingClassTypeId"><display-entity
entity-name="TrainingClassType"/></field>
- </form>
-
- <form name="SimpleListTrainingStatus" list-name="listIt" title=""
type="list" odd-row-style="alternate-row" default-table-style="basic-table">
+ </grid>
+ <grid name="SimpleListTrainingStatus" list-name="listIt"
+ odd-row-style="alternate-row" default-table-style="basic-table">
<actions>
<service service-name="performFind" result-map="result"
result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
@@ -209,17 +212,16 @@ under the License.
<field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
- <field name="fromDate"><display type="date-time"/></field>
- <field name="thruDate"><display type="date-time"/></field>
+ <field name="fromDate" title="${uiLabelMap.CommonFrom}"><display
type="date-time"/></field>
+ <field name="thruDate" title="${uiLabelMap.CommonThru}"><display
type="date-time"/></field>
<field name="trainingClassTypeId"
title="${uiLabelMap.HumanResTrainingClassType}"/>
- <field name="approvalStatus"><display-entity entity-name="StatusItem"
key-field-name="statusId"/></field>
+ <field name="approvalStatus"
title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"
key-field-name="statusId"/></field>
<field name="trainingClassTypeId"><display-entity
entity-name="TrainingClassType"/></field>
<field name="approverId" widget-style="buttontext">
<display-entity entity-name="PartyNameView"
key-field-name="partyId" description="${firstName} ${middleName} ${lastName}
${groupName}"/>
</field>
- </form>
-
- <form name="ListEmplTrainings" type="list" list-name="listIt"
separate-columns="true" target="updateEmplLeave"
paginate-target="FindEmplLeaves"
+ </grid>
+ <grid name="ListEmplTrainings" list-name="listIt" target="updateEmplLeave"
paginate-target="FindEmplLeaves" separate-columns="true"
odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="PersonTraining">
@@ -234,9 +236,9 @@ under the License.
<field name="approverId">
<display-entity entity-name="PartyNameView"
key-field-name="partyId" description="${firstName} ${middleName} ${lastName}
${groupName}"/>
</field>
- <field name="trainingRequestId"/>
+ <field name="trainingRequestId" title="${CommonRequest}"/>
<field name="trainingClassTypeId"
title="${uiLabelMap.HumanResTrainingClassType}"/>
- <field name="approvalStatus"><display-entity entity-name="StatusItem"
key-field-name="statusId"/></field>
+ <field name="approvalStatus" title="${CommonStatus}"><display-entity
entity-name="StatusItem" key-field-name="statusId"/></field>
<field name="trainingClassTypeId"><display-entity
entity-name="TrainingClassType"/></field>
- </form>
+ </grid>
</forms>
