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

[hansbak-2]

Author: hansbak
Date: Sat Nov  1 09:05:54 2008
New Revision: 709718

URL: http://svn.apache.org/viewvc?rev=709718&view=rev
Log:
introduce a project 'closed' status to be able to list only active projects, modified some field descriptions

Modified:
    ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrTypeData.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/ProjectMgrTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml?rev=709718&r1=709717&r2=709718&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml Sat Nov  1 09:05:54 2008
@@ -46,6 +46,7 @@
     <SkillType skillTypeId="_NA_" description="Not Applicable"/>
     
     <StatusType description="Project" statusTypeId="PROJECT" hasTable="N" parentTypeId=""/>
+    <StatusType description="Project status" statusTypeId="PROJECT_STATUS" hasTable="N" parentTypeId="PROJECT"/>
     <StatusType description="Project Task" statusTypeId="PROJECT_TASK_STATUS" hasTable="N" parentTypeId="PROJECT"/>
     <StatusType description="Project Assignment" statusTypeId="PROJECT_ASSGN_STATUS" hasTable="N" parentTypeId="PROJECT"/>
 
@@ -66,5 +67,12 @@
     <StatusValidChange condition="" statusId="PTS_CREATED" statusIdTo="PTS_ON_HOLD" transitionName="Task On Hold"/>
     <StatusValidChange condition="" statusId="PTS_CREATED" statusIdTo="PTS_CANCELLED" transitionName="Task On Hold"/>
     <StatusValidChange condition="" statusId="PTS_ON_HOLD" statusIdTo="PTS_CREATED" transitionName="Activated"/>
-    
+
+    <!-- status of project and phase is defined by the underlying task status.
+        however to remove the project from current lists the closed status is introduced -->
+    <StatusItem description="Active" sequenceId="01" statusCode="ACTIVE" statusId="PRJ_ACTIVE" statusTypeId="PROJECT_STATUS"/>
+    <StatusItem description="Closed" sequenceId="09" statusCode="CLOSED" statusId="PRJ_CLOSED" statusTypeId="PROJECT_STATUS"/>
+    <StatusValidChange condition="" statusId="PRJ_ACTIVE" statusIdTo="PRJ_CLOSED" transitionName="Close project"/>
+    <!-- for current installations -->
+    <StatusValidChange condition="" statusId="_NA_" statusIdTo="PRJ_CLOSED" transitionName="Close project"/>
 </entity-engine-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=709718&r1=709717&r2=709718&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Sat Nov  1 09:05:54 2008
@@ -26,6 +26,7 @@
             <set field="parameters.projectId" from-field="parameters.templateId"/>
             <call-simple-method method-name="copyProject"/>
             <else>
+                <set field="parameters.currentStatusId" value="PRJ_ACTIVE"/>      
                 <call-simple-method method-name="createWorkEffort" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/>
             </else>
         </if-not-empty>
@@ -458,10 +459,9 @@
                 <set field="parameters.workEffortTypeId" value="PROJECT"/>
             </else>            
         </if-not-empty>
-        <set field="parameters.currentStatusId" value="_NA_"/>
+        <set field="parameters.currentStatusId" value="PRJ_ACTIVE"/>
         <clear-field field-name="parameters.workEffortId"/>
         <set field="parameters.workEffortName" from-field="project.workEffortName"/>
-        <set field="parameters.currentStatusId" value="_NA_"/>            
         <call-simple-method method-name="createWorkEffort" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/>
         <set field="newProjectId" from-field="newEntity.workEffortId"/>
         

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=709718&r1=709717&r2=709718&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Sat Nov  1 09:05:54 2008
@@ -175,11 +175,10 @@
         </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>
-        <field name="actualCompletionDate" title="${uiLabelMap.WorkEffortActualCompletionDate}"><display type="date"/></field>
+        <field name="actualStartDate"><display type="date"/></field>
+        <field name="actualCompletionDate"><display type="date"/></field>
         <field name="plannedHours"><display/></field>
         <field name="actualHours"><display/></field>
-        <field name="createdDate"><display type="date"/></field>
     </form>                                        
     <form name="ListChildEfforts"  target="updateProjectAndAssoc" title="" list-name="projects" type="list" separate-columns="true" paginate-target="FindProject"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=709718&r1=709717&r2=709718&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Sat Nov  1 09:05:54 2008
@@ -472,7 +472,6 @@
         <field name="actualCompletionDate"><display type="date"/></field>
         <field name="plannedHours"><display/></field>
         <field name="actualHours"><display/></field>
-        <field name="createdDate"><display type="date"/></field>
     </form>                                        
     <form name="EditWorkEffortPartyAssigns" target="deleteTaskPartyAssign" title="" type="list" paginate-target="EditTaskPartyAssigns"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">