You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by di...@apache.org on 2016/09/17 10:45:47 UTC
svn commit: r1761186 - in /ofbiz/trunk: applications/humanres/widget/forms/
specialpurpose/projectmgr/widget/forms/
Author: diveshdutta
Date: Sat Sep 17 10:45:46 2016
New Revision: 1761186
URL: http://svn.apache.org/viewvc?rev=1761186&view=rev
Log:
Improved:Convert search criteria on status into multi select pattern for project and HR component.
(OFBIZ-7549) (OFBIZ-7550)
Added Check box for status fields on Find Qualifications, Find Employment Applications, Find Leave in HR and in Find Tasks, Find TimeSheet in Project components.
Thanks: Mohammad Kathawala for the patch and Swapnil Shah for reporting the issues.
Modified:
ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml
ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml
ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml?rev=1761186&r1=1761185&r2=1761186&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml Sat Sep 17 10:45:46 2016
@@ -35,12 +35,12 @@
</drop-down>
</field>
<field name="leaveStatus">
- <drop-down allow-empty="true">
+ <check all-checked="false">
<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>
- </drop-down>
+ </check>
</field>
<field name="approverPartyId"><lookup target-form-name="LookupPartyName"/></field>
<field name="description"><hidden/></field>
Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml?rev=1761186&r1=1761185&r2=1761186&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml Sat Sep 17 10:45:46 2016
@@ -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">
- <drop-down allow-empty="true" current-description="">
+ <check all-checked="false">
<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>
- </drop-down>
+ </check>
</field>
<field name="employmentAppSourceTypeId">
<drop-down allow-empty="true" current-description="">
Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml?rev=1761186&r1=1761185&r2=1761186&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml Sat Sep 17 10:45:46 2016
@@ -32,12 +32,12 @@ under the License.
</drop-down>
</field>
<field name="statusId">
- <drop-down allow-empty="true">
+ <check all-checked="false">
<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>
- </drop-down>
+ </check>
</field>
<field name="verifStatusId">
<drop-down allow-empty="true">
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=1761186&r1=1761185&r2=1761186&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Sat Sep 17 10:45:46 2016
@@ -158,7 +158,7 @@
<field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskId}"><text-find ignore-case="true"/></field>
<field name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}"><text-find ignore-case="true"/></field>
<field name="currentStatusId">
- <drop-down allow-empty="true">
+ <check all-checked="false">
<entity-options entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId" value="PROJECT_TASK_STATUS"/>
<entity-constraint name="statusId" operator="not-equals" value="PTS_CREATED_UA"/>
@@ -166,7 +166,7 @@
<entity-constraint name="statusId" operator="not-equals" value="PTS_CREATED_IP"/>
<entity-order-by field-name="description"/>
</entity-options>
- </drop-down>
+ </check>
</field>
<field name="partyId">
<drop-down allow-empty="true">
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=1761186&r1=1761185&r2=1761186&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Sat Sep 17 10:45:46 2016
@@ -107,12 +107,12 @@
</drop-down>
</field>
<field name="statusId" title="${uiLabelMap.CommonStatus}" position="1">
- <drop-down allow-empty="true">
+ <check all-checked="false">
<entity-options entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId" value="TIMESHEET_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
- </drop-down>
+ </check>
</field>
<field name="fromDate"><date-find/></field>
<field name="find" title="${uiLabelMap.CommonFind}"><submit/></field>