svn commit: r796654 - in /ofbiz/trunk/applications: commonext/data/SystemInfoPortletData.xml order/data/OrderPortletData.xml order/widget/ordermgr/ReportScreens.xml

[apatel-2]

Author: apatel
Date: Wed Jul 22 09:58:37 2009
New Revision: 796654

URL: http://svn.apache.org/viewvc?rev=796654&view=rev
Log:
Now rendering Reports tab of Order manager using ofbiz portal page technology.
Patch from OFBIZ-2745. Thanks Vivek for patch.

Modified:
    ofbiz/trunk/applications/commonext/data/SystemInfoPortletData.xml
    ofbiz/trunk/applications/order/data/OrderPortletData.xml
    ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml

Modified: ofbiz/trunk/applications/commonext/data/SystemInfoPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/SystemInfoPortletData.xml?rev=796654&r1=796653&r2=796654&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/data/SystemInfoPortletData.xml (original)
+++ ofbiz/trunk/applications/commonext/data/SystemInfoPortletData.xml Wed Jul 22 09:58:37 2009
@@ -35,5 +35,6 @@
         screenLocation="component://commonext/widget/SystemInfoScreens.xml" description="List of system notes for this specific party"
         screenshot="/images/portlets/SystemInfoStatus.png"/>
     <PortletPortletCategory portalPortletId="SystemInfoStatus" portletCategoryId="SYSTEMINFO"/>
+    <PortletCategory portletCategoryId="REPORT" description="Reports"/>
 
 </entity-engine-xml>
\ No newline at end of file

Modified: ofbiz/trunk/applications/order/data/OrderPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/OrderPortletData.xml?rev=796654&r1=796653&r2=796654&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/data/OrderPortletData.xml (original)
+++ ofbiz/trunk/applications/order/data/OrderPortletData.xml Wed Jul 22 09:58:37 2009
@@ -71,4 +71,48 @@
     <PortalPagePortlet portalPageId="OrderPortalPage" portalPortletId="ListSalesOrders" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
     <PortalPagePortlet portalPageId="OrderPortalPage" portalPortletId="BestSellingProducts" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/>
 
+    <!-- Order Reports -->
+    <PortalPage portalPageId="OrderReportPage" sequenceNum="0" portalPageName="Order Purchase Report Portal Page" description="Order purchase Report page using flexible Portal technology" ownerUserLoginId="_NA_"/>
+    <PortalPageColumn portalPageId="OrderReportPage" columnSeqId="00001" columnWidthPercentage="50"/>
+    <PortalPageColumn portalPageId="OrderReportPage" columnSeqId="00002"/>
+
+    <PortalPortlet portalPortletId="SalesByStore"
+        portletName="Sales by store report"
+        screenName="OrderReportSalesByStore"
+        screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
+        description=""/>
+    <PortletPortletCategory portalPortletId="SalesByStore" portletCategoryId="REPORT"/>
+    <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="SalesByStore" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
+
+    <PortalPortlet portalPortletId="OpenOrderItems"
+        portletName="Order Report Open OrderItems"
+        screenName="OrderReportOpenOrderItems"
+        screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
+        description=""/>
+    <PortletPortletCategory portalPortletId="OpenOrderItems" portletCategoryId="REPORT"/>
+    <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="OpenOrderItems" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/>
+
+    <PortalPortlet portalPortletId="PurchasesByOrg"
+        portletName="Order Report Purchases By Organization"
+        screenName="OrderReportPurchasesByOrganization"
+        screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
+        description=""/>
+    <PortletPortletCategory portalPortletId="PurchasesByOrg" portletCategoryId="REPORT"/>
+    <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="PurchasesByOrg" portletSeqId="00001" columnSeqId="00001" sequenceNum="2"/>
+
+    <PortalPortlet portalPortletId="PurchasesByProduct"
+        portletName="Order Report Purchases By Product"
+        screenName="OrderReportPurchasesByProduct"
+        screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
+        description=""/>
+    <PortletPortletCategory portalPortletId="PurchasesByProduct" portletCategoryId="REPORT"/>
+    <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="PurchasesByProduct" portletSeqId="00001" columnSeqId="00002" sequenceNum="3"/>
+
+    <PortalPortlet portalPortletId="PurchByPaymMeth"
+        portletName="Order Report Purchases By PaymentMethod"
+        screenName="OrderReportPurchasesByPaymentMethod"
+        screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
+        description=""/>
+    <PortletPortletCategory portalPortletId="PurchByPaymMeth" portletCategoryId="REPORT"/>
+    <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="PurchByPaymMeth" portletSeqId="00001" columnSeqId="00002" sequenceNum="4"/>
 </entity-engine-xml>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml?rev=796654&r1=796653&r2=796654&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml Wed Jul 22 09:58:37 2009
@@ -20,81 +20,83 @@
 
 <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
+
     <screen name="OrderPurchaseReportOptions">
         <section>
             <actions>
