svn commit: r673672 - in /ofbiz/trunk/applications/party: webapp/partymgr/communication/CommForms.xml widget/partymgr/CommonScreens.xml widget/partymgr/CommunicationScreens.xml

[hansbak-2]

Author: hansbak
Date: Thu Jul  3 06:15:27 2008
New Revision: 673672

URL: http://svn.apache.org/viewvc?rev=673672&view=rev
Log:
added a special email display screen for email communications

Modified:
    ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
    ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
    ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml

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=673672&r1=673671&r2=673672&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Thu Jul  3 06:15:27 2008
@@ -190,6 +190,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="partyIdFrom"><hidden value="${partyIdFrom}"/></field>
         <field name="emailAddress" parameter-name="contactMechIdFrom">
@@ -207,9 +208,33 @@
         <field name="subject"><text size="60"/></field>
         <field name="contentMimeTypeId"><hidden value="text/plain"/></field>
         <field name="content" title="${uiLabelMap.CommonContent}"><textarea cols="60" rows="10"/></field>
-        <field name="note" title="${uiLabelMap.CommonNote}"><textarea cols="60" rows="3"/></field>
         <field name="sendButton"><submit button-type="button"/></field>
     </form>
+    <form name="DisplayEmail" type="single" default-map-name="communicationEvent">
+        <actions>
+            <entity-one entity-name="ContactMech" value-name="contactMechFrom">
+                <field-map field-name="contactMechId" env-name="communicationEvent.contactMechIdFrom"/>
+            </entity-one>
+            <entity-one entity-name="ContactMech" value-name="contactMechTo">
+                <field-map field-name="contactMechId" env-name="communicationEvent.contactMechIdTo"/>
+            </entity-one>
+        </actions>
+        <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"/>
+            </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"/>
+            </display-entity>
+        </field>
+        <field name="datetimeStarted" title="${uiLabelMap.CommonSendDate}"><display type="date"/></field>
+        <field name="subject"><display/></field>
+        <field name="content" title="${uiLabelMap.CommonContent}"><display/></field>
+        <field name="note" title="${uiLabelMap.CommonNote}"><display/></field>
+    </form>
     
     <form name="NewInternalNote" type="single" target="createCommunicationEvent" default-map-name="communicationEvent">
         <actions>
@@ -217,7 +242,7 @@
         </actions>
         <field name="communicationEventTypeId"><hidden value="COMMENT_NOTE"/></field>
         <field name="parentCommEventId"><hidden value="${parentCommEventId}"/></field>
-        <field name="statusId"><hidden value="COM_ENTERED"/></field>
+        <field name="statusId"><hidden value="COM_COMPLETE"/></field>
         <field name="partyIdFrom"><hidden value="${partyIdFrom}"/></field>
         <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}">
             <drop-down>
@@ -227,7 +252,6 @@
         <field name="subject"><text size="60"/></field>
         <field name="contentMimeTypeId"><hidden value="text/plain"/></field>
         <field name="content" title="${uiLabelMap.CommonContent}"><textarea cols="60" rows="10"/></field>
-        <field name="note" title="${uiLabelMap.CommonNote}"><textarea cols="60" rows="3"/></field>
         <field name="sendButton"><submit button-type="button"/></field>
     </form>
     
@@ -320,7 +344,7 @@
     <form name="ListCommEvents" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate="true">
         <field name="communicationEventId"><hidden/></field>
         <field name="subject">
-            <hyperlink description="${subject}" target="EditCommunicationEvent?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/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml?rev=673672&r1=673671&r2=673672&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml Thu Jul  3 06:15:27 2008
@@ -202,6 +202,7 @@
                             </condition>
                             <widgets>
                                 <include-menu location="component://party/webapp/partymgr/communication/CommMenus.xml" name="CommEventTabBar"/>
+                                <include-menu location="component://party/webapp/partymgr/communication/CommMenus.xml" name="CommSubTabBar"/>
                             </widgets>
                         </section>
                     </decorator-section>

Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?rev=673672&r1=673671&r2=673672&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Thu Jul  3 06:15:27 2008
@@ -150,19 +150,19 @@
             </widgets>
         </section>
     </screen>
