svn commit: r606113 - in /ofbiz/trunk/specialpurpose/projectmgr: data/ProjectMgrDemoData.xml data/ProjectMgrTypeData.xml entitydef/entitymodel.xml script/org/ofbiz/project/ProjectServices.xml widget/forms/ProjectForms.xml widget/forms/TaskForms.xml

[hansbak-2]

Author: hansbak
Date: Thu Dec 20 22:23:44 2007
New Revision: 606113

URL: http://svn.apache.org/viewvc?rev=606113&view=rev
Log:
Introduced the new status values for project tasks and assignments

Modified:
    ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml
    ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml
    ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml
    ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml

Modified: ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml?rev=606113&r1=606112&r2=606113&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml Thu Dec 20 22:23:44 2007
@@ -25,18 +25,18 @@
     <PartyRole partyId="admin" roleTypeId="PROJECT_TEAM"/>
 
     <!-- Demo project, phases and tasks with estimated time-->
-    <WorkEffort workEffortId="9000" workEffortTypeId="PROJECT" currentStatusId="CAL_ACCEPTED" lastStatusUpdate="2007-12-14 15:07:52.901" scopeEnumId="WES_PUBLIC" workEffortName="Demo Project" revisionNumber="1"/>
-    <WorkEffortPartyAssignment  workEffortId="9000" partyId="admin" statusId="PRTYASGN_ASSIGNED" roleTypeId="PROVIDER_MANAGER" fromDate="2007-12-14 16:45:21.831"/>
-    <WorkEffortPartyAssignment  workEffortId="9000" partyId="DemoCustomer" statusId="PRTYASGN_ASSIGNED" roleTypeId="CLIENT_MANAGER" fromDate="2007-12-14 16:45:21.831"/>
-    <WorkEffort workEffortId="9001" workEffortTypeId="PHASE" currentStatusId="CAL_ACCEPTED" lastStatusUpdate="2007-12-14 16:45:14.226" workEffortParentId="9000" workEffortName="phase1" revisionNumber="1" />
-    <WorkEffort workEffortId="9002" workEffortTypeId="TASK" currentStatusId="CAL_ACCEPTED" lastStatusUpdate="2007-12-14 16:45:21.831" workEffortParentId="9001" scopeEnumId="WES_PUBLIC" workEffortName="task1" estimatedStartDate="2007-12-03 00:00:00.0" estimatedCompletionDate="2007-12-05 00:00:00.0" revisionNumber="1" />
+    <WorkEffort workEffortId="9000" workEffortTypeId="PROJECT" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 15:07:52.901" scopeEnumId="WES_PUBLIC" workEffortName="Demo Project" revisionNumber="1"/>
+    <WorkEffortPartyAssignment  workEffortId="9000" partyId="admin" statusId="PAS_ASSIGNED" roleTypeId="PROVIDER_MANAGER" fromDate="2007-12-14 16:45:21.831"/>
+    <WorkEffortPartyAssignment  workEffortId="9000" partyId="DemoCustomer" statusId="PAS_ASSIGNED" roleTypeId="CLIENT_MANAGER" fromDate="2007-12-14 16:45:21.831"/>
+    <WorkEffort workEffortId="9001" workEffortTypeId="PHASE" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 16:45:14.226" workEffortParentId="9000" workEffortName="phase1" revisionNumber="1" />
+    <WorkEffort workEffortId="9002" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:21.831" workEffortParentId="9001" scopeEnumId="WES_PUBLIC" workEffortName="task1" estimatedStartDate="2007-12-03 00:00:00.0" estimatedCompletionDate="2007-12-05 00:00:00.0" revisionNumber="1" />
     <WorkEffortSkillStandard workEffortId="9002" skillTypeId="9000" estimatedDuration="16.0"/>
