Improved: Status ID checkbox for FindTask and FindTimeSheet forms (OFBIZ-11936)
This commit is contained in:
@@ -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>
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user