You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ch...@apache.org on 2008/03/06 12:32:47 UTC

svn commit: r634225 [3/4] - in /ofbiz/trunk/specialpurpose/projectmgr: ./ data/ entitydef/ script/org/ofbiz/project/ servicedef/ src/org/ofbiz/project/ webapp/projectmgr/WEB-INF/ webapp/projectmgr/js/ widget/ widget/forms/

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=634225&r1=634224&r2=634225&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Thu Mar  6 03:32:39 2008
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
-    <screen name="Dependencies">
-        <section>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
+    <screen name="Dependencies">
+        <section>
             <actions>
-                <set field="headerItem" value="task"/>
+                <set field="headerItem" value="task"/>
                 <set field="titleProperty" value="PageTitleDependencies"/>                
-                <set field="tabButtonItem" value="dependencies"/>
-                <set field="workEffortId" from-field="parameters.workEffortId"/>
-                <service service-name="getProjectIdAndNameFromTask" result-map-name="result">
-                    <field-map field-name="taskId" env-name="parameters.workEffortId"/>
-                </service>
-                <set field="projectId" from-field="result.projectId"/>
-                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
-                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
+                <set field="tabButtonItem" value="dependencies"/>
+                <set field="workEffortId" from-field="parameters.workEffortId"/>
+                <service service-name="getProjectIdAndNameFromTask" result-map-name="result">
+                    <field-map field-name="taskId" env-name="parameters.workEffortId"/>
+                </service>
+                <set field="projectId" from-field="result.projectId"/>
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                             <section>
                                 <actions>
@@ -75,7 +75,7 @@
                                             </container>
                                         </container>
                                     </container>
-                                </widgets>
+                                </widgets>
                             </section>
                             <section>
                                 <actions>
@@ -117,38 +117,38 @@
                                     </container>
                                 </widgets>
                             </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    <screen name="MyTasks">
-        <section>            
-            <actions>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="MyTasks">
+        <section>            
+            <actions>
                 <set field="titleProperty" value="WorkEffortMyTasks"/>
-                <set field="headerItem" value="mytasks"/>
+                <set field="headerItem" value="mytasks"/>
                 <set field="labelTitleProperty" value="ProjectMgrMyTasks"/>
-                <entity-and entity-name="WorkEffortAndPartyAssign" list-name="tasks" filter-by-date="true">
-                    <field-map field-name="partyId" env-name="userLogin.partyId"/>
-                    <field-map field-name="workEffortTypeId" value="TASK"/>
-                    <field-map field-name="statusId" value="PAS_ASSIGNED"/>
-                </entity-and>
-                <entity-and entity-name="WorkEffortAndPartyAssign" list-name="projects" filter-by-date="true">
-                    <field-map field-name="partyId" env-name="userLogin.partyId"/>
-                    <field-map field-name="workEffortTypeId" value="PROJECT"/>
-                </entity-and>
+                <entity-and entity-name="WorkEffortAndPartyAssign" list-name="tasks" filter-by-date="true">
+                    <field-map field-name="partyId" env-name="userLogin.partyId"/>
+                    <field-map field-name="workEffortTypeId" value="TASK"/>
+                    <field-map field-name="statusId" value="PAS_ASSIGNED"/>
+                </entity-and>
+                <entity-and entity-name="WorkEffortAndPartyAssign" list-name="projects" filter-by-date="true">
+                    <field-map field-name="partyId" env-name="userLogin.partyId"/>
+                    <field-map field-name="workEffortTypeId" value="PROJECT"/>
+                </entity-and>
                 <entity-one entity-name="WorkEffort" value-name="task">
                     <field-map field-name="workEffortId" value="dummy"/>
                 </entity-one>
                 <set field="myTask" value="notNull"/>
-                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
-                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
-            </actions>                                                
-            <widgets>  
-                <decorator-screen name="CommonMyTaskDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">                                                                                                                
-                        <section>                                                        
-                            <widgets>
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
+            </actions>                                                
+            <widgets>  
+                <decorator-screen name="CommonMyTaskDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">                                                                                                                
+                        <section>                                                        
+                            <widgets>
                                 <container style="screenlet">
                                     <container style="screenlet-title-bar">
                                         <container style="h3">
@@ -163,23 +163,23 @@
                                             <widgets>
                                                 <include-form name="MyTasks" location="component://projectmgr/widget/forms/TaskForms.xml"/>
                                             </widgets>
-                                            <fail-widgets>
+                                            <fail-widgets>
                                                 <container>
-                                                <label style="h3" text="${uiLabelMap.ProjectMgrTaskNoOpen1}"></label>
-                                                </container>
+                                                <label style="h3" text="${uiLabelMap.ProjectMgrTaskNoOpen1}"></label>
+                                                </container>
                                                 <container>
-                                                <label style="h3" text="${uiLabelMap.ProjectMgrTaskNoOpen2}"></label>
+                                                <label style="h3" text="${uiLabelMap.ProjectMgrTaskNoOpen2}"></label>
                                                 </container>
                                             </fail-widgets>
                                         </section>
                                     </container>
                                 </container>
