svn commit: r685102 - in /ofbiz/trunk/specialpurpose/projectmgr: webapp/projectmgr/WEB-INF/actions/custRequestWorkEffort.bsh widget/forms/RequestForms.xml

[hansbak-2]

Author: hansbak
Date: Tue Aug 12 02:28:50 2008
New Revision: 685102

URL: http://svn.apache.org/viewvc?rev=685102&view=rev
Log:
improve the workeffort/customer request list

Removed:
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/custRequestWorkEffort.bsh
Modified:
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml?rev=685102&r1=685101&r2=685102&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml Tue Aug 12 02:28:50 2008
@@ -101,7 +101,11 @@
         </actions>
         <field name="custRequestTypeId"><display-entity entity-name="CustRequestType" description="${description}"/></field>
         <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
-        <field name="fromPartyId"><display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}" key-field-name="partyId"></display-entity></field>
+        <field name="fromPartyId">
+            <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}" key-field-name="partyId">
+                <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${fromPartyId}" target-type="inter-app" description="[${fromPartyId}]"/>
+            </display-entity>
+        </field>
         <field name="custRequestName"><display/></field>
         <field name="description"><display/></field>
         <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}">
@@ -135,22 +139,34 @@
     <form name="ListRequestsWorkEffortForm" type="list" use-row-submit="true" list-name="requests" paginate-target="requestlist"
         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_ACCEPTED"/>
-                </entity-and>
+            <entity-and entity-name="WorkEffortCustRequestView" list-name="requests">
+                <field-map field-name="statusId" value="CRQ_REVIEWED"/>
+            </entity-and>
         </actions>
         <row-actions>
-            <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/custRequestWorkEffort.bsh"/>
+            <service service-name="getProjectIdAndNameFromTask" result-map-name="sResult">
+                <field-map field-name="taskId" env-name="workEffortId"/>
+            </service>
         </row-actions>
-        <field name="custRequestName" widget-style="buttontext">
-            <hyperlink description="${custRequestName} ${custRequestId}" target="ViewRequest?custRequestId=${custRequestId}"/>
+        <field name="custRequestId">
+            <hyperlink target="/ordermgr/control/ViewRequest?custRequestId=${custRequestId}" target-type="inter-app" description="${custRequestName} [${custRequestId}]"/>
+         </field>
+        <field name="projectId" map-name="sResult">
+            <hyperlink target="projectView?projectId=${sResult.projectId}" description="${sResult.projectName} [${sResult.projectId}]"/>
+        </field>
+        <field name="phaseId" map-name="sResult">
+            <display description="${sResult.phaseName} [${sResult.phaseId}]"/>
         </field>
         <field name="workEffortId">
-            <hyperlink target="taskView?workEffortId=${workEffortId}" description="${workEffortId}"/>
+            <hyperlink target="taskView?workEffortId=${workEffortId}" description="${workEffortName} [${workEffortId}]"/>
         </field>
         <field name="priority"><display/></field>
         <field name="createdDate"><display type="date"/></field>
-        <field name="fromPartyId"><display/></field>
+        <field name="fromPartyId">
+            <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}" key-field-name="partyId">
+                <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${fromPartyId}" target-type="inter-app" description="[${fromPartyId}]"/>
+            </display-entity>
+        </field>
         <field name="statusId">
             <display-entity also-hidden="false" entity-name="StatusItem"/>
         </field>