svn commit: r756412 - in /ofbiz/trunk/specialpurpose/projectmgr: webapp/projectmgr/WEB-INF/ webapp/projectmgr/WEB-INF/actions/ webapp/projectmgr/project/ widget/ widget/forms/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r756412 - in /ofbiz/trunk/specialpurpose/projectmgr: webapp/projectmgr/WEB-INF/ webapp/projectmgr/WEB-INF/actions/ webapp/projectmgr/project/ widget/ widget/forms/

hansbak-2
Author: hansbak
Date: Fri Mar 20 10:55:24 2009
New Revision: 756412

URL: http://svn.apache.org/viewvc?rev=756412&view=rev
Log:
cleaning the project manager from unused files as reported in the mailing list

Added:
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.groovy
      - copied, changed from r756397, ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.bsh
Removed:
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/AssociatedParties.bsh
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ChildWorkEffort.bsh
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/FindProject.bsh
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListFilteredTasks.bsh
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListProjectsByDateRange.bsh
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListTimeSheetByDateRange.bsh
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/MilliSecToHour.bsh
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/MyTasks.bsh
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.bsh
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/hoursNotYetBilled.bsh
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/EditTimeEntry.ftl
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editProjectskills.ftl
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editprojectandassoc.ftl
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklist.ftl
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklistandassoc.ftl
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/findtasks.ftl
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/listTimeSheetByDateRange.ftl
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/listprojectsbydaterange.ftl
Modified:
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml

