Author: hansbak
Date: Mon Dec 24 18:29:37 2007
New Revision: 606753
URL: http://svn.apache.org/viewvc?rev=606753&view=rev
Log:
status not correct in the mytask list
Modified:
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
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=606753&r1=606752&r2=606753&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
(original)
+++
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
Mon Dec 24 18:29:37 2007
@@ -585,7 +585,6 @@
<set field="highInfo.scopeEnumId" from-field="lowInfo.scopeEnumId"/>
<call-simple-method method-name="combineInfo"/>
<call-simple-method method-name="getHours"/>
- <clear-field field-name="highInfo.sequenceId"/>
<set field="highInfo.currentStatusId"
from-field="lowInfo.currentStatusId"/>
<field-to-result field-name="highInfo" result-name="taskInfo"/>
<call-simple-method method-name="getProjectIdAndName"/>
@@ -796,8 +795,6 @@
</if-compare>
</if-compare>
- <!-- get the status from the lowerlevel tasks follow the sequence in
the StatusItem entity and use the highest until 'completed'
- after that all tasks need to me completed until a phase is completed,
all phases need to be completed until the project is completed-->
<entity-one entity-name="StatusItem" value-name="status">
<field-map field-name="statusId"
env-name="lowInfo.currentStatusId"/>
</entity-one>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=606753&r1=606752&r2=606753&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Mon Dec 24
18:29:37 2007
@@ -203,11 +203,13 @@
<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>
- <set field="plannedHours"
from-field="result.taskInfo.plannedHours"/>
- <set field="actualHours" from-field="result.taskInfo.actualHours"/>
+ </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="projectName" from-field="result.projectName"/>
+ <set field="currentStatusId" from-field="task.currentStatusId"/>
</row-actions>
<field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskName}"
widget-style="buttontext">
<hyperlink also-hidden="false" description="${workEffortName}
[${workEffortId}]" target="taskView?workEffortId=${workEffortId}"/>