-    <WorkEffort workEffortId="9003" workEffortTypeId="TASK" currentStatusId="CAL_ACCEPTED" lastStatusUpdate="2007-12-14 16:45:29.453" workEffortParentId="9001" scopeEnumId="WES_PUBLIC" workEffortName="task2" estimatedStartDate="2007-12-05 00:00:00.0" estimatedCompletionDate="2007-12-16 00:00:00.0" revisionNumber="1" />
+    <WorkEffort workEffortId="9003" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:29.453" workEffortParentId="9001" scopeEnumId="WES_PUBLIC" workEffortName="task2" estimatedStartDate="2007-12-05 00:00:00.0" estimatedCompletionDate="2007-12-16 00:00:00.0" revisionNumber="1" />
     <WorkEffortSkillStandard workEffortId="9003" skillTypeId="9000" estimatedDuration="24.0"/>
-    <WorkEffort workEffortId="9004" workEffortTypeId="PHASE" currentStatusId="CAL_ACCEPTED" lastStatusUpdate="2007-12-14 16:45:35.939" workEffortParentId="9000" workEffortName="phase2" revisionNumber="1"/>
-    <WorkEffort workEffortId="9005" workEffortTypeId="TASK" currentStatusId="CAL_ACCEPTED" lastStatusUpdate="2007-12-14 16:45:50.84" workEffortParentId="9004" scopeEnumId="WES_PUBLIC" workEffortName="task3" estimatedStartDate="2007-12-16 00:00:00.0" estimatedCompletionDate="2007-12-17 00:00:00.0" revisionNumber="1"/>
+    <WorkEffort workEffortId="9004" workEffortTypeId="PHASE" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 16:45:35.939" workEffortParentId="9000" workEffortName="phase2" revisionNumber="1"/>
+    <WorkEffort workEffortId="9005" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:50.84" workEffortParentId="9004" scopeEnumId="WES_PUBLIC" workEffortName="task3" estimatedStartDate="2007-12-16 00:00:00.0" estimatedCompletionDate="2007-12-17 00:00:00.0" revisionNumber="1"/>
     <WorkEffortSkillStandard workEffortId="9005" skillTypeId="9000" estimatedDuration="32.0"/>
-    <WorkEffort workEffortId="9006" workEffortTypeId="TASK" currentStatusId="CAL_ACCEPTED" lastStatusUpdate="2007-12-14 16:45:58.857" workEffortParentId="9004" scopeEnumId="WES_PUBLIC" workEffortName="task4" estimatedStartDate="2007-12-18 00:00:00.0" estimatedCompletionDate="2007-12-20 00:00:00.0" revisionNumber="1"/>
+    <WorkEffort workEffortId="9006" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:58.857" workEffortParentId="9004" scopeEnumId="WES_PUBLIC" workEffortName="task4" estimatedStartDate="2007-12-18 00:00:00.0" estimatedCompletionDate="2007-12-20 00:00:00.0" revisionNumber="1"/>
     <WorkEffortSkillStandard workEffortId="9006" skillTypeId="9000" estimatedDuration="40.0"/>
     
     <!-- task dependencies -->

Modified: ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml?rev=606113&r1=606112&r2=606113&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml Thu Dec 20 22:23:44 2007
@@ -54,7 +54,10 @@
     <StatusValidChange condition="" statusId="PAS_ASSIGNED" statusIdTo="PAS_COMPLETED" transitionName="Assignment Complete"/>
     
     <StatusItem description="Created" sequenceId="01" statusCode="CREATED" statusId="PTS_CREATED" statusTypeId="PROJECT_TASK_STATUS"/>
