svn commit: r597821 - in /ofbiz/trunk: applications/humanres/widget/forms/ applications/workeffort/config/ specialpurpose/projectmgr/config/ specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/ specialpurpose/projectmgr/webapp/projectmgr/project/ speci...

[hansbak-2]

Author: hansbak
Date: Fri Nov 23 23:44:31 2007
New Revision: 597821

URL: http://svn.apache.org/viewvc?rev=597821&view=rev
Log:
show current project name on the menus, extend task list with phases, reduce date fields to date only, created a basic document in confluence about principles and design decisions.

Modified:
    ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml
    ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties
    ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editProjectskills.ftl
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editproject.ftl
    ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml

Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml?rev=597821&r1=597820&r2=597821&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml Fri Nov 23 23:44:31 2007
@@ -98,7 +98,6 @@
         <field name="skillTypeId" title="skillType Id" tooltip="${uiLabelMap.CommonRequired}">
             <drop-down allow-empty="false">
                 <entity-options description="${description}" key-field-name="skillTypeId" entity-name="SkillType">
-                    <entity-constraint name="skillTypeId" operator="equals" value="PARTYQUAL_VERIFY"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>

Modified: ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties?rev=597821&r1=597820&r2=597821&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties (original)
+++ ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties Fri Nov 23 23:44:31 2007
@@ -187,6 +187,7 @@
 WorkEffortChildren=Children
 WorkEffortCommEvents=Communications
 WorkEffortComments=Comments
+WorkEffortCompletionDate=Completion date
 WorkEffortCompanyName=OFBiz\: WorkEffort Manager
 WorkEffortCompanySubtitle=Part of the Open For Business Family of Open Source Software
 WorkEffortContactMech=Contact Mech
@@ -322,6 +323,7 @@
 WorkEffortShowActive=Show Active
 WorkEffortShowAllNotes=Show All Notes
 WorkEffortShowThisItemsNotes=Show This Item's Notes
+WorkEffortStartDate=Start Date
 WorkEffortStatus=Status
 WorkEffortStatusIdMissing=Current Status ID is missing.
 WorkEffortSummary=Summary

Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties?rev=597821&r1=597820&r2=597821&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties Fri Nov 23 23:44:31 2007
@@ -52,7 +52,7 @@
 ProjectMgrCompanyName=Ofbiz Company
 ProjectMgrCompanySubtitle=Project
 ProjectMgrEditPatySkill=Edit PatySkill
-ProjectMgrEditPoject=Edit Poject
+ProjectMgrEditPoject=Edit Project
 ProjectMgrEditTask=Edit Task
 ProjectMgrEstimatedCost=Estimated Cost
 ProjectMgrEstimatedDuration=Estimated Duration
@@ -65,6 +65,7 @@
 ProjectMgrNewTask=New Task
 ProjectMgrNotesCreateNew=Create New
 ProjectMgrPartyList=List of Parties
+ProjectMgrProjectCurrent=Current Project
 ProjectMgrProjectName=Project Name
 ProjectMgrProjectSummary=Project Summary
 ProjectMgrProjectTeam=Project Team

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml?rev=597821&r1=597820&r2=597821&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Fri Nov 23 23:44:31 2007
@@ -91,18 +91,30 @@
         <security https="true" auth="true"/>
         <response name="success" type="view" value="EditTask"/>
     </request-map>
