Author: hansbak
Date: Mon Mar 8 06:59:23 2010
New Revision: 920212
URL: http://svn.apache.org/viewvc?rev=920212&view=rev
Log:
show wbsId on project manager timesheets
Modified:
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.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=920212&r1=920211&r2=920212&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
(original)
+++
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
Mon Mar 8 06:59:23 2010
@@ -595,6 +595,8 @@
<field-to-result field="phase.workEffortName"
result-name="phaseName"/>
<field-to-result field="task.workEffortId" result-name="taskId"/>
<field-to-result field="task.workEffortName"
result-name="taskName"/>
+ <set field="taskWbsId"
value="${project.workEffortId}.${phase.sequenceNum}.${task.sequenceNum}"/>
+ <field-to-result field="taskWbsId"/>
</if-not-empty>
</simple-method>
Modified: ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml?rev=920212&r1=920211&r2=920212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml Mon Mar 8
06:59:23 2010
@@ -179,6 +179,7 @@
<attribute name="phaseId" type="String" mode="OUT" optional="true"/>
<attribute name="phaseName" type="String" mode="OUT" optional="true"/>
<attribute name="taskName" type="String" mode="OUT" optional="true"/>
+ <attribute name="taskWbsId" type="String" mode="OUT" optional="true"/>
</service>
<service name="getProjectPhaseList" engine="simple"
Modified:
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy?rev=920212&r1=920211&r2=920212&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy
(original)
+++
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy
Mon Mar 8 06:59:23 2010
@@ -1,5 +1,4 @@
/*
-/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -120,6 +119,7 @@
entry.phaseName = result.phaseName;
entry.projectId = result.projectId;
entry.projectName = result.projectName;
+ entry.taskWbsId = result.taskWbsId;
}
entry.total = taskTotal;
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=920212&r1=920211&r2=920212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
(original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Mon
Mar 8 06:59:23 2010
@@ -30,14 +30,16 @@
<field name="roleTypeId"><hidden/></field>
<field name="fromDate"><hidden/></field>
<field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskName}">
- <drop-down allow-empty="true"
current-description="${result.projectName} -- ${result.phaseName} --
${result.taskName} ${phaseName}">
- <entity-options entity-name="ProjectPartyAndPhaseAndTask"
description="${projectName} -- ${phaseName} -- ${workEffortName}">
+ <drop-down allow-empty="true"
current-description="${result.taskWbsId} ${result.projectName} --
${result.phaseName} -- ${result.taskName} ${phaseName}">
+ <entity-options entity-name="ProjectPartyAndPhaseAndTask"
description="${projectId}.${phaseSeqNum}.${sequenceNum} ${projectName} --
${phaseName} -- ${workEffortName}">
<entity-constraint name="projectStatusId"
operator="not-equals" value="PRJ_CLOSED"/>
<entity-constraint name="workEffortTypeId"
operator="equals" value="TASK"/>
<entity-constraint name="partyId"
env-name="timesheet.partyId"/>
<entity-constraint name="currentStatusId"
value="PTS_CREATED"/>
<entity-order-by field-name="projectName"/>
+ <entity-order-by field-name="phaseSeqNum"/>
<entity-order-by field-name="phaseName"/>
+ <entity-order-by field-name="sequenceNum"/>
<entity-order-by field-name="workEffortName"/>
</entity-options>
<sub-hyperlink target="taskView"
description="${bsh:workEffortId!=void&&!"Totals".equals(workEffortId)?workEffortId:""}">
@@ -281,6 +283,7 @@
<form name="WeekTimesheet" type="list" list-name="timeEntries"
separate-columns="true"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="timesheetId"><hidden/></field>
+ <field name="taskWbsId"><display/></field>
<field name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}">
<hyperlink target="taskView" description="${workEffortName}">
<parameter param-name="workEffortId"/>