Copied: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.groovy (from r756397, ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.bsh)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.groovy?p2=ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.groovy&p1=ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.bsh&r1=756397&r2=756412&rev=756412&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.bsh (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.groovy Fri Mar 20 10:55:24 2009
@@ -21,11 +21,10 @@
 import java.lang.*;
 import org.ofbiz.entity.*;
 import org.ofbiz.base.util.*;
-import org.ofbiz.base.util.UtilMisc;
 import javolution.util.FastMap;
 
-if (parameters.get("workEffortId") != null) {
-    workEffortId = parameters.get("workEffortId");
+if (parameters.workEffortId) {
+    workEffortId = parameters.workEffortId;
     projects = delegator.findByAnd("ProjectAndPhaseAndTask", UtilMisc.toMap("workEffortId", workEffortId));
     if (UtilValidate.isNotEmpty(projects)) {
         context.put("projectId", projects.get(0).getString("projectId"));

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=756412&r1=756411&r2=756412&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Fri Mar 20 10:55:24 2009
@@ -121,26 +121,6 @@
         <event type="service" invoke="deletePartyRole"/>
         <response name="success" type="view" value="FindResource"/>
     </request-map>
-    <request-map uri="ChildWorkEfforts">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="ChildWorkEfforts"/>
-    </request-map>
-    <request-map uri="EditProjectAndAssoc">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="EditProjectAndAssoc"/>
-    </request-map>
-    <request-map uri="createProjectAndAssoc">
-        <security https="true" auth="true"/>
-        <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortAndAssoc"/>
-        <response name="success" type="view" value="FindProject"/>
-        <response name="error" type="view" value="FindProject"/>
-    </request-map>
-    <request-map uri="updateProjectAndAssoc">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updateWorkEffortAndAssoc"/>
-        <response name="success" type="view" value="FindProject"/>
-        <response name="error" type="view" value="FindProject"/>
-    </request-map>    
     <request-map uri="EditProjectTasks">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="EditProjectTasks"/>
@@ -268,13 +248,6 @@
         <response name="error" type="view" value="EditProjectTasks"/>
     </request-map>    
     
-    <!-- TO BE REMOVED
-    <request-map uri="EditTaskAndAssoc">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="EditTaskAndAssoc"/>
-    </request-map>
-    -->
-    
     <request-map uri="createTaskAndAssoc">
         <security https="true" auth="true"/>
         <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortAndAssoc"/>
@@ -296,26 +269,6 @@
         <response name="success" type="view" value="MyTasks"/>
     </request-map>
     
-    <!-- TO BE REMOVED
-    <request-map uri="EditTaskList">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="EditTaskList"/>
-        <response name="error" type="view" value="EditTaskList"/>
-    </request-map>
-    <request-map uri="createTaskList">
-        <security https="true" auth="true"/>
-        <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffort"/>
-        <response name="success" type="view" value="EditTaskList"/>
-        <response name="error" type="view" value="EditTaskList"/>
-    </request-map>    
-    <request-map uri="deleteTaskList">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="deleteWorkEffort"/>
-        <response name="success" type="view" value="Dependencies"/>
-        <response name="error" type="view" value="Dependencies"/>
-    </request-map>
-    -->
-    
     <request-map uri="EditTaskListAndAssoc">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="EditTaskListAndAssoc"/>
@@ -356,28 +309,6 @@
         <response name="success" type="view" value="FindPhase"/>
         <response name="error" type="view" value="FindPhase"/>
     </request-map>
-    <request-map uri="EditProjectSkills">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="EditProjectSkills"/>
-    </request-map>
-    <request-map uri="createProjectSkillStandard">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="createWorkEffortSkillStandard"/>
-        <response name="success" type="view" value="EditProjectSkills"/>
-        <response name="error" type="view" value="EditProjectSkills"/>
-    </request-map>
-    <request-map uri="updateProjectSkillStandard">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updateWorkEffortSkillStandard"/>
-        <response name="success" type="view" value="EditProjectSkills"/>
-        <response name="error" type="view" value="EditProjectSkills"/>
-    </request-map>
-    <request-map uri="deleteProjectSkillStandard">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="deleteWorkEffortSkillStandard"/>
-        <response name="success" type="view" value="EditProjectSkills"/>
-        <response name="error" type="view" value="EditProjectSkills"/>
-    </request-map>
     <request-map uri="EditTaskSkills">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="EditTaskSkills"/>
@@ -867,39 +798,16 @@
     <view-map name="projectBilling" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#projectBilling"/>
     <view-map name="ListResourceBillingHours" type="screen" page="component://projectmgr/widget/ResourceScreens.xml#ListBillingHours"/>
     <view-map name="EditWorkEffort" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditProject"/>
-    <view-map name="ChildWorkEfforts" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#ChildWorkEfforts"/>
-    <view-map name="EditProjectAndAssoc" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditProjectAndAssoc"/>
     <view-map name="EditProjectTasks" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditProjectTasks"/>
     <view-map name="EditProjectOrders" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditProjectOrders"/>
     <view-map name="MyTasks" type="screen" page="component://projectmgr/widget/TaskScreens.xml#MyTasks"/>
     <view-map name="FindTask" type="screen" page="component://projectmgr/widget/TaskScreens.xml#FindTask"/>
     <view-map name="EditTask" type="screen" page="component://projectmgr/widget/TaskScreens.xml#EditTask"/>
-    
-    <!--
-    <view-map name="AddProjectTask" type="screen" page="component://projectmgr/widget/TaskScreens.xml#AddProjectTask"/>
-    -->
-      
-    <!-- TO DO
-    <view-map name="AddTaskAndAssoc" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#AddTaskAndAssoc"/>
-    <view-map name="EditTaskAndAssoc" type="screen" page="component://projectmgr/widget/TaskScreens.xml#EditTaskAndAssoc"/>
-    -->
-    
     <view-map name="Dependencies" type="screen" page="component://projectmgr/widget/TaskScreens.xml#Dependencies"/>
-    
-    <!-- TO DO
-    <view-map name="EditTaskList" type="screen" page="component://projectmgr/widget/TaskScreens.xml#EditTaskList"/>
-    -->
-    
     <view-map name="EditTaskPartyAssigns" type="screen" page="component://projectmgr/widget/TaskScreens.xml#EditTaskPartyAssigns"/>
     <view-map name="EditTaskListAndAssoc" type="screen" page="component://projectmgr/widget/TaskScreens.xml#EditTaskListAndAssoc"/>
-    
-    <!-- TO DO
-    <view-map name="ChildTaskWorkEfforts" type="screen" page="component://projectmgr/widget/TaskScreens.xml#ChildTaskWorkEfforts"/>
-    -->
-    
     <view-map name="ListWorkEffortPartyAssigns" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditProjectParties"/>
     <view-map name="FindPhase" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#FindPhase"/>
-    <view-map name="EditProjectSkills" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditProjectSkills"/>
     <view-map name="EditTaskSkills" type="screen" page="component://projectmgr/widget/TaskScreens.xml#EditTaskSkills"/>
     <view-map name="projectView" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#ProjectView"/>
     <view-map name="EditPartySkills" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditPartySkills"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=756412&r1=756411&r2=756412&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Fri Mar 20 10:55:24 2009
@@ -294,7 +294,7 @@
             </condition>
             <link target="EditTaskPartyAssigns?workEffortId=${workEffortId}"/>
         </menu-item>
-        <menu-item name="projectskills" title="${uiLabelMap.ProjectMgrSkillStandards}">
+        <menu-item name="taskskills" title="${uiLabelMap.ProjectMgrSkillStandards}">
             <condition>
                 <and>
                     <not><if-empty field="workEffort"/></not>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=756412&r1=756411&r2=756412&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Fri Mar 20 10:55:24 2009
@@ -126,90 +126,6 @@
         </section>
     </screen>
     
-    <screen name="ChildWorkEfforts">
-        <section>
-            <actions>                
-                <set field="titleProperty" value="PageTitleListWorkEfforts"/>
-                <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.WorkEffortId" default-value="parameters.workEffortIdForm"/>
-                <set field="workEffortIdFrom" from-field="parameters.workEffortId"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleTreeWorkEfforts}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <container><link  text="${uiLabelMap.WorkEffortCreate}" target="EditWorkEffort?DONE_PAGE=${donePage}" style="linktext"/></container>
-                                        <include-tree name="TreeWorkEffort" location="component://projectmgr/widget/WorkEffortTrees.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    
-    <screen name="WorkEffortTreeLine">
-        <section>
-            <actions>
-                <set field="workEffortId" from-field="workEffortIdFrom" default-value="${workEffort.workEffortId}"/>
-                <set field="tabButtonItem" value="treeDetails"/>
-                <entity-one entity-name="WorkEffort" value-field="workEffort"/>
-                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="ChildWorkEfforts?workEffortId=${workEffort.workEffortId}"/>                
-            </actions>
-            <widgets>
-                <label text=" ${workEffort.workEffortName} - ${workEffort.description}" style="tabletext"/>
-                <link target="EditWorkEffort?workEffortId=${workEffort.workEffortId}" text="${workEffort.workEffortId}" style="buttontext"/>
-                <link target="AddProjectAndAssoc?workEffortIdFrom=${workEffort.workEffortId}" text="${uiLabelMap.WorkEffortAddChild}" style="buttontext"></link>
-                <link target="AddProjectAndAssoc?workEffortIdFrom=${workEffort.workEffortId}" text="${uiLabelMap.WorkEffortAddExistingWorkEffortChild}" style="buttontext"></link>
-                <section>
-                    <condition><not><if-empty field="workEffortAssoc"/></not></condition>
-                    <widgets>
-                        <link target="EditProjectAndAssoc?workEffortIdFrom=${workEffortAssoc.workEffortIdFrom}&amp;workEffortIdTo=${workEffortAssoc.workEffortIdTo}&amp;workEffortAssocTypeId=${workEffortAssoc.workEffortAssocTypeId}&amp;fromDate=${workEffortAssoc.fromDate}&amp;DONE_PAGE=${donePage}" text="${uiLabelMap.ProjectMgrEditAssoc}" style="buttontext"></link>
-                        <link target="EditProjectAndAssoc?workEffortIdFrom=${workEffortAssoc.workEffortIdFrom}&amp;workEffortIdTo=${workEffortAssoc.workEffortIdTo}&amp;workEffortAssocTypeId=${workEffortAssoc.workEffortAssocTypeId}&amp;fromDate=${workEffortAssoc.fromDate}&amp;DONE_PAGE=${donePage}" text="${uiLabelMap.ProjectMgrEditAssocDetail}" style="buttontext"></link>
-                    </widgets>
-                </section>
-            </widgets>
-        </section>
-    </screen>    
-    <screen name="EditProjectAndAssoc">
-        <section>
-            <actions>
-                <set field="titleProperty" value="PageTitleEditProject"/>                
-                <set field="labelTitleProperty" value="PageTitleEditProject"/>
-                <set field="tabButtonItem" value="treeDetails"/>
-                <set field="donePage" from-field="parameters.DONE_PAGE"/>
-                <set field="workEffortId" from-field="parameters.workEffortIdTo"/>
-                <set field="workEffortIdTo" from-field="parameters.workEffortIdTo"/>
-                <set field="workEffortIdFrom" from-field="parameters.workEffortIdFrom"/>
-                <set field="fromDate" from-field="parameters.fromDate"/>
-                <entity-one entity-name="WorkEffort" value-field="project"/>
-                <entity-one entity-name="WorkEffortAssoc" value-field="workEffortAssoc"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <container><label style="h1">${uiLabelMap.${titleProperty}}</label></container>
-                        <platform-specific>
-                            <html><html-template location="component://projectmgr/webapp/projectmgr/project/editprojectandassoc.ftl"/></html>
-                        </platform-specific>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>        
-    
     <screen name="EditProjectTasks">
         <section>
             <actions>
@@ -433,46 +349,6 @@
             </widgets>
         </section>
     </screen>
-    <screen name="EditProjectSkills">
-        <section>
-            <actions>
-                <set field="titleProperty" value="PageTitleEditSkill"/>
-                <set field="tabButtonItem" value="projectskills"/>
-                <set field="labelTitleProperty" value="PageTitleEditSkill"/>
-                <set field="workEffortId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
-                <entity-and entity-name="WorkEffortSkillStandard" list="workEffortSkillStandardList">
-                    <field-map field-name="workEffortId"/>
-                </entity-and>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <section>                            
-                            <widgets>
-                                <container style="screenlet">
-                                    <container style="screenlet-title-bar">
-                                        <container style="h3">
-                                            <label text="${uiLabelMap.${titleProperty}}"/>
-                                        </container>
-                                    </container>
-                                    <container style="screenlet-body">
-                                        <section>
-                                            <widgets>    
-                                                <include-form name="EditProjectSkills" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
-                                            </widgets>
-                                        </section>
-                                    </container>
-                                </container>
-                                <platform-specific>
-                                    <html><html-template location="component://projectmgr/webapp/projectmgr/project/editProjectskills.ftl"/></html>
-                                </platform-specific>
-                            </widgets>                            
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
     <screen name="EditPartySkills">
         <section>
             <actions>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=756412&r1=756411&r2=756412&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Fri Mar 20 10:55:24 2009
@@ -217,36 +217,12 @@
             </widgets>
         </section>
     </screen>
-    <screen name="EditTaskListAndAssoc">
-        <section>
-            <actions>
-                <set field="titleProperty" value="PageTitleEditTask"/>                
-                <set field="labelTitleProperty" value="PageTitleEditTask"/>
-                <set field="tabButtonItem" value="edittask"/>
-                <set field="donePage" from-field="parameters.DONE_PAGE"/>
-                <set field="workEffortIdTo" from-field="parameters.workEffortIdTo"/>
-                <set field="workEffortIdFrom" from-field="parameters.workEffortIdFrom"/>
-                <set field="fromDate" from-field="parameters.fromDate"/>
-                <entity-one entity-name="WorkEffort" value-field="task"/>
-                <entity-one entity-name="WorkEffortAssoc" value-field="workEffortAssoc"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">                        
-                        <platform-specific>
-                            <html><html-template location="component://projectmgr/webapp/projectmgr/project/edittasklistandassoc.ftl"/></html>
-                        </platform-specific>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-   <screen name="EditTaskSkills">
+    <screen name="EditTaskSkills">
         <section>
             <actions>
                 <set field="headerItem" value="task"/>
                 <set field="titleProperty" value="PageTitleEditSkill"/>
-                <set field="tabButtonItem" value="projectskills"/>
+                <set field="tabButtonItem" value="taskskills"/>
                 <set field="labelTitleProperty" value="PageTitleEditSkill"/>
                 <set field="workEffortId" from-field="parameters.workEffortId"/>
                 <entity-and entity-name="WorkEffortSkillStandard" list="workEffortSkillStandards">
@@ -285,51 +261,6 @@
             </widgets>
         </section>
     </screen>
-    <!--screen name="ChildTaskWorkEfforts">
-        <section>
-            <actions>                
-                <set field="titleProperty" value="PageTitleListWorkEfforts"/>
-                <set field="headerItem" value="task"/>
-                <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"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <container><label style="h1">${uiLabelMap.PageTitleTreeWorkEfforts}</label></container>
-                        <container><link  text="${uiLabelMap.WorkEffortCreate}" target="EditWorkEffort?DONE_PAGE=${donePage}" style="linktext"/></container>
-                        <include-tree name="TreeTaskWorkEffort" location="component://projectmgr/widget/WorkEffortTrees.xml"/>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>    
-    <screen name="WorkEffortTreeLine">
-        <section>
-            <actions>
-                <set field="workEffortId" from-field="workEffortIdFrom" default-value="${workEffort.workEffortId}"/>
-                <set field="headerItem" value="task"/>
-                <set field="tabButtonItem" value="treeDetails"/>
-                <entity-one entity-name="WorkEffort" value-field="workEffort"/>
-                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="ChildWorkEfforts?workEffortId=${workEffort.workEffortId}"/>                
-            </actions>
-            <widgets>
-                <label text=" ${workEffort.workEffortName} - ${workEffort.description}" style="tabletext"/>
-                <link target="EditWorkEffort?workEffortId=${workEffort.workEffortId}" text="${workEffort.workEffortId}" style="buttontext"/>
-                <link target="AddTaskAndAssoc?workEffortIdFrom=${workEffort.workEffortId}" text="${uiLabelMap.WorkEffortAddChild}" style="buttontext"></link>
-                <link target="AddTaskAndAssoc?workEffortIdFrom=${workEffort.workEffortId}" text="${uiLabelMap.WorkEffortAddExistingWorkEffortChild}" style="buttontext"></link>
-                <section>
-                    <condition><not><if-empty field="workEffortAssoc"/></not></condition>
-                    <widgets>
-                        <link target="EditTaskListAndAssoc?workEffortIdFrom=${workEffortAssoc.workEffortIdFrom}&amp;workEffortIdTo=${workEffortAssoc.workEffortIdTo}&amp;workEffortAssocTypeId=${workEffortAssoc.workEffortAssocTypeId}&amp;fromDate=${workEffortAssoc.fromDate}&amp;DONE_PAGE=${donePage}" text="Edit Assoc" style="buttontext"></link>
-                        <link target="EditTaskListAndAssoc?workEffortIdFrom=${workEffortAssoc.workEffortIdFrom}&amp;workEffortIdTo=${workEffortAssoc.workEffortIdTo}&amp;workEffortAssocTypeId=${workEffortAssoc.workEffortAssocTypeId}&amp;fromDate=${workEffortAssoc.fromDate}&amp;DONE_PAGE=${donePage}" text="Edit Assoc Detail" style="buttontext"></link>
-                    </widgets>
-                </section>
-            </widgets>
-        </section>
-    </screen-->
     <screen name="EditTaskPartyAssigns">
         <section>
             <actions>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=756412&r1=756411&r2=756412&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Fri Mar 20 10:55:24 2009
@@ -454,22 +454,6 @@
         <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field>
         <field name="currencyUomId"><display-entity entity-name="Uom" key-field-name="uomId" description="${description}"></display-entity></field>
     </form>
-    <form name="EditProjectSkills" type="list" target="updateProjectSkillStandard" list-name="workEffortSkillStandardList" paginate-target="EditProjectSkills"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
-        <field name="workEffortId" title="${uiLabelMap.ProjectMgrWorkEffortId}">
-            <display-entity entity-name="WorkEffort" description="${workEffortName} ${workEffortId}">
-                <sub-hyperlink target="EditProject?workEffortId=${workEffortId}" description="${workEffortId}" link-style="buttontext"/>
-            </display-entity>
-        </field>
-        <field name="skillTypeId" title="${uiLabelMap.ProjectMgrSkillType}"><display-entity entity-name="SkillType" description="${description}"/></field>
-        <field name="estimatedNumPeople" title="${uiLabelMap.ProjectMgrEstimatedNumPeople}"><text/></field>
-        <field name="estimatedDuration" title="${uiLabelMap.ProjectMgrEstimatedDuration}"><text/></field>
-        <field name="estimatedCost" title="${uiLabelMap.ProjectMgrEstimatedCost}" widget-style="linktext"><text/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
-        <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="linktext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteProjectSkillStandard?workEffortId=${workEffortId}&amp;skillTypeId=${skillTypeId}"/>
-        </field>
-    </form>
     <form name="EditWorkEffortPartyAssigns" target="deleteWorkEffortPartyAssign" title="" type="list" paginate-target="ListWorkEffortPartyAssigns"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>