-                                <section>
-                                    <condition>
-                                        <not><if-empty field-name="projects"/></not>                                        
-                                    </condition>
-                                    <widgets>
-                                        <container style="lefthalf">
+                                <section>
+                                    <condition>
+                                        <not><if-empty field-name="projects"/></not>                                        
+                                    </condition>
+                                    <widgets>
+                                        <container style="lefthalf">
                                             <container style="screenlet">
                                                 <container style="screenlet-title-bar">
                                                     <container style="h3">
@@ -189,9 +189,9 @@
                                                 <container style="screenlet-body">
                                                     <include-form name="assignTaskToMe" location="component://projectmgr/widget/forms/TaskForms.xml"/>
                                                 </container>
-                                            </container>                                                                        
-                                        </container>
-                                        <container style="righthalf">
+                                            </container>                                                                        
+                                        </container>
+                                        <container style="righthalf">
                                             <container style="screenlet">
                                                 <container style="screenlet-title-bar">
                                                     <container style="h3">
@@ -201,10 +201,10 @@
                                                 <container style="screenlet-body">
                                                     <include-form name="EditTask" location="component://projectmgr/widget/forms/TaskForms.xml"/>
                                                 </container>
-                                            </container>                                                                           
-                                        </container>                                                                             
-                                    </widgets>
-                                    <fail-widgets>
+                                            </container>                                                                           
+                                        </container>                                                                             
+                                    </widgets>
+                                    <fail-widgets>
                                         <container style="screenlet">
                                             <container style="screenlet-title-bar">
                                                 <container style="h3">
@@ -214,15 +214,15 @@
                                                <container style="screenlet-body">
                                                 <label style="h3" text="${uiLabelMap.ProjectMgrTaskMember}"></label>
                                             </container>
-                                        </container>                                                                        
-                                    </fail-widgets>
-                                </section>
-                            </widgets>                            
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
+                                        </container>                                                                        
+                                    </fail-widgets>
+                                </section>
+                            </widgets>                            
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
     </screen>
     <screen name="FindTask">
         <section>            
@@ -230,13 +230,13 @@
                 <set field="titleProperty" value="PageTitleFindTask"/>
                 <set field="headerItem" value="task"/>
                 <set field="labelTitleProperty" value="ProjectMgrListTasks"/>
-                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
-                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
             </actions>                                                
             <widgets>  
                 <decorator-screen name="CommonMyTaskDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">                                                                                                                
-                        <screenlet  title="${uiLabelMap.PageTitleFindTask}" collapsible="true" id="findTask">
+                        <screenlet  title="${uiLabelMap.PageTitleFindTask}" collapsible="true" id="findTask">
                             <include-form name="FindTask" location="component://projectmgr/widget/forms/TaskForms.xml"/>
                         </screenlet>
                         <section>
@@ -250,8 +250,8 @@
                                 <set field="entityName" value="ProjectAndPhaseAndTask"/>
                             </actions>
                             <widgets>
-                                <screenlet  title="${uiLabelMap.PageTitleListTaskSearchResult}" navigation-form-name="ListTasks">
-                                    <include-form name="ListTasks" location="component://projectmgr/widget/forms/TaskForms.xml"/>
+                                <screenlet  title="${uiLabelMap.PageTitleListTaskSearchResult}" navigation-form-name="ListTasks">
+                                    <include-form name="ListTasks" location="component://projectmgr/widget/forms/TaskForms.xml"/>
                                 </screenlet>
                             </widgets>
                         </section>
@@ -267,8 +267,8 @@
                                 <set field="parameters.partyId" from-field="context.userLogin.partyId"/>
                             </actions>
                             <widgets>
-                                <screenlet  title="${uiLabelMap.PageTitleListTaskSearchResult}" navigation-form-name="ListTasks">
-                                    <include-form name="ListTasks" location="component://projectmgr/widget/forms/TaskForms.xml"/>
+                                <screenlet  title="${uiLabelMap.PageTitleListTaskSearchResult}" navigation-form-name="ListTasks">
+                                    <include-form name="ListTasks" location="component://projectmgr/widget/forms/TaskForms.xml"/>
                                 </screenlet>
                             </widgets>
                         </section>
@@ -277,23 +277,23 @@
             </widgets>
         </section>
     </screen>
-    <screen name="EditTask">
-        <section>
+    <screen name="EditTask">
+        <section>
             <actions>
-                <set field="headerItem" value="task"/>
-                <set field="titleProperty" value="PageTitleEditTask"/>
-                <set field="tabButtonItem" value="edittask"/>                
-                <set field="labelTitleProperty" value="PageTitleEditTaskList"/>
-                <set field="workEffortId" from-field="parameters.workEffortId"/>                
+                <set field="headerItem" value="task"/>
+                <set field="titleProperty" value="PageTitleEditTask"/>
+                <set field="tabButtonItem" value="edittask"/>                
+                <set field="labelTitleProperty" value="PageTitleEditTaskList"/>
+                <set field="workEffortId" from-field="parameters.workEffortId"/>                
                 <entity-one entity-name="WorkEffort" value-name="task"/>    
                 <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.bsh"/>
