Author: hansbak
Date: Thu Feb 4 10:39:12 2010
New Revision: 906446
URL: http://svn.apache.org/viewvc?rev=906446&view=rev
Log:
allow the entry of planned hours on the project task list
Modified:
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.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=906446&r1=906445&r2=906446&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
(original)
+++
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
Thu Feb 4 10:39:12 2010
@@ -179,6 +179,23 @@
</if-not-empty>
</simple-method>
+ <simple-method method-name="updateTaskAndRelatedInfo"
short-description="Update the task and when info is provided update the related
information too">
+ <set-service-fields service-name="updateWorkEffort"
to-map="updateWorkeffort" map="parameters"/>
+ <call-service service-name="updateWorkEffort"
in-map-name="updateWorkeffort"/>
+ <if-not-empty field="parameters.estimatedDuration">
+ <set-service-fields service-name="updateWorkEffortSkillStandard"
to-map="updateWorkEffortSkillStandard" map="parameters"/>
+ <if-empty field="parameters.skillTypeId">
+ <entity-and list="workEffortSkillStandards"
entity-name="WorkEffortSkillStandard">
+ <field-map field-name="workEffortId"
from-field="parameters.workEffortId"/>
+ </entity-and>
+ <first-from-list entry="workEffortSkillStandard"
list="workEffortSkillStandards"/>
+ <set field="updateWorkEffortSkillStandard.skillTypeId"
from-field="workEffortSkillStandard.skillTypeId"/>
+ </if-empty>
+ <call-service service-name="updateWorkEffortSkillStandard"
in-map-name="updateWorkEffortSkillStandard"/>
+ </if-not-empty>
+ <!-- if required can update more task related info here -->
+ </simple-method>
+
<simple-method method-name="updateTaskAssigment"
short-description="Update task to resource assignment, if required
create a new one by re-assigment">
<field-to-result field="parameters.workEffortId"
result-name="workEffortId"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml?rev=906446&r1=906445&r2=906446&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml Thu Feb 4
10:39:12 2010
@@ -226,7 +226,20 @@
<attribute name="taskParties" type="List" mode="OUT" optional="true"/>
</service>
- <service name="updateTaskAssigment"
default-entity-name="WorkEffortPartyAssignment" engine="simple"
+ <service name="updateTaskAndRelatedInfo" default-entity-name="WorkEffort"
engine="simple"
+
location="component://projectmgr/script/org/ofbiz/project/ProjectServices.xml"
invoke="updateTaskAndRelatedInfo">
+ <description>Update a task and related info</description>
+ <permission-service service-name="projectMgrPermission"
main-action="VIEW"/>
+ <implements service="interfaceWorkEffort"/>
+ <auto-attributes mode="IN" include="pk" optional="false"/>
+ <attribute name="communicationEventId" type="String" mode="IN"
optional="true"/>
+ <attribute name="reason" type="String" mode="IN" optional="true"/>
+ <!-- optional related data -->
+ <attribute name="skillTypeId" mode="IN" type="String" optional="true"/>
+ <attribute name="estimatedDuration" mode="IN" type="Double"
optional="true"/>
+ </service>
+
+ <service name="updateTaskAssigment"
default-entity-name="WorkEffortPartyAssignment" engine="simple"
location="component://projectmgr/script/org/ofbiz/project/ProjectServices.xml"
invoke="updateTaskAssigment">
<description>Update a WorkEffortPartyAssignment Entity, including set
enddate and create new</description>
<permission-service service-name="projectMgrPermission"
main-action="UPDATE"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=906446&r1=906445&r2=906446&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
(original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Thu Feb
4 10:39:12 2010
@@ -289,7 +289,7 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit
button-type="button"/></field>
</form>
- <form name="EditProjectTasks" target="updateProjectTaskOrPhase" title=""
list-name="tasks" type="list" separate-columns="true"
+ <form name="EditProjectTasks" target="updateProjectTask" title=""
list-name="tasks" type="list" separate-columns="true"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<row-actions>
<service service-name="getProjectTask" result-map="result">
@@ -307,7 +307,7 @@
</hyperlink>
</field>
<field name="currentStatusId"
title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"
key-field-name="statusId" description="${description}"
also-hidden="false"></display-entity></field>
- <field name="plannedHours"
title="${uiLabelMap.ProjectMgrPlannedHours}"><display/></field>
+ <field name="plannedHours" parameter-name="estimatedDuration"
title="${uiLabelMap.ProjectMgrPlannedHours}"><text/></field>
<field name="actualHours"
title="${uiLabelMap.ProjectMgrActualHours}"><display/></field>
<field name="workEffortParentId"
title="${uiLabelMap.ProjectMgrTaskPhase}">
<drop-down allow-empty="false">