-    
-    <screen name="ViewCommunicationEvent">
-        <section>
-            <actions>
-                <set field="titleProperty" value="PageTitleViewCommunication"/>
-                <set field="tabButtonItem" value="PartyCommEvents"/>
-                <set field="subTabButtonItem" value="CommunicationEvent"/>
-
-                <set field="communicationEventId" from-field="parameters.communicationEventId"/>
-                <set field="parentCommEventId" from-field="parameters.parentCommEventId"/>
-                <set default-value="" field="partyId" value="${parameters.partyId}"/>
-                <set default-value="${userLogin.partyId}" field="partyIdFrom" value="${parameters.partyId}"/>
-                <set default-value="${userLogin.partyId}" field="partyIdTo" value="${parameters.partyId}"/>
+ <screen name="ViewCommunicationEvent">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleViewCommunication" />
+ <set field="tabButtonItem" value="PartyCommEvents" />
+ <set field="subTabButtonItem" value="CommunicationEvent" />
+ <set field="communicationEventId" from-field="parameters.communicationEventId" />
+ <set field="parentCommEventId" from-field="parameters.parentCommEventId" />
+ <set default-value="" field="partyId" value="${parameters.partyId}" />
+ <set default-value="${userLogin.partyId}" field="partyIdFrom"
+ value="${parameters.partyId}" />
+ <set default-value="${userLogin.partyId}" field="partyIdTo"
+ value="${parameters.partyId}" />
                 <entity-one entity-name="Party" value-name="party"/>
                 <entity-one entity-name="Person" value-name="lookupPerson"/>
                 <entity-one entity-name="CommunicationEvent" value-name="communicationEvent"/>
@@ -185,31 +185,36 @@
                 <entity-one entity-name="RoleType" value-name="toRoleType">
                     <field-map env-name="communicationEvent.roleTypeIdTo" field-name="roleTypeId"/>
                 </entity-one>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonCommunicationEventDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <section>
-                            <widgets>
-                                <section>
-                                    <condition>
-                                        <not><if-empty field-name="communicationEvent"/></not>
-                                    </condition>
-                                    <widgets>
-                                        <label style="h1" text="${uiLabelMap.PartyViewCommunicationEvent}"/>
-                                    </widgets>
-                                    <fail-widgets>
-                                        <label style="h1" text="${uiLabelMap.PartyNewCommunication}"/>
-                                    </fail-widgets>
-                                </section>
-                                <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ViewCommEvent"/>
-                            </widgets>
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonCommunicationEventDecorator"
+ location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <or>
+ <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>
+                                <include-form
+                                    location="component://party/webapp/partymgr/communication/CommForms.xml"
+                                    name="DisplayEmail" />
+ </widgets>
+ <fail-widgets>
+ <include-form
+ location="component://party/webapp/partymgr/communication/CommForms.xml"
+ name="ViewCommEvent" />
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
     <screen name="EditCommunicationEvent">
         <section>
             <actions>
@@ -239,11 +244,6 @@
                 <decorator-screen name="CommonCommunicationEventDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <section>
-                            <widgets>
-                                <include-menu name="CommSubTabBar" location="component://party/webapp/partymgr/communication/CommMenus.xml"/>
-                            </widgets>
-                        </section>
-                        <section>
                             <condition>
                                 <if-compare field-name="okayToUpdate" operator="equals" value="true" type="Boolean"/>
                             </condition>
@@ -294,7 +294,6 @@
             <widgets>
                 <decorator-screen name="CommonCommunicationEventDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <include-menu name="CommSubTabBar" location="component://party/webapp/partymgr/communication/CommMenus.xml"/>
                         <screenlet id="EditCommunicationEventPanel" title="${uiLabelMap.PartyEditCommunicationEvent}" collapsible="true">
                             <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="NewEmail"/>
                         </screenlet>
@@ -325,7 +324,6 @@
             <widgets>
                 <decorator-screen name="CommonCommunicationEventDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <include-menu name="CommSubTabBar" location="component://party/webapp/partymgr/communication/CommMenus.xml"/>
                         <screenlet id="EditCommunicationEventPanel" title="${uiLabelMap.PartyEditCommunicationEvent}" collapsible="true">
                             <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="NewInternalNote"/>
                         </screenlet>