-            </actions>
+            </actions>
             <widgets>
-                <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <section>                                                       
-                            <!-- To add a new Project -->
-                            <widgets>
+                <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>                                                       
+                            <!-- To add a new Project -->
+                            <widgets>
                                 <container style="screenlet">
                                     <container style="screenlet-title-bar">
                                         <container style="h3">
@@ -308,134 +308,134 @@
                                         </section>
                                     </container>
                                 </container>
-                            </widgets>                            
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </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-name="task"/>
-                <entity-one entity-name="WorkEffortAssoc" value-name="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">
-        <section>
-            <actions>
-                <set field="headerItem" value="task"/>
-                <set field="titleProperty" value="PageTitleEditSkill"/>
-                <set field="tabButtonItem" value="projectskills"/>
-                <set field="labelTitleProperty" value="PageTitleEditSkill"/>
-                <set field="workEffortId" from-field="parameters.workEffortId"/>
-                <entity-and entity-name="WorkEffortSkillStandard" list-name="workEffortSkillStandards">
-                    <field-map field-name="workEffortId" env-name="workEffortId"/>
-                </entity-and>
-                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
-                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <screenlet title="${uiLabelMap.${titleProperty}}">
+                            </widgets>                            
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </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-name="task"/>
+                <entity-one entity-name="WorkEffortAssoc" value-name="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">
+        <section>
+            <actions>
+                <set field="headerItem" value="task"/>
+                <set field="titleProperty" value="PageTitleEditSkill"/>
+                <set field="tabButtonItem" value="projectskills"/>
+                <set field="labelTitleProperty" value="PageTitleEditSkill"/>
+                <set field="workEffortId" from-field="parameters.workEffortId"/>
+                <entity-and entity-name="WorkEffortSkillStandard" list-name="workEffortSkillStandards">
+                    <field-map field-name="workEffortId" env-name="workEffortId"/>
+                </entity-and>
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <screenlet title="${uiLabelMap.${titleProperty}}">
                             <include-form name="ListTaskSkills" location="component://projectmgr/widget/forms/TaskForms.xml"/>
-                        </screenlet>
-                        <platform-specific>
-                            <html><html-template location="component://projectmgr/webapp/projectmgr/project/edittaskskills.ftl"/></html>
-                        </platform-specific>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>     
-    <screen name="EditTimeEntries">
-        <section>
-            <actions>
-                <set field="titleProperty" value="PageTitleListTimeEntries"/>
-                <set field="tabButtonItem" value="timeEntries"/>
-                <set field="labelTitleProperty" value="PageTitleEditSkill"/>
-                <set field="workEffortId" from-field="parameters.workEffortId"/>
-                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
-                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <screenlet title="${uiLabelMap.${titleProperty}} ${workEffortId}">
-                            <include-form name="ListTimeEntries" location="component://projectmgr/widget/forms/TaskForms.xml"/>
-                        </screenlet>
-                        <screenlet title="Add Time Entry">
-                            <include-form name="createTimeEntry" location="component://projectmgr/widget/forms/TaskForms.xml"/>
-                        </screenlet>
-                    </decorator-section>
-                </decorator-screen>
-            </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-name="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-name="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-->
+                        </screenlet>
+                        <platform-specific>
+                            <html><html-template location="component://projectmgr/webapp/projectmgr/project/edittaskskills.ftl"/></html>
+                        </platform-specific>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>     
+    <screen name="EditTimeEntries">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleListTimeEntries"/>
+                <set field="tabButtonItem" value="timeEntries"/>
+                <set field="labelTitleProperty" value="PageTitleEditSkill"/>
+                <set field="workEffortId" from-field="parameters.workEffortId"/>
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <screenlet title="${uiLabelMap.${titleProperty}} ${workEffortId}">
+                            <include-form name="ListTimeEntries" location="component://projectmgr/widget/forms/TaskForms.xml"/>
+                        </screenlet>
+                        <screenlet title="Add Time Entry">
+                            <include-form name="createTimeEntry" location="component://projectmgr/widget/forms/TaskForms.xml"/>
+                        </screenlet>
+                    </decorator-section>
+                </decorator-screen>
+            </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-name="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-name="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>
@@ -450,8 +450,8 @@
                     <field-map field-name="taskId" env-name="parameters.workEffortId"/>
                 </service>
                 <set field="projectId" from-field="result.projectId"/>
-                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
-                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
             </actions>            
             <widgets>
                 <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
@@ -489,21 +489,21 @@
             </widgets>
         </section>
     </screen>
-    <screen name="EditTaskNotes">
-        <section>
-            <actions>
-                <set field="titleProperty" value="PageTitleListTaskNotes"/>
-                <set field="headerItem" value="task"/>
-                <set field="tabButtonItem" value="notes"/>
-                <set field="labelTitleProperty" value="PageTitleListTaskNotes"/>
-
-                <set field="workEffortId" from-field="parameters.workEffortId"/>
-                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
-                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
+    <screen name="EditTaskNotes">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleListTaskNotes"/>
+                <set field="headerItem" value="task"/>
+                <set field="tabButtonItem" value="notes"/>
+                <set field="labelTitleProperty" value="PageTitleListTaskNotes"/>
+
+                <set field="workEffortId" from-field="parameters.workEffortId"/>
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
                         <container style="screenlet">
                             <container style="screenlet-title-bar">
                                 <container style="h3">
