svn commit: r942544 - in /ofbiz/trunk: applications/product/config/ applications/product/data/ applications/product/servicede
Locked
 
|
Author: erwan
Date: Sun May 9 14:59:11 2010 New Revision: 942544 URL: http://svn.apache.org/viewvc?rev=942544&view=rev Log: Facilities management for a productStore, made using the new set of portals/portlets. It can be reached at this address : https://localhost:8443/catalog/control/ProductStoreFacilities?productStoreId=90100 Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml ofbiz/trunk/applications/product/data/ProductPortletData.xml ofbiz/trunk/applications/product/servicedef/services_store.xml ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml ofbiz/trunk/framework/common/config/CommonPortalEntityLabels.xml Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=942544&r1=942543&r2=942544&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Sun May 9 14:59:11 2010 @@ -19642,6 +19642,10 @@ <value xml:lang="th">à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²</value> <value xml:lang="zh">åºéº</value> </property> + <property key="ProductStoreFacilityAssocList"> + <value xml:lang="en">Product Store Facility Settings</value> + <value xml:lang="fr">Paramétrage des lieux de stockage du centre de profit</value> + </property> <property key="ProductStoreFinAccountSettings"> <value xml:lang="en">Product Store Financial Account Settings</value> <value xml:lang="fr">Paramétrage des comptes financiers du centre de profit</value> Modified: ofbiz/trunk/applications/product/data/ProductPortletData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ProductPortletData.xml?rev=942544&r1=942543&r2=942544&view=diff ============================================================================== --- ofbiz/trunk/applications/product/data/ProductPortletData.xml (original) +++ ofbiz/trunk/applications/product/data/ProductPortletData.xml Sun May 9 14:59:11 2010 @@ -27,4 +27,24 @@ description="List of best selling products of the day"/> <PortletPortletCategory portalPortletId="BestSellingProducts" portletCategoryId="PRODUCTS"/> + <PortletCategory portletCategoryId="PRODUCTSTORE" description="ProductStore Management"/> + <PortalPortlet portalPortletId="PrdStoreFacilityMgmt" + portletName="Facility associated to ProductStore management" + screenName="GenericScreenletAjaxWithMenu" + screenLocation="component://common/widget/PortalPageScreens.xml" + description="Facilities associated for one productStore list and management : associate a facility, edit associate data, remove association" + securityServiceName="" securityMainAction="VIEW"/> + <PortletAttribute portalPortletId="PrdStoreFacilityMgmt" attrName="titleLabel" attrValue="ProductStoreFacilityAssocList" portalPageId="_NA_" portletSeqId="00000"/> + <PortletAttribute portalPortletId="PrdStoreFacilityMgmt" attrName="divIdRefresh" attrValue="PrdStoreFacilityMgmt_refresh" portalPageId="_NA_" portletSeqId="00000"/> + <PortletAttribute portalPortletId="PrdStoreFacilityMgmt" attrName="divIdArea" attrValue="PrdStoreFacilityMgmtArea" portalPageId="_NA_" portletSeqId="00000"/> + <PortletAttribute portalPortletId="PrdStoreFacilityMgmt" attrName="screenName" attrValue="ListProductStoreFacility" portalPageId="_NA_" portletSeqId="00000"/> + <PortletAttribute portalPortletId="PrdStoreFacilityMgmt" attrName="screenLocation" attrValue="component://product/widget/catalog/StoreScreens.xml" portalPageId="_NA_" portletSeqId="00000"/> + <PortletAttribute portalPortletId="PrdStoreFacilityMgmt" attrName="menuName" attrValue="ProductStoreFacility" portalPageId="_NA_" portletSeqId="00000"/> + <PortletAttribute portalPortletId="PrdStoreFacilityMgmt" attrName="menuLocation" attrValue="component://product/widget/catalog/CatalogMenus.xml" portalPageId="_NA_" portletSeqId="00000"/> + <PortletPortletCategory portalPortletId="PrdStoreFacilityMgmt" portletCategoryId="PRODUCTSTORE"/> + <PortalPage portalPageId="ProductStoreFacility" sequenceNum="100" portalPageName="ProductStore Facility Management" + description="The page to manage productStoreFacility data" ownerUserLoginId="_NA_" /> + <PortalPageColumn portalPageId="ProductStoreFacility" columnSeqId="00001"/> + <PortalPagePortlet portalPageId="ProductStoreFacility" portalPortletId="PrdStoreFacilityMgmt" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> + </entity-engine-xml> \ No newline at end of file Modified: ofbiz/trunk/applications/product/servicedef/services_store.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_store.xml?rev=942544&r1=942543&r2=942544&view=diff ============================================================================== --- ofbiz/trunk/applications/product/servicedef/services_store.xml (original) +++ ofbiz/trunk/applications/product/servicedef/services_store.xml Sun May 9 14:59:11 2010 @@ -290,4 +290,20 @@ under the License. <auto-attributes include="pk" mode="IN" optional="false"/> </service> + <!--ProductStoreFacility Services --> + <service name="createProductStoreFacility" default-entity-name="ProductStoreFacility" engine="entity-auto" invoke="create" auth="true"> + <description>Create a ProductStoreFacility</description> + <auto-attributes include="pk" mode="IN" optional="false"/> + <auto-attributes include="nonpk" mode="IN" optional="true"/> + </service> + <service name="updateProductStoreFacility" default-entity-name="ProductStoreFacility" engine="entity-auto" invoke="update" auth="true"> + <description>Update a ProductStoreFacility</description> + <auto-attributes include="pk" mode="IN" optional="false"/> + <auto-attributes include="nonpk" mode="IN" optional="true"/> + </service> + <service name="deleteProductStoreFacility" default-entity-name="ProductStoreFacility" engine="entity-auto" invoke="delete" auth="true"> + <description>Delete a ProductStoreFacility</description> + <auto-attributes include="pk" mode="IN" optional="false"/> + </service> + </services> Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=942544&r1=942543&r2=942544&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Sun May 9 14:59:11 2010 @@ -21,6 +21,7 @@ under the License. <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://commonext/webapp/WEB-INF/controller.xml"/> <description>Catalog Module Site Configuration File</description> <owner>Copyright 2001-2009 The Apache Software Foundation</owner> @@ -2296,6 +2297,32 @@ under the License. <response name="error" type="view" value="EditProductStoreVendorShipments"/> </request-map> + <!-- ================ ProductStore Facility Requests =========== --> + <request-map uri="ProductStoreFacilities"><security https="true" auth="true"/> + <response name="success" type="view" value="ProductStoreFacilities"/> + </request-map> + <request-map uri="editProductStoreFacility"><security https="true" auth="true"/> + <response name="success" type="view" value="EditProductStoreFacility"/> + </request-map> + <request-map uri="addProductStoreFacility"> + <security https="true" auth="true"/> + <event type="service" invoke="createProductStoreFacility"/> + <response name="success" type="request" value="json"/> + <response name="error" type="request" value="json"/> + </request-map> + <request-map uri="updateProductStoreFacility"> + <security https="true" auth="true"/> + <event type="service" invoke="updateProductStoreFacility"/> + <response name="success" type="request" value="json"/> + <response name="error" type="request" value="json"/> + </request-map> + <request-map uri="deleteProductStoreFacility"> + <security https="true" auth="true"/> + <event type="service" invoke="deleteProductStoreFacility"/> + <response name="success" type="view" value="ListProductStoreFacility"/> + <response name="error" type="view" value="ListProductStoreFacility"/> + </request-map> + <!-- ================ Keyword Thesaurus Requests ================= --> <request-map uri="editKeywordThesaurus"> <security https="true" auth="true"/> @@ -2811,6 +2838,9 @@ under the License. <view-map name="EditProductStoreFinAccountSettings" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreFinAccountSettings"/> <view-map name="EditProductStoreVendorPayments" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreVendorPayments"/> <view-map name="EditProductStoreVendorShipments" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreVendorShipments"/> + <view-map name="ProductStoreFacilities" page="component://product/widget/catalog/StoreScreens.xml#ProductStoreFacilities" type="screen"/> + <view-map name="ListProductStoreFacility" page="component://product/widget/catalog/StoreScreens.xml#ListProductStoreFacility" type="screen"/> + <view-map name="EditProductStoreFacility" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreFacility" type="screen"/> <view-map name="EditVendorProduct" type="screen" page="component://product/widget/catalog/ProductScreens.xml#EditVendorProduct"/> <view-map name="EditKeywordThesaurus" type="screen" page="component://product/widget/catalog/ThesaurusScreens.xml#EditKeywordThesaurus"/> Modified: ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml?rev=942544&r1=942543&r2=942544&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml Sun May 9 14:59:11 2010 @@ -159,6 +159,11 @@ under the License. <parameter param-name="productStoreId"/> </link> </menu-item> + <menu-item name="EditProductStoreFacilities" title="${uiLabelMap.ProductFacility}"> + <link target="ProductStoreFacilities"> + <parameter param-name="productStoreId"/> + </link> + </menu-item> <menu-item name="EditProductStoreEmails" title="${uiLabelMap.CommonEmails}"> <link target="EditProductStoreEmails"> <parameter param-name="productStoreId"/> @@ -190,6 +195,12 @@ under the License. </link> </menu-item> </menu> + <menu name="ProductStoreFacility" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> + <menu-item name="AddProductStoreFacility" title="${uiLabelMap.ProductAddFacility}"> + <link target="javascript:ajaxUpdateArea('ProductStoreFacilityEditArea', 'editProductStoreFacility', 'productStoreId=${parameters.productStoreId}');" + url-mode="plain"/> + </menu-item> + </menu> <menu name="CatalogTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="ProductCatalog" title="${uiLabelMap.ProductCatalog}"> Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=942544&r1=942543&r2=942544&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Sun May 9 14:59:11 2010 @@ -48,6 +48,28 @@ under the License. </section> </screen> + <screen name="uiLabelDecorator"> + <section> + <condition> + <if-has-permission permission="CATALOG" action="_VIEW" /> + </condition> + <actions> + <!-- base/top/specific map first, then more common map added for shared labels --> + <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> + </actions> + <widgets> + <decorator-section-include name="body"/> + </widgets> + <fail-widgets> + <label style="h3">${uiLabelMap.ProductCatalogViewPermissionError}</label> + </fail-widgets> + </section> + </screen> + <screen name="CommonProductDecorator"> <section> <actions> Modified: ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml?rev=942544&r1=942543&r2=942544&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml Sun May 9 14:59:11 2010 @@ -99,4 +99,58 @@ under the License. <submit button-type="button"/> </field> </form> + + <!-- ProductStoreFacility forms --> + <form name="ListProductStoreFacility" type="list" list-name="listIt" target="" + default-table-style="basic-table hover-bar" odd-row-style="alternate-row"> + <actions> + <entity-and entity-name="ProductStoreFacility"> + <field-map field-name="productStoreId" from-field="parameters.productStoreId"/> + <order-by field-name="sequenceNum"/> + <order-by field-name="fromDate"/> + </entity-and> + </actions> + + <field name="submitButton" title=" " > + <hyperlink target="javascript:ajaxUpdateArea('ProductStoreFacilityEditArea', 'editProductStoreFacility', 'productStoreId=${productStoreId}&facilityId=${facilityId}&fromDate=${fromDate}');" + target-type="plain" image-location="/images/mini-edit.png" image-title="${uiLabelMap.CommonEdit}"/> + </field> + <field name="productStoreId"><hidden /></field> + <field name="facilityId"> + <display-entity entity-name="Facility" description="${facilityName}"> + <sub-hyperlink link-style="link" description="[${facilityId}]" target="EditFacility"> + <parameter param-name="facilityId"/> + </sub-hyperlink> + </display-entity> + </field> + <field name="sequenceNum" ><display /></field> + <field name="fromDate" ><display type="date-time" /></field> + <field name="thruDate" ><display type="date-time" /></field> + <field name="deleteLink" title=" " > + <hyperlink target="javascript:ajaxUpdateArea('PrdStoreFacilityMgmtArea', 'deleteProductStoreFacility', 'productStoreId=${productStoreId}&facilityId=${facilityId}&fromDate=${fromDate}');" + target-type="plain" request-confirmation="true" image-location="/images/mini-trash.png" image-title="${uiLabelMap.CommonRemove}"> + </hyperlink> + </field> + </form> + + <form name="EditProductStoreFacility" type="single" focus-field-name="facilityId" + target="addProductStoreFacility" title="" default-map-name="productStoreFacility" > + <alt-target target="updateProductStoreFacility" use-when="productStoreFacility != null"/> + + <field name="productStoreId"><hidden /></field> + <field name="facilityId" use-when="productStoreFacility != null"><display/></field> + <field name="facilityId" use-when="productStoreFacility == null"> + <drop-down allow-empty="false"> + <entity-options description="${facilityName} [${facilityId}]" entity-name="Facility"/> + </drop-down> + </field> + <field name="sequenceNum" ><text size="3"/></field> + <field name="fromDate" use-when="productStoreFacility != null"><display type="date-time"/></field> + <field name="fromDate" use-when="productStoreFacility == null"><date-time type="date" input-method="time-dropdown"/></field> + <field name="thruDate"><date-time type="date" input-method="time-dropdown"/></field> + <field name="submitButton" title="${groovy: productStoreFacility == null ? uiLabelMap.CommonAdd : uiLabelMap.CommonUpdate}" widget-style="smallSubmit"> + <submit button-type="button"/> + </field> + <on-event-update-area event-type="submit" area-id="PrdStoreFacilityMgmt_refresh" area-target="refreshPortlet?portalPortletId=PrdStoreFacilityMgmt&productStoreId=${parameters.productStoreId}"/> + </form> </forms> Modified: ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml?rev=942544&r1=942543&r2=942544&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml Sun May 9 14:59:11 2010 @@ -568,4 +568,55 @@ under the License. </widgets> </section> </screen> + + <!-- Assoc with product --> + <screen name="ProductStoreFacilities"> + <section> + <actions> + <set field="titleProperty" value="ProductStoreFacilityAssocList"/> + <set field="headerItem" value="store"/> + <set field="tabButtonItem" value="EditProductStoreFacilities"/> + <set field="productStoreId" from-field="parameters.productStoreId"/> + <set field="portalPageId" value="ProductStoreFacility"/> + </actions> + <widgets> + <decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <include-screen name="PortalPageScreen" location="component://common/widget/CommonScreens.xml"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="ListProductStoreFacility"> + <section> + <widgets> + <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <container id="ProductStoreFacilityEditArea"/> + <include-form name="ListProductStoreFacility" location="component://product/widget/catalog/StoreForms.xml"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="EditProductStoreFacility"> + <section> + <condition><if-has-permission permission="CATALOG" action="_ADMIN"/></condition> + <actions> + <entity-one entity-name="ProductStoreFacility" value-field="productStoreFacility"/> + </actions> + <widgets> + <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <include-form name="EditProductStoreFacility" location="component://product/widget/catalog/StoreForms.xml"/> + </decorator-section> + </decorator-screen> + </widgets> + <fail-widgets> + <label style="h3">${uiLabelMap.ProductCatalogUpdatePermissionError}</label> + </fail-widgets> + </section> + </screen> + </screens> Modified: ofbiz/trunk/framework/common/config/CommonPortalEntityLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonPortalEntityLabels.xml?rev=942544&r1=942543&r2=942544&view=diff ============================================================================== --- ofbiz/trunk/framework/common/config/CommonPortalEntityLabels.xml (original) +++ ofbiz/trunk/framework/common/config/CommonPortalEntityLabels.xml Sun May 9 14:59:11 2010 @@ -31,4 +31,17 @@ <value xml:lang="en">My Time Sheet</value> <value xml:lang="fr">Mes feuilles de temps</value> </property> + <property key="PortalPage.portalPageName.ProductStoreFacility"> + <value xml:lang="de">Lager</value> + <value xml:lang="en">Facility</value> + <value xml:lang="es">Almacén</value> + <value xml:lang="fr">Lieu de stockage</value> + <value xml:lang="it">Stabilimento </value> + <value xml:lang="nl">Faciliteit</value> + <value xml:lang="ro">Compartiment </value> + <value xml:lang="ru">ÐбоÑÑдование</value> + <value xml:lang="th">à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²</value> + <value xml:lang="zh">åºæ</value> + <value xml:lang="zh_CN">ä»å¨è®¾æ½</value> + </property> </resource> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |