various changes for hiding buttons when not required and create workefforts at the same time as a customer requests

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@699994 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hans Bakker
2008-09-29 06:08:13 +00:00
parent e994b71b2a
commit 6efcd7ea47
5 changed files with 38 additions and 14 deletions
+1 -1
View File
@@ -481,7 +481,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-menu name="RequestSubTabBar" location="component://mypage/widget/MyPageMenus.xml"/>
<include-menu name="RequestSubTabBar" location="component://projectmgr/widget/Menus.xml"/>
<decorator-section-include name="body"/>
</decorator-section>
</decorator-screen>
-11
View File
@@ -193,15 +193,4 @@ under the License.
<link target="RemoveCommunicationEventRole?communicationEventId=${parameters.communicationEventId}&amp;roleTypeId=${communicationEventRole.roleTypeId}&amp;partyId=${userLogin.partyId}&amp;deleteCommEventIfLast=Y&amp;delContentDataResource=Y"/>
</menu-item>
</menu>
<menu name="RequestSubTabBar" type="simple" menu-container-style="button-bar button-style-2">
<menu-item name="cancelledRequest" title="Cancel request" >
<condition>
<and>
<if-compare field-name="custRequest.statusId" operator="not-equals" value="CRQ_CANCELLED"/>
<if-compare field-name="custRequest.statusId" operator="not-equals" value="CRQ_COMPLETED"/>
</and>
</condition>
<link target="setCustRequestStatus?custRequestId=${custRequestId}&amp;statusId=CRQ_CANCELLED"/>
</menu-item>
</menu>
</menus>
@@ -24,5 +24,23 @@
<call-service service-name="createCustRequest" in-map-name="createCust">
<result-to-field result-name="custRequestId" field-name="custRequestId"/>
</call-service>
<if-not-empty field="parameters.workEffortParentId">
<set-service-fields service-name="createWorkEffort" map-name="parameters" to-map-name="createTask" />
<set field="createTask.custRequestId" from-field="custRequestId"/>
<set field="createTask.workEffortName" from-field="parameters.custRequestName"/>
<call-service service-name="createWorkEffort" in-map-name="createTask" >
<result-to-field result-name="workEffortId" field-name="workEffortId"/>
</call-service>
<set field="updCust.statusId" value="CRQ_REVIEWED"/>
<set field="updCust.custRequestId" from-field="custRequestId"/>
<call-service service-name="updateCustRequest" in-map-name="updCust"/>
<if-not-empty field="parameters.partyId">
<set field="assignParty.workEffortId" from-field="workEffortId"/>
<set field="assignParty.partyId" from-field="parameters.partyId"/>
<set field="assignParty.roleTypeId" from-field="parameters.roleTypeId"/>
<set field="assignParty.statusId" value="PAS_ASSIGNED"/>
<call-service service-name="assignPartyToWorkEffort" in-map-name="assignParty" />
</if-not-empty>
</if-not-empty>
</simple-method>
</simple-methods>
+17
View File
@@ -382,9 +382,19 @@
</menu>
<menu name="RequestTabBar" menu-container-style="button-bar tab-bar" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
<menu-item name="ViewRequest" title="${uiLabelMap.ProjectMgrView}">
<condition>
<not><if-empty field-name="custRequest"/></not>
</condition>
<link target="ViewRequest?custRequestId=${parameters.custRequestId}"/>
</menu-item>
<menu-item name="editRequest" title="${uiLabelMap.ProjectMgrEdit}">
<condition>
<and>
<not><if-empty field-name="custRequest"/></not>
<if-compare field-name="custRequest.statusId" operator="not-equals" value="CRQ_CANCELLED"/>
<if-compare field-name="custRequest.statusId" operator="not-equals" value="CRQ_COMPLETED"/>
</and>
</condition>
<link target="EditRequest?custRequestId=${parameters.custRequestId}"/>
</menu-item>
</menu>
@@ -398,6 +408,13 @@
</menu>
<menu name="RequestSubTabBar" type="simple" menu-container-style="button-bar button-style-2">
<menu-item name="cancelledRequest" title="Cancel request" >
<condition>
<and>
<not><if-empty field-name="custRequest"/></not>
<if-compare field-name="custRequest.statusId" operator="not-equals" value="CRQ_CANCELLED"/>
<if-compare field-name="custRequest.statusId" operator="not-equals" value="CRQ_COMPLETED"/>
</and>
</condition>
<link target="setCustRequestStatus?custRequestId=${custRequestId}&amp;statusId=CRQ_CANCELLED"/>
</menu-item>
</menu>
+2 -2
View File
@@ -20,8 +20,8 @@ under the License.
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
<form name="ListRequests" type="list"
extends="ListRequestList" extends-resource="component://order/webapp/ordermgr/request/RequestForms.xml">
<form name="ListRequests" type="list" extends="ListRequestList" extends-resource="component://order/webapp/ordermgr/request/RequestForms.xml"
paginate-target="requestlist" >
<field name="createTaskFromRequest" title="${uiLabelMap.ProjectMgrCreateTaskFromRequest}" widget-style="buttontext">
<hyperlink description="${uiLabelMap.ProjectMgrCreateTaskFromRequest}" target="EditTaskFromRequest?custRequestId=${custRequestId}"/>
</field>