[ofbiz-framework] branch trunk updated: Improved: Status ID checkbox for FindEmploymentApps, FindPartyQuals and FindEmplLeaves forms (OFBIZ-11937)

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[ofbiz-framework] branch trunk updated: Improved: Status ID checkbox for FindEmploymentApps, FindPartyQuals and FindEmplLeaves forms (OFBIZ-11937)

akashjain
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 da0f52d  Improved: Status ID checkbox for FindEmploymentApps, FindPartyQuals and FindEmplLeaves forms (OFBIZ-11937)
da0f52d is described below

commit da0f52d00577dc440f7799063e4027f6c3c316ab
Author: Akash Jain <[hidden email]>
AuthorDate: Tue Aug 4 15:41:53 2020 +0530

    Improved: Status ID checkbox for FindEmploymentApps, FindPartyQuals and FindEmplLeaves forms (OFBIZ-11937)
---
 applications/humanres/widget/EmplLeaveScreens.xml         | 11 +++++++++++
 applications/humanres/widget/EmploymentAppScreens.xml     | 11 +++++++++++
 applications/humanres/widget/PartyQualScreens.xml         | 11 +++++++++++
 applications/humanres/widget/forms/EmplLeaveForms.xml     |  6 +++---
 applications/humanres/widget/forms/EmploymentAppForms.xml |  6 +++---
 applications/humanres/widget/forms/PartyQualForms.xml     |  6 +++---
 6 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/applications/humanres/widget/EmplLeaveScreens.xml b/applications/humanres/widget/EmplLeaveScreens.xml
index 07fe2b6..b0264f3 100644
--- a/applications/humanres/widget/EmplLeaveScreens.xml
+++ b/applications/humanres/widget/EmplLeaveScreens.xml
@@ -34,6 +34,12 @@
                     <field-map field-name="mainAction" value="ADMIN"/>
                 </service>
                 <set field="hasAdminPermission" from-field="permResult.hasPermission"/>
+                <set field="asm_multipleSelectForm" value="FindEmplLeaves"/>
+                <set field="asm_asmListItemPercentOfForm" value="110"/>
+                <set field="leaveStatus.asm_multipleSelect" value="FindEmplLeaves_leaveStatus"/>
+                <set field="leaveStatus.asm_sortable" value="true"/>
+                <set field="leaveStatus.asm_title" value=" "/>
+                <set field="asm_listField[]" from-field="leaveStatus"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -57,6 +63,11 @@
                                         </section>
                                     </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="FindEmplLeaves" location="component://humanres/widget/forms/EmplLeaveForms.xml"/>
                                     </decorator-section>
                                     <decorator-section name="search-results">
diff --git a/applications/humanres/widget/EmploymentAppScreens.xml b/applications/humanres/widget/EmploymentAppScreens.xml
index c606940..04e81f4 100644
--- a/applications/humanres/widget/EmploymentAppScreens.xml
+++ b/applications/humanres/widget/EmploymentAppScreens.xml
@@ -26,6 +26,12 @@
                 <set field="titleProperty" value="HumanResFindEmploymentApp"/>
                 <set field="headerItem" value="EmploymentApp"/>
                 <set field="employmentAppCtx" from-field="parameters"/>
+                <set field="asm_multipleSelectForm" value="FindEmploymentApps"/>
+                <set field="asm_asmListItemPercentOfForm" value="110"/>
+                <set field="statusId.asm_multipleSelect" value="FindEmploymentApps_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="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}">
@@ -41,6 +47,11 @@
                                 </section>
                             </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="FindEmploymentApps" location="component://humanres/widget/forms/EmploymentAppForms.xml"/>
                             </decorator-section>
                             <decorator-section name="search-results">
diff --git a/applications/humanres/widget/PartyQualScreens.xml b/applications/humanres/widget/PartyQualScreens.xml
index 59c8a88..c0f8c2a 100644
--- a/applications/humanres/widget/PartyQualScreens.xml
+++ b/applications/humanres/widget/PartyQualScreens.xml
@@ -29,6 +29,12 @@
                 <set field="partyQualTypeId" from-field="parameters.partyQualTypeId"/>
                 <set field="fromDate" from-field="parameters.fromDate"/>
                 <set field="partyQualCtx" from-field="parameters"/>