@@ -531,32 +531,32 @@
                                     </widgets>
                                 </section>
                             </container>
-                        </container>                
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    <screen name="TaskView">        
-        <section>
+                        </container>                
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="TaskView">        
+        <section>
             <actions>
                 <set field="titleProperty" value="ProjectMgrTaskSummary"/>
-                <set field="headerItem" value="task"/>
-                <set field="tabButtonItem" value="taskView"/>
-                <set field="workEffortId" from-field="parameters.workEffortId"/>
-                <set field="projectId" from-field="parameters.workEffortId"/>
+                <set field="headerItem" value="task"/>
+                <set field="tabButtonItem" value="taskView"/>
+                <set field="workEffortId" from-field="parameters.workEffortId"/>
+                <set field="projectId" from-field="parameters.workEffortId"/>
                 <service service-name="getProjectTask" result-map-name="result">
                     <field-map field-name="taskId" env-name="workEffortId"/>
                 </service>
                 <set field="task" from-field="result.taskInfo"/>
-            </actions>                        
-            <widgets>
-                <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <section>                                                 
-                            <condition>
-                                <not><if-empty field-name="task"/></not>
-                            </condition>
+            </actions>                        
+            <widgets>
+                <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>                                                 
+                            <condition>
+                                <not><if-empty field-name="task"/></not>
+                            </condition>
                             <widgets>                                
                                 <container style="lefthalf">
                                     <container style="screenlet">
@@ -573,76 +573,76 @@
                                             </section>
                                         </container>
                                     </container>
-                                    <include-screen name="taskBefore"/>
-                                    <include-screen name="taskAfter"/>
-                                </container>
-                                <container style="righthalf">
-                                    <include-screen name="TaskTeamInfo"/>
-                                    <include-screen name="NoteInfo"/>
-                                    <include-screen name="ListWorkEffortRequests"/>
-                                </container>
-                            </widgets>
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>            
-        </section>
-    </screen>
-    <screen name="TaskInfo">
-        <section>
-            <widgets>
-                <platform-specific>
-                    <html><html-template location="component://projectmgr/webapp/projectmgr/project/summary/projectinfo.ftl"/></html>
-                </platform-specific>
-            </widgets>
-        </section>
-    </screen>
-    <screen name="SubTasksInfo">
-        <section>
-            <actions>
-                <set field="parameters.workEffortIdFrom" from-field="parameters.workEffortId"/>
-                <set field="parameters.workEffortTypeId" value="TASK"/>
-                <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/ChildWorkEffort.bsh"/>
-            </actions>
-            <widgets>                
-                <container style="screenlet">
-                    <container style="screenlet-title-bar">
-                        <label style="boxhead">${uiLabelMap.ProjectMgrSubTasks}</label>
-                    </container>
-                    <container style="screenlet-body">
-                        <include-form name="ListTasks" location="component://projectmgr/widget/forms/TaskForms.xml"/>
-                    </container>
-                </container>                
-            </widgets>
-        </section>
-    </screen>
-    <screen name="NoteInfo">
-        <section>
-            <actions>
-                <set field="workEffortId" from-field="parameters.workEffortId"/>
-                <entity-and entity-name="WorkEffortNoteAndData" list-name="workEffortNoteandDetails">
-                    <field-map field-name="workEffortId" env-name="workEffortId"/>
-                    <order-by field-name="-noteDateTime"/>
-                </entity-and>
-            </actions>
-            <widgets>
-                <platform-specific>
-                    <html><html-template location="component://projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl"/></html>
-                </platform-specific>
-            </widgets>
-        </section>
-    </screen>
-    <screen name="TaskTeamInfo">      
-        <section>        
-            <actions>                      
-                <service service-name="getTasksByParties" result-map-name="result">
-                    <field-map field-name="workEffortId" env-name="workEffortId"/>                  
-                </service>
-                <set field="taskParties" from-field="result.taskParties"/>     
-                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
-                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
-            </actions>           
-            <widgets> 
+                                    <include-screen name="taskBefore"/>
+                                    <include-screen name="taskAfter"/>
+                                </container>
+                                <container style="righthalf">
+                                    <include-screen name="TaskTeamInfo"/>
+                                    <include-screen name="NoteInfo"/>
+                                    <include-screen name="ListWorkEffortRequests"/>
+                                </container>
+                            </widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>            
+        </section>
+    </screen>
+    <screen name="TaskInfo">
+        <section>
+            <widgets>
+                <platform-specific>
+                    <html><html-template location="component://projectmgr/webapp/projectmgr/project/summary/projectinfo.ftl"/></html>
+                </platform-specific>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="SubTasksInfo">
+        <section>
+            <actions>
+                <set field="parameters.workEffortIdFrom" from-field="parameters.workEffortId"/>
+                <set field="parameters.workEffortTypeId" value="TASK"/>
+                <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/ChildWorkEffort.bsh"/>
+            </actions>
+            <widgets>                
+                <container style="screenlet">
+                    <container style="screenlet-title-bar">
+                        <label style="boxhead">${uiLabelMap.ProjectMgrSubTasks}</label>
+                    </container>
+                    <container style="screenlet-body">
+                        <include-form name="ListTasks" location="component://projectmgr/widget/forms/TaskForms.xml"/>
+                    </container>
+                </container>                
+            </widgets>
+        </section>
+    </screen>
+    <screen name="NoteInfo">
+        <section>
+            <actions>
+                <set field="workEffortId" from-field="parameters.workEffortId"/>
+                <entity-and entity-name="WorkEffortNoteAndData" list-name="workEffortNoteandDetails">
+                    <field-map field-name="workEffortId" env-name="workEffortId"/>
+                    <order-by field-name="-noteDateTime"/>
+                </entity-and>
+            </actions>
+            <widgets>
+                <platform-specific>
+                    <html><html-template location="component://projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl"/></html>
+                </platform-specific>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="TaskTeamInfo">      
+        <section>        
+            <actions>                      
+                <service service-name="getTasksByParties" result-map-name="result">
+                    <field-map field-name="workEffortId" env-name="workEffortId"/>                  
+                </service>
+                <set field="taskParties" from-field="result.taskParties"/>     
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
+            </actions>           
+            <widgets> 
                 <container style="screenlet">
                     <container style="screenlet-title-bar">
                         <container style="h3">