-    <request-map uri="createTask">
-        <security https="true" auth="true"/>
-        <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffort"/>
-        <response name="success" type="view" value="EditTask"/>
-        <response name="error" type="view" value="EditTask"/>
-    </request-map>
-    <request-map uri="updateTask">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updateWorkEffort"/>
-        <response name="success" type="view" value="EditTask"/>
-        <response name="error" type="view" value="EditTask"/>
-    </request-map>
+    <request-map uri="createTask">
+        <security https="true" auth="true"/>
+        <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffort"/>
+        <response name="success" type="view" value="EditTask"/>
+        <response name="error" type="view" value="EditTask"/>
+    </request-map>
+    <request-map uri="createProjectTaskOrPhase">
+        <security https="true" auth="true"/>
+        <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffort"/>
+        <response name="success" type="view" value="FindTask"/>
+        <response name="error" type="view" value="FindTask"/>
+    </request-map>
+    <request-map uri="updateTask">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateWorkEffort"/>
+        <response name="success" type="view" value="EditTask"/>
+        <response name="error" type="view" value="EditTask"/>
+    </request-map>
+    <request-map uri="updateProjectTaskOrPhase">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateWorkEffort"/>
+        <response name="success" type="view" value="FindTask"/>
+        <response name="error" type="view" value="FindTask"/>
+    </request-map>
     <request-map uri="deleteTask">
         <security https="true" auth="true"/>
         <event type="service" invoke="deleteWorkEffort"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editProjectskills.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editProjectskills.ftl?rev=597821&r1=597820&r2=597821&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editProjectskills.ftl (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editProjectskills.ftl Fri Nov 23 23:44:31 2007
@@ -28,7 +28,7 @@
     <form name="editProjectSkillForm" action="<@ofbizUrl>createProjectSkillStandard</@ofbizUrl>">
       <table width="100%" cellpadding="2" cellspacing="0" border="1">
         <tr>
-          <td><input type="hidden" name="workEffortId" value="${parameters.workEffortId?if_exists}"/></td>
+          <td><input type="hidden" name="workEffortId" value="${parameters.workEffortIdFrom?if_exists}"/></td>
         </tr>
         <tr>
           <td class="label">${uiLabelMap.ProjectMgrSkillType}</td>

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editproject.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editproject.ftl?rev=597821&r1=597820&r2=597821&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editproject.ftl (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editproject.ftl Fri Nov 23 23:44:31 2007
@@ -37,7 +37,7 @@
   <div class="screenlet-title-bar">
     <ul>
       <#if project?has_content>
-        <li class="head3">&nbsp;${uiLabelMap.PageTitleEditProject}&nbsp;#${project.workEffortName?if_exists} ${uiLabelMap.CommonInformation}</li>
+        <li class="head3">&nbsp;${uiLabelMap.PageTitleEditProject} ${uiLabelMap.CommonInformation}</li>
       <#else>
         <li class="head3">&nbsp;${uiLabelMap.PageTitleAddProject}</li>
       </#if>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=597821&r1=597820&r2=597821&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Fri Nov 23 23:44:31 2007
@@ -63,6 +63,9 @@
             <actions>
                 <set field="headerItem" value="projects"/>                
                 <set field="workEffortTypeId" from-field="parameters.workEffortTypeId"/>
+                <entity-one entity-name="WorkEffort" value-name="project">
+                    <field-map field-name="workEffortId" env-name="parameters.workEffortIdFrom"/>
+                </entity-one>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -75,11 +78,12 @@
                                 <section>
                                     <condition>
                                         <not>                                            
-                                            <if-empty field-name="workEffortId"/>                                                
+                                            <if-empty field-name="project"/>                                                
                                         </not>                                        
                                     </condition>
                                     <widgets>                                        
-                                        <include-menu name="ProjectTabBar" location="component://projectmgr/widget/Menus.xml"/>
+                                        <include-menu name="ProjectTabBar" location="component://projectmgr/widget/Menus.xml"/>
+                                        <label style="head1" text="${uiLabelMap.ProjectMgrProjectCurrent}: ${project.workEffortName}[${project.workEffortId}]"/>
                                     </widgets>
                                  </section>  
                                                                                                                                       

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=597821&r1=597820&r2=597821&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Fri Nov 23 23:44:31 2007
@@ -40,15 +40,15 @@
         </menu-item>
     </menu>
     <menu name="ProjectTabBar" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected">
-        <menu-item name="projectView" title="${uiLabelMap.ProjectMgrProjectSummary}"><link target="projectView?workEffortId=${workEffortId}"/></menu-item>
-        <menu-item name="editproject" title="${uiLabelMap.ProjectMgrEditPoject}"><link target="EditProject?workEffortId=${workEffortId}"/></menu-item>
-        <menu-item name="phases" title="${uiLabelMap.ProjectMgrPhases}"><link target="FindPhase?workEffortIdFrom=${workEffortId}&amp;workEffortTypeId=PHASE&amp;workEffortAssocTypeId=WORK_EFF_BREAKDOWN"/></menu-item>
-        <menu-item name="subprojects" title="${uiLabelMap.ProjectMgrSubProjects}"><link target="FindProject?workEffortIdFrom=${workEffortId}&amp;workEffortTypeId=PROJECT&amp;workEffortAssocTypeId=WORK_EFF_BREAKDOWN"/></menu-item>
-        <menu-item name="tasks" title="${uiLabelMap.ProjectMgrTasks}"><link target="FindTask?workEffortIdFrom=${workEffortId}&amp;workEffortTypeId=TASK&amp;workEffortAssocTypeId=WORK_EFF_BREAKDOWN"/></menu-item>        
-        <menu-item name="notes" title="${uiLabelMap.CommonNotes}"><link target="EditWorkEffortNotes?workEffortId=${workEffortId}"/></menu-item>
-        <menu-item name="projectskills" title="${uiLabelMap.ProjectMgrSkillStandards}"><link target="EditProjectSkills?workEffortId=${workEffortId}"/></menu-item>
-        <menu-item name="parties" title="${uiLabelMap.ProjectMgrParties}"><link target="ListWorkEffortPartyAssigns?workEffortId=${workEffortId}"/></menu-item>
-        <menu-item name="treeDetails" title="${uiLabelMap.ProjectMgrTreeDetails}"><link target="ChildWorkEfforts?workEffortId=${workEffortId}&amp;trail=${workEffortId}&amp;workEffortTypeId=PROJECT&amp;workEffortAssocTypeId=WORK_EFF_BREAKDOWN"/></menu-item>
+        <menu-item name="projectView" title="${uiLabelMap.ProjectMgrProjectSummary}"><link target="projectView?workEffortIdFrom=${parameters.workEffortIdFrom}"/></menu-item>
+        <menu-item name="editproject" title="${uiLabelMap.ProjectMgrEditPoject}"><link target="EditProject?workEffortIdFrom=${parameters.workEffortIdFrom}"/></menu-item>
+        <menu-item name="phases" title="${uiLabelMap.ProjectMgrPhases}"><link target="FindPhase?workEffortIdFrom=${parameters.workEffortIdFrom}&amp;workEffortTypeId=PHASE&amp;workEffortAssocTypeId=WORK_EFF_BREAKDOWN"/></menu-item>
+        <menu-item name="subprojects" title="${uiLabelMap.ProjectMgrSubProjects}"><link target="FindProject?workEffortIdFrom=${parameters.workEffortIdFrom}&amp;workEffortTypeId=PROJECT&amp;workEffortAssocTypeId=WORK_EFF_BREAKDOWN"/></menu-item>
+        <menu-item name="tasks" title="${uiLabelMap.ProjectMgrTasks}"><link target="FindTask?workEffortIdFrom=${parameters.workEffortIdFrom}&amp;workEffortTypeId=TASK&amp;workEffortAssocTypeId=WORK_EFF_BREAKDOWN"/></menu-item>        
+        <menu-item name="notes" title="${uiLabelMap.CommonNotes}"><link target="EditWorkEffortNotes?workEffortIdFrom=${parameters.workEffortIdFrom}"/></menu-item>
+        <menu-item name="projectskills" title="${uiLabelMap.ProjectMgrSkillStandards}"><link target="EditProjectSkills?workEffortIdFrom=${parameters.workEffortIdFrom}"/></menu-item>
+        <menu-item name="parties" title="${uiLabelMap.ProjectMgrParties}"><link target="ListWorkEffortPartyAssigns?workEffortIdFrom=${parameters.workEffortIdFrom}"/></menu-item>
+        <menu-item name="treeDetails" title="${uiLabelMap.ProjectMgrTreeDetails}"><link target="ChildWorkEfforts?workEffortId=${parameters.workEffortIdFrom}&amp;trail=${workEffortId}&amp;workEffortTypeId=PROJECT&amp;workEffortAssocTypeId=WORK_EFF_BREAKDOWN"/></menu-item>
     </menu>
     <menu name="TaskTabBar" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected">
         <menu-item name="taskView" title="${uiLabelMap.ProjectMgrTaskSummary}"><link target="taskView?workEffortId=${workEffortId}"/></menu-item>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=597821&r1=597820&r2=597821&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Fri Nov 23 23:44:31 2007
@@ -18,8 +18,8 @@
 under the License.
 -->
 
-<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
     <screen name="FindProject">
         <section>            
             <actions>
@@ -102,7 +102,7 @@
                 <set field="titleProperty" value="PageTitleEditProject"/>
                 <set field="tabButtonItem" value="editproject"/>                
                 <set field="labelTitleProperty" value="PageTitleEditProject"/>
-                <set field="workEffortId" from-field="parameters.workEffortId"/>
+                <set field="workEffortId" from-field="parameters.workEffortIdFrom"/>
                 <entity-one entity-name="WorkEffort" value-name="project"/>
                 <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/MilliSecToHour.bsh"/>
             </actions>
@@ -205,46 +205,43 @@
                 <set field="headerItem" value="projects"/>
                 <set field="tabButtonItem" value="tasks"/>
                 <set field="labelTitleProperty" value="PageTitleFindTask"/>                
-                <set field="workEffortId" from-field="parameters.workEffortIdFrom"/>
                 <set field="workEffortIdFrom" from-field="parameters.workEffortIdFrom"/>
                 <set field="filterTaskNotAssigned" from-field="parameters.filterTaskNotAssigned"/>
-                <set field="workEffortTypeId" from-field="parameters.workEffortTypeId"/>
-                <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/ListFilteredTasks.bsh"/>
+                <set field="workEffortTypeId" from-field="parameters.workEffortTypeId"/>
+                <entity-and entity-name="ProjectAndPhaseAndTask" list-name="tasks">
+                    <field-map field-name="projectId" env-name="parameters.workEffortIdFrom"/>
+                    <order-by field-name="phaseName"/>
+                    <order-by field-name="taskName"/>
+                </entity-and>
+                <set field="workEffort" from-field=""/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <section>
-                            <condition>
-                                 <if-empty field-name="parameters.filterTaskNotAssigned"/>
-                            </condition>
-                            <widgets>
-                                <platform-specific>
-                                    <html><html-template location="component://projectmgr/webapp/projectmgr/project/findtasks.ftl"/></html>
-                                </platform-specific>
-                                <container style="screenlet">                                    
-                                    <container style="screenlet-title-bar">
-                                        <label style="boxhead">${uiLabelMap.${titleProperty}}</label>
-                                    </container>                                
-                                    <container style="screenlet-body">                                                                
-                                        <include-form name="ListTasks" location="component://projectmgr/widget/forms/ProjectForms.xml"/>                                    
-                                     </container>                                      
-                                </container>
-                                <platform-specific>
-                                    <html><html-template location="component://projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl"/></html>
-                                </platform-specific>
-                            </widgets>
-                            <fail-widgets>
-                                <container style="screenlet">
-                                    <container style="screenlet-title-bar">
-                                        <label style="boxhead">${uiLabelMap.${titleProperty}}</label>
-                                    </container>
-                                    <container style="screenlet-body">                                                                
-                                        <include-form name="ListUnassignedTasks" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
-                                     </container>
-                                </container>
-                            </fail-widgets>                            
-                        </section>
+                    <decorator-section name="body">
+                        <container style="screenlet">                                    
+                            <container style="screenlet-title-bar">
+                                <label style="boxhead">${uiLabelMap.${titleProperty}}</label>
+                            </container>                                
+                            <container style="screenlet-body">                                                                
+                                <include-form name="ListTasks" location="component://projectmgr/widget/forms/ProjectForms.xml"/>                                    
+                            </container>                                      
+                        </container>
+                        <container style="lefthalf">
+                            <container style="screenlet">
+                                <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleAddTask}</label></container>                                
+                                <container style="screenlet-body">
+                                    <include-form name="EditTask" location="component://projectmgr/widget/forms/TaskForms.xml"/>
+                                </container>
+                            </container>
+                        </container>
+                        <container style="righthalf">
+                            <container style="screenlet">
+                                <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleAddPhase}</label></container>                                
+                                <container style="screenlet-body">
+                                    <include-form name="AddPhase" location="component://projectmgr/widget/forms/TaskForms.xml"/>
+                                </container>
+                            </container>
+                        </container>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -375,7 +372,7 @@
                 <set field="titleProperty" value="PageTitleListWorkEffortPartyAssigns"/>
                 <set field="tabButtonItem" value="parties"/>
                 <set field="labelTitleProperty" value="PageTitleListWorkEffortPartyAssigns"/>