+                <set field="asm_multipleSelectForm" value="FindPartyQuals"/>
+                <set field="asm_asmListItemPercentOfForm" value="110"/>
+                <set field="statusId.asm_multipleSelect" value="FindPartyQuals_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}">
@@ -44,6 +50,11 @@
                                 </section>
                             </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="FindPartyQuals" location="component://humanres/widget/forms/PartyQualForms.xml"/>
                            </decorator-section>
                            <decorator-section name="search-results">
diff --git a/applications/humanres/widget/forms/EmplLeaveForms.xml b/applications/humanres/widget/forms/EmplLeaveForms.xml
index 65fe78b..58ffc91 100644
--- a/applications/humanres/widget/forms/EmplLeaveForms.xml
+++ b/applications/humanres/widget/forms/EmplLeaveForms.xml
@@ -20,7 +20,7 @@
 
 <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="FindEmplLeaves" type="single" target="FindEmplLeaves"
+    <form name="FindEmplLeaves" type="single" target="FindEmplLeaves" default-map-name="parameters"
         odd-row-style="header-row" default-table-style="basic-table">
         <auto-fields-entity entity-name="EmplLeave" default-field-type="find"/>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field>
@@ -35,12 +35,12 @@
             </drop-down>
         </field>
         <field name="leaveStatus">
-            <check all-checked="false">
+            <drop-down allow-multiple="true">
                 <entity-options key-field-name="statusId" entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="LEAVE_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
-            </check>
+            </drop-down>
         </field>
         <field name="approverPartyId"><lookup target-form-name="LookupPartyName"/></field>
         <field name="description"><hidden/></field>
diff --git a/applications/humanres/widget/forms/EmploymentAppForms.xml b/applications/humanres/widget/forms/EmploymentAppForms.xml
index 9e227e6..2027ed4 100644
--- a/applications/humanres/widget/forms/EmploymentAppForms.xml
+++ b/applications/humanres/widget/forms/EmploymentAppForms.xml
@@ -70,7 +70,7 @@ under the License.
         <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" use-when="listSize>0" widget-style="smallSubmit"><submit/></field>
     </form>
-    <form name="FindEmploymentApps" type="single" target="FindEmploymentApps" header-row-style="header-row" default-table-style="basic-table" default-map-name="employmentApp">
+    <form name="FindEmploymentApps" type="single" target="FindEmploymentApps" header-row-style="header-row" default-table-style="basic-table" default-map-name="parameters">
         <actions>
             <set field="referredByPartyId" from-field="parameters.partyId"/>
         </actions>
@@ -79,12 +79,12 @@ under the License.
         <field name="emplPositionId"><lookup target-form-name="LookupEmplPosition"/></field>
         <field name="applicationId"><lookup target-form-name="LookupEmploymentApp"/></field>
         <field name="statusId">
-            <check all-checked="false">
+            <drop-down allow-multiple="true">
                 <entity-options key-field-name="statusId" entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="EMPL_POSITION_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
-            </check>
+            </drop-down>
         </field>
         <field name="employmentAppSourceTypeId">
             <drop-down allow-empty="true" current-description="">
diff --git a/applications/humanres/widget/forms/PartyQualForms.xml b/applications/humanres/widget/forms/PartyQualForms.xml
index 322bd35..56e8787 100644
--- a/applications/humanres/widget/forms/PartyQualForms.xml
+++ b/applications/humanres/widget/forms/PartyQualForms.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="FindPartyQuals" type="single" target="FindPartyQuals" header-row-style="header-row" default-table-style="basic-table">
+     <form name="FindPartyQuals" type="single" target="FindPartyQuals" header-row-style="header-row" default-table-style="basic-table" default-map-name="parameters">
         <auto-fields-entity entity-name="PartyQual" default-field-type="find"/>
         <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
         <field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
@@ -32,12 +32,12 @@ under the License.
             </drop-down>
         </field>
         <field name="statusId">
-            <check all-checked="false">
+            <drop-down allow-multiple="true">
                 <entity-options key-field-name="statusId" entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="HR_DEGREE_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
-            </check>
+            </drop-down>
         </field>
         <field name="verifStatusId">
             <drop-down allow-empty="true">