-    <StatusItem description="Completed" sequenceId="02" statusCode="COMPLETED" statusId="PTS_COMPLETED" statusTypeId="PROJECT_TASK_STATUS"/>
+    <StatusItem description="Unassigned" sequenceId="02" statusCode="CREATED" statusId="PTS_CREATED_UA" statusTypeId="PROJECT_TASK_STATUS"/>
+    <StatusItem description="Assigned" sequenceId="03" statusCode="CREATED" statusId="PTS_CREATED_AS" statusTypeId="PROJECT_TASK_STATUS"/>
+    <StatusItem description="In Progress" sequenceId="04" statusCode="CREATED" statusId="PTS_CREATED_IP" statusTypeId="PROJECT_TASK_STATUS"/>
+    <StatusItem description="Completed" sequenceId="05" statusCode="COMPLETED" statusId="PTS_COMPLETED" statusTypeId="PROJECT_TASK_STATUS"/>
     <StatusItem description="On Hold" sequenceId="07" statusCode="ON_HOLD" statusId="PTS_ON_HOLD" statusTypeId="PROJECT_TASK_STATUS"/>
     <StatusItem description="Cancelled" sequenceId="09" statusCode="CANCELLED" statusId="PTS_CANCELLED" statusTypeId="PROJECT_TASK_STATUS"/>
     <StatusValidChange condition="" statusId="PTS_CREATED" statusIdTo="PTS_COMPLETED" transitionName="Task Complete"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml?rev=606113&r1=606112&r2=606113&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml Thu Dec 20 22:23:44 2007
@@ -80,6 +80,9 @@
     <relation type="many" rel-entity-name="TimeEntry">
       <key-map field-name="workEffortId"/>
     </relation>
+    <relation type="many" rel-entity-name="WorkEffortPartyAssignment">
+      <key-map field-name="workEffortId"/>
+    </relation>
     <relation type="many" rel-entity-name="WorkEffortSkillStandard">
       <key-map field-name="workEffortId"/>
     </relation>
@@ -106,6 +109,9 @@
       <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>

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=606113&r1=606112&r2=606113&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Thu Dec 20 22:23:44 2007
@@ -20,8 +20,8 @@
 
 <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
-
-    <simple-method method-name="scheduleProject" short-description="Project Schulers sets the planningdates according task requirements and available resources">
+    
+    <simple-method method-name="scheduleProject" short-description="Project Scheduler sets the planningdates according task requirements and available resources">
         <!--
                 theory behind the program
                 - - - - - - - - - - - - -
@@ -251,7 +251,7 @@
                 <set field="newProject.workEffortTypeId" value="PROJECT"/>
             </else>            
         </if-not-empty>
-        <set field="newProject.currentStatusId" value="CAL_ACCEPTED"/>            
+        <set field="newProject.currentStatusId" value="_NA_"/>            
         <call-service service-name="createWorkEffort" in-map-name="newProject">
             <result-to-field result-name="workEffortId" field-name="newProjectId"/>
         </call-service>
@@ -262,7 +262,7 @@
             <set field="pa.workEffortId" from-field="newProjectId"/>            
             <set field="pa.partyId" from-field="party.partyId"/>
             <set field="pa.roleTypeId" from-field="party.roleTypeId"/>
-            <set field="pa.statusId" value="CAL_ACCEPTED"/>            
+            <set field="pa.statusId" value="PAS_ASSIGNED"/>            
             <call-service service-name="assignPartyToWorkEffort" in-map-name="pa"/>
         </iterate>
         
@@ -278,7 +278,7 @@
                 </if-not-empty>
                 <set field="newPhase.workEffortName" from-field="phase.workEffortName"/>
                 <set field="newPhase.workEffortParentId" from-field="newProjectId"/>
-                <set field="newPhase.currentStatusId" value="CAL_ACCEPTED"/>            
+                <set field="newPhase.currentStatusId" value="_NA_"/>            
                 <call-service service-name="createWorkEffort" in-map-name="newPhase">
                     <result-to-field result-name="workEffortId" field-name="newPhaseId"/>
                 </call-service>
@@ -296,7 +296,7 @@
                         <set field="newTask.workEffortName" from-field="task.workEffortName"/>
                         <set field="newTask.priority" from-field="task.priority"/>
                         <set field="newTask.workEffortParentId" from-field="newPhaseId"/>
-                        <set field="newTask.currentStatusId" value="CAL_ACCEPTED"/>            
+                        <set field="newTask.currentStatusId" value="PTS_CREATED"/>            
                         <call-service service-name="createWorkEffort" in-map-name="newTask"/>
                     </iterate>
                 </if-not-empty>