-                <set field="workEffortId" from-field="parameters.workEffortId"/>
+                <set field="workEffortId" from-field="parameters.workEffortIdFrom"/>
                 <entity-one entity-name="WorkEffortPartyAssignment" value-name="workEffortPartyAssignment"/>
             </actions>            
             <widgets>
@@ -404,7 +401,7 @@
                 <set field="titleProperty" value="PageTitleEditSkill"/>
                 <set field="tabButtonItem" value="projectskills"/>
                 <set field="labelTitleProperty" value="PageTitleEditSkill"/>
-                <set field="workEffortId" from-field="parameters.workEffortId"/>
+                <set field="workEffortId" from-field="parameters.workEffortIdFrom" default-value="${parameters.workEffortId}"/>
                 <entity-and entity-name="WorkEffortSkillStandard" list-name="workEffortSkillStandardList">
                     <field-map field-name="workEffortId"/>
                 </entity-and>
@@ -435,7 +432,7 @@
             <actions>
                 <set field="tabButtonItem" value="parties"/>                
                 <set field="partyId" from-field="parameters.partyId"/>
-                <set field="workEffortId" from-field="parameters.workEffortId"/>
+                <set field="workEffortId" from-field="parameters.workEffortIdFrom"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}">
@@ -490,8 +487,8 @@
                 <set field="titleProperty" value="PageTitleListProjectNotes"/>
                 <set field="tabButtonItem" value="notes"/>
                 <set field="labelTitleProperty" value="PageTitleListProjectNotes"/>
