svn commit: r918343 - in /ofbiz/trunk: applications/workeffort/config/ applications/workeffort/data/ specialpurpose/projectmgr/config/ specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ specialpurpose/projectmgr/webapp/projectmgr/project/ spe...

[erwan]

Author: erwan
Date: Wed Mar  3 07:11:31 2010
New Revision: 918343

URL: http://svn.apache.org/viewvc?rev=918343&view=rev
Log:
Project manager update :
milestones can be added to a project and are diplayed on the Gantt chart

Modified:
    ofbiz/trunk/applications/workeffort/config/WorkEffortEntityLabels.xml
    ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml
    ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml

Modified: ofbiz/trunk/applications/workeffort/config/WorkEffortEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/config/WorkEffortEntityLabels.xml?rev=918343&r1=918342&r2=918343&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/config/WorkEffortEntityLabels.xml (original)
+++ ofbiz/trunk/applications/workeffort/config/WorkEffortEntityLabels.xml Wed Mar  3 07:11:31 2010
@@ -313,6 +313,10 @@
         <value xml:lang="it">Incontri</value>
         <value xml:lang="zh">会议</value>
     </property>
+    <property key="WorkEffortType.description.MILESTONE">
+        <value xml:lang="en">Milestone</value>
+        <value xml:lang="fr">Jalon</value>
+    </property>
     <property key="WorkEffortType.description.PERSONAL_TIMEOFF">
         <value xml:lang="en">Personal Time Off</value>
         <value xml:lang="fr">Temps libre personnel</value>

Modified: ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml?rev=918343&r1=918342&r2=918343&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml (original)
+++ ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml Wed Mar  3 07:11:31 2010
@@ -158,6 +158,7 @@
     <WorkEffortType description="Workflow Process" hasTable="N" parentTypeId="" workEffortTypeId="WORK_FLOW"/>
     <WorkEffortType description="Workflow Activity" hasTable="N" parentTypeId="" workEffortTypeId="ACTIVITY"/>
     <WorkEffortType description="Task" hasTable="N" parentTypeId="" workEffortTypeId="TASK"/>
+    <WorkEffortType description="Milestone" hasTable="N" parentTypeId="" workEffortTypeId="MILESTONE"/>
     <WorkEffortType description="Event" hasTable="N" parentTypeId="" workEffortTypeId="EVENT"/>
     <WorkEffortType description="Available" hasTable="N" parentTypeId="" workEffortTypeId="AVAILABLE"/>
     <WorkEffortType description="Program" hasTable="N" parentTypeId="" workEffortTypeId="PROGRAM"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=918343&r1=918342&r2=918343&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml Wed Mar  3 07:11:31 2010
@@ -153,6 +153,10 @@
         <value xml:lang="nl">Taak</value>
         <value xml:lang="zh">任务</value>
     </property>
+    <property key="FormFieldTitle_milestone">
+        <value xml:lang="en">Milestone</value>
+        <value xml:lang="fr">Jalon</value>
+    </property>
     <property key="FormFieldTitle_taskName">
         <value xml:lang="de">Aufgabenname</value>
         <value xml:lang="en">Task Name</value>

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy?rev=918343&r1=918342&r2=918343&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy Wed Mar  3 07:11:31 2010
@@ -109,7 +109,7 @@
                 }
                 taskInfo.estimatedStartDate = UtilDateTime.toDateString(taskInfo.estimatedStartDate, "MM/dd/yyyy");
                 taskInfo.estimatedCompletionDate = UtilDateTime.toDateString(taskInfo.estimatedCompletionDate, "MM/dd/yyyy");
-                taskInfo.workEffortTypeId = "TASK";
+                taskInfo.workEffortTypeId = task.workEffortTypeId;
                 if (security.hasEntityPermission("PROJECTMGR", "_READ", session) || security.hasEntityPermission("PROJECTMGR", "_ADMIN", session)) {
                     taskInfo.url = "/projectmgr/control/taskView?workEffortId="+task.workEffortId;
                 } else {

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl?rev=918343&r1=918342&r2=918343&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl Wed Mar  3 07:11:31 2010
@@ -35,6 +35,9 @@
     <#if t.workEffortTypeId == "TASK">
         g.AddTaskItem(new JSGantt.TaskItem(${t.taskNr},"${t.taskSeqNum?if_exists}. ${t.taskName}","${StringUtil.wrapString(t.estimatedStartDate)}", "${StringUtil.wrapString(t.estimatedCompletionDate)}","009900", "${t.url}", 0 , "${t.resource?if_exists}", ${t.completion?if_exists} , 0, ${t.phaseNr}, 1<#if t.preDecessor?exists>, ${t.preDecessor}</#if>));
     </#if>
+    <#if t.workEffortTypeId == "MILESTONE">
+        g.AddTaskItem(new JSGantt.TaskItem(${t.taskNr},"${t.taskName}","${StringUtil.wrapString(t.estimatedStartDate)}", "${StringUtil.wrapString(t.estimatedStartDate)}","00ff00", "", 1 , "", 100 , 0,${t.phaseNr}, "", "" ));
+    </#if>
 </#list>
 
 <#--

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=918343&r1=918342&r2=918343&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Wed Mar  3 07:11:31 2010
@@ -316,6 +316,9 @@
         <field entry-name="workEffortName" name="taskName" parameter-name="workEffortName" title="${uiLabelMap.CommonName}">
          <text/>
         </field>
+         <field name="workEffortTypeId" title="${uiLabelMap.CommonType}">
+            <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId" description="${description}" also-hidden="false"/>
+         </field>
         <field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
          <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}" also-hidden="false"/>
          </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=918343&r1=918342&r2=918343&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Wed Mar  3 07:11:31 2010
@@ -30,7 +30,6 @@
         <field name="statusId"><hidden value="PAS_ASSIGNED"/></field>
         <field name="partyId" use-when="myTask!=void"><hidden value="${userLogin.partyId}"/></field>
         <field name="projectId"><hidden value="${parameters.projectId}"/></field>
-        <field name="workEffortTypeId"><hidden value="TASK"/></field>
         <field name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}*" tooltip="${uiLabelMap.CommonRequired}"><text/></field>
         <field name="workEffortParentId" use-when="myTask==void&amp;&amp;projectId!=void" title="${uiLabelMap.ProjectMgrTaskPhase}*" tooltip="${uiLabelMap.CommonRequired}">
             <drop-down allow-empty="true">
@@ -96,6 +95,12 @@
                 <option key="9" description="${uiLabelMap.WorkEffortPriorityNine}"/>
             </drop-down>
         </field>
+        <field name="workEffortTypeId" title="${uiLabelMap.CommonType}">
+            <drop-down allow-empty="false" current="selected">
+                <option key="TASK" description="${uiLabelMap.FormFieldTitle_task}"/>
+                <option key="MILESTONE" description="${uiLabelMap.FormFieldTitle_milestone}"/>
+            </drop-down>
+        </field>
         <field name="description" title="${uiLabelMap.CommonDescription}" tooltip="${uiLabelMap.CommonMax250Chars}"><textarea/></field>
         <field name="scopeEnumId" title="${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}">
             <drop-down allow-empty="false" no-current-selected-key="WES_PRIVATE">