svn commit: r610017 - in /ofbiz/trunk/specialpurpose/projectmgr/widget: Menus.xml RequestScreens.xml forms/RequestForms.xml forms/TaskForms.xml

[hansbak-2]

Author: hansbak
Date: Tue Jan  8 07:09:37 2008
New Revision: 610017

URL: http://svn.apache.org/viewvc?rev=610017&view=rev
Log:
small corrections to the request and task screens

Modified:
    ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=610017&r1=610016&r2=610017&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Tue Jan  8 07:09:37 2008
@@ -338,10 +338,10 @@
     </menu>
     <menu name="RequestTabBar">
         <menu-item name="viewRequest" title="${uiLabelMap.ProjectMgrView}">
-            <link target="ViewRequest?custRequestId?${parameters.custRequestId}"/>
+            <link target="ViewRequest?custRequestId=${parameters.custRequestId}"/>
         </menu-item>
         <menu-item name="editRequest" title="${uiLabelMap.ProjectMgrEdit}">
-            <link target="EditRequest?custRequestId?${parameters.custRequestId}"/>
+            <link target="EditRequest?custRequestId=${parameters.custRequestId}"/>
         </menu-item>
     </menu>
 </menus>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml?rev=610017&r1=610016&r2=610017&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml Tue Jan  8 07:09:37 2008
@@ -81,6 +81,7 @@
                 <set field="showRequestManagementLinks" value="Y"/>
                 <set field="custRequestId" from-field="parameters.custRequestId"/>
                 <entity-one entity-name="CustRequest" value-name="custRequest"/>
+                <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/custRequestWorkEffort.bsh"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml?rev=610017&r1=610016&r2=610017&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml Tue Jan  8 07:09:37 2008
@@ -102,11 +102,8 @@
         <field name="lastModifiedByUserLogin"><hidden/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-    <form name="RequestInfo" type="single" use-row-submit="true" default-entity-name="CustRequest" default-map-name="custRequest">
+    <form name="RequestInfo" type="single" default-entity-name="CustRequest" default-map-name="custRequest">
         <actions>
-            <entity-one entity-name="CustRequestWorkEffort" value-name="custRequestWorkEffort">
-                <field-map field-name="workEffortId" env-name="workEffortId"/>
-            </entity-one>
             <entity-one entity-name="WorkEffort" value-name="workEffort">
                 <field-map field-name="workEffortId" env-name="workEffortId"/>
             </entity-one>
@@ -118,15 +115,15 @@
             <set field="phaseId" from-field="result.phaseId"/>
             <set field="phaseName" from-field="result.phaseName"/>
         </actions>
-        <field name="custRequestTypeId"><display-entity entity-name="CustRequestType" description="${description}"></display-entity></field>
-        <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"></display-entity></field>
+        <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="custRequestName"><display/></field>
         <field name="description"><display/></field>
         <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}">
             <hyperlink also-hidden="false" description="${projectName}" target="projectView?projectId=${projectId}"/>
         </field>
-        <field name="phaseName"><hyperlink target="FindPhase?projectId=${projectId}" description="${phaseName}"/></field>
+        <field name="phaseName"><display description="${result.phaseName}"/></field>
         <field name="taskName">
             <hyperlink target="taskView?workEffortId=${workEffortId}" description="${workEffort.workEffortName}"/>
         </field>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=610017&r1=610016&r2=610017&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Tue Jan  8 07:09:37 2008
@@ -222,19 +222,9 @@
                 <field-map field-name="taskId" env-name="workEffortId"/>
                 <field-map field-name="hoursPartyId" env-name="userLogin.partyId"/>
             </service>
-            <set field="task" from-field="result.taskInfo"/>
-            <set field="plannedHours" from-field="task.plannedHours"/>
-            <set field="actualHours" from-field="task.actualHours"/>
-            <set field="projectId" from-field="result.projectId"/>
-            <set field="projectName" from-field="result.projectName"/>
-            <set field="currentStatusId" from-field="task.currentStatusId"/>
             <service service-name="getProjectIdAndName" result-map-name="resultProject">
                 <field-map field-name="taskId" env-name="workEffortId"/>
             </service>
-            <set field="projectId" from-field="resultProject.projectId"/>
-            <set field="projectName" from-field="resultProject.projectName"/>
-            <set field="phaseId" from-field="resultProject.phaseId"/>
-            <set field="phaseName" from-field="resultProject.phaseName"/>
         </row-actions>
         <field name="fromDate"><hidden/></field>
         <field name="workEffortId"><hidden/></field>
@@ -243,16 +233,16 @@
         <field name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${workEffortName}" target="taskView?workEffortId=${workEffortId}"/>
         </field>
-        <field name="phaseName" title="${uiLabelMap.ProjectMgrPhaseName}"><display description="${phaseName}"/></field>
-        <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}"><hyperlink target="projectView?projectId=${projectId}" description="${projectName}"/></field>
-        <field name="currentStatusId" ><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
+        <field name="phaseName" title="${uiLabelMap.ProjectMgrPhaseName}"><display description="${resultProject.phaseName}"/></field>
+        <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}"><hyperlink target="projectView?projectId=${resultProject.projectId}" description="${resultProject.projectName}"/></field>
+        <field entry-name="result.taskInfo.currentStatusId" name="currentStatusId" ><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="priority"><display/></field>
         <field name="estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field>
         <field name="estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}" red-when="before-now"><display type="date"/></field>
         <field name="actualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><display type="date"/></field>
         <field name="actualCompletionDate" title="${uiLabelMap.WorkEffortActualCompletionDate}" red-when="before-now"><display type="date"/></field>
-        <field name="plannedHours" title="${uiLabelMap.ProjectMgrPlannedHours}"><display/></field>
-        <field name="actualHours" title="${uiLabelMap.ProjectMgrActualHours}"><display/></field>
+        <field entry-name="result.taskInfo.plannedHours" name="plannedHours" title="${uiLabelMap.ProjectMgrPlannedHours}"><display/></field>
+        <field entry-name="result.taskInfo.actualHours" name="actualHours" title="${uiLabelMap.ProjectMgrActualHours}"><display/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
         <field name="roleTypeId" parameter-name="newRoleTypeId" title="${uiLabelMap.PartyRole}">
             <drop-down>