-
-                <set field="workEffortId" from-field="parameters.workEffortId"/>
+                <set field="workEffortId" from-field="parameters.workEffortIdFrom" default-value="${parameters.workEffortId}"/>
+                <set field="parameters.workEffortIdFrom" from-field="workEffortId"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}">
@@ -515,8 +512,8 @@
         <section>
             <actions>
                 <set field="tabButtonItem" value="projectView"/>
-                <set field="workEffortId" from-field="parameters.workEffortId"/>
-                <set field="workEffortIdFrom" from-field="parameters.workEffortId"/>
+                <set field="workEffortId" from-field="parameters.workEffortIdFrom"/>
+                <set field="workEffortIdFrom" from-field="parameters.workEffortIdFrom"/>
                 <entity-one entity-name="WorkEffort" value-name="project"/>
             </actions>                        
             <widgets>
@@ -574,10 +571,8 @@
     <screen name="PhasesTasksInfo">
         <section>
             <actions>
-                <set field="parameters.workEffortIdFrom" from-field="parameters.workEffortId"/>
-                <set field="parameters.workEffortTypeId" value="PHASE"/>
                 <entity-and entity-name="ProjectAndPhaseAndTask" list-name="phases">
-                    <field-map field-name="projectId" env-name="parameters.workEffortId"/>
+                    <field-map field-name="projectId" env-name="parameters.workEffortIdFrom"/>
                 </entity-and>
             </actions>
             <widgets>                