@@ -652,19 +652,19 @@
                     <container style="screenlet-body">
                         <include-form name="ListTaskParties" location="component://projectmgr/widget/forms/TaskForms.xml"/>
                     </container>
-                </container>       
-            </widgets>
-        </section>
-    </screen>
-    <screen name="ListWorkEffortRequests">
-        <section>
-            <actions>
-                <set field="tabButtonItem" value="taskView"/>
-                <set field="workEffortId" from-field="parameters.workEffortId"/>
-                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
-                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
-            </actions>
-            <widgets>
+                </container>       
+            </widgets>
+        </section>
+    </screen>
+    <screen name="ListWorkEffortRequests">
+        <section>
+            <actions>
+                <set field="tabButtonItem" value="taskView"/>
+                <set field="workEffortId" from-field="parameters.workEffortId"/>
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
+            </actions>
+            <widgets>
                 <container style="screenlet">
                      <container style="screenlet-title-bar">
                          <container style="h3">
@@ -678,21 +678,21 @@
                              </widgets>
                          </section>
                      </container>
-                 </container>
-            </widgets>
-        </section>
-    </screen>
-    <screen name="taskBefore">
-        <section>
-            <actions>
-                <entity-and entity-name="WorkEffortAssocView" list-name="depList" filter-by-date="true">
-                    <field-map field-name="workEffortIdTo" env-name="parameters.workEffortId"/>
-                    <field-map field-name="workEffortAssocTypeId" value="WORK_EFF_DEPENDENCY"/>
-                </entity-and>
-                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
-                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
-            </actions>
-            <widgets>
+                 </container>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="taskBefore">
+        <section>
+            <actions>
+                <entity-and entity-name="WorkEffortAssocView" list-name="depList" filter-by-date="true">
+                    <field-map field-name="workEffortIdTo" env-name="parameters.workEffortId"/>
+                    <field-map field-name="workEffortAssocTypeId" value="WORK_EFF_DEPENDENCY"/>
+                </entity-and>
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
+            </actions>
+            <widgets>
                 <container style="screenlet">
                      <container style="screenlet-title-bar">
                          <container style="h3">
@@ -706,21 +706,21 @@
                              </widgets>
                          </section>
                      </container>
-                 </container>
-            </widgets>
-        </section>
-    </screen>  
-    <screen name="taskAfter">
-        <section>
-            <actions>
-                <entity-and entity-name="WorkEffortAssocView" list-name="depList" filter-by-date="true">
-                    <field-map field-name="workEffortIdFrom" env-name="parameters.workEffortId"/>
-                    <field-map field-name="workEffortAssocTypeId" value="WORK_EFF_DEPENDENCY"/>
-                </entity-and>
-                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
-                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
-            </actions>
-            <widgets>
+                 </container>
+            </widgets>
+        </section>
+    </screen>  
+    <screen name="taskAfter">
+        <section>
+            <actions>
+                <entity-and entity-name="WorkEffortAssocView" list-name="depList" filter-by-date="true">
+                    <field-map field-name="workEffortIdFrom" env-name="parameters.workEffortId"/>
+                    <field-map field-name="workEffortAssocTypeId" value="WORK_EFF_DEPENDENCY"/>
+                </entity-and>
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
+            </actions>
+            <widgets>
                 <container style="screenlet">
                      <container style="screenlet-title-bar">
                          <container style="h3">
@@ -734,28 +734,28 @@
                              </widgets>
                          </section>
                      </container>