@@ -306,30 +306,21 @@
     </simple-method>
     
     <simple-method method-name="getProject" short-description="get Project information" login-required="true">
-            <if-empty field-name="parameters.projectId">
-                <return/>
-            </if-empty>
-            <entity-one entity-name="WorkEffort" value-name="project">
-                <field-map field-name="workEffortId" env-name="parameters.projectId"/>
-            </entity-one>
-            <set field="highInfo.projectId" from-field="project.workEffortId"/>
+        <if-empty field-name="parameters.projectId">
+            <return/>
+        </if-empty>
+        <entity-one entity-name="WorkEffort" value-name="project">
+            <field-map field-name="workEffortId" env-name="parameters.projectId"/>
+        </entity-one>
+        <set field="highInfo.projectId" from-field="project.workEffortId"/>
         <set field="highInfo.projectName" from-field="project.workEffortName"/>
         <set field="highInfo.projectDescription" from-field="project.description"/>
-        <set field="highInfo.currentStatusId" from-field="project.currentStatusId"/>
         <set field="highInfo.scopeEnumId" from-field="project.scopeEnumId"/>
         <entity-one entity-name="StatusItem" value-name="highSeq">
             <field-map field-name="statusId" env-name="project.currentStatusId"/>
         </entity-one>
-        <set field="highInfo.sequenceId" from-field="highSeq.sequenceId"/>
-        <set field="highInfo.statusDescription" from-field="highSeq.description"/>
         <set field="highInfo.createdDate" from-field="project.createdDate"/>
-        <if-not-empty field-name="project.workEffortParentId">
-            <entity-one entity-name="WorkEffort" value-name="parentProject">
-                <field-map field-name="workEffortId" env-name="project.workEffortParentId"/>
-            </entity-one>
-            <set field="highInfo.parentProjectName" from-field="parentProject.workEffortName"/>
-            <set field="highInfo.parentProjectId" from-field="parentProject.workEffortId"/>
-        </if-not-empty>
+        <set field="highInfo.parentProjectId" from-field="parentProject.workEffortId"/>
         <!-- loop through the related phases and tasks -->
         <get-related value-name="project" relation-name="ChildWorkEffort" list-name="phases"/>
         <iterate entry-name="phase" list-name="phases">
@@ -342,12 +333,10 @@
         <!-- translate squenceId back into statusId -->
         <entity-and entity-name="StatusItem" list-name="statusses">
             <field-map field-name="sequenceId" env-name="highInfo.sequenceId"/>
-            <field-map field-name="statusTypeId" value="TASK_STATUS"/>
+            <field-map field-name="statusTypeId" value="PROJECT_TASK_STATUS"/>
         </entity-and>
         <first-from-list entry-name="status" list-name="statusses"/>
-        <clear-field field-name="highInfo.sequenceId"/>
-        <set field="highInfo.statusId" from-field="status.statusId"/>
-        
+        <set field="highInfo.currentStatusId" from-field="status.statusId"/>
         <call-simple-method method-name="createDates"/>
         
         <!-- results -->
@@ -387,7 +376,7 @@
             <!-- translate squenceId back into statusId -->
             <entity-and entity-name="StatusItem" list-name="statusses">
                 <field-map field-name="sequenceId" env-name="highInfo.sequenceId"/>
-                <field-map field-name="statusTypeId" value="TASK_STATUS"/>
+                <field-map field-name="statusTypeId" value="PROJECT_TASK_STATUS"/>
             </entity-and>
             <first-from-list entry-name="status" list-name="statusses"/>
             <clear-field field-name="highInfo.sequenceId"/>
@@ -408,33 +397,24 @@
             <field-map field-name="projectId" env-name="parameters.projectId"/>
         </entity-and>        
         
-        <iterate entry-name="task" list-name="tasks">
-            
-            <!-- merge estimated and actual dates -->
+        <iterate entry-name="lowInfo" list-name="tasks">
             <if-empty field-name="savePhaseName">
