svn commit: r662044 - in /ofbiz/trunk/applications: marketing/widget/sfa/ party/webapp/partymgr/WEB-INF/actions/party/ party/webapp/partymgr/party/ party/webapp/partymgr/party/profileblocks/ party/widget/partymgr/

[hansbak-2]

Author: hansbak
Date: Sat May 31 09:44:28 2008
New Revision: 662044

URL: http://svn.apache.org/viewvc?rev=662044&view=rev
Log:
convert person/group from ftl to forms and use in sfa

Removed:
    ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getPartyInfo.bsh
    ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Party.ftl
Modified:
    ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
    ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
    ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml

Modified: ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml?rev=662044&r1=662043&r2=662044&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml Sat May 31 09:44:28 2008
@@ -306,17 +306,12 @@
                                             <include-screen name="Party" location="component://party/widget/partymgr/ProfileScreens.xml"/>
                                             <section>
                                                 <actions>
-                                                    <entity-one entity-name="PartyGroup" value-name="partyGroup">
-                                                        <field-map field-name="partyId" env-name="partyGroupId"/>
-                                                    </entity-one>
+                                                    <set field="parameters.partyId" from-field="partyGroupId"/>
                                                 </actions>
                                                 <widgets>
-                                                    <screenlet title="${uiLabelMap.PartyPartyGroupInformation}" >
-                                                        <include-form name="ViewPartyGroup" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
-                                                    </screenlet>
+                                                    <include-screen name="Party" location="component://party/widget/partymgr/ProfileScreens.xml"/>
                                                 </widgets>
                                             </section>
-                                            <include-screen name="Contact" location="component://party/widget/partymgr/ProfileScreens.xml"/>
                                         </container>
                                         <container style="profile-right">
                                             <include-screen name="Notes" location="component://party/widget/partymgr/ProfileScreens.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=662044&r1=662043&r2=662044&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Sat May 31 09:44:28 2008
@@ -97,8 +97,7 @@
         <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"><hyperlink target="${donePage}?partyId=${partyId}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
     </form>
     
-    <form name="ViewPartyGroup" type="single" default-map-name="partyGroup"
-        focus-field-name="groupName" header-row-style="header-row" default-table-style="basic-table">
+    <form name="ViewPartyGroup" type="single" default-map-name="lookupGroup">
         <auto-fields-entity entity-name="PartyGroup" default-field-type="display"/>
         <field name="partyTypeId"><ignored/></field>
         <field name="preferredCurrencyUomId">
@@ -114,6 +113,24 @@
         <field name="preferredCurrencyUomId" title="${uiLabelMap.CommonCurrency}"><display-entity entity-name="Uom" key-field-name="uomId" description="${description}"/></field>
     </form>
     
+    <form name="ViewPartyPerson" type="single" default-map-name="lookupPerson">
+        <field name="partyId"><display/></field>
+        <field name="name" title="${uiLabelMap.PartyName}"><display description="${lookupPerson.personalTitle} ${lookupPerson.firstName} ${lookupPerson.middleName} ${lookupPerson.lastName}"/></field>
+        <field name="comments" title="${uiLabelMap.PartyComments}"><display/></field>        
+    </form>
+    
+    <form name="ViewPartyPersonHistory" type="list" list-name="partyNameHistoryList"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <field name="was" title="${uiLabelMap.PartyHistoryWas}"><display description="${personalTitle} ${firstName} ${middleName} ${lastName} ${suffix}"/></field>
+        <field name="changed" title="${uiLabelMap.PartyHistoryChanged}"><display description="${changeDate}"/></field>
+    </form>
+    
+    <form name="ViewPartyGroupHistory" type="list" list-name="partyNameHistoryList"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <field name="was" title="${uiLabelMap.PartyHistoryWas}"><display description="${groupName}"/></field>
+        <field name="changed" title="${uiLabelMap.PartyHistoryChanged}"><display description="${changeDate}"/></field>
+    </form>
+    
     <form name="AddUserLogin" type="single" target="createUserLogin"
         focus-field-name="userLoginId" header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createUserLogin"/>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=662044&r1=662043&r2=662044&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Sat May 31 09:44:28 2008
@@ -20,6 +20,18 @@
 
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
 
+
+    <menu name="personUpdate">
+        <menu-item name="update" title="${uiLabelMap.CommonUpdate}">
+            <link target="editperson?partyId=${party.partyId}"/>
+        </menu-item>
+    </menu>
+    <menu name="groupUpdate">
+        <menu-item name="update" title="${uiLabelMap.CommonUpdate}">
+            <link target="editpartygroup?partyId=${party.partyId}"/>
+        </menu-item>
+    </menu>
+    
     <menu name="ProfileTabBar" default-menu-item-name="viewprofile" default-selected-style="selected"
         type="simple" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem">
         <menu-item name="viewprofile" title="${uiLabelMap.PartyProfile}">

Modified: ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml?rev=662044&r1=662043&r2=662044&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml Sat May 31 09:44:28 2008
@@ -27,14 +27,52 @@
                     <field-map field-name="partyId" env-name="parameters.partyId"/>
                     <order-by field-name="-changeDate"/>
                 </entity-and>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/getPartyInfo.bsh"/>
+                <entity-one entity-name="PartyGroup" value-name="lookupGroup">
+                    <field-map field-name="partyId" env-name="parameters.partyId"/><!-- is required -->
+                </entity-one>
+                <entity-one entity-name="Person" value-name="lookupPerson">
+                    <field-map field-name="partyId" env-name="parameters.partyId"/><!-- is required -->
+                </entity-one>
             </actions>
             <widgets>
-                <platform-specific>
-                    <html>
-                        <html-template location="component://party/webapp/partymgr/party/profileblocks/Party.ftl"/>
-                    </html>
-                </platform-specific>
+                <section>
+                    <condition>
+                        <not><if-empty field-name="lookupPerson"/></not>
+                    </condition>
+                    <widgets>
+                        <screenlet title="${uiLabelMap.PartyPersonalInformation}" navigation-menu-name="personUpdate">
+                            <include-menu name="personUpdate" location="component://party/widget/partymgr/PartyMenus.xml"/>
+                            <include-form name="ViewPartyPerson" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+                            <section>
+                                <condition>
+                                    <not><if-empty field-name="partyNameHistoryList"/></not>
+                                </condition>
+                                <widgets>
+                                    <include-form name="ViewPartyPersonHistory" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+                                </widgets>
+                            </section>
+                        </screenlet>
+                    </widgets>
+                </section>
+                <section>
+                    <condition>
+                        <not><if-empty field-name="lookupGroup"/></not>
+                    </condition>
+                    <widgets>
+                        <screenlet title="${uiLabelMap.PartyPartyGroupInformation}" navigation-menu-name="groupUpdate">
+                            <include-menu name="groupUpdate" location="component://party/widget/partymgr/PartyMenus.xml"/>
+                            <include-form name="ViewPartyGroup" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+                            <section>
+                                <condition>
+                                    <not><if-empty field-name="partyNameHistoryList"/></not>
+                                </condition>
+                                <widgets>
+                                    <include-form name="ViewPartyGroupHistory" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+                                </widgets>
+                            </section>
+                        </screenlet>
+                    </widgets>
+                </section>
             </widgets>
         </section>
     </screen>