svn commit: r797478 - in /ofbiz/trunk/applications/part
Locked
svn commit: r797478 - in /ofbiz/trunk/applications/part
 
|
Author: mor
Date: Fri Jul 24 14:23:03 2009 New Revision: 797478 URL: http://svn.apache.org/viewvc?rev=797478&view=rev Log: Implemented new screens to show and manage CommunicationEventProduct & CommunicationEventOrder records. Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=797478&r1=797477&r2=797478&view=diff ============================================================================== --- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original) +++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Fri Jul 24 14:23:03 2009 @@ -1995,6 +1995,12 @@ <value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸«à¸±à¸§à¸à¹à¸à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸</value> <value xml:lang="zh">æ·»å æ²éå 容</value> </property> + <property key="PartyAddCommEventOrder"> + <value xml:lang="en">Add Communication Event Order</value> + </property> + <property key="PartyAddCommEventProduct"> + <value xml:lang="en">Add Communication Event Product</value> + </property> <property key="PartyAddListToCart"> <value xml:lang="de">Liste zum Einkaufswagen hinzufügen</value> <value xml:lang="en">Add List To Cart</value> @@ -2994,6 +3000,12 @@ <value xml:lang="th">à¸à¸¥à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸</value> <value xml:lang="zh">æ²éäºä»¶</value> </property> + <property key="PartyCommEventOrders"> + <value xml:lang="en">Communication Event Orders</value> + </property> + <property key="PartyCommEventProducts"> + <value xml:lang="en">Communication Event Products</value> + </property> <property key="PartyCommEventPurposes"> <value xml:lang="de">Kommunikationsereignis Zweck</value> <value xml:lang="en">Communication Event Purposes</value> @@ -6433,6 +6445,9 @@ <value xml:lang="nl">Optioneel</value> <value xml:lang="th">à¸à¸²à¸à¹à¸¥à¸·à¸à¸</value> </property> + <property key="PartyOrderAdd"> + <value xml:lang="en">Order Add</value> + </property> <property key="PartyOrderInLast"> <value xml:lang="de">Aufträge in den letzten</value> <value xml:lang="en">order(s) in the last</value> @@ -7233,6 +7248,9 @@ <value xml:lang="th">สิà¸à¸à¹à¸²</value> <value xml:lang="zh">产å</value> </property> + <property key="PartyProductAdd"> + <value xml:lang="en">Product Add</value> + </property> <property key="PartyProductId"> <value xml:lang="de">Produkt ID</value> <value xml:lang="en">Product Id</value> @@ -8899,6 +8917,12 @@ <value xml:lang="ru">ÐÑоÑмоÑÑ ÑеÑÑиÑикаÑа</value> <value xml:lang="th">à¹à¸ªà¸à¸à¸à¸§à¸²à¸¡à¸¡à¸±à¹à¸à¹à¸</value> </property> + <property key="PartyViewCommOrders"> + <value xml:lang="en">View Communication Orders</value> + </property> + <property key="PartyViewCommProducts"> + <value xml:lang="en">View Communication Products</value> + </property> <property key="PartyViewCommunicationEvent"> <value xml:lang="de">Kommunikationsereignis anzeigen</value> <value xml:lang="en">View Communication Event</value> Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=797478&r1=797477&r2=797478&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Fri Jul 24 14:23:03 2009 @@ -1148,6 +1148,41 @@ <response name="error" type="none"/> </request-map> + <!-- Order communication event requests --> + <request-map uri="UpdateCommOrders"> + <security https="true" auth="true"/> + <response name="success" type="view" value="UpdateCommOrders"/> + </request-map> + <request-map uri="createCommunicationEventOrder"> + <security https="true" auth="true"/> + <event type="service" invoke="createCommunicationEventOrder"/> + <response name="success" type="view" value="UpdateCommOrders"/> + <response name="error" type="view" value="UpdateCommOrders"/> + </request-map> + <request-map uri="deleteCommunicationEventOrder"> + <security https="true" auth="true"/> + <event type="service" invoke="removeCommunicationEventOrder"/> + <response name="success" type="view" value="UpdateCommOrders"/> + <response name="error" type="view" value="UpdateCommOrders"/> + </request-map> + + <!-- Product communication event requests --> + <request-map uri="UpdateCommProducts"> + <security https="true" auth="true"/> + <response name="success" type="view" value="UpdateCommProducts"/> + </request-map> + <request-map uri="createCommunicationEventProduct"> + <security https="true" auth="true"/> + <event type="service" invoke="createCommunicationEventProduct"/> + <response name="success" type="view" value="UpdateCommProducts"/> + <response name="error" type="view" value="UpdateCommProducts"/> + </request-map> + <request-map uri="deleteCommunicationEventProduct"> + <security https="true" auth="true"/> + <event type="service" invoke="removeCommunicationEventProduct"/> + <response name="success" type="view" value="UpdateCommProducts"/> + <response name="error" type="view" value="UpdateCommProducts"/> + </request-map> <!-- Lookup request mappings --> <request-map uri="LookupPartyName"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyName"/></request-map> @@ -1169,6 +1204,8 @@ <request-map uri="LookupPreferredContactMech"><security https="true" auth="true"/><response name="success" type="view" value="LookupPreferredContactMech"/></request-map> <request-map uri="LookupEmploymentApp"><security auth="true" https="true"/><response name="success" type="view" value="LookupEmploymentApp"/></request-map> <request-map uri="LookupEmplPosition"><security auth="true" https="true"/><response name="success" type="view" value="LookupEmplPosition"/></request-map> + <request-map uri="LookupOrderHeader"><security auth="true" https="true"/><response name="success" type="view" value="LookupOrderHeader"/></request-map> + <request-map uri="LookupProduct"><security auth="true" https="true"/><response name="success" type="view" value="LookupProduct"/></request-map> <!-- Financial History Report--> <request-map uri="PartyFinancialHistory"> @@ -1300,6 +1337,8 @@ <view-map name="LookupEmplPosition" type="screen" page="component://humanres/widget/LookupScreens.xml#LookupEmplPosition"/> <view-map name="LookupSegmentGroup" type="screen" page="component://marketing/widget/LookupScreens.xml#LookupSegmentGroup"/> + <view-map name="LookupOrderHeader" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupOrderHeader"/> + <view-map name="LookupProduct" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProduct"/> <view-map name="ViewSimpleContent" page="" type="simplecontent"/> @@ -1318,5 +1357,8 @@ <view-map name="PartyFinancialHistory" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#PartyFinancialHistory"/> <view-map name="Preferences" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#Preferences"/> <view-map name="PartyGeoLocation" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#PartyGeoLocation"/> + + <view-map name="UpdateCommOrders" type="screen" page="component://party/widget/partymgr/CommunicationEventScreens.xml#UpdateCommOrders"/> + <view-map name="UpdateCommProducts" type="screen" page="component://party/widget/partymgr/CommunicationEventScreens.xml#UpdateCommProducts"/> <!-- end of view mappings --> </site-conf> Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml?rev=797478&r1=797477&r2=797478&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml Fri Jul 24 14:23:03 2009 @@ -908,4 +908,52 @@ <field name="startDate"><display type="date-time"/></field> <field name="removeButton" widget-style="smallSubmit"><submit/></field> </form> + <form name="ListCommOrders" list-name="ordersList" type="list" target="deleteCommunicationEventOrder" paginate-target="UpdateCommOrders" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" view-size="20"> + <actions> + <entity-and entity-name="CommunicationEventOrder" list="ordersList"> + <field-map field-name="communicationEventId"/> + </entity-and> + </actions> + <row-actions> + <entity-one entity-name="OrderHeader" value-field="orderHeader" auto-field-map="true"/> + <set field="orderTypeId" from-field="orderHeader.orderTypeId"/> + </row-actions> + <field name="orderId" title="${uiLabelMap.FormFieldTitle_orderId}" widget-style="buttontext"> + <hyperlink target="/ordermgr/control/orderview?orderId=${orderId}" description="${orderId}" target-type="inter-app"/> + </field> + <field name="communicationEventId"><hidden/></field> + <field name="orderTypeId" title="${uiLabelMap.OrderOrderType}"> + <display-entity entity-name="OrderType" key-field-name="orderTypeId" description="${description}"/> + </field> + <field name="createdBy" title="${uiLabelMap.OrderCreatedBy}"> + <display description="${orderHeader.createdBy}"/> + </field> + <field name="deleteButton" title="${uiLabelMap.CommonDelete}" widget-style="smallSubmit"><submit/></field> + </form> + <form name="AddCommOrder" type="single" target="createCommunicationEventOrder" header-row-style="header-row" default-table-style="basic-table"> + <field name="communicationEventId"><hidden/></field> + <field name="orderId"><lookup target-form-name="LookupOrderHeader"/></field> + <field name="submitButton" title="${uiLabelMap.PartyOrderAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> + <form name="ListCommProducts" list-name="productsList" type="list" target="deleteCommunicationEventProduct" paginate-target="ListCommProducts" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" view-size="20"> + <actions> + <entity-and entity-name="CommunicationEventProduct" list="productsList"> + <field-map field-name="communicationEventId"/> + </entity-and> + </actions> + <row-actions> + <entity-one entity-name="Product" value-field="product" auto-field-map="true"/> + </row-actions> + <field name="communicationEventId"><hidden/></field> + <field name="productId" title="${uiLabelMap.PartyProductId}"><display/></field> + <field name="internalName"> + <display description="${product.internalName}"/> + </field> + <field name="deleteButton" title="${uiLabelMap.CommonDelete}" widget-style="smallSubmit"><submit/></field> + </form> + <form name="AddCommProduct" type="single" target="createCommunicationEventProduct" header-row-style="header-row" default-table-style="basic-table"> + <field name="communicationEventId"><hidden/></field> + <field name="productId" title="${uiLabelMap.PartyProductId}"><lookup target-form-name="LookupProduct"/></field> + <field name="submitButton" title="${uiLabelMap.PartyProductAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> </forms> Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml?rev=797478&r1=797477&r2=797478&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml Fri Jul 24 14:23:03 2009 @@ -838,4 +838,54 @@ </widgets> </section> </screen> + <screen name="UpdateCommOrders"> + <section> + <actions> + <set field="titleProperty" value="PartyViewCommOrders"/> + <set field="tabButtonItem" value="UpdateCommOrders"/> + <set field="communicationEventId" from-field="parameters.communicationEventId"/> + <set field="partyId" from-field="parameters.partyId"/> + <set field="partyIdFrom" from-field="parameters.partyIdFrom" default-value="${userLogin.partyId}"/> + <set field="partyIdTo" from-field="parameters.partyIdTo" default-value="${userLogin.partyId}"/> + <entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/> + </actions> + <widgets> + <decorator-screen name="CommonCommunicationEventDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.PartyCommEventOrders}"> + <include-form name="ListCommOrders" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.PartyAddCommEventOrder}"> + <include-form name="AddCommOrder" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="UpdateCommProducts"> + <section> + <actions> + <set field="titleProperty" value="PartyViewCommProducts"/> + <set field="tabButtonItem" value="UpdateCommProducts"/> + <set field="communicationEventId" from-field="parameters.communicationEventId"/> + <set field="partyId" from-field="parameters.partyId"/> + <set field="partyIdFrom" from-field="parameters.partyIdFrom" default-value="${userLogin.partyId}"/> + <set field="partyIdTo" from-field="parameters.partyIdTo" default-value="${userLogin.partyId}"/> + <entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/> + </actions> + <widgets> + <decorator-screen name="CommonCommunicationEventDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.PartyCommEventProducts}"> + <include-form name="ListCommProducts" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.PartyAddCommEventProduct}"> + <include-form name="AddCommProduct" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> </screens> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=797478&r1=797477&r2=797478&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Fri Jul 24 14:23:03 2009 @@ -552,6 +552,18 @@ <menu-item name="ListUnknownPartyComms" title="${uiLabelMap.PartyEmailFromUnknownParties}"> <link target="listUnknownPartyComms"/> </menu-item> + <menu-item name="UpdateCommOrders" title="${uiLabelMap.OrderOrders}"> + <condition><not><if-empty field="communicationEvent"/></not></condition> + <link target="UpdateCommOrders"> + <parameter param-name="communicationEventId" from-field="parameters.communicationEventId"/> + </link> + </menu-item> + <menu-item name="UpdateCommProducts" title="${uiLabelMap.ProductProducts}"> + <condition><not><if-empty field="communicationEvent"/></not></condition> + <link target="UpdateCommProducts"> + <parameter param-name="communicationEventId" from-field="parameters.communicationEventId"/> + </link> + </menu-item> </menu> <menu name="CommFindTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" default-menu-item-name="find"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |