Author: hansbak
Date: Tue Sep 1 07:41:49 2009 New Revision: 809870 URL: http://svn.apache.org/viewvc?rev=809870&view=rev Log: show also commevents for related parties if available Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.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=809870&r1=809869&r2=809870&view=diff ============================================================================== --- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original) +++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Tue Sep 1 07:41:49 2009 @@ -1945,6 +1945,9 @@ <value xml:lang="th">รายà¸à¸²à¸£à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸ªà¸·à¹à¸à¸ªà¸²à¸£</value> <value xml:lang="zh">æ²éå表</value> </property> + <property key="PageTitleListCommunicationsRelatedParties"> + <value xml:lang="en">List Communications of related parties</value> + </property> <property key="PageTitleListUnknownPartyComms"> <value xml:lang="de">Kommunikation von unbekannter Herkunft</value> <value xml:lang="en">Communications from Unknown origin</value> Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml?rev=809870&r1=809869&r2=809870&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml Tue Sep 1 07:41:49 2009 @@ -77,6 +77,12 @@ <condition-expr field-name="partyId" operator="equals" value="${partyId}"/> <order-by field-name="-entryDate"/> </entity-condition> + <entity-and list="contacts" entity-name="PartyRelationship" filter-by-date="true"> + <field-map field-name="partyIdFrom" from-field="partyId"/> + <field-map field-name="roleTypeIdFrom" value="ACCOUNT"/> + <field-map field-name="roleTypeIdTo" value="CONTACT"/> + <order-by field-name="partyIdTo"/> + </entity-and> </actions> <widgets> <decorator-screen name="CommonCommunicationEventDecorator" location="${parameters.mainDecoratorLocation}"> @@ -86,8 +92,34 @@ <if-service-permission service-name="partyCommunicationEventPermissionCheck" main-action="VIEW"/> </condition> <widgets> - <container style="h1"><label text="${uiLabelMap.PageTitleListCommunications}"/></container> + <container style="h1"><label text="${uiLabelMap.PageTitleListCommunications} ${partyId}"/></container> <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="ListCommEvents"/> + <section> + <condition> + <not><if-empty field="contacts"/></not> + </condition> + <widgets> + <horizontal-separator></horizontal-separator> + <container style="h1"><label text="${uiLabelMap.PageTitleListCommunicationsRelatedParties} ${partyId}"/></container> + <iterate-section entry="contact" list="contacts"> + <section> + <condition> + <not><if-empty field="contacts"/></not> + </condition> + <actions> + <entity-condition entity-name="CommunicationEventAndRole" list="commEvents"> + <condition-expr field-name="partyId" operator="equals" value="${contact.partyIdTo}"/> + <order-by field-name="-entryDate"/> + </entity-condition> + </actions> + <widgets> + <container style="h2"><label text="${contact.partyIdTo}"/></container> + <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="ListCommEvents"/> + </widgets> + </section> + </iterate-section> + </widgets> + </section> </widgets> <fail-widgets> <label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label> |
Free forum by Nabble | Edit this page |