@@ -585,7 +580,7 @@
                     <container style="screenlet-title-bar">
                         <label style="boxhead" text="">${uiLabelMap.ProjectMgrPhaseTaskList}</label>
                     </container>
-                    <container style="screenlet-body">
+                    <container style="screenlet-body">
                         <include-form name="ListPhaseTaskInfo" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
                     </container>
                 </container>                

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=597821&r1=597820&r2=597821&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Fri Nov 23 23:44:31 2007
@@ -17,13 +17,12 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
-
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    
  <!--================ Project Lists==============-->
     <form name="ListProjects" type="list" list-name="projects" paginate-target="FindProject">
         <field name="workEffortId" title="${uiLabelMap.ProjectMgrWorkEffortId}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${workEffortId}" target="EditProject?workEffortId=${workEffortId}"/>
+            <hyperlink also-hidden="false" description="${workEffortId}" target="EditProject?workEffortIdFrom=${workEffortId}"/>
         </field>
         <field name="workEffortName" title="${uiLabelMap.CommonName}"><display/></field>
         <field name="workEffortTypeId" title="${uiLabelMap.ProjectMgrWorkEffortTypeId}"><display-entity entity-name="WorkEffortType"/></field>
@@ -68,40 +67,46 @@
     </form>
   
  <!--================ Task Lists==============-->    
