svn commit: r789596 - in /ofbiz/trunk/applications/orde
Locked
 
|
Author: hansbak
Date: Tue Jun 30 07:23:20 2009 New Revision: 789596 URL: http://svn.apache.org/viewvc?rev=789596&view=rev Log: small corrections of the customer viewing his customer requests Modified: ofbiz/trunk/applications/order/data/OrderPortletData.xml ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml Modified: ofbiz/trunk/applications/order/data/OrderPortletData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/OrderPortletData.xml?rev=789596&r1=789595&r2=789596&view=diff ============================================================================== --- ofbiz/trunk/applications/order/data/OrderPortletData.xml (original) +++ ofbiz/trunk/applications/order/data/OrderPortletData.xml Tue Jun 30 07:23:20 2009 @@ -35,9 +35,9 @@ description="View your own customer request inclusive of notes"/> <PortletPortletCategory portalPortletId="ViewCustRequest" portletCategoryId="CUST_REQUEST"/> - <PortletCategory portletCategoryId="LIST_CUSTOMER" description="List(s) available to a Customer"/> + <PortletCategory portletCategoryId="LIST_CUSTOMER" description="List(s) used by a Customer"/> <PortalPortlet portalPortletId="ListCustRequests" - portletName="List Cust Requests" + portletName="List Cust Requests for a customer" screenName="ListCustRequests" screenLocation="component://order/widget/ordermgr/RequestScreens.xml" description="List Cust Requests to the customer" securityServiceName="portalPermissionIsCustomer" securityMainAction="VIEW" Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=789596&r1=789595&r2=789596&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Tue Jun 30 07:23:20 2009 @@ -1136,7 +1136,8 @@ <request-map uri="FindRequest"><security https="true" auth="true"/><response name="success" type="view" value="FindRequest"/></request-map> <request-map uri="ViewRequest"><security https="true" auth="true"/><response name="success" type="view" value="ViewRequest"/></request-map> <request-map uri="EditRequest"><security https="true" auth="true"/><response name="success" type="view" value="EditRequest"/></request-map> - + <request-map uri="EditRequestCustomer"><security https="true" auth="true"/><response name="success" type="view" value="EditRequestCustomer"/></request-map> + <!-- CustRequest Content --> <request-map uri="EditCustRequestContent"> <security https="true" auth="true"/> @@ -1718,6 +1719,7 @@ <view-map name="FindRequest" type="screen" page="component://order/widget/ordermgr/RequestScreens.xml#FindRequest"/> <view-map name="ViewRequest" type="screen" page="component://order/widget/ordermgr/RequestScreens.xml#ViewRequest"/> <view-map name="EditRequest" type="screen" page="component://order/widget/ordermgr/RequestScreens.xml#EditRequest"/> + <view-map name="EditRequestCustomer" type="screen" page="component://order/widget/ordermgr/RequestScreens.xml#EditRequestCustomer"/> <view-map name="EditRequestItem" type="screen" page="component://order/widget/ordermgr/RequestScreens.xml#EditRequestItem"/> <view-map name="RequestItems" type="screen" page="component://order/widget/ordermgr/RequestScreens.xml#RequestItems"/> <view-map name="RequestRoles" type="screen" page="component://order/widget/ordermgr/RequestScreens.xml#RequestRoles"/> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml?rev=789596&r1=789595&r2=789596&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml Tue Jun 30 07:23:20 2009 @@ -633,7 +633,7 @@ <field name="otherContacts" entry-name="attributeMap.otherContacts"><drop-down allow-empty="false"><option key="Y" description="Yes"/><option key="N" description="No"/></drop-down></field> <field name="saveButton"><submit/></field> </form> - <form name="ListCustRequests" type="list" list-name="custRequests" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" target="updateRequest"> + <form name="ListCustRequests" type="list" list-name="custRequests" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" target="updaterequest"> <row-actions> <service service-name="getProjectTask" result-map="taskResult"> <field-map field-name="taskId" from-field="workEffortId"/> @@ -650,7 +650,7 @@ <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName} [${fromPartyId}])"/> </field> <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field> - <field name="priority" use-when="statusGroup!="OPEN""><display/></field> + <field name="priority" use-when="statusGroup!="OPEN""><display also-hidden="false"/></field> <field name="currentStatusId" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field> <field name="estimatedStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskPlanStartDate}"><display type="date"/></field> <field name="estimatedCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskPlanEndDate}"><display type="date"/></field> @@ -659,22 +659,55 @@ <field name="plannedHours" map-name="taskResult.taskInfo"><display/></field> <field name="actualHours" map-name="taskResult.taskInfo"><display/></field> </form> - <form name="ListMyCustRequests" extends="ListCustRequests"> - <field name="fromPartyId"><ignored/></field> + <form name="ListMyCustRequests" type="list" list-name="custRequests" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" target="updaterequest"> + <row-actions> + <service service-name="getProjectTask" result-map="taskResult"> + <field-map field-name="taskId" from-field="workEffortId"/> + </service> + </row-actions> + <field name="custRequestId"><hidden/></field> + <field name="custRequestName"> + <hyperlink description="${custRequestName} [${custRequestId}]" target="ViewRequest"> + <parameter param-name="custRequestId"/> + </hyperlink> + </field> + <field name="custRequestDate" title="${uiLabelMap.CommonDate}"><display type="date"/></field> + <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field> <field name="priority"> <drop-down allow-empty="true"> - <option key="9"/> - <option key="8"/> - <option key="7"/> - <option key="6"/> - <option key="5"/> - <option key="4"/> - <option key="3"/> + <option key="1(Highest)"/> <option key="2"/> - <option key="1"/> + <option key="3"/> + <option key="4"/> + <option key="5"/> + <option key="6"/> + <option key="7"/> + <option key="8"/> + <option key="9(Lowest)"/> </drop-down> </field> <field name="updateButton" widget-style="smallSubmit"><submit /></field> + <field name="currentStatusId" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field> + <field name="estimatedStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskPlanStartDate}"><display type="date"/></field> + <field name="estimatedCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskPlanEndDate}"><display type="date"/></field> + <field name="actualStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskActStartDate}"><display type="date"/></field> + <field name="actualCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskActEndDate}"><display type="date"/></field> + <field name="plannedHours" map-name="taskResult.taskInfo"><display/></field> + <field name="actualHours" map-name="taskResult.taskInfo"><display/></field> + </form> + <form name="EditRequestCustomer" extends="EditSmallCustRequest"> + <field name="story" title="${uiLabelMap.CommonContent}"><textarea cols="60" rows="15"/></field> + <field name="fromPartyId"><hidden value="${userLogin.partyId}"/></field> + <field name="custRequestDate"><ignored/></field> + <field name="description"><ignored/></field> + <field name="custRequestName"><ignored/></field> + <field name="subject" parameter-name="custRequestName"><text/></field> + <sort-order> + <sort-field name="priority"/> + <sort-field name="responseRequiredDate"/> + <sort-field name="subject"/> + <sort-field name="story"/> + <sort-field name="submit"/> + </sort-order> </form> - </forms> Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml?rev=789596&r1=789595&r2=789596&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml Tue Jun 30 07:23:20 2009 @@ -117,7 +117,6 @@ <set field="tabButtonItem" value="ViewRequest"/> <set field="headerItem" value="request"/> <set field="titleProperty" value="PageTitleViewRequest"/> - <!--<set field="headerItem" value="Shopping List"/>--> <set field="showRequestManagementLinks" value="Y"/> </actions> <widgets> @@ -133,7 +132,7 @@ <section> <actions> <set field="titleProperty" value="OrderRequest"/> - <set field="tabButtonItem" value="request"/> + <set field="tabButtonItem" value="editRequest"/> <set field="headerItem" value="request"/> <set field="custRequestId" from-field="parameters.custRequestId"/> <entity-one entity-name="CustRequest" value-field="custRequest"/> @@ -161,6 +160,25 @@ </widgets> </section> </screen> + <screen name="EditRequestCustomer"> + <section> + <actions> + <set field="custRequestId" from-field="parameters.custRequestId"/> + <entity-one entity-name="CustRequest" value-field="custRequest"/> + <set field="statusId" from-field="custRequest.statusId"/> + <entity-one entity-name="StatusItem" value-field="currentStatus"/> + </actions> + <widgets> + <decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.OrderRequest}"> + <include-form name="EditRequestCustomer" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> <screen name="RequestRoles"> <section> <actions> @@ -560,6 +578,7 @@ </widgets> </section> </screen> + <!-- list customer requests to the customer portlet --> <screen name="ListCustRequests"> <section> <actions> @@ -650,7 +669,7 @@ </condition> <widgets> <screenlet title="${screenletTitle} ${fromPartyId}" navigation-form-name="ListCustRequests" > - <link target="newrequest" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/> + <link target="EditRequestCustomer" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/> <include-form name="ListMyCustRequests" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> </screenlet> </widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |