You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2009/11/12 08:04:42 UTC
svn commit: r835270 - in /ofbiz/trunk: applications/marketing/
applications/marketing/config/ applications/marketing/data/
applications/marketing/src/org/ofbiz/sfa/vcard/
applications/marketing/webapp/sfa/WEB-INF/
applications/marketing/widget/sfa/ app...
Author: hansbak
Date: Thu Nov 12 07:04:41 2009
New Revision: 835270
URL: http://svn.apache.org/viewvc?rev=835270&view=rev
Log:
add a portal page as the first page in sfa containing calendar and email, but can be changed as required via preferences. add the first screens for events which will appear on the calendar. next step will be to be able to connect events/tasks to opportunities, show them in the party pprofile etc...
Added:
ofbiz/trunk/applications/marketing/data/SfaPortletData.xml (with props)
ofbiz/trunk/applications/marketing/widget/sfa/EventScreens.xml (with props)
ofbiz/trunk/applications/marketing/widget/sfa/forms/EventForms.xml (with props)
Modified:
ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml
ofbiz/trunk/applications/marketing/ofbiz-component.xml
ofbiz/trunk/applications/marketing/src/org/ofbiz/sfa/vcard/VCard.java
ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml
ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml
ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml
ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
Modified: ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml?rev=835270&r1=835269&r2=835270&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml (original)
+++ ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml Thu Nov 12 07:04:41 2009
@@ -1716,6 +1716,10 @@
<value xml:lang="en">Assign To Me</value>
<value xml:lang="th">à¸à¸³à¸«à¸à¸à¹à¸«à¹à¸à¸±à¸</value>
</property>
+ <property key="SfaComplete">
+ <value xml:lang="en">Complete</value>
+ <value xml:lang="th">à¹à¸ªà¸£à¹à¸à¸ªà¸´à¹à¸</value>
+ </property>
<property key="SfaAcccounts">
<value xml:lang="en">Accounts</value>
<value xml:lang="fr">Comptes</value>
@@ -2133,4 +2137,16 @@
<property key="SfaOpportunityCommunications">
<value xml:lang="en">Opportunity Communications</value>
</property>
+ <property key="SfaTaskAssignedToMe">
+ <value xml:lang="en">Open Tasks Assigned to me.</value>
+ <value xml:lang="th">à¸à¸²à¸à¸à¸µà¹à¸¡à¸à¸à¸«à¸¡à¸²à¸¢à¹à¸«à¹à¸à¸±à¸</value>
+ </property>
+ <property key="SfaTaskAssignedByMe">
+ <value xml:lang="en">Open Tasks Assigned by me.</value>
+ <value xml:lang="th">à¸à¸²à¸à¸à¸µà¹à¸à¸±à¸à¸¡à¸à¸à¸«à¸¡à¸²à¸¢</value>
+ </property>
+ <property key="SfaAssignedBy">
+ <value xml:lang="en">Assigned by</value>
+ <value xml:lang="th">à¸à¸³à¸«à¸à¸à¹à¸à¸¢</value>
+ </property>
</resource>
Added: ofbiz/trunk/applications/marketing/data/SfaPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/SfaPortletData.xml?rev=835270&view=auto
==============================================================================
--- ofbiz/trunk/applications/marketing/data/SfaPortletData.xml (added)
+++ ofbiz/trunk/applications/marketing/data/SfaPortletData.xml Thu Nov 12 07:04:41 2009
@@ -0,0 +1,25 @@
+<?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.
+-->
+<entity-engine-xml>
+ <PortalPage portalPageId="SFA_MAIN" sequenceNum="0" portalPageName="Main" description="The SFA main page" ownerUserLoginId="_NA_" securityGroupId="MYPORTAL_EMPLOYEE"/>
+ <PortalPageColumn portalPageId="SFA_MAIN" columnSeqId="00001"/>
+ <PortalPagePortlet portalPageId="SFA_MAIN" portalPortletId="Calendar" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
+ <PortalPagePortlet portalPageId="SFA_MAIN" portalPortletId="MyCommunications" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/>
+</entity-engine-xml>
Propchange: ofbiz/trunk/applications/marketing/data/SfaPortletData.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/marketing/data/SfaPortletData.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/marketing/data/SfaPortletData.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/applications/marketing/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/ofbiz-component.xml?rev=835270&r1=835269&r2=835270&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/marketing/ofbiz-component.xml Thu Nov 12 07:04:41 2009
@@ -29,6 +29,7 @@
<entity-resource type="data" reader-name="seed" loader="main" location="data/MarketingTypeData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/MarketingSecurityData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/MarketingHelpData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/SfaPortletData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/sfaDemoData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="testdef/SeleniumTests.xml"/>
<service-resource type="model" loader="main" location="servicedef/services.xml"/>
Modified: ofbiz/trunk/applications/marketing/src/org/ofbiz/sfa/vcard/VCard.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/src/org/ofbiz/sfa/vcard/VCard.java?rev=835270&r1=835269&r2=835270&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/src/org/ofbiz/sfa/vcard/VCard.java (original)
+++ ofbiz/trunk/applications/marketing/src/org/ofbiz/sfa/vcard/VCard.java Thu Nov 12 07:04:41 2009
@@ -204,9 +204,12 @@
if (UtilValidate.isNotEmpty(state)) {
address.setRegion(state.getString("geoName"));
}
- String country = postalAddress.getRelatedOne("CountryGeo").getString("geoName");
- address.setCountry(country);
- address.setWork(true); // this can be better set by checking contactMechPurposeTypeId
+ GenericValue countryGeo = postalAddress.getRelatedOne("CountryGeo");
+ if (UtilValidate.isNotEmpty(countryGeo)) {
+ String country = postalAddress.getRelatedOne("CountryGeo").getString("geoName");
+ address.setCountry(country);
+ address.setWork(true); // this can be better set by checking contactMechPurposeTypeId
+ }
contact.addAddress(address);
Communications communication = cmf.createCommunications();
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=835270&r1=835269&r2=835270&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml Thu Nov 12 07:04:41 2009
@@ -21,14 +21,16 @@
<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
<include location="component://common/webcommon/WEB-INF/common-controller.xml"/>
+ <include location="component://common/webcommon/WEB-INF/portal-controller.xml"/>
<include location="component://party/webapp/partymgr/WEB-INF/controller.xml"/>
+ <include location="component://workeffort/webapp/workeffort/WEB-INF/controller.xml"/>
<description>SFA Manager Module Site Configuration File</description>
<owner>Copyright 2001-2009 The Apache Software Foundation</owner>
<!-- Request Mappings -->
<request-map uri="main">
<security https="true" auth="true"/>
- <response name="success" type="view" value="main"/>
+ <response name="success" type="view" value="main" save-home-view="true"/>
</request-map>
<!-- Sales Opportunity Requests -->
<request-map uri="FindSalesOpportunity">
@@ -232,6 +234,22 @@
<response name="success" type="view" value="EditSalesForecastDetail"/>
<response name="error" type="view" value="EditSalesForecastDetail"/>
</request-map>
+
+ <!-- Event Requests -->
+ <request-map uri="Events">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="Events" save-home-view="true"/>
+ </request-map>
+ <request-map uri="updateTaskAssigment">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updateTaskAssigment"/>
+ <response name="success" type="view-home"/>
+ <response name="error" type="view-home"/>
+ </request-map>
+ <request-map uri="EditEvent">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditEvent" save-home-view="true"/>
+ </request-map>
<!-- Lookup requests -->
<request-map uri="LookupSalesForecast"><security https="true" auth="true"/><response name="success" type="view" value="LookupSalesForecast"/></request-map>
@@ -270,6 +288,9 @@
<view-map name="FindSalesForecast" type="screen" page="component://marketing/widget/sfa/ForecastScreens.xml#FindSalesForecast"/>
<view-map name="EditSalesForecast" type="screen" page="component://marketing/widget/sfa/ForecastScreens.xml#EditSalesForecast"/>
<view-map name="EditSalesForecastDetail" type="screen" page="component://marketing/widget/sfa/ForecastScreens.xml#EditSalesForecastDetail"/>
+
+ <view-map name="Events" type="screen" page="component://marketing/widget/sfa/EventScreens.xml#main"/>
+ <view-map name="EditEvent" type="screen" page="component://marketing/widget/sfa/EventScreens.xml#EditEvent"/>
<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"/>
Modified: ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml?rev=835270&r1=835269&r2=835270&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml Thu Nov 12 07:04:41 2009
@@ -28,7 +28,7 @@
<set field="headerItem" value="Accounts"/>
<set field="setAccountDescription" value="${groovy:session.setAttribute("accountDescription",headerItem)}"/>
<set field="removeContactDescription" value="${groovy:session.removeAttribute("contactDescription")}"/>
- <set field="removeLeadDescription" value="${groovy:session.removeAttribute("removeDescription")}"/>
+ <set field="removeLeadDescription" value="${groovy:session.removeAttribute("leadDescription")}"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
Modified: ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml?rev=835270&r1=835269&r2=835270&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml Thu Nov 12 07:04:41 2009
@@ -29,6 +29,7 @@
<property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/partymgr/static/partymgr.js" global="true"/>
<set field="layoutSettings.styleSheets[]" value="/partymgr/static/partymgr.css" global="true"/>
@@ -40,6 +41,8 @@
<set field="leftbarScreenName" value="leftbar"/>
<set field="leftbarScreenLocation" value="component://marketing/widget/sfa/CommonScreens.xml"/>
<set field="MainColumnStyle" value="leftonly-larger"/>
+ <set field="parameters.parentPortalPageId" from-field="parameters.parentPortalPageId" default-value="SFA" global="true"/>
+ <script location="component://common/webcommon/WEB-INF/actions/includes/GetParentPortalPageId.groovy"/>
</actions>
<widgets>
<include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/>
@@ -50,15 +53,32 @@
<screen name="main">
<section>
<actions>
- <set field="headerItem" value="Main"/>
+ <set field="headerItem" from-field="parameters.headerItem" default-value="main"/>
+ <set field="removeAccountDescription" value="${groovy:session.removeAttribute("accountDescription")}"/>
+ <set field="removeContactDescription" value="${groovy:session.removeAttribute("contactDescription")}"/>
+ <set field="removeLeadDescription" value="${groovy:session.removeAttribute("leadDescription")}"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container style="no-clear">
- <screenlet title="${uiLabelMap.SfaManagerApplication}">
- <container><label style="label" text="${uiLabelMap.SfaManagerWelcome}"/></container>
- </screenlet>
+ <section>
+ <actions>
+ <entity-one entity-name="PortalPage" value-field="portalPage"/>
+ <entity-and entity-name="PortalPageColumn" list="portalPageColumns">
+ <field-map field-name="portalPageId" from-field="parameters.portalPageId"/>
+ <order-by field-name="columnSeqId"/>
+ </entity-and>
+ <entity-and entity-name="PortalPagePortletView" list="portalPagePortlets">
+ <field-map field-name="portalPageId" from-field="portalPage.portalPageId"/>
+ <order-by field-name="columnSeqId"/>
+ <order-by field-name="sequenceNum"/>
+ </entity-and>
+ </actions>
+ <widgets>
+ <platform-specific><html><html-template location="component://common/webcommon/portal/showPortalPage.ftl"/></html></platform-specific>
+ </widgets>
+ </section>
</container>
</decorator-section>
</decorator-screen>
@@ -155,6 +175,15 @@
</actions>
<widgets/>
</section>
+ <section>
+ <condition>
+ <if-empty field="currentCommonDecorator"/>
+ </condition>
+ <actions>
+ <set field="currentCommonDecorator" value="main-decorator"/>
+ </actions>
+ <widgets/>
+ </section>
<decorator-screen name="${currentCommonDecorator}" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
@@ -443,4 +472,33 @@
</widgets>
</section>
</screen>
+ <screen name="CommonEventDecorator">
+ <section>
+ <actions>
+ <set field="headerItem" value="Events"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator">
+ <decorator-section name="body">
+ <include-menu name="EventTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu name="EventSubTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <container style="no-clear">
+ <decorator-section-include name="body"/>
+ </container>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="CommonWorkEffortDecorator">
+ <section>
+ <widgets>
+ <decorator-screen name="CommonEventDecorator">
+ <decorator-section name="body">
+ <decorator-section-include name="body"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
Added: ofbiz/trunk/applications/marketing/widget/sfa/EventScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/EventScreens.xml?rev=835270&view=auto
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/EventScreens.xml (added)
+++ ofbiz/trunk/applications/marketing/widget/sfa/EventScreens.xml Thu Nov 12 07:04:41 2009
@@ -0,0 +1,80 @@
+<?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="main">
+ <section>
+ <actions>
+ <set field="tabButtonItem" value="find"/>
+ <entity-and entity-name="WorkEffortAndPartyAssign" list="myTasks" filter-by-date="true">
+ <field-map field-name="partyId" from-field="userLogin.partyId"/>
+ <field-map field-name="statusId" value="PRTYASGN_ASSIGNED"/>
+ <field-map field-name="workEffortTypeId" value="TASK"/>
+ <field-map field-name="currentStatusId" value="CAL_ACCEPTED"/>
+ <field-map field-name="workEffortParentId" from-field="null"/>
+ </entity-and>
+ <entity-and entity-name="WorkEffortAndPartyAssign" list="tasksAssignedByMe" filter-by-date="true">
+ <field-map field-name="assignedByUserLoginId" from-field="userLogin.userLoginId"/>
+ <field-map field-name="statusId" value="PRTYASGN_ASSIGNED"/>
+ <field-map field-name="workEffortTypeId" value="TASK"/>
+ <field-map field-name="currentStatusId" value="CAL_ACCEPTED"/>
+ <field-map field-name="workEffortParentId" from-field="null"/>
+ </entity-and>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonEventDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <screenlet title="${uiLabelMap.SfaTaskAssignedToMe}" navigation-form-name="MyTasks">
+ <include-form name="MyTasks" location="component://marketing/widget/sfa/forms/EventForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.SfaTaskAssignedByMe}" navigation-form-name="MyTasks">
+ <include-form name="TasksAssignedByMe" location="component://marketing/widget/sfa/forms/EventForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="EditEvent">
+ <section>
+ <actions>
+ <entity-one entity-name="WorkEffort" value-field="workEffort"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonEventDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <screenlet title="${uiLabelMap.WorkEffortAddCalendarEvent}">
+ <include-form name="EditEvent" location="component://marketing/widget/sfa/forms/EventForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+</screens>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/marketing/widget/sfa/EventScreens.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/marketing/widget/sfa/EventScreens.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/marketing/widget/sfa/EventScreens.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml?rev=835270&r1=835269&r2=835270&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml Thu Nov 12 07:04:41 2009
@@ -23,10 +23,15 @@
<menu-item name="Contacts" title="${uiLabelMap.SfaContacts}"><link target="FindContacts"/></menu-item>
<menu-item name="Leads" title="${uiLabelMap.SfaLeads}"><link target="FindLeads"/></menu-item>
<menu-item name="Competitors" title="${uiLabelMap.SfaCompetitors}" widget-style="disabled"><link target="#" url-mode="plain"/></menu-item>
- <menu-item name="Events" title="${uiLabelMap.SfaEvents}" widget-style="disabled"><link target="#" url-mode="plain"/></menu-item>
+ <menu-item name="Events" title="${uiLabelMap.SfaEvents}"><link target="Events" url-mode="plain"/></menu-item>
<menu-item name="Documents" title="${uiLabelMap.SfaDocuments}" widget-style="disabled"><link target="#" url-mode="plain"/></menu-item>
<menu-item name="Forecast" title="${uiLabelMap.SfaForecasts}"><link target="FindSalesForecast"/></menu-item>
<menu-item name="Opportunities" title="${uiLabelMap.SfaOpportunities}"><link target="FindSalesOpportunity"/></menu-item>
+ <menu-item name="Preferences" title="${uiLabelMap.CommonPreferences}" align-style="opposed">
+ <link target="ManagePortalPages">
+ <parameter param-name="parentPortalPageId" from-field="parameters.parentPortalPageId"/>
+ </link>
+ </menu-item>
</menu>
<menu name="OpportunityTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
@@ -327,4 +332,11 @@
</link>
</menu-item>
</menu>
+ <menu name="EventTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+ <menu-item name="find" title="${uiLabelMap.CommonFind}"><link target="Events"/></menu-item>
+ </menu>
+ <menu name="EventSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+ menu-container-style="button-bar button-style-2 no-clear">
+ <menu-item name="NewEvent" title="${uiLabelMap.CommonCreateNew}"><link target="EditEvent"/></menu-item>
+ </menu>
</menus>
Added: ofbiz/trunk/applications/marketing/widget/sfa/forms/EventForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/EventForms.xml?rev=835270&view=auto
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/EventForms.xml (added)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/EventForms.xml Thu Nov 12 07:04:41 2009
@@ -0,0 +1,108 @@
+<?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="MyTasks" list-name="myTasks" extends="ListWorkEfforts" extends-resource="component://workeffort/widget/WorkEffortForms.xml">
+ <row-actions>
+ <entity-one entity-name="UserLogin" value-field="assignedByUserLogin">
+ <field-map field-name="userLoginId" from-field="assignedByUserLoginId"/>
+ </entity-one>
+ <entity-one entity-name="PartyNameView" value-field="assignByPartyName">
+ <field-map field-name="partyId" from-field="assignedByUserLogin.partyId"/>
+ </entity-one>
+ </row-actions>
+ <field name="workEffortTypeId"><hidden/></field>
+ <field name="deleteLink"><hidden/></field>
+ <field name="currentStatusId"><hidden/></field>
+ <field name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}" widget-style="buttontext">
+ <hyperlink also-hidden="false" description="${workEffortName} [${workEffortId}]" target="/workeffort/control/WorkEffortSummary" target-type="inter-app">
+ <parameter param-name="workEffortId"/>
+ </hyperlink>
+ </field>
+ <field name="assignedByUserLoginId" title="${uiLabelMap.SfaAssignedBy}">
+ <hyperlink target="/partymgr/control/viewprofile" description="${assignByPartyName.firstName} ${assignByPartyName.middleName} ${assignByPartyName.lastName} ${assignByPartyName.groupName} [${assignByPartyName.partyId}]" target-type="inter-app">
+ <parameter param-name="partyId" from-field="assignByPartyName.partyId"/>
+ </hyperlink>
+ </field>
+ <field name="complete" title="${uiLabelMap.SfaComplete}" widget-style="buttontext">
+ <hyperlink target="updateWorkEffort" description="${uiLabelMap.SfaComplete}">
+ <parameter param-name="workEffortId"/>
+ <parameter param-name="currentStatusId" value="CAL_COMPLETED"/>
+ </hyperlink>
+ </field>
+ </form>
+ <form name="TasksAssignedByMe" list-name="tasksAssignedByMe" extends="MyTasks">
+ <field name="assignedByUserLoginId"><hidden/></field>
+ <field name="partyId" title="${uiLabelMap.FormFieldTitle_toPartyId}">
+ <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}">
+ <sub-hyperlink description="[${partyId}]" target="/partymgr/control/viewprofile" target-type="inter-app">
+ <parameter param-name="partyId"/>
+ </sub-hyperlink>
+ </display-entity>
+ </field>
+ <sort-order>
+ <sort-field name="workEffortId"/>
+ <sort-field name="workEffortPurposeTypeId"/>
+ <sort-field name="description"/>
+ <sort-field name="priority"/>
+ <sort-field name="estimatedStartDate"/>
+ <sort-field name="estimatedCompletionDate"/>
+ <sort-field name="actualStartDate"/>
+ <sort-field name="actualCompletionDate"/>
+ <sort-field name="partyId"/>
+ <sort-field name="complete"/>
+ </sort-order>
+ </form>
+ <form name="EditEvent" extends="editCalEvent" extends-resource="component://workeffort/widget/CalendarForms.xml">
+ <field name="workEffortTypeId"><hidden value="TASK"/></field>
+ <field name="statusId"><hidden value="PRTYASGN_ASSIGNED"/></field>
+ <field name="currentStatusId"><hidden value="CAL_ACCEPTED"/></field>
+ <field name="scopeEnumId"><hidden/></field>
+ <field name="actualStartDate"><hidden/></field>
+ <field name="actualCompletionDate"><hidden/></field>
+ <field name="priority" position="1">
+ <drop-down allow-empty="true">
+ <option key="1" description="${uiLabelMap.WorkEffortPriorityOne}"/>
+ <option key="2" description="${uiLabelMap.WorkEffortPriorityTwo}"/>
+ <option key="3" description="${uiLabelMap.WorkEffortPriorityThree}"/>
+ <option key="4" description="${uiLabelMap.WorkEffortPriorityFour}"/>
+ <option key="5" description="${uiLabelMap.WorkEffortPriorityFive}"/>
+ <option key="6" description="${uiLabelMap.WorkEffortPrioritySix}"/>
+ <option key="7" description="${uiLabelMap.WorkEffortPrioritySeventh}"/>
+ <option key="8" description="${uiLabelMap.WorkEffortPriorityEight}"/>
+ <option key="9" description="${uiLabelMap.WorkEffortPriorityNine}"/>
+ </drop-down>
+ </field>
+ <field name="estimatedStartDate"><date-time input-method="time-dropdown" default-value="${nowTimestamp}"/></field>
+ <field name="estimatedCompletionDate"><date-time input-method="time-dropdown" default-value="${nowTimestamp}"/></field>
+ <field name="partyId" title="${uiLabelMap.FormFieldTitle_toPartyId}"><lookup target-form-name="LookupPartyName" default-value="${userLogin.partyId}"/></field>
+ <sort-order>
+ <sort-field name="workEffortName"/>
+ <sort-field name="description"/>
+ <sort-field name="priority"/>
+ <sort-field name="estimatedStartDate"/>
+ <sort-field name="estimatedCompletionDate"/>
+ <sort-field name="partyId"/>
+ <sort-field name="addButton"/>
+ <sort-field name="updateButton"/>
+ </sort-order>
+ </form>
+</forms>
Propchange: ofbiz/trunk/applications/marketing/widget/sfa/forms/EventForms.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/marketing/widget/sfa/forms/EventForms.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/marketing/widget/sfa/forms/EventForms.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml?rev=835270&r1=835269&r2=835270&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Thu Nov 12 07:04:41 2009
@@ -270,6 +270,7 @@
<now-timestamp field="newEntity.fromDate"/>
</if-empty>
<field-to-result field="newEntity.fromDate" result-name="fromDate"/>
+ <set field="newEntity.assignedByUserLoginId" from-field="userLogin.userLoginId"/>
<if-not-empty field="parameters.statusId">
<now-timestamp field="newEntity.statusDateTime"/>
Modified: ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageScreens.xml?rev=835270&r1=835269&r2=835270&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortalPageScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortalPageScreens.xml Thu Nov 12 07:04:41 2009
@@ -103,7 +103,7 @@
<script location="component://common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.CommonPortalPagesForApplication}: ${parameters.parentPortalPageId}">
<include-form name="ListPortalPages" location="component://common/widget/PortalPageForms.xml"/>
Re: svn commit: r835270 - in /ofbiz/trunk: applications/marketing/ applications/marketing/config/ applications/marketing/data/ applications/marketing/src/org/ofbiz/sfa/vcard/ applications/marketing/webapp/sfa/WEB-INF/ applications/marketing/widget/sfa/ app...
Posted by Scott Gray <sc...@hotwaxmedia.com>.
Hi Hans
Could you explain the reason for changing the decorator-screen name
from main-decorator to CommonPartyDecorator for the ManagePortalPages
screen in your commit below? I would like to change it back so that
other apps can use the screen without requiring the
CommonPartyDecorator and I see no adverse effects in SFA by doing so
but I prefer to check with you first.
Thanks
Scott
HotWax Media
http://www.hotwaxmedia.com
On 12/11/2009, at 8:04 PM, hansbak@apache.org wrote:
> Author: hansbak
> Date: Thu Nov 12 07:04:41 2009
> New Revision: 835270
>
> URL: http://svn.apache.org/viewvc?rev=835270&view=rev
> Log:
> add a portal page as the first page in sfa containing calendar and
> email, but can be changed as required via preferences. add the first
> screens for events which will appear on the calendar. next step will
> be to be able to connect events/tasks to opportunities, show them in
> the party pprofile etc...
>
> Added:
> ofbiz/trunk/applications/marketing/data/SfaPortletData.xml
> (with props)
> ofbiz/trunk/applications/marketing/widget/sfa/EventScreens.xml
> (with props)
> ofbiz/trunk/applications/marketing/widget/sfa/forms/
> EventForms.xml (with props)
> Modified:
> ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml
> ofbiz/trunk/applications/marketing/ofbiz-component.xml
> ofbiz/trunk/applications/marketing/src/org/ofbiz/sfa/vcard/
> VCard.java
> ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/
> controller.xml
> ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml
> ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
> ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml
> ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/
> workeffort/WorkEffortSimpleServices.xml
> ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
>
>
[snip]
> Modified: ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageScreens.xml?rev=835270&r1=835269&r2=835270&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
> (original)
> +++ ofbiz/trunk/framework/common/widget/PortalPageScreens.xml Thu
> Nov 12 07:04:41 2009
> @@ -103,7 +103,7 @@
> <script location="component://common/webcommon/WEB-
> INF/actions/includes/ListPortalPages.groovy"/>
> </actions>
> <widgets>
> - <decorator-screen name="main-decorator" location="$
> {parameters.mainDecoratorLocation}">
> + <decorator-screen name="CommonPartyDecorator"
> location="${parameters.mainDecoratorLocation}">
> <decorator-section name="body">
> <screenlet title="$
> {uiLabelMap.CommonPortalPagesForApplication}: $
> {parameters.parentPortalPageId}">
> <include-form name="ListPortalPages"
> location="component://common/widget/PortalPageForms.xml"/>
>
>