Author: hansbak
Date: Sat Aug 9 18:08:53 2008
New Revision: 684390
URL: http://svn.apache.org/viewvc?rev=684390&view=rev
Log:
added requestlist on communicationeventsummary, changed update status
communicationeventEvent, when status is set the complete, set the rolestatus
also to complete(closed)
Modified:
ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
Modified:
ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml?rev=684390&r1=684389&r2=684390&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
(original)
+++
ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
Sat Aug 9 18:08:53 2008
@@ -406,6 +406,14 @@
<else>
<set field="communicationEvent.statusId"
from-field="parameters.statusId"/>
<store-value value-name="communicationEvent"/>
+ <!-- if complete, set all role status fields to 'complete'
(intentionally ignoring the status change checking)-->
+ <if-compare operator="equals" value="COM_COMPLETE"
field="parameters.statusId">
+ <get-related value-name="communicationEvent"
relation-name="CommunicationEventRole" list-name="updRoles"/>
+ <iterate entry-name="updRole" list-name="updRoles">
+ <set field="updRole.statusId"
value="COM_ROLE_COMPLETED"/>
+ <store-value value-name="updRole"/>
+ </iterate>
+ </if-compare>
</else>
</if-empty>
</if-compare-field>
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml?rev=684390&r1=684389&r2=684390&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
(original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
Sat Aug 9 18:08:53 2008
@@ -272,7 +272,7 @@
<field name="subject">
<hyperlink description="${subject}"
target="ViewCommunicationEvent?communicationEventId=${communicationEventId}"/>
</field>
- <field name="communicationEventTypeId"><display-entity
description="${description}" entity-name="CommunicationEventType"
key-field-name="communicationEventTypeId"/></field>
+ <field name="communicationEventTypeId"
title="${uiLabelMap.CommonType}"><display-entity description="${description}"
entity-name="CommunicationEventType"
key-field-name="communicationEventTypeId"/></field>
<field name="partyIdFrom" title="${uiLabelMap.CommonPartyID}
${uiLabelMap.CommonFrom}">
<display-entity description="${firstName} ${middleName}
${lastName} ${groupName}" entity-name="PartyNameView" key-field-name="partyId">
<sub-hyperlink
target="/partymgr/control/viewprofile?partyId=${partyIdFrom}"
target-type="inter-app" description="[${partyIdFrom}]"/>
@@ -284,12 +284,6 @@
</display-entity>
</field>
<field name="statusId"><display-entity description="${description}"
entity-name="StatusItem" key-field-name="statusId"/></field>
- <!--field name="contactMechTypeId"><display-entity
description="${description}" entity-name="ContactMechType"
key-field-name="contactMechTypeId"/></field-->
- <!-- Next two fields don't seem to be used, commenting out for now -->
- <!--
- <field name="roleTypeIdFrom"><display-entity
description="${description}" entity-name="RoleType"
key-field-name="roleTypeId"/></field>
- <field name="roleTypeIdTo"><display-entity
description="${description}" entity-name="RoleType"
key-field-name="roleTypeId"/></field>
- -->
<field name="createdStamp"
title="${uiLabelMap.CommonCreated}"><display type="date"/></field>
<field name="datetimeStarted"
title="${uiLabelMap.CommonSend}"><display type="date"/></field>
</form>
@@ -476,9 +470,9 @@
</field>
<field name="contentTypeId"><display-entity entity-name="ContentType"
description="${description}"/></field>
<field name="fromDate"><display/></field>
- <field name="drDataResourceName" widget-style="smallSubmit">
+ <!-- field name="drDataResourceName" widget-style="smallSubmit">
<hyperlink also-hidden="false" description="${drDataResourceName}
[${drDataResourceId}]"
target="/content/control/editDataResource?dataResourceId=${drDataResourceId}"
target-type="inter-app"/>
- </field>
+ </field-->
<field name="drMimeTypeId"><display-entity entity-name="MimeType"
description="${description}" key-field-name="mimeTypeId"/></field>
</form>
@@ -674,4 +668,7 @@
<field name="content"><textarea cols="70" rows="20"/></field>
<field name="submit" title="${uiLabelMap.CommonCreate}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
+ <form name="ListRequests" extends="ListRequests"
extends-resource="component://order/webapp/ordermgr/request/RequestForms.xml">
+ <field name="custRequestName"><hyperlink
description="${custRequestName} [${custRequestId}]"
target="/ordermgr/control/ViewRequest?custRequestId=${custRequestId}"
target-type="inter-app"/></field>
+ </form>
</forms>
Modified:
ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?rev=684390&r1=684389&r2=684390&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
(original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Sat
Aug 9 18:08:53 2008
@@ -241,8 +241,8 @@
</actions>
<widgets>
<screenlet title="${uiLabelMap.OrderRequestList}">
-
<include-form name="ListRequests"
-
location="component://order/webapp/ordermgr/request/RequestForms.xml" />
+ <include-form name="ListRequests"
+
location="component://party/webapp/partymgr/communication/CommForms.xml"/>
</screenlet>
</widgets>
</section>
