svn commit: r729276 - in /ofbiz/trunk/specialpurpose: mypage/config/ mypage/script/org/ofbiz/mypage/ mypage/widget/ myportal/widget/ projectmgr/widget/ projectmgr/widget/forms/

[hansbak-2]

Author: hansbak
Date: Wed Dec 24 00:03:53 2008
New Revision: 729276

URL: http://svn.apache.org/viewvc?rev=729276&view=rev
Log:
several small corrections in projectman, mypage, myportal

Modified:
    ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml
    ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml
    ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
    ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml
    ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml
    ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
    ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml
    ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml

Modified: ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml?rev=729276&r1=729275&r2=729276&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml Wed Dec 24 00:03:53 2008
@@ -18,7 +18,7 @@
     under the License.
 -->
 <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <property key="->Complete">
+    <property key="toComplete">
         <value xml:lang="en">->Closed</value>
         <value xml:lang="fr">->Fermé(e)</value>
     </property>

Modified: ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml?rev=729276&r1=729275&r2=729276&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml Wed Dec 24 00:03:53 2008
@@ -99,25 +99,20 @@
     <simple-method method-name="checkCommEventAccess" short-description="check if the user has access to the email of this party">
         <set field="found" value="false"/>
         <if-compare-field operator="not-equals" field="parameters.partyId" to-field="userLogin.partyId">
-                <entity-and list-name="emailOwners" entity-name="PartyRelationship" filter-by-date="true">
-                    <field-map field-name="partyIdFrom" value="${userLogin.partyId}" />
-                    <field-map field-name="roleTypeIdFrom" value="EMAIL_ADMIN" />
-                </entity-and>
-                <iterate entry-name="emailOwners" list-name="emailOwner">
-                    <if-compare operator="equals" value="${userLogin.partyId}" field="emailOwner.partyIdTo">
-                        <set field="found" value="true"/>
-                    </if-compare>
-                </iterate>
-                <else>
-                    <set field="found" value="true"/>
-                </else>
+            <entity-and list-name="emailOwners" entity-name="PartyRelationship" filter-by-date="true">
+                <field-map field-name="partyIdFrom" env-name="userLogin.partyId" />
+                <field-map field-name="roleTypeIdFrom" value="EMAIL_ADMIN" />
+                <field-map field-name="partyIdTo" env-name="parameters.partyId"/>
+            </entity-and>
+            <if-not-empty field="emailOwners">
+                <set field="found" value="true"/>
+            </if-not-empty>
         </if-compare-field>
     </simple-method>
     <simple-method method-name="createCommunicationEventRoles" short-description="">
         <entity-condition list-name="commEvents" entity-name="CommunicationEvent" />
         <set field="count" value="0" type="Integer" />
         <iterate entry-name="commEvent" list-name="commEvents">
-            <log level="always" message="====processing: ${commEvent.communicationEventId}"></log>
             <get-related value-name="commEvent" relation-name="CommunicationEventRole" list-name="roles" />
             <if-empty field="roles">
                 <!--partyId To -->
@@ -164,7 +159,6 @@
                 </calculate>
             </if-empty>
         </iterate>
-        <log level="always" message="========${count} records updated" />
     </simple-method>
 
     <simple-method method-name="getToNextDonePage" short-description="return the requestValue 'donePage' as a resultcode to the controller">

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml?rev=729276&r1=729275&r2=729276&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml Wed Dec 24 00:03:53 2008
@@ -98,7 +98,7 @@
     
     <form name="ListPartyCommEvents" extends="ListCommEvents" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml" type="list">
         <row-actions>
-            <set field="toComplete" value="${bsh:&quot;COM_ROLE_READ&quot;.equals(roleStatusId)?&quot;->Complete&quot;:&quot;&quot;}"/>
+            <set field="toComplete" value="${bsh:&quot;COM_ROLE_READ&quot;.equals(roleStatusId)?&quot;toComplete&quot;:&quot;&quot;}"/>
         </row-actions>
         <field name="donePage"><hidden/></field>
         <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field>

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml?rev=729276&r1=729275&r2=729276&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml Wed Dec 24 00:03:53 2008
@@ -261,7 +261,7 @@
             <condition>
                 <and>
                     <not><if-empty field-name="communicationEventRole"/></not>
