You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ap...@apache.org on 2009/06/12 07:54:35 UTC
svn commit: r783989 - in /ofbiz/trunk/applications/marketing:
webapp/sfa/WEB-INF/ webapp/sfa/party/ widget/sfa/ widget/sfa/forms/
Author: apatel
Date: Fri Jun 12 05:54:34 2009
New Revision: 783989
URL: http://svn.apache.org/viewvc?rev=783989&view=rev
Log:
Added lookups for Leads and accounts.
Added:
ofbiz/trunk/applications/marketing/widget/sfa/LookupScreens.xml (with props)
ofbiz/trunk/applications/marketing/widget/sfa/forms/LookupForms.xml (with props)
Modified:
ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml
ofbiz/trunk/applications/marketing/webapp/sfa/party/findSfaParty.ftl
ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml
ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml
ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml
Modified: ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml?rev=783989&r1=783988&r2=783989&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml Fri Jun 12 05:54:34 2009
@@ -229,6 +229,8 @@
<request-map uri="LookupSalesForecast"><security https="true" auth="true"/><response name="success" type="view" value="LookupSalesForecast"/></request-map>
<request-map uri="LookupProduct"><security auth="true" https="true"/><response name="success" type="view" value="LookupProduct"/></request-map>
<request-map uri="LookupProductCategory"><security auth="true" https="true"/><response name="success" type="view" value="LookupProductCategory"/></request-map>
+ <request-map uri="LookupLeads"><security auth="true" https="true"/><response name="success" type="view" value="LookupLeads"/></request-map>
+ <request-map uri="LookupAccounts"><security auth="true" https="true"/><response name="success" type="view" value="LookupAccounts"/></request-map>
<!-- end of request mappings -->
<!-- View Mappings -->
@@ -261,6 +263,8 @@
<view-map name="LookupSalesForecast" type="screen" page="component://marketing/widget/LookupScreens.xml#LookupSalesForecast"/>
<view-map name="LookupProduct" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProduct"/>
<view-map name="LookupProductCategory" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductCategory"/>
+ <view-map name="LookupLeads" type="screen" page="component://marketing/widget/sfa/LookupScreens.xml#LookupLeads"/>
+ <view-map name="LookupAccounts" type="screen" page="component://marketing/widget/sfa/LookupScreens.xml#LookupAccounts"/>
<!-- end of view mappings -->
</site-conf>
\ No newline at end of file
Modified: ofbiz/trunk/applications/marketing/webapp/sfa/party/findSfaParty.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/party/findSfaParty.ftl?rev=783989&r1=783988&r2=783989&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/sfa/party/findSfaParty.ftl (original)
+++ ofbiz/trunk/applications/marketing/webapp/sfa/party/findSfaParty.ftl Fri Jun 12 05:54:34 2009
@@ -18,12 +18,8 @@
-->
<#assign extInfo = parameters.extInfo?default("N")>
<#if partyRelationshipTypeId=="LEAD_OWNER">
- <#assign currentUrl="FindLead"/>
<#assign title="${uiLabelMap.SfaFindLeads}">
- <#assign currentUrl="FindLeads"/>
- <#assign title="${uiLabelMap.SfaFindLeads}"/>
<#elseif partyRelationshipTypeId == "ACCOUNT">
- <#assign currentUrl = "FindAccounts"/>
<#assign title = "${uiLabelMap.MarketingFindAccounts}">
</#if>
<div class="screenlet">
Modified: ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml?rev=783989&r1=783988&r2=783989&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml Fri Jun 12 05:54:34 2009
@@ -25,6 +25,7 @@
<actions>
<set field="titleProperty" value="MarketingFindAccounts"/>
<set field="partyRelationshipTypeId" value="ACCOUNT"/>
+ <set field="currentUrl" value="FindAccounts"/>
<set field="headerItem" value="Accounts"/>
</actions>
<widgets>
Modified: ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml?rev=783989&r1=783988&r2=783989&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml Fri Jun 12 05:54:34 2009
@@ -25,6 +25,7 @@
<actions>
<set field="partyRelationshipTypeId" value="LEAD_OWNER"/>
<set field="partyTypeId" value="ANY"/>
+ <set field="currentUrl" value="FindLeads"/>
<set field="headerItem" value="Leads"/>
<service service-name="findParty" auto-field-map="true"/>
</actions>
Added: ofbiz/trunk/applications/marketing/widget/sfa/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/LookupScreens.xml?rev=783989&view=auto
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/LookupScreens.xml (added)
+++ ofbiz/trunk/applications/marketing/widget/sfa/LookupScreens.xml Fri Jun 12 05:54:34 2009
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
+
+ <screen name="LookupLeads">
+ <section>
+ <actions>
+ <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
+ <set field="partyRelationshipTypeId" value="LEAD_OWNER"/>
+ <set field="title" value="${uiLabelMap.SfaFindLeads}"/>
+ <set field="partyTypeId" value="PERSON"/>
+ <set field="currentUrl" value="LookupLeads"/>
+ <service service-name="findParty" auto-field-map="true"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="search-options">
+ <platform-specific>
+ <html><html-template location="component://marketing/webapp/sfa/party/findSfaParty.ftl"/></html>
+ </platform-specific>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="listLookupParty" location="component://marketing/widget/sfa/forms/LookupForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="LookupAccounts">
+ <section>
+ <actions>
+ <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
+ <set field="partyRelationshipTypeId" value="ACCOUNT"/>
+ <set field="title" value="${uiLabelMap.SfaFindAccounts}"/>
+ <set field="partyTypeId" value="PARTY_GROUP"/>
+ <set field="currentUrl" value="LookupAccounts"/>
+ <service service-name="findParty" auto-field-map="true"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="search-options">
+ <platform-specific>
+ <html><html-template location="component://marketing/webapp/sfa/party/findSfaParty.ftl"/></html>
+ </platform-specific>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="listLookupParty" location="component://marketing/widget/sfa/forms/LookupForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+</screens>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/marketing/widget/sfa/LookupScreens.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/marketing/widget/sfa/LookupScreens.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/marketing/widget/sfa/LookupScreens.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ofbiz/trunk/applications/marketing/widget/sfa/forms/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/LookupForms.xml?rev=783989&view=auto
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/LookupForms.xml (added)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/LookupForms.xml Fri Jun 12 05:54:34 2009
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
+
+ <form name="listLookupParty" type="list" list-name="partyList" list-entry-name="partyRow" paginate-target="${currentUrl}"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ <row-actions>
+ <entity-one entity-name="PartyNameView" value-field="partyName">
+ <field-map field-name="partyId" from-field="partyRow.partyId"/>
+ </entity-one>
+ </row-actions>
+ <!--<auto-fields-entity entity-name="PartyNameView" default-field-type="display"/>-->
+ <field name="partyId" title="${uiLabelMap.PartyPartyId}" widget-style="smallSubmit">
+ <hyperlink also-hidden="false" target-type="plain" description="${partyRow.partyId}" target="javascript:set_value('${partyRow.partyId}')"/>
+ </field>
+ <field name="partyName" title="${uiLabelMap.PartyName}"><display description="${partyName.lastName}${partyName.groupName} ${partyName.firstName}"/></field>
+ </form>
+
+</forms>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/marketing/widget/sfa/forms/LookupForms.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/marketing/widget/sfa/forms/LookupForms.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/marketing/widget/sfa/forms/LookupForms.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml?rev=783989&r1=783988&r2=783989&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml Fri Jun 12 05:54:34 2009
@@ -78,8 +78,8 @@
<field name="opportunityName" title="${uiLabelMap.SfaOpportunityName}" widget-style="required"><text size="30"/></field>
- <field name="accountPartyId" title="${uiLabelMap.SfaInitialAccount}" widget-style="required"><lookup target-form-name="LookupPartyName" default-value="${accountPartyId}"/></field>
- <field name="leadPartyId" title="${uiLabelMap.SfaLead}" widget-style="required"><lookup target-form-name="LookupPartyName" default-value="${leadPartyId}"/></field>
+ <field name="accountPartyId" title="${uiLabelMap.SfaInitialAccount}" widget-style="required"><lookup target-form-name="LookupAccounts" default-value="${accountPartyId}"/></field>
+ <field name="leadPartyId" title="${uiLabelMap.SfaLead}" widget-style="required"><lookup target-form-name="LookupLeads" default-value="${leadPartyId}"/></field>
<field name="typeEnumId" title="${uiLabelMap.SfaType}"></field>
<field name="opportunityName" title="${uiLabelMap.SfaOpportunityName}" widget-style="required"><text size="25"></text></field>
<field name="typeEnumId" position="1" title="${uiLabelMap.SfaType}">