svn commit: r447973 - in /incubator/ofbiz/trunk: applications/marketing/config/ applications/marketing/servicedef/ applications/marketing/webapp/marketing/WEB-INF/ applications/marketing/webapp/marketing/campaign/ applications/marketing/widget/ framewo...

Author: jleroux
Date: Tue Sep 19 14:19:43 2006
New Revision: 447973

URL: http://svn.apache.org/viewvc?view=rev&rev=447973
Log:
A patch from Marco Risaliti which solves "Misc bugs in marketing campaigns screens" (https://issues.apache.org/jira/browse/OFBIZ-192)
Thanks Marco

Modified:
    incubator/ofbiz/trunk/applications/marketing/config/MarketingUiLabels.properties
    incubator/ofbiz/trunk/applications/marketing/config/MarketingUiLabels_it.properties
    incubator/ofbiz/trunk/applications/marketing/servicedef/services.xml
    incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml
    incubator/ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml
    incubator/ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml
    incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels.properties
    incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels_it.properties

Modified: incubator/ofbiz/trunk/applications/marketing/config/MarketingUiLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/config/MarketingUiLabels.properties?view=diff&rev=447973&r1=447972&r2=447973
==============================================================================
--- incubator/ofbiz/trunk/applications/marketing/config/MarketingUiLabels.properties (original)
+++ incubator/ofbiz/trunk/applications/marketing/config/MarketingUiLabels.properties Tue Sep 19 14:19:43 2006
@@ -177,3 +177,6 @@
 FormFieldTitle_contactListId=Contact List Id
 FormFieldTitle_contactMechId=Contact Mech Id
 FormFieldTitle_cmDetail=Contact Mech Detail
+FormFieldTitle_budgetedCost=Budgeted Cost
+FormFieldTitle_actualCost=Actual Cost
+FormFieldTitle_estimatedCost=Estimated Cost

Modified: incubator/ofbiz/trunk/applications/marketing/config/MarketingUiLabels_it.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/config/MarketingUiLabels_it.properties?view=diff&rev=447973&r1=447972&r2=447973
==============================================================================
--- incubator/ofbiz/trunk/applications/marketing/config/MarketingUiLabels_it.properties (original)
+++ incubator/ofbiz/trunk/applications/marketing/config/MarketingUiLabels_it.properties Tue Sep 19 14:19:43 2006
@@ -32,6 +32,8 @@
 ContactListContactMechTypeId=Tipo Contatto
 ContactListCreate=Creare Nuova Lista Contatto
 ContactListIsPublic=E' Pubblico ?
+ContactListIsSingleUse=E' Uso Singolo ?
+ContactListNotFound=Non \u00e8 possibile trovare la lista e-mail [${contactListId}].
 ContactListOptInVerifyCode=Codice Verifica Opt-In
 ContactListOwnerPartyId=Codice Soggetto Proprietario
 ContactListParty=Lista Contatti Soggetti
@@ -177,3 +179,6 @@
 FormFieldTitle_contactListId=Lista di Contatto
 FormFieldTitle_contactMechId=Contatto
 FormFieldTitle_cmDetail=Dettaglio Contatto
+FormFieldTitle_budgetedCost=Costo A Budget
+FormFieldTitle_actualCost=Costo Attuale
+FormFieldTitle_estimatedCost=Costo Stimato

Modified: incubator/ofbiz/trunk/applications/marketing/servicedef/services.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/servicedef/services.xml?view=diff&rev=447973&r1=447972&r2=447973
==============================================================================
--- incubator/ofbiz/trunk/applications/marketing/servicedef/services.xml (original)
+++ incubator/ofbiz/trunk/applications/marketing/servicedef/services.xml Tue Sep 19 14:19:43 2006
@@ -35,8 +35,8 @@
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="removeMarketingCampaign" default-entity-name="MarketingCampaign" engine="simple"
-            location="org/ofbiz/marketing/campaign/MarketingCampaignServices.xml" invoke="removeMarketingCampaign" auth="true">
+    <service name="deleteMarketingCampaign" default-entity-name="MarketingCampaign" engine="simple"
+            location="org/ofbiz/marketing/campaign/CampaignServices.xml" invoke="deleteMarketingCampaign" auth="true">
         <description>Remove a MarketingCampaign record</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>

Modified: incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml?view=diff&rev=447973&r1=447972&r2=447973
==============================================================================
--- incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml Tue Sep 19 14:19:43 2006
@@ -177,6 +177,12 @@
         <response name="success" type="view" value="EditMarketingCampaign"/>
         <response name="error" type="view" value="EditMarketingCampaign"/>
     </request-map>
+    <request-map uri="removeMarketingCampaign">
+        <security https="true" auth="true"/>      
+        <event type="service" invoke="deleteMarketingCampaign"/>
+        <response name="success" type="view" value="FindMarketingCampaign"/>
+        <response name="error" type="view" value="FindMarketingCampaign"/>
+    </request-map>
     
     <request-map uri="EditMarketingCampaignRoles"><security https="true" auth="true"/><response name="success" type="view" value="EditMarketingCampaignRoles"/></request-map>
     <request-map uri="addRoleToMarketingCampaign"><security https="true" auth="true"/>
@@ -206,8 +212,8 @@
     <request-map uri="removeMarketingCampaignRole">
         <security https="true" auth="true"/>
         <event type="service" invoke="deleteMarketingCampaignRole"/>
-        <response name="success" type="view" value="ListMarketingCampaignRoles"/>
-        <response name="error" type="view" value="ListMarketingCampaignRoles"/>
+        <response name="success" type="view" value="FindMarketingCampaignRoles"/>
+        <response name="error" type="view" value="FindMarketingCampaignRoles"/>
     </request-map>
     
     <!--  SegmentGroup requests -->

Modified: incubator/ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml?view=diff&rev=447973&r1=447972&r2=447973
==============================================================================
--- incubator/ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml (original)
+++ incubator/ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml Tue Sep 19 14:19:43 2006
@@ -78,7 +78,7 @@
             <display/>
         </field>
         <field name="deleteLink" title="&amp;nbsp;" widget-style="buttontext">
-            <hyperlink target="deleteMarketingCampaign?marketingCampaignId=${marketingCampaignId}"
+            <hyperlink target="removeMarketingCampaign?marketingCampaignId=${marketingCampaignId}"
                 description="[${uiLabelMap.CommonDelete}]" also-hidden="false"/>
         </field>
     </form>
@@ -115,7 +115,7 @@
             <hyperlink target="EditMarketingCampaignRoles?marketingCampaignId=${marketingCampaignId}&amp;roleTypeId=${roleTypeId}&amp;partyId=${partyId}" description="${uiLabelMap.CommonEdit}" also-hidden="false"/>
         </field>
         <field name="deleteLink" title="&amp;nbsp;" widget-style="buttontext">
-            <hyperlink target="deleteMarketingCampaignGeo?marketingCampaignId=${marketingCampaignId}&amp;roleTypeId=${roleTypeId}&amp;partyId=${partyId}"
+            <hyperlink target="removeMarketingCampaignRole?marketingCampaignId=${marketingCampaignId}&amp;roleTypeId=${roleTypeId}&amp;partyId=${partyId}"
                 description="[${uiLabelMap.CommonDelete}]" also-hidden="false"/>
         </field>
     </form>
@@ -133,7 +133,7 @@
         <field name="partyId" title="${uiLabelMap.PartyPartyId}">
             <lookup target-form-name="LookupPartyName"/>
         </field>
-        <field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}">
+        <field name="roleTypeId">
             <drop-down>
                 <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
                 </entity-options>

