svn commit: r597986 - in /ofbiz/trunk/specialpurpose/projectmgr/widget: Menus.xml ProjectScreens.xml forms/ProjectForms.xml

[hansbak-2]

Author: hansbak
Date: Sun Nov 25 05:45:38 2007
New Revision: 597986

URL: http://svn.apache.org/viewvc?rev=597986&view=rev
Log:
some cleanups and show project bar in project tree

Modified:
    ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=597986&r1=597985&r2=597986&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Sun Nov 25 05:45:38 2007
@@ -48,7 +48,7 @@
         <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-item name="treeDetails" title="${uiLabelMap.ProjectMgrTreeDetails}"><link target="ChildWorkEfforts?workEffortIdFrom=${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=597986&r1=597985&r2=597986&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Sun Nov 25 05:45:38 2007
@@ -24,7 +24,6 @@
         <section>            
             <actions>
                 <set field="titleProperty" value="PageTitleFindProject"/>
-                <set field="headerItem" value="projects"/>
                 <set field="tabButtonItem" value="subprojects"/>
                 <set field="labelTitleProperty" value="ProjectMgrProjectName"/>
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/workeffort/control/FindProject"/>
@@ -72,7 +71,6 @@
         <section>            
             <actions>
                 <set field="titleProperty" value="PageTitleFindProject"/>
-                <set field="headerItem" value="projects"/>                
                 <set field="labelTitleProperty" value="ProjectMgrProjectName"/>
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/workeffort/control/FindProject"/>
                 <set field="workEffortId" from-field="parameters.workEffortIdFrom"/>
@@ -128,11 +126,11 @@
         <section>
             <actions>                
                 <set field="titleProperty" value="PageTitleListWorkEfforts"/>
-                <set field="headerItem" value="projects"/>
                 <set field="tabButtonItem" value="treeDetails"/>
                 <set field="labelTitleProperty" value="PageTitleListWorkEfforts"/>
                 <set field="trail" from-field="parameters.trail" default-value="${parameters.workEffortId}"/>
-                <set field="workEffortId" from-field="parameters.trail"/>
+                <set field="workEffortId" from-field="parameters.WorkEffortId" default-value="parameters.workEffortIdForm"/>
+                <set field="workEffortIdFrom" from-field="parameters.workEffortId"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}">
@@ -155,7 +153,6 @@
         <section>
             <actions>
                 <set field="workEffortId" from-field="workEffortIdFrom" default-value="${workEffort.workEffortId}"/>
-                <set field="headerItem" value="projects"/>
                 <set field="tabButtonItem" value="treeDetails"/>
                 <entity-one entity-name="WorkEffort" value-name="workEffort"/>
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="ChildWorkEfforts?workEffortId=${workEffort.workEffortId}"/>                
@@ -180,7 +177,6 @@
             <actions>
                 <set field="titleProperty" value="PageTitleEditProject"/>                
                 <set field="labelTitleProperty" value="PageTitleEditProject"/>
-                <set field="headerItem" value="projects"/>
                 <set field="tabButtonItem" value="treeDetails"/>
                 <set field="donePage" from-field="parameters.DONE_PAGE"/>
                 <set field="workEffortId" from-field="parameters.workEffortIdTo"/>
@@ -207,12 +203,9 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleEditTask"/>
-                <set field="headerItem" value="projects"/>
                 <set field="tabButtonItem" value="tasks"/>
                 <set field="labelTitleProperty" value="PageTitleFindTask"/>                
                 <set field="workEffortIdFrom" from-field="parameters.workEffortIdFrom"/>
-                <set field="filterTaskNotAssigned" from-field="parameters.filterTaskNotAssigned"/>
-                <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"/>
@@ -257,7 +250,6 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleEditTask"/>
-                <set field="headerItem" value="projects"/>
                 <set field="tabButtonItem" value="edittask"/>
                 <set field="labelTitleProperty" value="ProjectMgrTaskName"/>
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/workeffort/control/FindTasks"/>
@@ -318,7 +310,6 @@
             <actions>
                 <set field="titleProperty" value="PageTitleEditTask"/>                
                 <set field="labelTitleProperty" value="PageTitleEditTask"/>
-                <set field="headerItem" value="projects"/>
                 <set field="tabButtonItem" value="edittask"/>
                 <set field="donePage" from-field="parameters.DONE_PAGE"/>
                 <set field="workEffortIdTo" from-field="parameters.workEffortIdTo"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=597986&r1=597985&r2=597986&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Sun Nov 25 05:45:38 2007
@@ -109,6 +109,7 @@
                 <field-map field-name="statusId" env-name="currentStatusId"/>
             </entity-one>
         </row-actions>
+        <field name="taskName" parameter-name="workEffortName" title="${uiLabelMap.CommonName}*"><hyperlink target="taskView?workEffortId=${taskId}" description="${taskName}"/></field>
         <field name="workEffortId"><hidden value="${taskId}"/></field>
         <field name="workEffortIdFrom"><hidden/></field>
         <field name="workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}">
@@ -120,7 +121,6 @@
                 </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})">