svn commit: r606785 - in /ofbiz/trunk/specialpurpose/projectmgr: script/org/ofbiz/project/ProjectServices.xml widget/TaskScreens.xml widget/forms/TaskForms.xml

[hansbak-2]

Author: hansbak
Date: Tue Dec 25 03:47:27 2007
New Revision: 606785

URL: http://svn.apache.org/viewvc?rev=606785&view=rev
Log:
improved the task depency screen

Modified:
    ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml

Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=606785&r1=606784&r2=606785&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Tue Dec 25 03:47:27 2007
@@ -540,6 +540,7 @@
         <set field="highInfo.taskName" from-field="lowInfo.workEffortName"/>
         <set field="highInfo.taskDescription" from-field="lowInfo.description"/>
         <set field="highInfo.scopeEnumId" from-field="lowInfo.scopeEnumId"/>
+        <set field="highInfo.workEffortParentId" from-field="lowInfo.workEffortParentId"/>
         <call-simple-method method-name="combineInfo"/>
         <call-simple-method method-name="getHours"/>
         <set field="highInfo.currentStatusId" from-field="lowInfo.currentStatusId"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=606785&r1=606784&r2=606785&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Tue Dec 25 03:47:27 2007
@@ -27,7 +27,10 @@
                 <set field="titleProperty" value="PageTitleDependencies"/>                
                 <set field="tabButtonItem" value="dependencies"/>
                 <set field="workEffortId" from-field="parameters.workEffortId"/>
-                <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.bsh"/>
+                <service service-name="getProjectIdAndName" result-map-name="result">
+                    <field-map field-name="taskId" env-name="parameters.workEffortId"/>
+                </service>
+                <set field="projectId" from-field="result.projectId"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
@@ -44,7 +47,7 @@
                                         <container style="screenlet">
                                             <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleTasksBefore}</label></container>                                
                                             <container style="screenlet-body">
-                                                <include-form name="Dependencies" location="component://projectmgr/widget/forms/TaskForms.xml"/>
+                                                <include-form name="DependenciesBefore" location="component://projectmgr/widget/forms/TaskForms.xml"/>
                                             </container>
                                         </container>
                                         <container style="screenlet">
@@ -68,7 +71,7 @@
                                         <container style="screenlet">
                                             <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleTasksAfter}</label></container>                                
                                             <container style="screenlet-body">
-                                                <include-form name="Dependencies" location="component://projectmgr/widget/forms/TaskForms.xml"/>
+                                                <include-form name="DependenciesAfter" location="component://projectmgr/widget/forms/TaskForms.xml"/>
                                             </container>
                                         </container>
                                         <container style="screenlet">

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=606785&r1=606784&r2=606785&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Tue Dec 25 03:47:27 2007
@@ -273,20 +273,52 @@
         </field>
         <field name="addButton"><submit/></field>
     </form>
-    <form name="Dependencies" target="removeDependency" title="" list-name="depList" type="list" separate-columns="true" paginate-target="Dependencies">
-        <field name="workEffortIdTo"><hidden/></field>
-        <field name="workEffortIdFrom"><hidden/></field>
-        <field name="workEffortAssocTypeId"><hidden value="WORK_EFF_DEPENDENCY"/></field>
+    <form name="DependenciesBefore" target="removeDependency" title="" list-name="depList" type="list" separate-columns="true" paginate-target="Dependencies">
+        <row-actions>
+            <service service-name="getProjectTask" result-map-name="result">
+                <field-map field-name="taskId" env-name="workEffortIdFrom"/>
+            </service>
+            <set field="task" from-field="result.taskInfo"/>
+            <set field="currentStatusId" from-field="task.currentStatusId"/>
+            <set field="taskName" from-field="task.taskName"/>
+            <set field="workEffortParentId" from-field="task.workEffortParentId"/>
+        </row-actions>
+        <field name="workEffortIdTo"><hidden/></field>
+        <field name="workEffortAssocTypeId"><hidden/></field>
         <field name="fromDate"><hidden/></field>
-        <field name="workEffortId"><hidden/></field>
-        <field name="workEffortToName" title="${uiLabelMap.CommonName}"><hyperlink target="Dependencies?workEffortId=${workEffortIdTo}" description="${workEffortToName}"/></field>
-        <field name="workEffortToParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field>        
-        <field name="estimatedStartDate" entry-name="workEffortToEstimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field>
-        <field name="estimatedCompletionDate"  entry-name="workEffortToEstimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field>
-        <field name="actualStartDate" entry-name="workEffortToActualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><display type="date"/></field>
-        <field name="actualCompletionDate"  entry-name="workEffortToActualCompletionDate" title="${uiLabelMap.WorkEffortActualCompletionDate}"><display type="date"/></field>
+        <field name="workEffortId"><hidden/></field>
+        <field name="workEffortIdFrom" title="${uiLabelMap.CommonName}"><hyperlink target="Dependencies?workEffortId=${workEffortIdFrom}" description="${taskName}"/></field>
+        <field name="workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field>        
+        <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <field name="estimatedStartDate" entry-name="workEffortToEstimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field>
+        <field name="estimatedCompletionDate"  entry-name="workEffortToEstimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field>
+        <field name="actualStartDate" entry-name="workEffortToActualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><display type="date"/></field>
+        <field name="actualCompletionDate"  entry-name="workEffortToActualCompletionDate" title="${uiLabelMap.WorkEffortActualCompletionDate}"><display type="date"/></field>
         <field name="deleteButton"><submit button-type="button"/></field>
-    </form>
+    </form>
+    <form name="DependenciesAfter" target="removeDependency" title="" list-name="depList" type="list" separate-columns="true" paginate-target="Dependencies">
+        <row-actions>
+            <service service-name="getProjectTask" result-map-name="result">
+                <field-map field-name="taskId" env-name="workEffortIdTo"/>
+            </service>
+            <set field="task" from-field="result.taskInfo"/>
+            <set field="currentStatusId" from-field="task.currentStatusId"/>
+            <set field="taskName" from-field="task.taskName"/>
+            <set field="workEffortParentId" from-field="task.workEffortParentId"/>
+        </row-actions>
+        <field name="workEffortIdFrom"><hidden/></field>
+        <field name="workEffortAssocTypeId"><hidden/></field>
+        <field name="fromDate"><hidden/></field>
+        <field name="workEffortId"><hidden/></field>
+        <field name="workEffortIdTo" title="${uiLabelMap.CommonName}"><hyperlink target="Dependencies?workEffortId=${workEffortIdTo}" description="${taskName}"/></field>
+        <field name="workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field>        
+        <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <field name="estimatedStartDate" entry-name="workEffortToEstimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field>
+        <field name="estimatedCompletionDate"  entry-name="workEffortToEstimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field>
+        <field name="actualStartDate" entry-name="workEffortToActualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><display type="date"/></field>
+        <field name="actualCompletionDate"  entry-name="workEffortToActualCompletionDate" title="${uiLabelMap.WorkEffortActualCompletionDate}"><display type="date"/></field>
+        <field name="deleteButton"><submit button-type="button"/></field>
+    </form>
     <form name="AddDependencyBefore" type="single" target="addDependency">
         <field name="workEffortId"><hidden/></field>
         <field name="workEffortIdTo"><hidden value="${parameters.workEffortId}"/></field>