You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2008/07/17 17:06:01 UTC
svn commit: r677605 - in /ofbiz/trunk: applications/party/config/
applications/party/webapp/partymgr/communication/
applications/party/widget/partymgr/ framework/common/config/
specialpurpose/mypage/widget/
Author: hansbak
Date: Thu Jul 17 08:06:00 2008
New Revision: 677605
URL: http://svn.apache.org/viewvc?rev=677605&view=rev
Log:
show more related information of the communicationevent on the overview screen
Modified:
ofbiz/trunk/applications/party/config/PartyUiLabels.xml
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
ofbiz/trunk/framework/common/config/CommonUiLabels.xml
ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=677605&r1=677604&r2=677605&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Thu Jul 17 08:06:00 2008
@@ -2500,6 +2500,9 @@
<value xml:lang="th">à¸à¹à¸à¸à¸´à¸à¹à¸«à¹à¸</value>
<value xml:lang="zh">è¯è®º</value>
</property>
+ <property key="PartyCommunicationEvent">
+ <value xml:lang="en">Communication Event</value>
+ </property>
<property key="PartyCommunications">
<value xml:lang="en">Communications</value>
<value xml:lang="es">Comunicaciones</value>
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=677605&r1=677604&r2=677605&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Thu Jul 17 08:06:00 2008
@@ -122,7 +122,7 @@
<form name="NewEmail" type="single" target="createCommunicationEvent" default-map-name="communicationEvent">
<field name="communicationEventTypeId"><hidden value="AUTO_EMAIL_COMM"/></field>
<field name="statusId"><hidden value="COM_IN_PROGRESS"/></field>
- <field name="parentCommEventId"><hidden value="${parentCommEventId}"/></field>
+ <field name="parentCommEventId"><hidden value="${parameters.parentCommEventId}"/></field>
<field name="partyIdFrom"><hidden value="${userLogin.partyId}"/></field>
<field name="emailAddress" parameter-name="contactMechIdFrom">
<drop-down>
@@ -150,15 +150,18 @@
<field-map field-name="contactMechId" env-name="communicationEvent.contactMechIdTo"/>
</entity-one>
</actions>
+ <field name="communicationEventId">
+ <hyperlink description="${communicationEvent.communicationEventId}" target="ViewCommunicationEvent?communicationEventId=${communicationEvent.communicationEventId}"/>
+ </field>
<field name="communicationEventTypeId"><display-entity entity-name="CommunicationEventType" description="${description}"/></field>
<field name="partyIdFrom">
<display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName} (${contactMechFrom.infoString})">
- <sub-hyperlink description=" [${partyIdFrom}]" target="/partymgr/control/viewprofile?partyId=${partyIdFrom}" target-type="inter-app"/>
+ <sub-hyperlink description=" [${communicationEvent.partyIdFrom}]" target="/partymgr/control/viewprofile?partyId=${communicationEvent.partyIdFrom}" target-type="inter-app"/>
</display-entity>
</field>
<field name="partyIdTo">
<display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName} (${contactMechTo.infoString})">
- <sub-hyperlink description=" [${partyIdTo}]" target="/partymgr/control/viewprofile?partyId=${partyIdTo}" target-type="inter-app"/>
+ <sub-hyperlink description=" [${communicationEvent.partyIdTo}]" target="/partymgr/control/viewprofile?partyId=${communicationEvent.partyIdTo}" target-type="inter-app"/>
</display-entity>
</field>
<field name="datetimeStarted" title="${uiLabelMap.CommonSendDate}"><display type="date"/></field>
@@ -188,7 +191,9 @@
<form name="ViewCommEvent" type="single" default-map-name="communicationEvent"
header-row-style="header-row" default-table-style="basic-table">
- <field name="communicationEventId"><display/></field>
+ <field name="communicationEventId">
+ <hyperlink description="${communicationEventId}" target="ViewCommunicationEvent?communicationEventId=${communicationEventId}"/>
+ </field>
<field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}"><sub-hyperlink target="viewprofile?partyId=${partyIdFrom}" description="[${partyIdFrom}]"/></display-entity></field>
<field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}"><sub-hyperlink target="viewprofile?partyId=${communicationEvent.partyIdTo}" description="[${communicationEvent.partyIdTo}]"/></display-entity></field>
<field name="statusId"><display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/></field>
@@ -262,7 +267,7 @@
<form name="ListCommEvents" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate="true" list-name="commEvents">
<field name="communicationEventId"><hidden/></field>
<field name="subject">
- <hyperlink description="${subject}" target="ViewCommunicationEvent?communicationEventId=${communicationEventId}"/>
+ <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="partyIdFrom" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonFrom}">
Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?rev=677605&r1=677604&r2=677605&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Thu Jul 17 08:06:00 2008
@@ -162,95 +162,130 @@
</widgets>
</section>
</screen>
- <screen name="ViewCommunicationEvent">
- <section>
- <actions>
- <set field="titleProperty" value="PageTitleViewCommunication" />
- <set field="tabButtonItem" value="OverView"/>
- <set field="parentCommEventId" from-field="parameters.parentCommEventId" />
- <entity-one entity-name="CommunicationEvent" value-name="communicationEvent"/>
- <entity-one entity-name="CommunicationEvent" value-name="parentEvent" auto-field-map="false">
- <field-map env-name="parentCommEventId" field-name="communicationEventId"/>
- </entity-one>
- </actions>
- <widgets>
- <decorator-screen name="CommonCommunicationEventDecorator"
- location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <container style="lefthalf">
- <label style="h1" text="Communication Event id: ${parameters.communicationEventId}"></label>
- <screenlet title="Communication info">
- <section>
- <condition>
- <or><!-- have for e-mails a special form -->
- <if-compare field-name="communicationEvent.communicationEventTypeId"
- operator="equals" value="EMAIL_COMMUNICATION" />
- <if-compare field-name="communicationEvent.communicationEventTypeId"
- operator="equals" value="AUTO_EMAIL_COMM" />
- </or>
- </condition>
- <widgets>
- <section>
- <condition>
- <and>
- <if-compare field-name="communicationEvent.statusId" operator="equals" value="COM_UNKNOWN_PARTY"/>
- <if-empty field-name="communicationEvent.partyIdFrom"/>
- </and>
- </condition>
- <widgets>
- <screenlet>
- <container>
- <label style="h1" text="Origin Email address not known!"/>
- </container>
- <container>
- <label style="h2" text="Allocate this message to a existing or new party and add an email address"/>
- </container>
- <include-form name="allocateMsgToPartyForm" location="component://party/webapp/partymgr/communication/CommForms.xml"/>
- </screenlet>
- </widgets>
- </section>
- <include-form
- location="component://party/webapp/partymgr/communication/CommForms.xml"
- name="ViewEmail" />
- </widgets>
- <fail-widgets>
- <include-form
- location="component://party/webapp/partymgr/communication/CommForms.xml"
- name="ViewCommEvent" />
- </fail-widgets>
- </section>
- </screenlet>
- </container>
- <container style="righthalf">
- <section>
- <actions>
- <entity-and list-name="commEvents" entity-name="CommunicationEvent">
- <field-map field-name="parentCommEventId" value="parameters.communicationEventId"/>
- </entity-and>
- </actions>
- <widgets>
- <screenlet title="${uiLabelMap.PartyChildCommunicationEvents}">
- <include-form name="ListCommEvents" location="component://party/webapp/partymgr/communication/CommForms.xml"/>
- </screenlet>
- </widgets>
- </section>
- <section>
- <actions>
- <set field="entityName" value="CustRequestAndCommEvent"/>
- <set field="requestParameters.communicationEventId" from-field="parameters.communicationEventId"/>
- </actions>
- <widgets>
- <screenlet title="${uiLabelMap.OrderRequestList}">
- <include-form name="ListRequests" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
- </screenlet>
- </widgets>
- </section>
- </container>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
+ <screen name="ViewCommunicationEvent">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleViewCommunication" />
+ <set field="tabButtonItem" value="OverView" />
+ <set field="parentCommEventId" from-field="parameters.parentCommEventId" />
+ <entity-one entity-name="CommunicationEvent" value-name="communicationEvent" />
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonCommunicationEventDecorator"
+ location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <container style="lefthalf">
+ <section>
+ <widgets>
+ <label style="h1"
+ text="Communication Event id: ${parameters.communicationEventId}"></label>
+ <include-screen name="commEvent" />
+ </widgets>
+ </section>
+ </container>
+ <container style="righthalf">
+ <label style="h1" text="${uiLabelMap.CommonRelatedInformation}" />
+ <section>
+ <condition>
+ <not>
+ <if-empty field-name="communicationEvent.parentCommEventId" />
+ </not>
+ </condition>
+ <actions>
+ <set field="parent" value="${uiLabelMap.CommonParent}"/>
+ <entity-one entity-name="CommunicationEvent"
+ value-name="communicationEvent">
+ <field-map field-name="communicationEventId"
+ env-name="communicationEvent.parentCommEventId" />
+ </entity-one>
+ </actions>
+ <widgets>
+ <include-screen name="commEvent" />
+ </widgets>
+ </section>
+ <section>
+ <actions>
+ <entity-and list-name="commEvents" entity-name="CommunicationEvent">
+ <field-map field-name="parentCommEventId"
+ env-name="parameters.communicationEventId" />
+ </entity-and>
+ </actions>
+ <widgets>
+ <screenlet title="${uiLabelMap.PartyChildCommunicationEvents}">
+ <include-form name="ListCommEvents"
+ location="component://party/webapp/partymgr/communication/CommForms.xml" />
+ </screenlet>
+ </widgets>
+ </section>
+ <section>
+ <actions>
+ <set field="entityName" value="CustRequestAndCommEvent" />
+ <set field="requestParameters.communicationEventId"
+ from-field="parameters.communicationEventId" />
+ </actions>
+ <widgets>
+ <screenlet title="${uiLabelMap.OrderRequestList}">
+ <include-form name="ListRequests"
+ location="component://order/webapp/ordermgr/request/RequestForms.xml" />
+ </screenlet>
+ </widgets>
+ </section>
+ </container>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="commEvent">
+ <section>
+ <widgets>
+ <screenlet title="${parent} ${uiLabelMap.PartyCommunicationEvent}">
+ <section>
+ <condition>
+ <or><!-- have for e-mails a special form -->
+ <if-compare field-name="communicationEvent.communicationEventTypeId"
+ operator="equals" value="EMAIL_COMMUNICATION" />
+ <if-compare field-name="communicationEvent.communicationEventTypeId"
+ operator="equals" value="AUTO_EMAIL_COMM" />
+ </or>
+ </condition>
+ <widgets>
+ <section>
+ <condition>
+ <and>
+ <if-compare field-name="communicationEvent.statusId"
+ operator="equals" value="COM_UNKNOWN_PARTY" />
+ <if-empty field-name="communicationEvent.partyIdFrom" />
+ </and>
+ </condition>
+ <widgets>
+ <screenlet>
+ <container>
+ <label style="h1" text="Origin Email address not known!" />
+ </container>
+ <container>
+ <label style="h2"
+ text="Allocate this message to a existing or new party and add an email address" />
+ </container>
+ <include-form name="allocateMsgToPartyForm"
+ location="component://party/webapp/partymgr/communication/CommForms.xml" />
+ </screenlet>
+ </widgets>
+ </section>
+ <include-form
+ location="component://party/webapp/partymgr/communication/CommForms.xml"
+ name="ViewEmail" />
+ </widgets>
+ <fail-widgets>
+ <include-form
+ location="component://party/webapp/partymgr/communication/CommForms.xml"
+ name="ViewCommEvent" />
+ </fail-widgets>
+ </section>
+ </screenlet>
+ </widgets>
+ </section>
+ </screen>
<screen name="EditCommunicationEvent">
<section>
<actions>
Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=677605&r1=677604&r2=677605&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Thu Jul 17 08:06:00 2008
@@ -4132,6 +4132,9 @@
<value xml:lang="pt">Com Paginação</value>
<value xml:lang="th">à¹à¸à¸´à¸à¸«à¸à¹à¸²</value>
</property>
+ <property key="CommonParent">
+ <value xml:lang="en">Parent</value>
+ </property>
<property key="CommonPartyID">
<value xml:lang="ar">دÙÙ٠اÙطرÙ</value>
<value xml:lang="de">Akteur ID</value>
@@ -4712,6 +4715,9 @@
<value xml:lang="pt">1.0.0-Preview</value>
<value xml:lang="th">à¹à¸§à¸à¸£à¹à¸à¸±à¸à¹à¸«à¸¡à¹</value>
</property>
+ <property key="CommonRelatedInformation">
+ <value xml:lang="en">Related Information</value>
+ </property>
<property key="CommonRemove">
<value xml:lang="ar">Ùزع</value>
<value xml:lang="cs">Odstranit</value>
Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml?rev=677605&r1=677604&r2=677605&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml Thu Jul 17 08:06:00 2008
@@ -103,13 +103,13 @@
<hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deletePartyCommunicationEventOthers?partyId=${partyId}&communicationEventId=${communicationEventId}"/>
</field>
<field use-when="headerItem.equals("main")" name="subject" widget-style="buttontext" widget-area-style="fieldWidth300">
- <hyperlink description="${subject}" target="ViewCommunicationEvent?communicationEventId=${communicationEventId}&type=main"/>
+ <hyperlink description="${subject} " target="ViewCommunicationEvent?communicationEventId=${communicationEventId}&type=main"/>
</field>
<field use-when="headerItem.equals("myCommunications")" name="subject" widget-style="buttontext" widget-area-style="fieldWidth300">
- <hyperlink description="${subject}" target="ViewCommunicationEvent?communicationEventId=${communicationEventId}&type=my" />
+ <hyperlink description="${subject} " target="ViewCommunicationEvent?communicationEventId=${communicationEventId}&type=my" />
</field>
<field use-when="headerItem.equals("otherCommunications")" name="subject" widget-style="buttontext" widget-area-style="fieldWidth300">
- <hyperlink description="${subject}" target="ViewCommunicationEvent?communicationEventId=${communicationEventId}&type=other" />
+ <hyperlink description="${subject} " target="ViewCommunicationEvent?communicationEventId=${communicationEventId}&type=other" />
</field>
</form>
<form name="ListMyUnknownPartyEmails"