svn commit: r612756 - in /ofbiz/trunk/applications/party: config/PartyUiLabels.properties webapp/partymgr/communication/CommForms.xml webapp/partymgr/communication/CommMenus.xml widget/partymgr/CommonScreens.xml widget/partymgr/CommunicationScreens.xml

[hansbak-2]

Author: hansbak
Date: Thu Jan 17 00:27:56 2008
New Revision: 612756

URL: http://svn.apache.org/viewvc?rev=612756&view=rev
Log:
various enhancements to the communication screens

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

Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.properties?rev=612756&r1=612755&r2=612756&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.properties (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.properties Thu Jan 17 00:27:56 2008
@@ -76,6 +76,7 @@
 PageTitleAddressMatches=Address Matches
 PageTitleCommEvents=Communication Events
 PageTitleCreateNewPartyDetail=Create New Party Detail
+PageTitleChildCommunicationEvents=Child Communication events
 PageTitleEditAvsOverride=Edit AVS Override
 PageTitleEditCommContent=Edit Comm Content
 PageTitleEditCommunication=Edit Communication
@@ -583,7 +584,7 @@
 PartyYouHave=You have
 PartyYearsWork=Years Work
 PartyZipCode=Zip/Postal Code
-
+PartyGoToParent=Go to Parent
 
 
 

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=612756&r1=612755&r2=612756&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Thu Jan 17 00:27:56 2008
@@ -20,10 +20,10 @@
 
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
 
-    <form name="viewCommunication" type="single" target="editCommunication" default-map-name="communicationEvent">
+    <!--form name="viewCommunication1" type="single" target="editCommunication" default-map-name="communicationEvent">
         <alt-target target="createCommunicationEvent" use-when="communicationEvent==null"/>
         <field name="communicationEventId" use-when="communicationEvent != null"><display/></field>
-        <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><display/></field>
+        <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><display-entity entity-name="PartyNameView"><sub-hyperlink target="viewprofile?partyId=${partyIdFrom}" description="${firstName} ${middleName} ${lastName} ${groupName}"/></display-entity></field>
         <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"><display/></field>
         <field name="statusId" use-when="statusId==null"><display/></field>
         <field name="statusId" use-when="statusId!=null"><display/></field>
@@ -39,7 +39,7 @@
         <field map-name="subjectMap" name="note" title="${uiLabelMap.CommonNote}"><display/></field>
         <field name="content" title="${uiLabelMap.CommonContent}"><text size="1"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonEdit}"><submit button-type="button"/></field>
-    </form>
+    </form-->
 
     <form name="EditCommEvent" type="single" target="updateCommunicationEvent" default-map-name="communicationEvent">
         <actions>
@@ -64,12 +64,10 @@
             <display-entity entity-name="CommunicationEventType" description="${description}" key-field-name="communicationEventTypeId"/>
         </field>
 
-        <!-- parent communications -->
-        <field name="parentCommEventId" use-when="${bsh:communicationEvent!=null&amp;&amp;communicationEvent.getString(&quot;parentCommEventId&quot;)!=null}">
-            <hyperlink description="${communicationEvent.parentCommEventId}" target="EditCommunicationEvent?communicationEventId=${communicationEvent.parentCommEventId}&amp;partyId=${partyId}" target-type="intra-app"/>
-        </field>
-        <field name="parentCommEventId" map-name="parameters" use-when="communicationEvent==null" >
-            <hidden/>
+        <field name="parentCommEventId">
+            <lookup target-form-name="LookupCommEvent">
+                <sub-hyperlink use-when="&quot;${communicationEvent.parentCommEventId}&quot;.length()>0" link-style="buttontext" target="EditCommunicationEvent?communicationEventId=${communicationEvent.parentCommEventId}" description="${uiLabelMap.PartyGoToParent}"/>
+            </lookup>
         </field>
         
         <!-- status -->
@@ -211,8 +209,9 @@
     </form>
 
     <form name="ViewCommEvent" type="single" default-map-name="communicationEvent">
-        <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><display-entity description="${firstName} ${lastName} [${partyId}]" entity-name="Person" key-field-name="partyId"/></field>
-        <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"><display-entity description="${firstName} ${lastName} [${partyId}]" entity-name="Person" key-field-name="partyId"/></field>
+        <field name="communicationEventId"><display/></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>
         <field name="contactMechTypeId"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
         <!-- This will display email addresses when it is an email.  This could be more elaborate to show the actual string, or it could

Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml?rev=612756&r1=612755&r2=612756&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml Thu Jan 17 00:27:56 2008
@@ -18,8 +18,7 @@
 under the License.
 -->
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
-    <menu name="CommEventTabBar" default-menu-item-name="viewprofile" menu-container-style="button-bar button-style-1"
-        type="simple" selected-menuitem-context-field-name="subTabButtonItem">
+    <menu name="CommEventTabBar" type="simple" selected-menuitem-context-field-name="subTabButtonItem">
         <menu-item name="CommunicationEvent" title="${uiLabelMap.PartyCommEvent}">
             <link target="EditCommunicationEvent?partyId=${partyId}&amp;communicationEventId=${communicationEventId}"/>
         </menu-item>

Modified: ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml?rev=612756&r1=612755&r2=612756&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml Thu Jan 17 00:27:56 2008
@@ -201,6 +201,7 @@
                                 <if-compare field-name="communicationEvent.statusId" operator="equals" type="String" value="COM_COMPLETE"/>
                                 <if-compare field-name="communicationEvent.statusId" operator="equals" type="String" value="COM_RESOLVED"/>
                                 <if-compare field-name="communicationEvent.statusId" operator="equals" type="String" value="COM_REFERRED"/>
+                                <if-compare field-name="communicationEvent.statusId" operator="equals" type="String" value="COM_CANCELLED"/>
                             </or>
                         </and>
                     </condition>

Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?rev=612756&r1=612755&r2=612756&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Thu Jan 17 00:27:56 2008
@@ -302,6 +302,7 @@
                                         <container style="widget-container">
                                             <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="EditCommEvent"/>
                                         </container>
+                                        <label style="head1" text="${uiLabelMap.PageTitleChildCommunicationEvents}"></label>
                                         <container style="widget-container">
                                             <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListChildCommEvents"/>
                                         </container>
@@ -310,6 +311,7 @@
                                         <container style="widget-container">
                                             <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ViewCommEvent"/>
                                         </container>
+                                        <label style="head1" text="${uiLabelMap.PageTitleChildCommunicationEvents}"></label>
                                         <container style="widget-container">
                                             <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListChildCommEvents"/>
                                         </container>