-                    <if-compare field-name="communicationEventRole.statusId" operator="equals" value="COM_ROLE_READ"/>
+                    <if-compare field-name="communicationEvent.statusId" operator="equals" value="COM_ROLE_READ"/>
                     <if-has-permission permission="PARTYMGR_CME-EMAIL_CREATE"/>
                 </and>
             </condition>

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml?rev=729276&r1=729275&r2=729276&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml Wed Dec 24 00:03:53 2008
@@ -224,6 +224,7 @@
             <condition-expr field-name="partyId" operator="equals"
                 value="${partyId}"/>            
         </condition-list>
+        <order-by field-name="-datetimeStarted" />
     </entity-condition>
                 <entity-one entity-name="PartyNameView" value-name="partyName">
                     <field-map field-name="partyId" env-name="partyId"/>

Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml?rev=729276&r1=729275&r2=729276&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml Wed Dec 24 00:03:53 2008
@@ -98,7 +98,7 @@
     
     <form name="ListPartyCommEvents" extends="ListCommEvents" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml" type="list">
         <row-actions>
-            <set field="toComplete" value="${bsh:&quot;COM_ROLE_READ&quot;.equals(roleStatusId)?&quot;->Complete&quot;:&quot;&quot;}"/>
+            <set field="toComplete" value="${bsh:&quot;COM_ROLE_READ&quot;.equals(roleStatusId)?&quot;toComplete&quot;:&quot;&quot;}"/>
         </row-actions>
         <field name="donePage"><hidden/></field>
         <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field>

Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml?rev=729276&r1=729275&r2=729276&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml Wed Dec 24 00:03:53 2008
@@ -260,7 +260,7 @@
             <condition>
                 <and>
                     <not><if-empty field-name="communicationEventRole"/></not>
-                    <if-compare field-name="communicationEventRole.statusId" operator="equals" value="COM_ROLE_READ"/>
+                    <if-compare field-name="communicationEvent.statusId" operator="equals" value="COM_ROLE_READ"/>
                     <if-has-permission permission="PARTYMGR_CME-EMAIL_CREATE"/>
                 </and>
             </condition>

Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml?rev=729276&r1=729275&r2=729276&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml Wed Dec 24 00:03:53 2008
@@ -224,6 +224,7 @@
             <condition-expr field-name="partyId" operator="equals"
                 value="${partyId}"/>            
         </condition-list>
+        <order-by field-name="-datetimeStarted" />
     </entity-condition>
                 <entity-one entity-name="PartyNameView" value-name="partyName">
                     <field-map field-name="partyId" env-name="partyId"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml?rev=729276&r1=729275&r2=729276&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml Wed Dec 24 00:03:53 2008
@@ -32,6 +32,7 @@
                         <condition-expr field-name="statusId" operator="not-equals" value="PARTY_DISABLED"/>
                     </condition-list>
                     <order-by field-name="lastName"/>
+                    <order-by field-name="firstName"/>
                     <order-by field-name="groupName"/>
                 </entity-condition>
             </actions>                                                

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml?rev=729276&r1=729275&r2=729276&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml Wed Dec 24 00:03:53 2008
@@ -31,7 +31,7 @@
             <service service-name="getPartyTelephone" result-map-name="telResult"/>
         </row-actions>
         <field name="resourceName" parameter-name="partyId" title="${uiLabelMap.ProjectMgrResourceName}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${firstName} ${middleName} ${lastName} ${groupName}" target="viewprofile?partyId=${partyId}"/>
+            <hyperlink also-hidden="false" description="${lastName}, ${firstName} ${middleName} ${groupName}" target="viewprofile?partyId=${partyId}"/>
         </field>
         <field name="roleTypeId"><hidden/></field>
         <field name="emailAddess" title="${uiLabelMap.PartyEmailAddress}"><hyperlink target="/partymgr/control/EditCommunicationEvent?partyIdFrom=${userLogin.partyId}&amp;partyIdTo=${partyId}&amp;communicationEventTypeId=EMAIL_COMMUNICATION&amp;contactMechIdTo=${contactMechId}&amp;contactMechTypeId=EMAIL_ADDRESS" description="${emailResult.emailAddress}" target-type="inter-app"/></field>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=729276&r1=729275&r2=729276&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Wed Dec 24 00:03:53 2008
@@ -88,6 +88,7 @@
         <field name="partyId" title="${uiLabelMap.PartyParty}">
             <drop-down allow-empty="true">
                 <entity-options entity-name="PartyRoleAndPartyDetail" description="${firstName} ${lastName}">
+                    <entity-constraint name="statusId" operator="not-equals" value="PARTY_DISABLED"/>
                     <entity-constraint name="roleTypeId" value="PROJECT_TEAM"/>
                     <entity-order-by field-name="lastName"/>
                     <entity-order-by field-name="groupName"/>