svn commit: r606860 - in /ofbiz/trunk/specialpurpose/projectmgr/widget: TaskScreens.xml forms/TaskForms.xml

[hansbak-2]

Author: hansbak
Date: Wed Dec 26 01:00:57 2007
New Revision: 606860

URL: http://svn.apache.org/viewvc?rev=606860&view=rev
Log:
add task dependencies to task overview

Modified:
    ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=606860&r1=606859&r2=606860&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Wed Dec 26 01:00:57 2007
@@ -418,6 +418,8 @@
                                             <include-form name="TaskInfo" location="component://projectmgr/widget/forms/TaskForms.xml"/>                  
                                         </container>
                                     </container>
+                                    <include-screen name="taskBefore"/>
+                                    <include-screen name="taskAfter"/>
                                 </container>
                                 <container style="righthalf">
                                     <include-screen name="TaskTeamInfo"/>
@@ -510,5 +512,41 @@
                 </container>
             </widgets>
         </section>
-    </screen>          
+    </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>
+            </actions>
+            <widgets>
+                <container style="screenlet">
+                    <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleTasksBefore}</label></container>                                
+                    <container style="screenlet-body">
+                        <include-form name="TaskBefore" location="component://projectmgr/widget/forms/TaskForms.xml"/>
+                    </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>
+            </actions>
+            <widgets>
+                <container style="screenlet">
+                    <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleTasksAfter}</label></container>                                
+                    <container style="screenlet-body">
+                        <include-form name="TaskAfter" location="component://projectmgr/widget/forms/TaskForms.xml"/>
+                    </container>
+                </container>
+            </widgets>
+        </section>
+    </screen>                  
 </screens>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=606860&r1=606859&r2=606860&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Wed Dec 26 01:00:57 2007
@@ -446,5 +446,49 @@
         <field name="description"><display/></field>
         <field name="custRequestTypeDescription"><display/></field>
         <field name="statusItemDescription"><display/></field>
-    </form>              
+    </form>
+    <form name="TaskBefore" 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="workEffortIdFrom" title="${uiLabelMap.CommonName}"><hyperlink target="taskView?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>
+    </form>
+    <form name="TaskAfter" 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="taskView?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>
+    </form>                      
 </forms>