svn commit: r927403 - in /ofbiz/trunk/applications/party: config/PartyUiLabels.xml widget/partymgr/CommunicationEventForms.xml widget/partymgr/CommunicationEventScreens.xml

[ashish-18]

Author: ashish
Date: Thu Mar 25 13:53:35 2010
New Revision: 927403

URL: http://svn.apache.org/viewvc?rev=927403&view=rev
Log:
-- Changed the uiLabelMap of section available on Communication Event tab. As the old doesn't seem good. Actually all the communication event shown on this page are not child communication events. So changed title to "Others and General Communication Events"
-- Improved condition for showing communication events on this block. Added another check so that completed communication event should not be shown. If you wanted to see all the completed communication event then go to the main communication event and find communications from there. Also think if we have thousands of record than previous condition will create problem in page loading.
-- Formating changes.

Modified:
    ofbiz/trunk/applications/party/config/PartyUiLabels.xml
    ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml
    ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml

Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=927403&r1=927402&r2=927403&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Thu Mar 25 13:53:35 2010
@@ -7813,6 +7813,9 @@
         <value xml:lang="pt_BR">Substituir quantidade da taxa padrão</value>
         <value xml:lang="zh">覆盖缺省税金金额</value>
     </property>
+    <property key="PartyOtherAndGeneralCommunicationEvents">
+        <value xml:lang="en">Others and General Communication Events</value>
+    </property>
     <property key="PartyPagePushFollowing">
         <value xml:lang="de">Page Push/Following</value>
         <value xml:lang="en">Page Push/Following</value>

Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml?rev=927403&r1=927402&r2=927403&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml Thu Mar 25 13:53:35 2010
@@ -536,9 +536,12 @@ under the License.
     <form name="ListChildCommEvents" type="list" extends="ListCommEvents" paginate-target="EditCommunicationEvent">
         <actions>
             <entity-condition entity-name="CommunicationEvent" list="commEvents">
-                <condition-list combine="or">
-                    <condition-expr field-name="parentCommEventId" operator="equals" value="${communicationEventId}"/>
-                    <condition-expr field-name="origCommEventId" operator="equals" value="${communicationEventId}"/>
+                <condition-list combine="and">
+                    <condition-expr field-name="statusId" operator="not-equals" value="COM_COMPLETE"/>
+                    <condition-list combine="or">
+                        <condition-expr field-name="parentCommEventId" operator="equals" value="${communicationEventId}"/>
+                        <condition-expr field-name="origCommEventId" operator="equals" value="${communicationEventId}"/>
+                    </condition-list>
                 </condition-list>
             </entity-condition>
         </actions>

Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml?rev=927403&r1=927402&r2=927403&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml Thu Mar 25 13:53:35 2010
@@ -339,14 +339,12 @@ under the License.
                     <section>
                         <actions>
                             <entity-and list="commEvents" entity-name="CommunicationEvent">
-                                <field-map field-name="parentCommEventId"
-                                    from-field="parameters.communicationEventId"/>
+                                <field-map field-name="parentCommEventId" from-field="parameters.communicationEventId"/>
                             </entity-and>
                         </actions>
                         <widgets>
                             <screenlet title="${uiLabelMap.PartyChildCommunicationEvents}">
-                                <include-form name="ListCommEvents"
-                                    location="component://party/widget/partymgr/CommunicationEventForms.xml"/>
+                                <include-form name="ListCommEvents" location="component://party/widget/partymgr/CommunicationEventForms.xml"/>
                             </screenlet>
                         </widgets>
                     </section>
@@ -1095,7 +1093,7 @@ under the License.
                         <screenlet id="EditCommunicationEventPanel" title="${uiLabelMap.PartyEditCommunicationEvent} ${parameters.communicationEventId}">
                             <include-form name="EditCommEvent" location="component://party/widget/partymgr/CommunicationEventForms.xml"/>
                         </screenlet>
-                        <screenlet title="${uiLabelMap.PartyChildCommunicationEvents}" navigation-form-name="ListChildCommEvents">
+                        <screenlet title="${uiLabelMap.PartyOtherAndGeneralCommunicationEvents}" navigation-form-name="ListChildCommEvents">
                             <include-form  name="ListChildCommEvents" location="component://party/widget/partymgr/CommunicationEventForms.xml"/>
                         </screenlet>
                     </widgets>