Modified: incubator/ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml?view=diff&rev=447973&r1=447972&r2=447973
==============================================================================
--- incubator/ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml Tue Sep 19 14:19:43 2006
@@ -62,7 +62,7 @@
                 <set field="tabButtonItem" value="MarketingCampaign"/>
                 <set field="labelTitleProperty" value="PageTitleEditMarketingCampaign"/>
 
-                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListMarketingCampaign"/>
+                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="FindMarketingCampaign"/>
                 <set field="marketingCampaignId" from-field="parameters.marketingCampaignId"/>
                 <entity-one entity-name="MarketingCampaign" value-name="marketingCampaign"/>
             </actions>
@@ -96,7 +96,7 @@
                 <set field="tabButtonItem" value="MarketingCampaign"/>
                 <set field="labelTitleProperty" value="PageTitleListMarketingCampaign"/>
 
-                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListMarketingCampaign"/>
+                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="FindListMarketingCampaign"/>
                 <set field="marketingCampaignId" from-field="parameters.marketingCampaignId"/>
                 <set field="entityName" value="MarketingCampaign"/>
             </actions>
@@ -118,9 +118,10 @@
                 <set field="tabButtonItem" value="MarketingCampaignRole"/>
                 <set field="labelTitleProperty" value="PageTitleEditMarketingCampaignRole"/>
 
-                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListMarketingCampaign"/>
+                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="FindMarketingCampaignRoles"/>
                 <set field="marketingCampaignId" from-field="parameters.marketingCampaignId"/>
-                <set field="roleTypeId" from-field="parameters.partyId"/>
+                <set field="partyId" from-field="parameters.partyId"/>
+                <set field="roleTypeId" from-field="parameters.roleTypeId"/>
                 <set field="fromDate" from-field="parameters.fromDate"/>
                 <entity-one entity-name="MarketingCampaignRole" value-name="marketingCampaignRole"/>
             </actions>
@@ -143,7 +144,7 @@
                 <set field="tabButtonItem" value="MarketingCampaignRole"/>
                 <set field="labelTitleProperty" value="PageTitleListMarketingCampaignRole"/>
 
-                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListMarketingCampaigns"/>
+                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="FindMarketingCampaign"/>
                 <set field="marketingCampaignId" from-field="parameters.marketingCampaignId"/>
             </actions>
             <widgets>
