You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ak...@apache.org on 2020/08/04 17:27:51 UTC
[ofbiz-plugins] branch trunk updated: Improved: Status ID checkbox
for FindTask and FindTimeSheet forms (OFBIZ-11936)
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-plugins.git
The following commit(s) were added to refs/heads/trunk by this push:
new 7f46273 Improved: Status ID checkbox for FindTask and FindTimeSheet forms (OFBIZ-11936)
7f46273 is described below
commit 7f462731de44989faec11bc2d8a88fe696fd7468
Author: Akash Jain <ak...@hotwaxsystems.com>
AuthorDate: Tue Aug 4 22:57:24 2020 +0530
Improved: Status ID checkbox for FindTask and FindTimeSheet forms (OFBIZ-11936)
---
projectmgr/widget/TaskScreens.xml | 11 +++++++++++
projectmgr/widget/TimeSheetScreens.xml | 11 +++++++++++
projectmgr/widget/forms/TaskForms.xml | 6 +++---
projectmgr/widget/forms/TimeSheetForms.xml | 6 +++---
4 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/projectmgr/widget/TaskScreens.xml b/projectmgr/widget/TaskScreens.xml
index 8906e50..7f6998c 100644
--- a/projectmgr/widget/TaskScreens.xml
+++ b/projectmgr/widget/TaskScreens.xml
@@ -164,6 +164,12 @@ under the License.
<set field="tabButtonItem" value="find"/>
<set field="helpAnchor" value="_project_tasks"/>
<set field="labelTitleProperty" value="ProjectMgrListTasks"/>
+ <set field="asm_multipleSelectForm" value="FindTask"/>
+ <set field="asm_asmListItemPercentOfForm" value="110"/>
+ <set field="currentStatusId.asm_multipleSelect" value="FindTask_currentStatusId"/>
+ <set field="currentStatusId.asm_sortable" value="true"/>
+ <set field="currentStatusId.asm_title" value=" "/>
+ <set field="asm_listField[]" from-field="currentStatusId"/>
</actions>
<widgets>
<decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
@@ -174,6 +180,11 @@ under the License.
</condition>
<widgets>
<screenlet title="${uiLabelMap.PageTitleFindTask}" collapsible="true" id="findTask">
+ <platform-specific>
+ <html>
+ <html-template multi-block="true" location="component://common-theme/template/includes/SetMultipleSelectJsList.ftl"/>
+ </html>
+ </platform-specific>
<include-form name="FindTask" location="component://projectmgr/widget/forms/TaskForms.xml"/>
<include-form name="ListTasks" location="component://projectmgr/widget/forms/TaskForms.xml"/>
</screenlet>
diff --git a/projectmgr/widget/TimeSheetScreens.xml b/projectmgr/widget/TimeSheetScreens.xml
index 903faa7..8ebd693 100644
--- a/projectmgr/widget/TimeSheetScreens.xml
+++ b/projectmgr/widget/TimeSheetScreens.xml
@@ -27,6 +27,12 @@ under the License.
<set field="headerItem" value="timesheet"/>
<set field="helpAnchor" value="_timesheets"/>
<set field="labelTitleProperty" value="ProjectMgrFindTimeSheet"/>
+ <set field="asm_multipleSelectForm" value="FindTimeSheet"/>
+ <set field="asm_asmListItemPercentOfForm" value="110"/>
+ <set field="statusId.asm_multipleSelect" value="FindTimeSheet_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="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}">
@@ -34,6 +40,11 @@ under the License.
<section>
<widgets>
<screenlet title="${uiLabelMap.PageTitleFindTimeSheet}">
+ <platform-specific>
+ <html>
+ <html-template multi-block="true" location="component://common-theme/template/includes/SetMultipleSelectJsList.ftl"/>
+ </html>
+ </platform-specific>
<include-form name="FindTimeSheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.PageTitleTimesheets}" navigation-form-name="ListFindTimeSheet">
diff --git a/projectmgr/widget/forms/TaskForms.xml b/projectmgr/widget/forms/TaskForms.xml
index 31c556c..b5f457d 100644
--- a/projectmgr/widget/forms/TaskForms.xml
+++ b/projectmgr/widget/forms/TaskForms.xml
@@ -152,18 +152,18 @@
<field name="phaseDdescription" parameter-name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
<field name="save" title="${uiLabelMap.CommonSave}"><submit/></field>
</form>
- <form name="FindTask" type="single" target="FindTask">
+ <form name="FindTask" type="single" target="FindTask" default-map-name="parameters">
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="workEffortTypeId"><hidden value="TASK"/></field>
<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">
- <check all-checked="false">
+ <drop-down allow-multiple="true">
<entity-options entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId" value="PROJECT_TASK_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
- </check>
+ </drop-down>
</field>
<field name="partyId">
<drop-down allow-empty="true">
diff --git a/projectmgr/widget/forms/TimeSheetForms.xml b/projectmgr/widget/forms/TimeSheetForms.xml
index aa51e9a..b7618c3 100644
--- a/projectmgr/widget/forms/TimeSheetForms.xml
+++ b/projectmgr/widget/forms/TimeSheetForms.xml
@@ -91,7 +91,7 @@
</hyperlink>
</field>
</form>
- <form name="FindTimeSheet" target="FindTimeSheet" title="" type="single"
+ <form name="FindTimeSheet" target="FindTimeSheet" title="" type="single" default-map-name="parameters"
header-row-style="header-row" default-table-style="basic-table">
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="timesheetId"><text-find ignore-case="true"/></field>
@@ -107,12 +107,12 @@
</drop-down>
</field>
<field name="statusId" title="${uiLabelMap.CommonStatus}" position="1">
- <check all-checked="false">
+ <drop-down allow-multiple="true">
<entity-options entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId" value="TIMESHEET_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
- </check>
+ </drop-down>
</field>
<field name="fromDate"><date-find/></field>
<field name="find" title="${uiLabelMap.CommonFind}"><submit/></field>