-                 </container>
-            </widgets>
-        </section>
-    </screen>                  
-    <screen name="CreateTaskbyRequest">
-        <section>
-            <actions>
-                <set field="titleProperty" value="PageTitleEditTaskList"/>
-                <set field="headerItem" value="request"/>
-                <set field="tabButtonItem" value="edittask"/>                
-                <set field="labelTitleProperty" value="PageTitleEditTaskList"/>
-                <set field="workEffortId" from-field="parameters.workEffortId"/>    
-                <entity-one entity-name="CustRequest" value-name="custRequest"></entity-one>            
-                <entity-one entity-name="WorkEffort" value-name="task"/>    
-                <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.bsh"/>
-                </actions>
-            <widgets>
-                <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <section>                                                       
-                            <widgets>
-                                <container style="lefthalf">
+                 </container>
+            </widgets>
+        </section>
+    </screen>                  
+    <screen name="CreateTaskbyRequest">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleEditTaskList"/>
+                <set field="headerItem" value="request"/>
+                <set field="tabButtonItem" value="edittask"/>                
+                <set field="labelTitleProperty" value="PageTitleEditTaskList"/>
+                <set field="workEffortId" from-field="parameters.workEffortId"/>    
+                <entity-one entity-name="CustRequest" value-name="custRequest"></entity-one>            
+                <entity-one entity-name="WorkEffort" value-name="task"/>    
+                <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.bsh"/>
+                </actions>
+            <widgets>
+                <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>                                                       
+                            <widgets>
+                                <container style="lefthalf">
                                     <container style="screenlet">
                                         <container style="screenlet-title-bar">
                                             <container style="h3">
@@ -769,9 +769,9 @@
                                                 </widgets>
                                             </section>
                                         </container>
-                                    </container>
-                                </container>
-                                <container style="righthalf">
+                                    </container>
+                                </container>
+                                <container style="righthalf">
                                     <container style="screenlet">
                                         <container style="screenlet-title-bar">
                                             <container style="h3">
@@ -785,13 +785,13 @@
                                                 </widgets>
                                             </section>
                                         </container>
-                                    </container>
-                                </container>  
-                            </widgets>                            
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>     
+                                    </container>
+                                </container>  
+                            </widgets>                            
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>     
 </screens>

Propchange: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml?rev=634225&r1=634224&r2=634225&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml Thu Mar  6 03:32:39 2008
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
-    <screen name="FindTimeSheet">
-        <section>
-            <actions>
-                <set field="titleProperty" value="PageTitleFindTimeSheet"/>
-                <set field="headerItem" value="timesheet"/>
-                <set field="labelTitleProperty" value="ProjectMgrFindTimeSheet"/>
-                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
-                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <section>                        
-                            <widgets>
+    <screen name="FindTimeSheet">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleFindTimeSheet"/>
+                <set field="headerItem" value="timesheet"/>
+                <set field="labelTitleProperty" value="ProjectMgrFindTimeSheet"/>
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>                        
+                            <widgets>
                                 <container style="screenlet">
                                     <container style="screenlet-title-bar">
                                         <container style="h3">
@@ -61,28 +61,28 @@
                                             </widgets>
                                         </section>
                                     </container>
-                                </container>
-                            </widgets>
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    <screen name="Timesheet">
-        <section>
-            <actions>
-                <set field="titleProperty" value="PageTitleTimesheet"/>
-                <set field="headerItem" value="timesheet"/>
-                <set field="tabButtonItem" value="editTimesheet"/>
-                <set field="labelTitleProperty" value="ProjectMgrTimeSheetMyTime"/>
-                <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.bsh"/>
-                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
-                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">                                                  
+                                </container>
+                            </widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="Timesheet">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleTimesheet"/>
+                <set field="headerItem" value="timesheet"/>
+                <set field="tabButtonItem" value="editTimesheet"/>
+                <set field="labelTitleProperty" value="ProjectMgrTimeSheetMyTime"/>
+                <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.bsh"/>
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">                                                  
                         <container style="screenlet">
                             <container style="screenlet-title-bar">
                                 <container style="h3">
@@ -116,79 +116,79 @@
                                     </widgets>
                                 </section>
                             </container>
