svn commit: r607149 - in /ofbiz/trunk/specialpurpose/projectmgr: config/ProjectMgrUiLabels.properties script/org/ofbiz/project/ProjectServices.xml widget/forms/TaskForms.xml

[hansbak-2]

Author: hansbak
Date: Thu Dec 27 17:15:36 2007
New Revision: 607149

URL: http://svn.apache.org/viewvc?rev=607149&view=rev
Log:
corrected a problem in the planned/actual hours counting, improved task find fucntion and other small corrections

Modified:
    ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
    ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml

Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties?rev=607149&r1=607148&r2=607149&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties Thu Dec 27 17:15:36 2007
@@ -96,6 +96,7 @@
 ProjectMgrPhaseList=List of project Phases
 ProjectMgrPhases=Phases
 ProjectMgrPhaseTaskList=List of Phases and Tasks
+ProjectMgrPlannedHours=Planned Hours
 ProjectMgrProjectId=Project Id
 ProjectMgrProjectName=Project Name
 ProjectMgrProjectSummary=Project Summary

Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=607149&r1=607148&r2=607149&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Thu Dec 27 17:15:36 2007
@@ -395,6 +395,7 @@
                     </if-compare>
                 </if-compare>
                 <call-simple-method method-name="combineInfo"/>
+                <call-simple-method method-name="getHours"/>
             </iterate>
         </iterate>
         
@@ -767,8 +768,6 @@
             </else>
         </if-empty>
         
-        <!-- add the estimated/planned hours together -->
-        <call-simple-method method-name="getHours"/>
     </simple-method>
     
     <simple-method method-name="getHours"
@@ -791,7 +790,6 @@
                 </if-not-empty>
             </if-not-empty>
         </iterate>
-        
         <!-- get the actual hours -->
         <get-related value-name="lowInfo" relation-name="TimeEntry" list-name="actuals"/>
         <iterate entry-name="actual" list-name="actuals">

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=607149&r1=607148&r2=607149&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Thu Dec 27 17:15:36 2007
@@ -176,21 +176,29 @@
         <actions>
             <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
                 <field-map field-name="inputFields" env-name="parameters"/>
-                <field-map field-name="entityName" value="ProjectAndPhaseAndTask"/>
-                <field-map field-name="orderBy" value="lastStatusUpdate"/>
+                <field-map field-name="entityName" value="WorkEffort"/>
+                <field-map field-name="orderBy" value="lastUpdatedStamp DESC"/>
             </service>
         </actions>
         <row-actions>
-            <service service-name="getProjectTask" result-map-name="result">
-                <field-map field-name="taskId" env-name="workEffortId"/>
-                <field-map field-name="hoursPartyId" env-name="userLogin.partyId"/>
-            </service>
+            <service service-name="getProjectTask" result-map-name="result">
+                <field-map field-name="taskId" env-name="workEffortId"/>
+            </service>
             <set field="plannedHours" from-field="result.taskInfo.plannedHours"/>
-            <set field="actualHours" from-field="result.taskInfo.actualHours"/>
-            <set field="currentStatusId" from-field="result.taskInfo.currentStatusId"/>
+            <set field="actualHours" from-field="result.taskInfo.actualTotalHours"/>
+            <set field="currentStatusId" from-field="result.taskInfo.currentStatusId"/>
+            <service service-name="getProjectIdAndName" result-map-name="resultProject">
+                <field-map field-name="taskId" env-name="workEffortId"/>
+            </service>
+            <set field="projectName" from-field="resultProject.projectName"/>
+            <set field="projectId" from-field="resultProject.projectId"/>
+            <set field="phaseName" from-field="resultProject.phaseName"/>
         </row-actions>
         <field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskId}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${workEffortName}[${workEffortId}]" target="taskView?workEffortId=${workEffortId}"/>
+            <hyperlink also-hidden="false" description="${workEffortName}[${workEffortId}]" target="taskView?workEffortId=${workEffortId}"/>
+        </field>
+        <field name="resultProject.phaseName" title="${uiLabelMap.ProjectMgrPhaseName}">
+            <hyperlink also-hidden="false" description="${phaseName}" target="FindPhase?projectId=${projectId}"/>
         </field>
         <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${projectName}" target="projectView?projectId=${projectId}"/>
@@ -201,8 +209,8 @@
         <field name="estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}" red-when="before-now"><display type="date"/></field>
         <field name="actualStartDate" title="${uiLabelMap.ProjectMgrWorkEffortActualStartDate}"><display type="date"/></field>
         <field name="actualCompletionDate" title="${uiLabelMap.ProjectMgrWorkEffortActualCompletionDate}" red-when="before-now"><display type="date"/></field>
-        <field name="plannedHours"><display/></field>
-        <field name="actualHours"><display/></field>
+        <field name="plannedHours" title="${uiLabelMap.ProjectMgrPlannedHours}"><display/></field>
+        <field name="actualHours" title="${uiLabelMap.ProjectMgrActualHours}"><display/></field>
     </form>
     <form name="MyTasks" type="list" list-name="tasks" paginate-target="MyTasks" target="updateMyTasks">
         <row-actions>