-    <form name="ListTasks" target="updateTaskAndAssoc" title="" list-name="tasks" type="list" separate-columns="true" paginate-target="FindTask">
-        <row-actions>
-            <entity-one entity-name="StatusItem" value-name="currentStatus">
-                <field-map field-name="statusId" env-name="currentStatusId"/>
-            </entity-one>
-        </row-actions>
-        <field name="workEffortTypeId"><hidden/></field>
-        <field name="workEffortId"><hidden/></field>
+    <form name="ListTasks" target="updateProjectTaskOrPhase" title="" list-name="tasks" type="list" separate-columns="true" paginate-target="FindTask">
+        <row-actions>
+            <entity-one entity-name="StatusItem" value-name="currentStatus" auto-field-map="false">
+                <field-map field-name="statusId" env-name="currentStatusId"/>
+            </entity-one>
+        </row-actions>
+        <field name="workEffortId"><hidden value="${taskId}"/></field>
         <field name="workEffortIdFrom"><hidden/></field>
-        <field name="fromDate"><hidden/></field>
-        <field name="workEffortAssocTypeId"><hidden/></field>
-        <field name="workEffortIdTo" entry-name="workEffortId"><hidden/></field>
-        <field name="workEffortName" position="1" title="${uiLabelMap.CommonName}*"><display/></field>
-              
-        <field name="currentStatusId">
-            <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" value="${currentStatusId}"/>
-                    <entity-order-by field-name="sequenceId"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="priority" title="${uiLabelMap.CommonPriority}" widget-style="selectBox" position="1">
+        <field name="workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}">
+            <drop-down allow-empty="false">
+                <entity-options entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}[${workEffortId}]">
+                    <entity-constraint name="workEffortTypeId" value="PHASE"/>
+                    <entity-constraint name="workEffortParentId" value="${workEffortIdFrom}"/>
+                    <entity-order-by field-name="workEffortName"/>
+                </entity-options>        
+            </drop-down>
+        </field>
+        <field name="taskName" parameter-name="workEffortName" title="${uiLabelMap.CommonName}*"><text/></field>
+        <field 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="currentStatusId"/>
+                    <entity-order-by field-name="sequenceId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="priority" title="${uiLabelMap.CommonPriority}" widget-style="selectBox">
             <drop-down allow-empty="true">
                 <option key="1" description="1 (${uiLabelMap.WorkEffortPriorityHigh})"/><option key="2"/><option key="3"/><option key="4"/><option key="5"/>
                 <option key="6"/><option key="7"/><option key="8"/><option key="9" description="9 (${uiLabelMap.WorkEffortPriorityLow})"/>
             </drop-down>
         </field>      