-                        </container>
-                        <include-screen name="ListTimesheets"/>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    <screen name="EditTimeSheet">
-        <section>
-            <actions>
-                <set field="titleProperty" value="PageTitleFindTimesheet"/>
-                <set field="headerItem" value="timesheet"/>
-                <set field="tabButtonItem" value="edittimesheet"/>
-                <set field="labelTitleProperty" value="PageTitleAddTimesheet"/>
-                <entity-one entity-name="Timesheet" value-name="timesheet"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">                                                  
-                        <section>          
-                            <widgets>
-                                <container style="screenlet">
-                                    <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleEditTimesheet} # ${timesheet.timesheetId}</label></container>                                
-                                    <container style="screenlet-body"> 
-                                        <include-form name="EditTimesheet" location="component://workeffort/widget/TimesheetForms.xml"/>
-                                    </container>
-                                </container>
-                            </widgets>
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    
-    <screen name="addWeeklyTimesheet">
-        <section>
-            <actions>
-                <set field="titleProperty" value="PageTitleFindTimesheet"/>
-                <set field="headerItem" value="timesheet"/>
-                <set field="tabButtonItem" value="addtimesheet"/>
-                <set field="labelTitleProperty" value="PageTitleAddTimesheet"/>
-                <entity-one entity-name="Timesheet" value-name="timesheet"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">                                                  
-                        <section>          
-                            <widgets>
-                                <container style="screenlet">
-                                    <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleAddTimesheet}</label></container>                                
-                                    <container style="screenlet-body"> 
-                                        <include-form name="AddWeeklyTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
-                                    </container>
-                                </container>
-                            </widgets>
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    
+                        </container>
+                        <include-screen name="ListTimesheets"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="EditTimeSheet">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleFindTimesheet"/>
+                <set field="headerItem" value="timesheet"/>
+                <set field="tabButtonItem" value="edittimesheet"/>
+                <set field="labelTitleProperty" value="PageTitleAddTimesheet"/>
+                <entity-one entity-name="Timesheet" value-name="timesheet"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">                                                  
+                        <section>          
+                            <widgets>
+                                <container style="screenlet">
+                                    <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleEditTimesheet} # ${timesheet.timesheetId}</label></container>                                
+                                    <container style="screenlet-body"> 
+                                        <include-form name="EditTimesheet" location="component://workeffort/widget/TimesheetForms.xml"/>
+                                    </container>
+                                </container>
+                            </widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    
+    <screen name="addWeeklyTimesheet">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleFindTimesheet"/>
+                <set field="headerItem" value="timesheet"/>
+                <set field="tabButtonItem" value="addtimesheet"/>
+                <set field="labelTitleProperty" value="PageTitleAddTimesheet"/>
+                <entity-one entity-name="Timesheet" value-name="timesheet"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">                                                  
+                        <section>          
+                            <widgets>
+                                <container style="screenlet">
+                                    <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleAddTimesheet}</label></container>                                
+                                    <container style="screenlet-body"> 
+                                        <include-form name="AddWeeklyTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
+                                    </container>
+                                </container>
+                            </widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    
     <screen name="MyTimesheet">
         <section>
             <actions>
                 <set field="titleProperty" value="TimesheetMyTime"/>
                 <set field="tabButtonItem" value="edittimesheet"/>
                 <set field="labelTitleProperty" value="PageTitleAddTimesheet"/>
-                <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.bsh"/>
+                <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.bsh"/>
                 <set field="my" value="My"/><!-- change link and target -->
-                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
-                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonMyTimeDecorator" location="${parameters.mainDecoratorLocation}">
@@ -222,8 +222,8 @@
                             <container style="screenlet-body">
                                 <include-form name="AddMyWeeklyTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
                             </container>
-                        </container>
-                        <include-screen name="ListTimesheets"/>
+                        </container>
+                        <include-screen name="ListTimesheets"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -238,8 +238,8 @@
                 
                 <set field="timesheetId" from-field="parameters.timesheetId"/>
                 <entity-one entity-name="Timesheet" value-name="timesheet"/>
-                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
-                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}">
@@ -292,10 +292,10 @@
                 </decorator-screen>
             </widgets>
         </section>
-    </screen>
-    <screen name="ListTimesheets">
-        <section>
-            <widgets>
+    </screen>
+    <screen name="ListTimesheets">
+        <section>
+            <widgets>
                 <container style="screenlet">
                     <container style="screenlet-title-bar">
                         <container style="h3">
@@ -309,8 +309,8 @@
                             </widgets>
                         </section>
                     </container>
-                </container>
-            </widgets>
-        </section>
+                </container>
+            </widgets>
+        </section>
     </screen>
 </screens>