-                <set field="titleProperty" value="OrderReports"/>
-                <set field="headerItem" value="reports"/>
+                <entity-one value-field="portalPage" entity-name="PortalPage">
+                    <field-map field-name="portalPageId" value="OrderReportPage"/>
+                </entity-one>
+                <entity-and entity-name="PortalPageColumn" list="portalPageColumns">
+                    <field-map field-name="portalPageId" value="OrderReportPage"/>
+                    <order-by field-name="columnSeqId"/>
+                </entity-and>
+                <entity-and entity-name="PortalPagePortletView" list="portalPagePortlets">
+                    <field-map field-name="portalPageId" value="OrderReportPage"/>
+                    <order-by field-name="columnSeqId"/>
+                    <order-by field-name="sequenceNum"/>
+                </entity-and>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container>
-                            <label style="h1" text="${uiLabelMap.OrderReports}"/>
-                        </container>
-                        <container style="lefthalf">
-                            <container style="screenlet">
-                                <container style="screenlet-title-bar">
-                                    <container style="h3">
-                                        <label text="${uiLabelMap.OrderReportSalesByStore}"/>
-                                    </container>
-                                </container>
-                                <container style="screenlet-body">
-                                    <section>
-                                        <widgets>
-                                            <include-form name="SalesByStoreReport" location="component://order/widget/ordermgr/ReportForms.xml"/>
-                                        </widgets>
-                                    </section>
-                                </container>
-                            </container>
-                            <container style="screenlet">
-                                <container style="screenlet-title-bar">
-                                    <container style="h3">
-                                        <label text="${uiLabelMap.OrderReportOpenOrderItems}"/>
-                                    </container>
-                                </container>
-                                <container style="screenlet-body">
-                                    <include-form name="OpenOrderItemsReport" location="component://order/widget/ordermgr/ReportForms.xml"/>
-                                </container>
-                            </container>
-                            <container style="screenlet">
-                                <container style="screenlet-title-bar">
-                                    <container style="h3">
-                                        <label text="${uiLabelMap.OrderReportPurchasesByOrganization}"/>
-                                    </container>
-                                </container>
-                                <container style="screenlet-body">
-                                    <include-form name="PurchasesByOrganizationReport" location="component://order/widget/ordermgr/ReportForms.xml"/>
-                                </container>
-                            </container>
-                        </container>
-                        <container style="righthalf">
-                            <container style="screenlet">
-                                <container style="screenlet-title-bar">
-                                    <container style="h3">
-                                        <label text="${uiLabelMap.OrderReportPurchasesByProduct}"/>
-                                    </container>
-                                </container>
-                                <container style="screenlet-body">
-                                    <include-form name="OrderPurchaseProductOptions" location="component://order/widget/ordermgr/ReportForms.xml"/>
-                                </container>
-                            </container>
-                            <container style="screenlet">
-                                <container style="screenlet-title-bar">
-                                    <container style="h3">
-                                        <label text="${uiLabelMap.OrderReportPurchasesByPaymentMethod}"/>
-                                    </container>
-                                </container>
-                                <container style="screenlet-body">
-                                    <include-form name="OrderPurchasePaymentOptions" location="component://order/widget/ordermgr/ReportForms.xml"/>
-                                </container>
-                            </container>
-                        </container>
+                        <platform-specific><html><html-template location="component://common/webcommon/portal/showPortalPage.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
         </section>
     </screen>
+
+    <screen name="OrderReportSalesByStore">
+        <section>
+            <widgets>
+                <screenlet title="${uiLabelMap.OrderReportSalesByStore}">
+                    <include-form name="SalesByStoreReport" location="component://order/widget/ordermgr/ReportForms.xml"/>
+                </screenlet>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="OrderReportOpenOrderItems">
+        <section>
+            <widgets>
+                <screenlet title="${uiLabelMap.OrderReportOpenOrderItems}">
+                    <include-form name="OpenOrderItemsReport" location="component://order/widget/ordermgr/ReportForms.xml"/>
+                </screenlet>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="OrderReportPurchasesByOrganization">
+        <section>
+            <widgets>
+                <screenlet title="${uiLabelMap.OrderReportPurchasesByOrganization}">
+                    <include-form name="PurchasesByOrganizationReport" location="component://order/widget/ordermgr/ReportForms.xml"/>
+                </screenlet>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="OrderReportPurchasesByProduct">
+        <section>
+            <widgets>
+                <screenlet title="${uiLabelMap.OrderReportPurchasesByOrganization}">
+                    <include-form name="OrderPurchaseProductOptions" location="component://order/widget/ordermgr/ReportForms.xml"/>
+                </screenlet>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="OrderReportPurchasesByPaymentMethod">
+        <section>
+            <widgets>
+                <screenlet title="${uiLabelMap.OrderReportPurchasesByOrganization}">
+                    <include-form name="OrderPurchasePaymentOptions" location="component://order/widget/ordermgr/ReportForms.xml"/>
+                </screenlet>
+            </widgets>
+        </section>
+    </screen>
+
     <screen name="OrderPurchaseReportPayment">
         <section>
             <actions>
@@ -300,4 +302,4 @@
             </widgets>
         </section>
     </screen>
-</screens>
\ No newline at end of file
+</screens>