-        <field name="actualStartDate" entry-name="workEffortToActualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><date-time/></field>
-        <field name="actualCompletionDate"  entry-name="workEffortToActualCompletionDate" title="${uiLabelMap.WorkEffortActualCompletionDate}"><date-time/></field>
-        <field name="description" title="${uiLabelMap.CommonDescription}"><textarea cols="6"/></field>
+        <field use-when="actualStartDate!=null" name="StartDate" entry-name="actualStartDate" title="${uiLabelMap.WorkEffortStartDate}" parameter-name="actualStartDate"><date-time type="date"/></field>
+        <field use-when="actualStartDate==null" name="StartDate" entry-name="estimatedStartDate" title="${uiLabelMap.WorkEffortStartDate}" parameter-name="estimatedStartDate"><date-time type="date"/></field>
+        <field use-when="actualCompletionDate!=null" name="CompletionDate" entry-name="actualCompletionDate" title="${uiLabelMap.WorkEffortCompletionDate}" parameter-name="actualCompletionDate"><date-time type="date"/></field>
+        <field use-when="actualCompletionDate==null" name="CompletionDate" entry-name="estimatedCompletionDate" title="${uiLabelMap.WorkEffortCompletionDate}" parameter-name="estimatedCompletionDate"><date-time type="date"/></field>
+        <!--field name="description" title="${uiLabelMap.CommonDescription}"><textarea cols="6"/></field-->
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
         <field name="timeEntries" title="${uiLabelMap.ProjectMgrTimeEntries}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.ProjectMgrTimeEntries}" target="EditTimeEntries?workEffortId=${workEffortId}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.ProjectMgrTimeEntries}" target="EditTimeEntries?workEffortId=${taskId}"/>
         </field>
     </form>
     <form name="ListUnassignedTasks" target="updateTaskAndAssoc" title="" list-name="tasks" type="list" separate-columns="true" paginate-target="FindTask">
@@ -156,21 +161,21 @@
             </drop-down>
         </field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><text size="15"/></field>        
-        <field name="estimatedStartDate" entry-name="workEffortToEstimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><date-time/></field>
-        <field name="estimatedCompletionDate"  entry-name="workEffortToEstimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><date-time/></field>        
-        <field name="actualStartDate" entry-name="workEffortToActualStartDate" title="${uiLabelMap.FormFieldTitle_actualStartDate}"><date-time/></field>
-        <field name="actualCompletionDate"  entry-name="workEffortToActualCompletionDate" title="${uiLabelMap.FormFieldTitle_actualCompletionDate}"><date-time/></field>
+        <field name="estimatedStartDate" entry-name="workEffortToEstimatedStartDate" title="${uiLabelMap.WorkEffortStartDate}"><date-time/></field>
+        <field name="estimatedCompletionDate"  entry-name="workEffortToEstimatedCompletionDate" title="${uiLabelMap.WorkEffortStartDate}"><date-time/></field>        
+        <field name="actualStartDate" entry-name="actualStartDate" title="${uiLabelMap.WorkEffortCompletionDate}"><date-time/></field>
+        <field name="actualCompletionDate"  entry-name="actualCompletionDate" title="${uiLabelMap.WorkEffortCompletionDate}"><date-time/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
     </form>
     <form name="ListPhaseTaskInfo" type="list" list-name="phases">
         <field name="workEffortIdFrom"><hidden value="parameters.worEffortIdFrom"/></field>
-        <field name="Phase"><hyperlink target="FindPhase?workEffortIdFrom=${projectId}" description="${phaseName}[${phaseId}"/></field>
-        <field name="Task"><hyperlink target="EditTask?workEffortId=${taskId}" description="${taskName}[${taskId}]"/></field>
+        <field name="Phase"><hyperlink target="FindPhase?workEffortIdFrom=${projectId}" description="${phaseName}"/></field>
+        <field name="Task"><hyperlink target="EditTask?workEffortId=${taskId}" description="${taskName}"/></field>
         <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
         <field name="estimatedStartDate"><display/></field>