Propchange: ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/WorkEffortTrees.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/WorkEffortTrees.xml?rev=634225&r1=634224&r2=634225&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/WorkEffortTrees.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/WorkEffortTrees.xml Thu Mar  6 03:32:39 2008
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<trees xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-tree.xsd">
-    <tree name="TreeWorkEffort" root-node-name="node-root" entity-name="WorkEffort"
-        default-render-style="simple" default-wrap-style="treeWrapper">
-        <node name="node-root"  entity-name="WorkEffort" render-style="expand-collapse">
-            <entity-one entity-name="WorkEffort" value-name="workEffort"/>
-            <include-screen name="WorkEffortTreeLine" location="component://projectmgr/widget/ProjectScreens.xml"/>
-            <sub-node node-name="node-list">
-                <entity-condition entity-name="WorkEffortAssoc">
-                    <condition-expr field-name="workEffortIdFrom" operator="equals" env-name="workEffortId"/>
-                </entity-condition>
-            </sub-node>
-        </node>
-        <node name="node-list" entry-name="workEffortAssoc" entity-name="WorkEffortAssoc" join-field-name="workEffortIdFrom" render-style="expand-collapse">
-            <entity-one entity-name="WorkEffort" value-name="workEffort">
-                <field-map field-name="workEffortId" env-name="workEffortAssoc.workEffortIdTo"/>
-            </entity-one>
-            <include-screen name="WorkEffortTreeLine" location="component://projectmgr/widget/ProjectScreens.xml"/>
-            <sub-node node-name="node-list">
-                <entity-condition entity-name="WorkEffortAssoc">
-                    <condition-expr field-name="workEffortIdFrom" operator="equals" env-name="workEffortAssoc.workEffortIdTo"/>
-                </entity-condition>
-            </sub-node>
-        </node>
-    </tree>
-    <tree name="TreeTaskWorkEffort" root-node-name="node-root" entity-name="WorkEffort"
-        default-render-style="simple" default-wrap-style="treeWrapper">
-        <node name="node-root"  entity-name="WorkEffort" render-style="expand-collapse">
-            <entity-one entity-name="WorkEffort" value-name="workEffort"/>
-            <include-screen name="WorkEffortTreeLine" location="component://projectmgr/widget/TaskScreens.xml"/>
-            <sub-node node-name="node-list">
-                <entity-condition entity-name="WorkEffortAssoc">
-                    <condition-expr field-name="workEffortIdFrom" operator="equals" env-name="workEffortId"/>
-                </entity-condition>
-            </sub-node>
-        </node>
-        <node name="node-list" entry-name="workEffortAssoc" entity-name="WorkEffortAssoc" join-field-name="workEffortIdFrom" render-style="expand-collapse">
-            <entity-one entity-name="WorkEffort" value-name="workEffort">
-                <field-map field-name="workEffortId" env-name="workEffortAssoc.workEffortIdTo"/>
-            </entity-one>
-            <include-screen name="WorkEffortTreeLine" location="component://projectmgr/widget/TaskScreens.xml"/>
-            <sub-node node-name="node-list">
-                <entity-condition entity-name="WorkEffortAssoc">
-                    <condition-expr field-name="workEffortIdFrom" operator="equals" env-name="workEffortAssoc.workEffortIdTo"/>
-                </entity-condition>
-            </sub-node>
-        </node>
-    </tree>
-</trees>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<trees xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-tree.xsd">
+    <tree name="TreeWorkEffort" root-node-name="node-root" entity-name="WorkEffort"
+        default-render-style="simple" default-wrap-style="treeWrapper">
+        <node name="node-root"  entity-name="WorkEffort" render-style="expand-collapse">
+            <entity-one entity-name="WorkEffort" value-name="workEffort"/>
+            <include-screen name="WorkEffortTreeLine" location="component://projectmgr/widget/ProjectScreens.xml"/>
+            <sub-node node-name="node-list">
+                <entity-condition entity-name="WorkEffortAssoc">
+                    <condition-expr field-name="workEffortIdFrom" operator="equals" env-name="workEffortId"/>
+                </entity-condition>
+            </sub-node>
+        </node>
+        <node name="node-list" entry-name="workEffortAssoc" entity-name="WorkEffortAssoc" join-field-name="workEffortIdFrom" render-style="expand-collapse">
+            <entity-one entity-name="WorkEffort" value-name="workEffort">
+                <field-map field-name="workEffortId" env-name="workEffortAssoc.workEffortIdTo"/>
+            </entity-one>
+            <include-screen name="WorkEffortTreeLine" location="component://projectmgr/widget/ProjectScreens.xml"/>
+            <sub-node node-name="node-list">
+                <entity-condition entity-name="WorkEffortAssoc">
+                    <condition-expr field-name="workEffortIdFrom" operator="equals" env-name="workEffortAssoc.workEffortIdTo"/>
+                </entity-condition>
+            </sub-node>
+        </node>
+    </tree>
+    <tree name="TreeTaskWorkEffort" root-node-name="node-root" entity-name="WorkEffort"
+        default-render-style="simple" default-wrap-style="treeWrapper">
+        <node name="node-root"  entity-name="WorkEffort" render-style="expand-collapse">
+            <entity-one entity-name="WorkEffort" value-name="workEffort"/>
+            <include-screen name="WorkEffortTreeLine" location="component://projectmgr/widget/TaskScreens.xml"/>
+            <sub-node node-name="node-list">
+                <entity-condition entity-name="WorkEffortAssoc">
+                    <condition-expr field-name="workEffortIdFrom" operator="equals" env-name="workEffortId"/>
+                </entity-condition>
+            </sub-node>
+        </node>
+        <node name="node-list" entry-name="workEffortAssoc" entity-name="WorkEffortAssoc" join-field-name="workEffortIdFrom" render-style="expand-collapse">
+            <entity-one entity-name="WorkEffort" value-name="workEffort">
+                <field-map field-name="workEffortId" env-name="workEffortAssoc.workEffortIdTo"/>
+            </entity-one>
+            <include-screen name="WorkEffortTreeLine" location="component://projectmgr/widget/TaskScreens.xml"/>
+            <sub-node node-name="node-list">
+                <entity-condition entity-name="WorkEffortAssoc">
+                    <condition-expr field-name="workEffortIdFrom" operator="equals" env-name="workEffortAssoc.workEffortIdTo"/>
+                </entity-condition>
+            </sub-node>
+        </node>
+    </tree>
+</trees>

Propchange: ofbiz/trunk/specialpurpose/projectmgr/widget/WorkEffortTrees.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/projectmgr/widget/WorkEffortTrees.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/projectmgr/widget/WorkEffortTrees.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml