Author: hansbak
Date: Mon Aug 11 18:12:33 2008
New Revision: 685013
URL: http://svn.apache.org/viewvc?rev=685013&view=rev
Log:
enable the selection of a phase in a project even if it has no tasks
Modified:
ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
Modified: ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml?rev=685013&r1=685012&r2=685013&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml Mon Aug 11
18:12:33 2008
@@ -155,6 +155,32 @@
</relation>
</view-entity>
+ <view-entity entity-name="ProjectAndPhase"
+ package-name="org.ofbiz.workeffort.project"
+ title="WorkEffort for use in project -> phase">
+ <member-entity entity-alias="WEP" entity-name="WorkEffort"/><!--project -->
+ <member-entity entity-alias="WEPH" entity-name="WorkEffort"/><!-- phase -->
+ <alias-all entity-alias="WET"/>
+ <alias entity-alias="WEP" field="workEffortId" name="projectId"/>
+ <alias entity-alias="WEP" field="workEffortName" name="projectName"/>
+ <alias entity-alias="WEP" field="StatusId" name="projectStatusId"/>
+ <alias entity-alias="WEPH" field="workEffortId" name="phaseId"/>
+ <alias entity-alias="WEPH" field="workEffortName" name="phaseName"/>
+ <alias entity-alias="WEPH" field="StatusId" name="phaseStatusId"/>
+ <view-link entity-alias="WEP" rel-entity-alias="WEPH">
+ <key-map field-name="workEffortId" rel-field-name="workEffortParentId"/>
+ </view-link>
+ <relation type="many" rel-entity-name="TimeEntry">
+ <key-map field-name="workEffortId"/>
+ </relation>
+ <relation type="many" rel-entity-name="WorkEffortSkillStandard">
+ <key-map field-name="workEffortId"/>
+ </relation>
+ <relation type="many" rel-entity-name="WorkEffortPartyAssignment">
+ <key-map field-name="workEffortId"/>
+ </relation>
+ </view-entity>
+
<view-entity entity-name="TimesheetAndTimeEntry"
package-name="org.ofbiz.workeffort.project"
title="Time entry for Timesheets, time entries always have a timesheet and
are always for one day only and recording the hours for one person which is
defined on the timesheet. A timesheet will always have at least one time
entry.">
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=685013&r1=685012&r2=685013&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Mon Aug 11
18:12:33 2008
@@ -659,8 +659,9 @@
</drop-down>
</field>
<field name="workEffortParentId"
title="${uiLabelMap.ProjectMgrProjectAndPhaseName}*">
- <drop-down allow-empty="true">
- <entity-options entity-name="ProjectAndPhaseAndTask"
description="${projectName} : ${phaseName}">
+ <drop-down allow-empty="false">
+ <entity-options entity-name="ProjectAndPhase"
description="${projectName} : ${phaseName}" key-field-name="phaseId">
+ <entity-order-by field-name="projectName"/>
<entity-order-by field-name="phaseName"/>
</entity-options>
</drop-down>
@@ -675,12 +676,9 @@
<field name="statusId"><hidden value="CRQ_ACCEPTED"/></field>
<field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskName}">
<drop-down allow-empty="false">
- <entity-options entity-name="ProjectPartyAndPhaseAndTask"
description="${workEffortName} (${phaseName}-${projectName})">
- <entity-constraint name="partyId"
env-name="userLogin.partyId"/>
- <entity-constraint name="workEffortTypeId" value="TASK"/>
- </entity-options>
- </drop-down>
- </field>
+ <entity-options entity-name="ProjectPartyAndPhaseAndTask"
description="${projectName} - ${phaseName}"/>
+ </drop-down>
+ </field>
<field name="save" title="${uiLabelMap.CommonSave}"><submit/></field>
</form>
</forms>
\ No newline at end of file
