svn commit: r677377 - in /ofbiz/trunk: applications/party/script/org/ofbiz/party/communication/ specialpurpose/mypage/widget/ specialpurpose/projectmgr/widget/ specialpurpose/projectmgr/widget/forms/

[hansbak-2]

Author: hansbak
Date: Wed Jul 16 11:58:33 2008
New Revision: 677377

URL: http://svn.apache.org/viewvc?rev=677377&view=rev
Log:
some more customer request enhancements and spaces for tabs

Modified:
    ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
    ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml?rev=677377&r1=677376&r2=677377&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml Wed Jul 16 11:58:33 2008
@@ -273,6 +273,7 @@
         <set field="custRequest.description" from-field="communicationEvent.content"/>
         <set field="custRequest.fromPartyId" from-field="communicationEvent.partyIdFrom"/>
         <set field="custRequest.custRequestTypeId" value="RF_SUPPORT"/>
+        <set field="custRequest.statusId" value="CRQ_SUBMITTED"/>
         
         <set-service-fields service-name="createCustRequest" map-name="parameters" to-map-name="custRequest"/>
         <call-service service-name="createCustRequest" in-map-name="custRequest">

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml?rev=677377&r1=677376&r2=677377&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml Wed Jul 16 11:58:33 2008
@@ -357,6 +357,18 @@
  <include-form
  location="component://party/webapp/partymgr/communication/CommForms.xml"
  name="ViewEmail" />
+ <section>
+                                                <actions>
+                                                    <set field="entityName" value="CustRequestAndCommEvent"/>
+                                                    <set field="requestParameters.communicationEventId" from-field="parameters.communicationEventId"/>
+                                                </actions>
+                                                <widgets>
+                                                    <label style="h1" text="${uiLabelMap.OrderRequestList}"/>
+                                                    <screenlet>
+                                                        <include-form name="ListRequests" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+                                                    </screenlet>
+                                                </widgets>
+                                            </section>
  </widgets>
  <fail-widgets>
  <include-form

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml?rev=677377&r1=677376&r2=677377&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml Wed Jul 16 11:58:33 2008
@@ -26,45 +26,20 @@
                 <set field="titleProperty" value="PageTitleListWorkEffortRequests"/>
                 <set field="tabButtonItem" value="requestlist"/>
                 <set field="headerItem" value="request"/>
-                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
-                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="3"/>
-
                 <set field="custRequestId" from-field="parameters.custRequestId"/>
+                <set field="parameters.statusId" value="CRQ_SUBMITTED"/>
+                <set field="entityName" value="CustRequest"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.OrderRequestList}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <container style="screenlet-body">
-                                            <link target="newrequest" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/>
-                                        </container>
-                                        <include-form name="ListRequests" location="component://projectmgr/widget/forms/RequestForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.ProjectMgrRequestWorkEffortList}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="ListRequestsWorkEffortForm" location="component://projectmgr/widget/forms/RequestForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                        <screenlet title="${uiLabelMap.OrderRequestList}" navigation-form-name="ListRequests">
+                            <link target="newrequest" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/>
+                            <include-form name="ListRequests" location="component://projectmgr/widget/forms/RequestForms.xml"/>
+                        </screenlet>
+                        <screenlet title="${uiLabelMap.ProjectMgrRequestWorkEffortList}" navigation-form-name="ListRequestsWorkEffortForm">
+                            <include-form name="ListRequestsWorkEffortForm" location="component://projectmgr/widget/forms/RequestForms.xml"/>
+                        </screenlet>
                     </decorator-section>
                 </decorator-screen>
             </widgets>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml?rev=677377&r1=677376&r2=677377&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml Wed Jul 16 11:58:33 2008
@@ -20,23 +20,8 @@
 
 <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" use-row-submit="true" title="" list-name="requests"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
-        <actions>
-            <entity-and entity-name="CustRequest" list-name="requests">
-                <field-map field-name="statusId" value="CRQ_SUBMITTED"/>
-                </entity-and>
-        </actions>
-        <field name="custRequestName" widget-style="buttontext">
-            <hyperlink description="${custRequestName} ${custRequestId}" target="ViewRequest?custRequestId=${custRequestId}"/>
-        </field>
-        <field name="priority"><display/></field>
-        <field name="createdDate"><display type="date"/></field>
-        <field name="fromPartyId"><display/></field>
-        <field name="statusId">
-            <display-entity also-hidden="false" entity-name="StatusItem"/>
-        </field>
-        <field name="description"><display/></field>
+    <form name="ListRequests" type="list"
+        extends="ListRequests" extends-resource="component://order/webapp/ordermgr/request/RequestForms.xml">
         <field name="createTaskFromRequest" title="${uiLabelMap.ProjectMgrCreateTaskFromRequest}" widget-style="buttontext">
             <hyperlink description="${uiLabelMap.ProjectMgrCreateTaskFromRequest}" target="CreateTaskbyRequest?custRequestId=${custRequestId}"/>
         </field>