-        <field name="estimatedEndDate"><display/></field>
+        <field name="estimatedCompletionDate"><display/></field>
         <field name="actualStartDate"><display/></field>
-        <field name="actualEndDate"><display/></field>
+        <field name="actualCompletionDate"><display/></field>
     </form>
     <form name="ListAssociatedParties" type="list" list-name="associatedParties">
         <field name="workEffortId" title="${uiLabelMap.ProjectMgrWorkEffortId}" widget-style="buttontext">

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=597821&r1=597820&r2=597821&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Fri Nov 23 23:44:31 2007
@@ -23,11 +23,14 @@
     
     <form name="EditTask" type="single" target="updateTask" default-map-name="task">
         <actions>
-            <entity-one entity-name="StatusItem" value-name="currentStatus" auto-field-map="false">
+            <set field="projectId" from-field="parameters.workEffortIdFrom"/>
+           <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="projectId!=null" target="createProjectTaskOrPhase"/>
         <alt-target use-when="task==null" target="createTask"/>
+        <field name="workEffortIdFrom"><hidden value="${parameters.workEffortIdFrom}"/></field>
         <field name="DONE_PAGE"><hidden value="${donePage}"/></field>
         <field name="workEffortTypeId"><hidden value="TASK"/></field>
         <field use-when="task!=null" name="workEffortId" title="${uiLabelMap.ProjectMgrWorkEffortId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
@@ -71,7 +74,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}">
+        <field use-when="projectId==null" name="workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}">
             <drop-down allow-empty="true">
                 <entity-options entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}[${workEffortId}](project:${workEffortParentId})">
                     <entity-constraint name="workEffortTypeId" value="PHASE"/>
@@ -79,13 +82,31 @@
                 </entity-options>        
             </drop-down>
         </field>
+        <field use-when="projectId!=null" name="workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}">
+            <drop-down allow-empty="false">
+                <entity-options entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}[${workEffortId}]">
+                    <entity-constraint name="workEffortTypeId" value="PHASE"/>
+                    <entity-constraint name="workEffortParentId" value="${projectId}"/>
+                    <entity-order-by field-name="workEffortParentId"/>
+                </entity-options>        
+            </drop-down>
+        </field>
         <field name="estimatedStartDate" title="${uiLabelMap.FormFieldTitle_estimatedStartDate}"><date-time/></field>
         <field name="estimatedCompletionDate" title="${uiLabelMap.FormFieldTitle_estimatedCompletionDate}"><date-time/></field>
         <field name="actualStartDate" title="${uiLabelMap.FormFieldTitle_actualStartDate}"><date-time/></field>
         <field name="actualCompletionDate" title="${uiLabelMap.FormFieldTitle_actualCompletionDate}"><date-time/></field>
         <field name="save" title="${uiLabelMap.CommonSave}"><submit/></field>
     </form>
-
+    <form name="AddPhase" type="single" target="createProjectTaskOrPhase" default-map-name="dummy">
+        <field name="workEffortIdFrom"><hidden value="${parameters.workEffortIdFrom}"/></field>
+        <field name="workEffortTypeId"><hidden value="PHASE"/></field>
+        <field name="currentStatusId"><hidden value="CAL_ACCEPTED"/></field>
+        <field name="workEffortName" title="${uiLabelMap.CommonName}*" tooltip="${uiLabelMap.CommonRequired}"><text/></field>
+        <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
+        <field name="workEffortParentId"><hidden value="${projectId}"/></field>
+        <field name="save" title="${uiLabelMap.CommonSave}"><submit/></field>
+    </form>
+    
     <form name="listtasksbydaterange" type="single" target="FindTaskByRange?workEffortTypeId=TASK&amp;findAll=Y">
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>