-                <set field="savePhaseName" from-field="task.phaseName"/>
-                <set field="highInfo.phaseName" from-field="task.phaseName"/>
+                <set field="savePhaseName" from-field="lowInfo.phaseName"/>
+                <set field="highInfo.phaseName" from-field="lowInfo.phaseName"/>
                 <else>
-                    <if-compare-field field-name="task.phaseName" operator="not-equals" to-field-name="savePhaseName">
-                        <set field="highInfo.phaseName" from-field="task.phaseName"/>
-                        <set field="savePhaseName" from-field="task.phaseName"/>
+                    <if-compare-field field-name="lowInfo.phaseName" operator="not-equals" to-field-name="savePhaseName">
+                        <set field="highInfo.phaseName" from-field="lowInfo.phaseName"/>
+                        <set field="savePhaseName" from-field="lowInfo.phaseName"/>
                     </if-compare-field>
                 </else>
             </if-empty>
-            <set field="highInfo.phaseId" from-field="task.phaseId"/>
-            <set field="highInfo.workEffortId" from-field="task.workEffortId"/>
-            <set field="highInfo.workEffortName" from-field="task.workEffortName"/>
-            <set field="highInfo.workEffortDescription" from-field="workEffortDescription"/>
-            <set field="highInfo.currentStatusId" from-field="task.currentStatusId"/>
-            <set field="highInfo.scopeEnumId" from-field="task.scopeEnumId"/>
-            <set field="highInfo.priority" from-field="task.priority"/>
-            <set field="highInfo.estimatedStartDate" from-field="task.estimatedStartDate"/>
-            <set field="highInfo.estimatedCompletionDate" from-field="task.estimatedCompletionDate"/>
-            <set field="highInfo.actualStartDate" from-field="task.actualStartDate"/>
-            <set field="highInfo.actualCompletionDate" from-field="task.actualCompletionDate"/>
+            <call-simple-method method-name="combineInfo"/>
+            <clear-field field-name="highInfo.sequenceId"/>
+            <set field="highInfo.currentStatusId" from-field="lowInfo.currentStatusId"/>
             <call-simple-method method-name="createDates"/>
-            <set field="lowInfo" from-field="task"/>
             <call-simple-method method-name="getHours"/>
+            <set field="highInfo.workEffortId" from-field="lowInfo.workEffortId"/>
+            <set field="highInfo.workEffortName" from-field="lowInfo.workEffortName"/>
             <field-to-list field-name="highInfo" list-name="taskList"/>
             <clear-field field-name="highInfo"/>
         </iterate>
@@ -455,7 +435,7 @@
         <call-simple-method method-name="combineInfo"/>
         <call-simple-method method-name="getHours"/>
         <clear-field field-name="highInfo.sequenceId"/>
-        <set field="highInfo.statusId" from-field="lowInfo.currentStatusId"/>
+        <set field="highInfo.currentStatusId" from-field="lowInfo.currentStatusId"/>
         <field-to-result field-name="highInfo" result-name="taskInfo"/>
         <call-simple-method method-name="getProjectIdAndName"/>
     </simple-method>
@@ -646,6 +626,25 @@
             </if-empty>
         </if-not-empty>
         
+        <!-- if lowlevel type equals TASK then get create the status first -->
+        <if-compare field-name="lowInfo.workEffortTypeId" value="TASK" operator="equals">
+            <if-compare field-name="lowInfo.currentStatusId" value="PTS_CREATED" operator="equals">
+                <get-related value-name="lowInfo" relation-name="WorkEffortPartyAssignment" list-name="assigns"/>
+                <if-empty field-name="assigns">
+                    <set field="lowInfo.currentStatusId" value="PTS_CREATED_UA"/>
+                    <else>
+                        <get-related value-name="lowInfo" relation-name="TimeEntry" list-name="entries"/>
+                        <if-empty field-name="entries">
+                            <set field="lowInfo.currentStatusId" value="PTS_CREATED_AS"/>
+                            <else>
+                                <set field="lowInfo.currentStatusId" value="PTS_CREATED_IP"/>
+                            </else>
+                        </if-empty>
+                    </else>
+                </if-empty>
+            </if-compare>
+        </if-compare>        
+        
         <!-- get the status from the lowerlevel tasks follow the sequence in the StatusItem entity and use the lowest-->
         <entity-one entity-name="StatusItem" value-name="status">
             <field-map field-name="statusId" env-name="lowInfo.currentStatusId"/>
@@ -653,7 +652,7 @@
         <if-empty field-name="highInfo.sequenceId">
             <set field="highInfo.sequenceId" from-field="status.sequenceId"/>
             <else>
-                <if-compare-field field-name="highInfo.sequenceId" operator="greater" to-field-name="status.sequenceId">
+                <if-compare-field field-name="highInfo.sequenceId" operator="less" to-field-name="status.sequenceId">
                     <set field="highInfo.sequenceId" from-field="status.sequenceId"/>
                 </if-compare-field>
             </else>
@@ -759,9 +758,10 @@
             </else>            
         </if-not-empty>
     </simple-method>
+    
     <simple-method method-name="updateMyTaskAssigment" short-description="Update the workEffortPartyAssigment, if required create a new one by re-assigment">
         <if-compare-field field-name="parameters.partyId" to-field-name="userLogin.partyId" operator="equals">
-            <if-compare field-name="parameters.statusId" value="CAL_COMPLETED" operator="equals">
+            <if-compare field-name="parameters.statusId" value="PAS_COMPLETED" operator="equals">
                 <now-timestamp-to-env env-name="upd.thruDate"/>
             </if-compare>
             <set-service-fields service-name="updatePartyToWorkEffortAssignment" map-name="parameters" to-map-name="upd"/>
@@ -803,5 +803,4 @@
         </if-compare-field>
     </simple-method>
     
-
 </simple-methods>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=606113&r1=606112&r2=606113&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Thu Dec 20 22:23:44 2007
@@ -113,9 +113,14 @@
     </form>                                        
     <form name="ProjectInfo" type="single" default-map-name="project" paginate-target="FindProject">
         <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}"><display/></field>
-        <field name="statusDescription" title="${uiLabelMap.CommonStatus}"><display/></field>
+        <field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
+            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
         <field name="priority" title="${uiLabelMap.CommonPriority}"><display/></field>
-        <field name="parentProjectName" title="${uiLabelMap.ProjectMgrParentProjectName}"><hyperlink target="projectView?projectId=${project.parentProjectId}" description="${project.parentProjectName}"/></field>
+        <field name="parentProjectId" title="${uiLabelMap.ProjectMgrParentProjectName}">
+            <display-entity entity-name="WorkEffort" description="${workEffortName} ${workEffortId}" key-field-name="workEffortId">
+                <sub-hyperlink target="projectView?projectId=${workEffortId}" description="${workEffortId}" link-style="buttontext"/>
+            </display-entity>
+        </field>
         <field name="estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field>
         <field name="estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field>
         <field name="actualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><display type="date"/></field>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=606113&r1=606112&r2=606113&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Thu Dec 20 22:23:44 2007
@@ -19,14 +19,9 @@
 -->
 
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
+        >
     
     <form name="EditTask" type="single" target="updateTask" default-map-name="task">
-        <actions>
-            <entity-one entity-name="StatusItem" value-name="currentStatus" auto-field-map="false">
-                <field-map field-name="statusId" env-name="task.statusId"/>
-            </entity-one>
-        </actions>
         <alt-target use-when="myTask!=null" target="createMyTask"/>
         <alt-target use-when="task==null" target="createTask"/>
         <field use-when="myTask!=null" name="partyId"><hidden value="${userLogin.partyId}"/></field>
@@ -69,16 +64,8 @@
             </drop-down>
         </field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
-        <field use-when="task==null" name="currentStatusId"><hidden value="CAL_ACCEPTED"/></field>
-        <field use-when="myTask!=null" name="statusId"><hidden value="CAL_ACCEPTED"/></field>
-        <field use-when="task!=null" name="statusId" parameter-name="currentStatusId" title="${uiLabelMap.CommonStatus}">
-            <drop-down allow-empty="false" current-description="${currentStatus.description}">
-                <entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})">
-                    <entity-constraint name="statusId" env-name="task.currentStatusId"/>
-                    <entity-order-by field-name="sequenceId"/>
-                </entity-options>
-            </drop-down>
-        </field>
+        <field use-when="myTask==null" name="currentStatusId"><hidden value="PTS_CREATED"/></field>
+        <field use-when="myTask!=null" name="statusId"><hidden/></field>
         <field name="priority" title="${uiLabelMap.CommonPriority}">
             <drop-down allow-empty="true" current="selected">
                 <option key="1" description="1 (${uiLabelMap.WorkEffortPriorityHigh})"/>
@@ -106,7 +93,7 @@
     <form name="AddProjectTask" type="single" target="createProjectTaskOrPhase">
         <field name="projectId"><hidden value="${parameters.projectId}"/></field>
         <field name="workEffortTypeId"><hidden value="TASK"/></field>
-        <field name="currentStatusId"><hidden value="CAL_ACCEPTED"/></field>
+        <field name="currentStatusId"><hidden value="PTS_CREATED"/></field>
         <field name="taskName" parameter-name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}*" tooltip="${uiLabelMap.CommonRequired}"><text/></field>
         <field name="taskDescription" parameter-name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
         <field name="phaseName" parameter-name="workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}">
@@ -155,7 +142,7 @@
         <field name="projectId"><hidden value="${parameters.projectId}"/></field>
         <field name="workEffortParentId"><hidden value="${parameters.projectId}"/></field>
         <field name="workEffortTypeId"><hidden value="PHASE"/></field>
-        <field name="currentStatusId"><hidden value="CAL_ACCEPTED"/></field>
+        <field name="currentStatusId"><hidden value="_NA_"/></field>
         <field name="phaseName"  parameter-name="workEffortName" title="${uiLabelMap.ProjectMgrPhaseName}*" tooltip="${uiLabelMap.CommonRequired}"><text/></field>
         <field name="phaseDdescription" parameter-name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
         <field name="save" title="${uiLabelMap.CommonSave}"><submit/></field>
@@ -164,7 +151,7 @@
         <field name="projectId"><hidden value="${parameters.projectId}"/></field>
         <field name="workEffortParentId"><hidden value="${parameters.projectId}"/></field>
         <field name="workEffortTypeId"><hidden value="PHASE"/></field>
-        <field name="currentStatusId"><hidden value="CAL_ACCEPTED"/></field>
+        <field name="currentStatusId"><hidden value="_NA_"/></field>
         <field name="phaseName"  parameter-name="workEffortName" title="${uiLabelMap.ProjectMgrPhaseName}*" tooltip="${uiLabelMap.CommonRequired}"><text/></field>
         <field name="phaseDdescription" parameter-name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
         <field name="save" title="${uiLabelMap.CommonSave}"><submit/></field>
@@ -263,7 +250,7 @@
     </form>
     <form name="AddMyTask" type="single" target="addMyTask">
         <field name="partyId"><hidden value="${userLogin.partyId}"/></field>
-        <field name="statusId"><hidden value="CAL_ACCEPTED"/></field>
+        <field name="statusId"><hidden value="PTS_CREATED"/></field>
         <field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskName}">
             <drop-down>
                 <entity-options entity-name="ProjectPartyAndPhaseAndTask" description="${workEffortName} (${phaseName}-${projectName})">
@@ -362,7 +349,7 @@
     <form name="TaskInfo" type="single" default-map-name="task">
         <field name="taskName" title="${uiLabelMap.ProjectMgrTaskName}"><display/></field>
         <field name="taskDescription" title="${uiLabelMap.CommonDescription}"><display/></field>
-        <field name="statusDescription" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"></display-entity></field>
+        <field name="currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"></display-entity></field>
         <field name="priority" title="${uiLabelMap.CommonPriority}"><display type="date"/></field>
         <field name="estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field>
         <field name="estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field>