svn commit: r689724 - in /ofbiz/trunk/specialpurpose: mypage/widget/MyPageMenus.xml mypage/widget/MyPageScreens.xml projectmgr/script/org/ofbiz/project/ProjectServices.xml

[hansbak-2]

Author: hansbak
Date: Wed Aug 27 22:56:52 2008
New Revision: 689724

URL: http://svn.apache.org/viewvc?rev=689724&view=rev
Log:
using the new condition ignore flag and fix error in resource actual hours in the project overview

Modified:
    ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml
    ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml?rev=689724&r1=689723&r2=689724&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml Wed Aug 27 22:56:52 2008
@@ -78,10 +78,10 @@
             </condition>
             <link target="myTasks?donePage=myTasks"/>
         </menu-item>
-        <!--menu-item name="help" title="${uiLabelMap.CommonHelp}" align-style="opposed">
+        <menu-item name="help" title="${uiLabelMap.CommonHelp}" align-style="opposed">
             <condition><not><if-empty field-name="userLogin"/></not></condition>
-            <link target="http://docs.ofbiz.org/display/OFBENDUSER/Project+Manager+Application+Roles?decorator=printable" url-mode="plain" target-window="new"/>
-        </menu-item-->
+            <link target="http://docs.ofbiz.org/display/OFBENDUSER/My+Page?decorator=printable" url-mode="plain" target-window="new"/>
+        </menu-item>
         <menu-item name="Logout" title="${uiLabelMap.CommonLogout}" align-style="opposed">
             <condition><not><if-empty field-name="userLogin"/></not></condition>
             <link target="logout"/>
@@ -120,20 +120,18 @@
         </menu-item>
         <menu-item name="openEvents" title="${uiLabelMap.OpenEvents}">
             <condition>
-                <if-compare field-name="parameters.status" operator="equals"
-                    value="all" />
+                <if-compare field-name="parameters.all" operator="equals" value="true" />
             </condition>
-            <link target="${parameters.donePage}?donePage=${parameters.donePage}&amp;status=open" />
+            <link target="${parameters.donePage}?donePage=${parameters.donePage}&amp;all=false" />
         </menu-item>
         <menu-item name="allOtherEvents" title="${uiLabelMap.AllEvents}">
             <condition>
                 <or>
-                    <if-compare field-name="parameters.status" operator="equals"
-                        value="open" />
-                    <if-empty field-name="parameters.status"/>
+                    <if-compare field-name="parameters.all" operator="equals" value="false" />
+                    <if-empty field-name="parameters.all"/>
                 </or>
             </condition>
-            <link target="${parameters.donePage}?donePage=${parameters.donePage}&amp;status=all" />
+            <link target="${parameters.donePage}?donePage=${parameters.donePage}&amp;all=true" />
         </menu-item>
     </menu>    
     

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml?rev=689724&r1=689723&r2=689724&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml Wed Aug 27 22:56:52 2008
@@ -190,8 +190,7 @@
  <screen name="Communications">
  <section>
  <actions>
-                <set field="status" from-field="parameters.status"/>
-                <set field="status" value="${bsh:&quot;all&quot;.equals(status)?&quot;%&quot;:&quot;open&quot;}"/>
+                <set field="all" from-field="parameters.all"/>
  <entity-condition entity-name="CommunicationEventAndRole"
  list-name="commEvents">
  <condition-list combine="and">
@@ -199,12 +198,8 @@
  value="COM_UNKNOWN_PARTY" />
  <condition-expr field-name="partyId" operator="equals"
  value="${partyId}" />
-                        <condition-list combine="or">
-                            <condition-expr field-name="roleStatusId"
-                                operator="not-equals" value="COM_ROLE_COMPLETED" />
-                            <condition-expr field-name="roleStatusId"
-                                operator="like" value="${status}" />
-                        </condition-list>
+                        <condition-expr field-name="roleStatusId"
+                                operator="not-equals" value="COM_ROLE_COMPLETED" ignore="${all}" />
  </condition-list>
  <order-by field-name="-datetimeStarted" />
  </entity-condition>
@@ -311,6 +306,7 @@
                                         <field-map field-name="communicationEventId"
                                             env-name="communicationEvent.parentCommEventId" />
                                     </entity-one>
+                                    <set field="donePage" from-field="parameters.donePage"/>
                                 </actions>
                                 <widgets>
                                     <include-screen name="commEvent"

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=689724&r1=689723&r2=689724&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Wed Aug 27 22:56:52 2008
@@ -207,7 +207,7 @@
         </if-not-empty>
     </simple-method>        
     
-    <simple-method method-name="updateTimeEntryByWorkeffort" short-description="Update workeffort by workeffort and timesheetId ">
+    <simple-method method-name="updateTimeEntryByWorkeffort" short-description="Update workeffort by workeffortId and timesheetId ">
         <field-to-result field-name="parameters.timesheetId" result-name="timesheetId"/>
         <if-empty field="parameters.workEffortId">
             <return/>
@@ -603,17 +603,10 @@
     </simple-method>
 
     <simple-method method-name="getProjectsByParties" short-description="get Project information by party member" login-required="true">
-        <!-- get the list of tasks optionaly selected for a party -->
-        <if-empty field="parameters.partyId">
-            <set field="parameters.partyId" value="%"/>
-        </if-empty>
-        <if-empty field="parameters.projectId">
-            <set field="parameters.projectId" value="%"/>
-        </if-empty>
-        <entity-condition entity-name="ProjectPartyAndPhaseAndTask" list-name="tasks">
+        <entity-condition entity-name="ProjectAndPhaseAndTaskParty" list-name="tasks">
             <condition-list combine="and">
-                <condition-expr field-name="partyId" operator="like" env-name="parameters.partyId"/>
-                <condition-expr field-name="projectId" operator="like" env-name="parameters.projectId"/>
+                <condition-expr field-name="projectId" operator="equals" env-name="parameters.projectId" ignore-if-empty="true"/>
+                <condition-expr field-name="partyId" operator="equals" env-name="parameters.partyId" ignore-if-empty="true"/>
             </condition-list>
             <order-by field-name="projectId"/>
             <order-by field-name="partyId"/>
@@ -621,17 +614,16 @@
         <if-not-empty field="tasks">
             <iterate entry-name="task" list-name="tasks">
                 <if>
-                    <condition >
+                    <condition>
                         <and>
-                            <not>
-                                <if-empty field="projectParty"/>
-                            </not>
+                            <not><if-empty field="projectParty"/></not>
                             <if-compare-field field="task.partyId" to-field="projectParty.partyId" operator="not-equals"/>
                         </and>
                     </condition>
                     <then>
                         <field-to-list field-name="projectParty" list-name="projectParties"/>
                         <clear-field field-name="projectParty"/>
+                        <clear-field field-name="highInfo"/>
                     </then>
                 </if>
                 
@@ -648,9 +640,9 @@
                     <set field="projectParty.thruDate" from-field="task.thruDate"/>
                 </if-empty>
                 
-                <!-- get the planned hours -->
+                <!-- get the planned/actual hours -->
                 <set field="lowInfo" from-field="task"/>
-                <set field="hoursPartyId" from-field="task.partyId"/>
+                <set field="parameters.hoursPartyId" from-field="task.partyId"/>
                 <call-simple-method method-name="getHours"/>
                 <set field="projectParty.plannedHours" from-field="highInfo.plannedHours"/>                    
                 <set field="projectParty.actualHours" from-field="highInfo.actualHours"/>