svn commit: r781897 - in /ofbiz/trunk/applications/party: data/PartyPortletData.xml webapp/partymgr/party/PartyForms.xml widget/partymgr/ProfileScreens.xml

[hansbak-2]

Author: hansbak
Date: Fri Jun  5 03:03:59 2009
New Revision: 781897

URL: http://svn.apache.org/viewvc?rev=781897&view=rev
Log:
add related contacts and related accounts portlets in party profile

Modified:
    ofbiz/trunk/applications/party/data/PartyPortletData.xml
    ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
    ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml

Modified: ofbiz/trunk/applications/party/data/PartyPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/PartyPortletData.xml?rev=781897&r1=781896&r2=781897&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/data/PartyPortletData.xml (original)
+++ ofbiz/trunk/applications/party/data/PartyPortletData.xml Fri Jun  5 03:03:59 2009
@@ -92,7 +92,19 @@
         screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
         description="contact methods of a party"/>
     <PortletPortletCategory portalPortletId="contact" portletCategoryId="PROFILE"/>
-
+    
+    <PortalPortlet portalPortletId="partyRelContacts" portletName="Account Related Contacts"
+        screenName="partyRelContacts"
+        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
+        description="Related contacts of an account"/>
+    <PortletPortletCategory portalPortletId="partyRelContacts" portletCategoryId="PROFILE"/>
+    
+    <PortalPortlet portalPortletId="partyRelAccounts" portletName="Contact Related Accounts"
+        screenName="partyRelAccounts"
+        screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
+        description="Related accounts of an contact"/>
+    <PortletPortletCategory portalPortletId="partyRelAccounts" portletCategoryId="PROFILE"/>
+    
     <!-- communications -->
     <PortletCategory portletCategoryId="COMMUNICATIONS" description="Communication(s)"/>
     <PortalPortlet portalPortletId="MyCommunications" portletName="My Communications"  description="IN and outgoing Communication list of a party"
@@ -107,15 +119,17 @@
 
     <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
     <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/>
-    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="LoyaltyPoints" portletSeqId="00001" columnSeqId="00001" sequenceNum="2"/>
-    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001" sequenceNum="3"/>
-    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="AvsSettings" portletSeqId="00001" columnSeqId="00001" sequenceNum="4"/>
-    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002" sequenceNum="7"/>
-    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002" sequenceNum="8"/>
-    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002" sequenceNum="9"/>
-    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="Content" portletSeqId="00001" columnSeqId="00002" sequenceNum="10"/>
-    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002" sequenceNum="11"/>
-    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002" sequenceNum="12"/>
+    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="partyRelContacts" portletSeqId="00001" columnSeqId="00001" sequenceNum="2"/>
+    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="partyRelAccounts" portletSeqId="00001" columnSeqId="00001" sequenceNum="3"/>
+    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="LoyaltyPoints" portletSeqId="00001" columnSeqId="00001" sequenceNum="4"/>
+    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001" sequenceNum="5"/>
+    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002" sequenceNum="1"/>
+    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002" sequenceNum="2"/>
+    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="AvsSettings" portletSeqId="00001" columnSeqId="00002" sequenceNum="3"/>
+    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002" sequenceNum="4"/>
+    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="Content" portletSeqId="00001" columnSeqId="00002" sequenceNum="5"/>
+    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002" sequenceNum="6"/>
+    <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002" sequenceNum="7"/>
 
 
 </entity-engine-xml>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml?rev=781897&r1=781896&r2=781897&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Fri Jun  5 03:03:59 2009
@@ -738,9 +738,8 @@
             </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="partyRelationshipTypeId"><display-entity entity-name="PartyRelationshipType" description="${partyRelationshipName}"/></field>
-        <field name="fromDate"><display type="date"/></field>
-        <field name="thruDate"><display type="date"/></field>
+        <field name="partyRelationshipTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="PartyRelationshipType" description="${partyRelationshipName}"/></field>
+        <field name="comments"><display/></field>
     </form>
 
     <form name="ListRelatedAccounts" type="list" list-name="accounts" default-table-style="basic-table">
@@ -751,9 +750,8 @@
             </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="partyRelationshipTypeId"><display-entity entity-name="PartyRelationshipType" description="${partyRelationshipName}"/></field>
-        <field name="fromDate"><display type="date"/></field>
-        <field name="thruDate"><display type="date"/></field>
+        <field name="partyRelationshipTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="PartyRelationshipType" description="${partyRelationshipName}"/></field>
+        <field name="comments"><display/></field>
     </form>
 
     <form name="ListPartyRelationships" type="list" list-name="partyRelationships" default-table-style="basic-table" target="updatePartyRelationship">

Modified: ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml?rev=781897&r1=781896&r2=781897&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml Fri Jun  5 03:03:59 2009
@@ -467,20 +467,14 @@
         </section>
     </screen>
 
-    <screen name="contactsAndAccounts">
+    <screen name="partyRelContacts">
         <section>
             <actions>
-                <set field="partyId" from-field="parameters.partyId"/>
                 <entity-and list="contacts" entity-name="PartyRelationship">
                     <field-map field-name="partyIdFrom" from-field="parameters.partyId"/>
                     <field-map field-name="roleTypeIdFrom" value="ACCOUNT"/>
                     <field-map field-name="roleTypeIdTo" value="CONTACT"/>
                 </entity-and>
-                <entity-and list="accounts" entity-name="PartyRelationship">
-                    <field-map field-name="partyIdTo" from-field="parameters.partyId"/>
-                    <field-map field-name="roleTypeIdFrom" value="ACCOUNT"/>
-                    <field-map field-name="roleTypeIdTo" value="CONTACT"/>
-                </entity-and>
             </actions>
             <widgets>
                 <section>
@@ -493,6 +487,20 @@
                         </screenlet>
                     </widgets>
                 </section>
+            </widgets>
+        </section>
+    </screen>
+    
+    <screen name="partyRelAccounts">
+        <section>
+            <actions>
+                <entity-and list="accounts" entity-name="PartyRelationship">
+                    <field-map field-name="partyIdTo" from-field="parameters.partyId"/>
+                    <field-map field-name="roleTypeIdFrom" value="ACCOUNT"/>
+                    <field-map field-name="roleTypeIdTo" value="CONTACT"/>
+                </entity-and>
+            </actions>
+            <widgets>
                 <section>
                     <condition>
                         <not><if-empty field="accounts"/></not>
@@ -506,7 +514,7 @@
             </widgets>
         </section>
     </screen>
-
+    
     <screen name="mytasks">
         <section>
             <condition>