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

[hansbak-2]

Author: hansbak
Date: Sun Dec 16 20:35:23 2007
New Revision: 604769

URL: http://svn.apache.org/viewvc?rev=604769&view=rev
Log:
add a partyList to the task overview

Modified:
    ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.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=604769&r1=604768&r2=604769&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Sun Dec 16 20:35:23 2007
@@ -403,6 +403,7 @@
                         <set field="taskParty.partyName" value="${partyNameView.lastName},${partyNameView.firstName}${partyNameView.groupName}"/>
                     </if-not-empty>
                     <set field="taskParty.roleTypeId" from-field="task.roleTypeId"/>
+                    <set field="taskParty.statusId" from-field="task.statusId"/>
                     <set field="taskParty.fromDate" from-field="task.fromDate"/>
                     <set field="taskParty.thruDate" from-field="task.thruDate"/>
                 </if-empty>
@@ -410,6 +411,7 @@
                 <!-- get the planned hours -->
                 <set field="lowInfo" from-field="task"/>
                 <set field="hoursPartyId" from-field="task.partyId"/>
+                <get-related-one value-name="task" relation-name="WorkEffort" to-value-name="lowInfo"/>
                 <call-simple-method method-name="getHours"/>
                 <set field="taskParty.plannedHours" from-field="highInfo.plannedHours"/>                    
                 <set field="taskParty.actualHours" from-field="highInfo.actualHours"/>                    

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=604769&r1=604768&r2=604769&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Sun Dec 16 20:35:23 2007
@@ -331,6 +331,7 @@
                                     </container>
                                 </container>
                                 <container style="righthalf">
+                                    <include-screen name="TaskTeamInfo"/>
                                     <include-screen name="NoteInfo"/>
                                 </container>
                             </widgets>
@@ -384,4 +385,24 @@
             </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"/>    
+            </actions>          
+            <widgets>
+                <container style="screenlet">
+                    <container style="screenlet-title-bar">
+                        <label style="boxhead" text="">${uiLabelMap.TaskTeam}</label>
+                    </container>
+                    <container style="screenlet-body">
+                        <include-form name="ListTaskParties" location="component://projectmgr/widget/forms/TaskForms.xml"/>
+                    </container>
+                </container>                
+            </widgets>
+        </section>
+    </screen>    
 </screens>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml?rev=604769&r1=604768&r2=604769&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml Sun Dec 16 20:35:23 2007
@@ -45,7 +45,7 @@
             </widgets>
         </section>
     </screen>
-    <screen name="EditTimeSheet1">
+    <screen name="EditTimeSheet">
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleFindTimesheet"/>
@@ -71,7 +71,8 @@
                 </decorator-screen>
             </widgets>
         </section>
-    </screen>
+    </screen>
+    
     <screen name="MyTimesheets">
         <section>
             <actions>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=604769&r1=604768&r2=604769&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Sun Dec 16 20:35:23 2007
@@ -284,5 +284,16 @@
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date"/></field>
         <field name="deleteButton" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="complete"><hyperlink description="set to Complete" target="updateTaskPartyAssign?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}&amp;statusId=CAL_COMPLETED&amp;thruDate=${nowDate}"/></field>
-    </form>
+    </form>
+    <form name="ListTaskParties" type="list" list-name="taskParties">  
+        <field name="partyId" title="${uiLabelMap.CommonName}">
+            <hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="inter-app" description="${partyName}"/>
+        </field>
+        <field name="roleTypeId" title="${uiLabelMap.ProjectMgrPartyRoleTypeId}"><display-entity entity-name="RoleType" description="${description}"/></field>        
+        <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}"/></field>        
+        <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display type="date"/></field>
+        <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date"/></field>
+        <field name="plannedHours"><display/></field>
+        <field name="actualHours"><display/></field>
+    </form>  
 </forms>