svn commit: r791199 - in /ofbiz/trunk/specialpurpose/projectmgr: entitydef/entitymodel.xml widget/forms/ProjectForms.xml widget/forms/TimeSheetForms.xml

[hansbak-2]

Author: hansbak
Date: Sun Jul  5 04:35:40 2009
New Revision: 791199

URL: http://svn.apache.org/viewvc?rev=791199&view=rev
Log:
 do not allow tasks of closed projects for selection

Modified:
    ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml

Modified: ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml?rev=791199&r1=791198&r2=791199&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml Sun Jul  5 04:35:40 2009
@@ -62,6 +62,7 @@
     </alias-all>
     <alias-all entity-alias="WET"/>
     <alias entity-alias="WEP" field="workEffortId" name="projectId"/>
+    <alias entity-alias="WEP" field="currentStatusId" name="projectStatusId"/>
     <alias entity-alias="WEP" field="workEffortName" name="projectName"/>
     <alias entity-alias="WEPH" field="workEffortId" name="phaseId"/>
     <alias entity-alias="WEPH" field="workEffortName" name="phaseName"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=791199&r1=791198&r2=791199&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Sun Jul  5 04:35:40 2009
@@ -741,6 +741,7 @@
         <field entry-name="test" name="workEffortId" title="${uiLabelMap.ProjectMgrTaskName}"><!-- task level -->
             <drop-down allow-empty="false">
                 <entity-options entity-name="ProjectPartyAndPhaseAndTask" description="${projectName} -- ${phaseName} -- ${workEffortName}">
+                    <entity-constraint name="projectStatusId" operator="not-equals" value="PRJ_CLOSED"/>
                     <entity-constraint name="partyId" env-name="parameters.partyId"/>
                     <entity-constraint name="workEffortTypeId" value="TASK"/>
                     <entity-constraint name="currentStatusId" operator="equals" value="PTS_CREATED"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=791199&r1=791198&r2=791199&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Sun Jul  5 04:35:40 2009
@@ -32,6 +32,7 @@
         <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}">
+                    <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"/>
@@ -216,6 +217,7 @@
         </field>
         <field name="workEffortId"><drop-down allow-empty="false">
             <entity-options entity-name="ProjectPartyAndPhaseAndTask" description="${projectName}--${phaseName}--${workEffortName}">
+                <entity-constraint name="projectStatusId" operator="not-equals" value="PRJ_CLOSED"/>
                 <entity-constraint name="partyId" env-name="userLogin.partyId"/>
                 <entity-order-by field-name="projectName"/>
                 <entity-order-by field-name="phaseName"/>