@@ -165,7 +166,7 @@
                 <set field="labelTitleProperty" value="PageTitleFindMarketingCampaignRole"/>
 
                 <set field="marketingCampaignId" from-field="parameters.marketingCampaignId"/>
-                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/EditMarketingCampaign?marketingCampaignId=${marketingCampaignId}"/>
+                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="EditMarketingCampaign?marketingCampaignId=${marketingCampaignId}"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonMarketingCampaignDecorator">

Modified: incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels.properties?view=diff&rev=447973&r1=447972&r2=447973
==============================================================================
--- incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels.properties (original)
+++ incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels.properties Tue Sep 19 14:19:43 2006
@@ -1269,3 +1269,21 @@
 StatusValidChange.transitionName.EXST_APPROVED.EXST_CANCELLED=Cancel Example
 StatusValidChange.transitionName.EXST_IMPLEMENTED.EXST_CANCELLED=Cancel Example
 StatusValidChange.transitionName.EXST_TESTED.EXST_CANCELLED=Cancel Example
+
+StatusType.description.MKTG_CAMP_STATUS=Marketing Campaign
+StatusItem.description.MKTG_CAMP_PLANNED=Planned
+StatusItem.description.MKTG_CAMP_APPROVED=Approved
+StatusItem.description.MKTG_CAMP_INPROGRESS=In Progress
+StatusItem.description.MKTG_CAMP_COMPLETED=Completed
+StatusItem.description.MKTG_CAMP_CANCELLED=Cancelled
+
+StatusValidChange.transitionName.MKTG_CAMP_PLANNED.MKTG_CAMP_APPROVED=Approve Marketing Campaign
+StatusValidChange.transitionName.MKTG_CAMP_APPROVED.MKTG_CAMP_INPROGRESS=Marketing Campaign In Progress
+StatusValidChange.transitionName.MKTG_CAMP_INPROGRESS.MKTG_CAMP_COMPLETED=Complete Marketing Campaign
+StatusValidChange.transitionName.MKTG_CAMP_PLANNED.MKTG_CAMP_CANCELLED=Cancel Marketing Campaign
+StatusValidChange.transitionName.MKTG_CAMP_APPROVED.MKTG_CAMP_CANCELLED=Cancel Marketing Campaign
+StatusValidChange.transitionName.MKTG_CAMP_INPROGRESS.MKTG_CAMP_CANCELLED=Cancel Marketing Campaign
+
+EnumerationType.description.TRACKINGCODE_SRC=Tracking Code Source
+Enumeration.description.TKCDSRC_COOKIE=Cookie
+Enumeration.description.TKCDSRC_URL_PARAM=URL Parameter

Modified: incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels_it.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels_it.properties?view=diff&rev=447973&r1=447972&r2=447973
==============================================================================
--- incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels_it.properties (original)
+++ incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels_it.properties Tue Sep 19 14:19:43 2006
@@ -1269,3 +1269,21 @@
 StatusValidChange.transitionName.EXST_APPROVED.EXST_CANCELLED=Cancella Esempio
 StatusValidChange.transitionName.EXST_IMPLEMENTED.EXST_CANCELLED=Cancella Esempio
 StatusValidChange.transitionName.EXST_TESTED.EXST_CANCELLED=Cancella Esempio
+
+StatusType.description.MKTG_CAMP_STATUS=Campagna Vendita
+StatusItem.description.MKTG_CAMP_PLANNED=Pianificata
+StatusItem.description.MKTG_CAMP_APPROVED=Approvata
+StatusItem.description.MKTG_CAMP_INPROGRESS=In Corso
+StatusItem.description.MKTG_CAMP_COMPLETED=Completata
+StatusItem.description.MKTG_CAMP_CANCELLED=Cancellata
+
+StatusValidChange.transitionName.MKTG_CAMP_PLANNED.MKTG_CAMP_APPROVED=Approva Campagna Vendita
+StatusValidChange.transitionName.MKTG_CAMP_APPROVED.MKTG_CAMP_INPROGRESS=Campagna Vendita In Corso
+StatusValidChange.transitionName.MKTG_CAMP_INPROGRESS.MKTG_CAMP_COMPLETED=Completa Campagna Vendita
+StatusValidChange.transitionName.MKTG_CAMP_PLANNED.MKTG_CAMP_CANCELLED=Cancella Campagna Vendita
+StatusValidChange.transitionName.MKTG_CAMP_APPROVED.MKTG_CAMP_CANCELLED=Cancella Campagna Vendita
+StatusValidChange.transitionName.MKTG_CAMP_INPROGRESS.MKTG_CAMP_CANCELLED=Cancella Campagna Vendita
+
+EnumerationType.description.TRACKINGCODE_SRC=Origine Codice Tracciatura
+Enumeration.description.TKCDSRC_COOKIE=Cookie
+Enumeration.description.TKCDSRC_URL_PARAM=Parametro URL