OFBiz › OFBiz - Commits

svn commit: r677306 - in /ofbiz/trunk: applications/order/entitydef/ applications/order/webapp/ordermgr/request/ applications/order/widget/ordermgr/ applications/party/config/ specialpurpose/mypage/widget/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

hansbak-2

svn commit: r677306 - in /ofbiz/trunk: applications/order/entitydef/ applications/order/webapp/ordermgr/request/ applications/order/widget/ordermgr/ applications/party/config/ specialpurpose/mypage/widget/

Author: hansbak
Date: Wed Jul 16 08:24:18 2008
New Revision: 677306

URL: http://svn.apache.org/viewvc?rev=677306&view=rev
Log:
show communication events on a customer request overview

Modified:
ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml
ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml
ofbiz/trunk/applications/party/config/PartyUiLabels.xml
ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml

Modified: ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml?rev=677306&r1=677305&r2=677306&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml (original)
+++ ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml Wed Jul 16 08:24:18 2008
@@ -1403,6 +1403,17 @@
<key-map field-name="communicationEventId"/>
</view-link>
</view-entity>
+ <view-entity entity-name="CommunicationEventAndCustRequest"
+ package-name="org.ofbiz.order.communication"
+ title="Communication Event And Customer request">
+ <member-entity entity-alias="CR" entity-name="CustRequestCommEvent"/>
+ <member-entity entity-alias="CE" entity-name="CommunicationEvent"/>
+ <alias-all entity-alias="CR"/>
+ <alias-all entity-alias="CE"/>
+ <view-link entity-alias="CR" rel-entity-alias="CE">
+ <key-map field-name="communicationEventId"/>
+ </view-link>
+ </view-entity>

<view-entity entity-name="OrderItemAndShipGrpInvResAndItemSum"
package-name="org.ofbiz.order.order"

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml?rev=677306&r1=677305&r2=677306&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml Wed Jul 16 08:24:18 2008
@@ -80,18 +80,21 @@
<service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
<field-map field-name="inputFields" env-name="requestParameters"/>
<field-map field-name="entityName" env-name="entityName"/>
+ <field-map field-name="orderBy" value="-lastModifiedDate"/>
</service>
</actions>
- <field name="custRequestId" widget-style="buttontext">
- <hyperlink description="${custRequestId}" target="ViewRequest?custRequestId=${custRequestId}"/>
- </field>
- <field name="custRequestName"><display/></field>
+ <field name="custRequestName"><hyperlink description="${custRequestName} [${custRequestId}]" target="ViewRequest?custRequestId=${custRequestId}"/></field>
<field name="priority"><display/></field>
<field name="responseRequiredDate"><display/></field>
- <field name="fromPartyId"><display/></field>
+ <field name="fromPartyId">
+ <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}">
+ <sub-hyperlink description="[${fromPartyId}]" target="/partymgr/control/viewprofile" target-type="inter-app"/>
+ </display-entity>
+ </field>
<field name="statusId">
<display-entity also-hidden="false" entity-name="StatusItem"/>
</field>
+ <field name="lastModifiedDate"><display/></field>
</form>
<form name="ListRequestItems" type="list" use-row-submit="true" title="" list-name="custRequestItems"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="requestitems">
@@ -130,6 +133,11 @@
<field name="custRequestItemSeqId"><hidden/></field>
</form>

+ <form name="ViewRequestCommunicationEvents" type="list" extends="ListCommEvents"
+ extends-resource="component://party/webapp/partymgr/communication/CommForms.xml"
+ paginate-target="ViewRequest">
+ </form>
+
<form name="EditCustRequest" type="single" target="updaterequest" title="Request" default-map-name="custRequest"
header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="custRequest==null" target="createrequest"/>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml?rev=677306&r1=677305&r2=677306&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml Wed Jul 16 08:24:18 2008
@@ -25,8 +25,6 @@
<actions>
<set field="titleProperty" value="OrderFindRequests"/>
<set field="headerItem" value="request"/>
- <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
- <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -35,20 +33,9 @@
<link target="request" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/>
<include-form name="FindRequests" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
</screenlet>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.OrderRequestList}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListRequests" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.OrderRequestList}" navigation-form-name="ListRequests" >
+ <include-form name="ListRequests" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -474,6 +461,11 @@
</screen>
<screen name="ViewRequestInfo">
<section>
+ <actions>
+ <entity-and list-name="commEvents" entity-name="CommunicationEventAndCustRequest">
+ <field-map field-name="custRequestId" env-name="parameters.custRequestId"/>
+ </entity-and>
+ </actions>
<widgets>
<container style="lefthalf">
<include-screen name="requestInfo"/>
@@ -482,6 +474,9 @@
<include-screen name="requestDate"/>
<include-screen name="requestContactMech"/>
<include-screen name="requestRoles"/>
+ <screenlet title="${uiLabelMap.PartyListCommunicationEvents}" navigation-form-name="ViewRequestCommunicationEvents">
+ <include-form name="ViewRequestCommunicationEvents" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ </screenlet>
</container>
</widgets>
</section>

Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=677306&r1=677305&r2=677306&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Wed Jul 16 08:24:18 2008
@@ -3258,6 +3258,9 @@
<value xml:lang="th">à¹à¸à¹à¹à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸</value>
<value xml:lang="zh">ç¼è¾èç³»ä¿¡æ¯</value>
</property>
+ <property key="PartyEditCustomerRequest">
+ <value xml:lang="en">Edit Customer request copied from Communication Event</value>
+ </property>
<property key="PartyEditSecurityGroupWithId">
<value xml:lang="en">Edit Security Group With ID</value>
<value xml:lang="es">Editar grupo de seguridad con cÃ³digo</value>
@@ -3908,7 +3911,7 @@
<value xml:lang="zh">æ¾å°äºæ²éäººå·¥æå¡</value>
</property>
<property key="PartyListCommunicationEvents">
- <value xml:lang="en">Found Communication Events</value>
+ <value xml:lang="en">Communication Events</value>
<value xml:lang="es">Eventos de comunicaciÃ³n</value>
<value xml:lang="fr">EvÃ¨nements de communication trouvÃ©s</value>
<value xml:lang="it">Trovati Eventi Comunicazione</value>

Modified: ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml?rev=677306&r1=677305&r2=677306&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml Wed Jul 16 08:24:18 2008
@@ -303,6 +303,18 @@
</widgets>
</section>
</screen>
+ <screen name="CommonRequestDecorator">
+ <section>
+ <actions/>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <decorator-section-include name="body"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>