Author: ashish
Date: Tue Mar 30 06:35:18 2010
New Revision: 929010
URL: http://svn.apache.org/viewvc?rev=929010&view=rev
Log:
Applied patch from jira issue OFBIZ-3624 - Find Communications By Order in
partymgr.
Thanks Arpit for the contribution.
Modified:
ofbiz/trunk/applications/party/config/PartyUiLabels.xml
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml
ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=929010&r1=929009&r2=929010&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Tue Mar 30 06:35:18
2010
@@ -5467,6 +5467,9 @@
<value
xml:lang="th">à¸à¹à¸à¸«à¸²à¸à¸¥à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸</value>
<value xml:lang="zh">æ¥æ¾æ²éäºä»¶</value>
</property>
+ <property key="PartyFindCommunicationsByOrder">
+ <value xml:lang="en">Find Communications by Order</value>
+ </property>
<property key="PartyFindParties">
<value xml:lang="de">Akteure suchen</value>
<value xml:lang="en">Find Parties</value>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=929010&r1=929009&r2=929010&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Tue
Mar 30 06:35:18 2010
@@ -839,6 +839,10 @@ under the License.
<security https="true" auth="true"/>
<response name="success" type="view" value="ListUnknownPartyComms"
save-home-view="true"/>
</request-map>
+ <request-map uri="FindCommunicationByOrder">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="FindCommunicationByOrder"/>
+ </request-map>
<request-map uri="editRequestFromCommEvent">
<security https="true" auth="true"/>
<response name="success" type="view" value="EditRequestFromCommEvent"
save-last-view="true"/>
@@ -1326,6 +1330,7 @@ under the License.
<view-map name="PendingCommunications" type="screen"
page="component://party/widget/partymgr/CommunicationEventScreens.xml#PendingCommunications"/>
<view-map name="ListPartyCommEvents" type="screen"
page="component://party/widget/partymgr/CommunicationEventScreens.xml#ListPartyCommEvents"/>
<view-map name="ListUnknownPartyComms" type="screen"
page="component://party/widget/partymgr/CommunicationEventScreens.xml#ListUnknownPartyComms"/>
+ <view-map name="FindCommunicationByOrder" type="screen"
page="component://party/widget/partymgr/CommunicationEventScreens.xml#FindCommunicationByOrder"/>
<view-map name="MyCommunicationEvents" type="screen"
page="component://party/widget/partymgr/CommunicationEventScreens.xml#PartyCommunicationEvents"/>
<view-map name="FindCommunicationEvents" type="screen"
page="component://party/widget/partymgr/CommunicationEventScreens.xml#FindCommunicationEvents"/>
<view-map name="EditCommunicationEvent" type="screen"
page="component://party/widget/partymgr/CommunicationEventScreens.xml#EditCommunicationEvent"/>
Modified:
ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml?rev=929010&r1=929009&r2=929010&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml
(original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml
Tue Mar 30 06:35:18 2010
@@ -434,6 +434,57 @@ under the License.
<field name="entryDate" title="${uiLabelMap.CommonCreated}"><display
type="date"/></field>
<field name="datetimeStarted"
title="${uiLabelMap.CommonSend}"><display type="date"/></field>
</form>
+
+ <form name="FindCommunicationByOrder" type="single"
target="FindCommunicationByOrder" paginate="true"
focus-field-name="submitButton"
+ header-row-style="header-row" default-table-style="basic-table">
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't
there then with all fields empty no query will be done --></field>
+ <field name="orderId" position="1"><text-find/></field>
+ <field name="communicationEventId" position="1"><text-find/></field>
+ <field name="partyIdFrom" position="1"
title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonFrom}"><lookup
target-form-name="LookupPartyName"/></field>
+ <field name="partyIdTo" position="2"
title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonTo}"><lookup
target-form-name="LookupPartyName"/></field>
+ <field name="partyId" position="1" title="${uiLabelMap.CommonPartyID}
${uiLabelMap.PartyAnyRole}"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="communicationEventTypeId" position="2">
+ <drop-down allow-empty="true">
+ <entity-options description="${description}"
entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/>
+ </drop-down>
+ </field>
+ <field name="statusId" position="2">
+ <drop-down allow-empty="true">
+ <entity-options description="${description}"
entity-name="StatusItem">
+ <entity-constraint name="statusTypeId" operator="equals"
value="COM_EVENT_STATUS"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit
button-type="button"/></field>
+ </form>
+
+ <form name="ListCommunicationByOrder" type="list" list-name="listIt"
extends="ListCommEvents" header-row-style="header-row-2">
+ <actions>
+ <service result-map-list="listIt" result-map="result"
service-name="performFind">
+ <field-map from-field="parameters" field-name="inputFields"/>
+ <field-map from-field="entityName" field-name="entityName"/>
+ <field-map value="-entryDate" field-name="orderBy"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
+ </service>
+ </actions>
+ <field name="orderId" title="${uiLabelMap.FormFieldTitle_orderId}">
+ <hyperlink target="/ordermgr/control/orderview?orderId=${orderId}"
description="${orderId}" target-type="inter-app"/>
+ </field>
+ <field name="communicationEventId">
+ <hyperlink description="${communicationEventId}"
target="ViewCommunicationEvent">
+ <parameter param-name="communicationEventId"/>
+ </hyperlink>
+ </field>
+ <field name="subject">
+ <hyperlink description="${subject}"
target="ViewCommunicationEvent">
+ <parameter param-name="communicationEventId"/>
+ <parameter param-name="partyIdFrom" from-field="partyId"/>
+ <parameter param-name="roleTypeId"/>
+ </hyperlink>
+ </field>
+ </form>
+
<form name="ListPartyCommEvents" type="list"
target="RemoveCommunicationEventRole" list-name="listIt"
odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
<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=929010&r1=929009&r2=929010&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
(original)
+++
ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
Tue Mar 30 06:35:18 2010
@@ -239,6 +239,40 @@ under the License.
</widgets>
</section>
</screen>
+
+ <screen name="FindCommunicationByOrder">
+ <section>
+ <actions>
+ <set field="tabButtonItem" value="FindCommunicationByOrder"/>
+ <set field="entityName" value="CommunicationEventAndOrder"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <if-service-permission
service-name="partyCommunicationEventPermissionCheck" main-action="VIEW"/>
+ </condition>
+ <widgets>
+ <decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="search-options">
+ <include-form
location="component://party/widget/partymgr/CommunicationEventForms.xml"
name="FindCommunicationByOrder"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form
location="component://party/widget/partymgr/CommunicationEventForms.xml"
name="ListCommunicationByOrder"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ <fail-widgets>
+ <label
style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
<screen name="FindCommunicationEvents">
<section>
<actions>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=929010&r1=929009&r2=929010&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Tue Mar 30
06:35:18 2010
@@ -586,6 +586,9 @@
<menu-item name="ListUnknownPartyComms"
title="${uiLabelMap.PartyEmailFromUnknownParties}">
<link target="listUnknownPartyComms"/>
</menu-item>
+ <menu-item name="FindCommunicationByOrder"
title="${uiLabelMap.PartyFindCommunicationsByOrder}">
+ <link target="FindCommunicationByOrder"/>
+ </menu-item>
<menu-item name="UpdateCommOrders" title="${uiLabelMap.OrderOrders}">
<condition><not><if-empty
field="communicationEvent"/></not></condition>
<link target="UpdateCommOrders">
