You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2012/07/13 11:48:36 UTC
svn commit: r1361130 [3/3] - in /ofbiz/trunk: ./
applications/accounting/webapp/accounting/WEB-INF/
applications/accounting/webapp/accounting/WEB-INF/actions/payment/
applications/accounting/webapp/accounting/WEB-INF/actions/reports/
applications/accou...
Added: ofbiz/trunk/specialpurpose/birt/widget/order/OrderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/widget/order/OrderScreens.xml?rev=1361130&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/widget/order/OrderScreens.xml (added)
+++ ofbiz/trunk/specialpurpose/birt/widget/order/OrderScreens.xml Fri Jul 13 09:48:32 2012
@@ -0,0 +1,156 @@
+<?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="SalesReport">
+ <section>
+ <actions>
+ <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+ </actions>
+ <widgets>
+ <screenlet title="Sales Report">
+ <include-form name="SalesReport" location="component://birt/widget/order/OrderForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="NetBeforeOverheadReport">
+ <section>
+ <actions>
+ <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+ </actions>
+ <widgets>
+ <screenlet title="Net Before Overhead Report">
+ <include-form name="NetBeforeOverheadReport" location="component://birt/widget/order/OrderForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="ProductDemandReport">
+ <section>
+ <actions>
+ <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+ </actions>
+ <widgets>
+ <screenlet title="Product Demand Report">
+ <include-form name="ProductDemandReport" location="component://birt/widget/order/OrderForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
+ </screen>
+ <!-- Sale Order By Referrer -->
+ <screen name="SaleOrdersByReferrerReport">
+ <section>
+ <widgets>
+ <screenlet title="Sale Orders by Referrer Report">
+ <include-form name="OrderByReferrer" location="component://birt/widget/order/OrderForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
+ </screen>
+ <!-- Sale Order By Channel -->
+ <screen name="SaleOrdersByChannelReport">
+ <section>
+ <widgets>
+ <screenlet title="Sale Orders By Channel Report">
+ <include-form name="SaleOrdersByChannel" location="component://birt/widget/order/OrderForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
+ </screen>
+ <!-- Sale Order with Discount Code -->
+ <screen name="SaleOrderDiscountCodeReport">
+ <section>
+ <widgets>
+ <screenlet title="Sale Orders Discount Code Report">
+ <include-form name="SaleOrderDiscountCode" location="component://birt/widget/order/OrderForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
+ </screen>
+ <!-- Last Three Months Sales Report -->
+ <screen name="Last3MonthsSalesReport">
+ <section>
+ <widgets>
+ <screenlet title="Last Three Months Sales Report">
+ <include-form name="Last3MonthsSalesReport" location="component://birt/widget/order/OrderForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
+ </screen>
+ <!-- Coupon Sales Report -->
+ <screen name="CouponSalesReport">
+ <section>
+ <widgets>
+ <screenlet title="Coupon Sales Report">
+ <include-form name="CouponSalesReport" location="component://birt/widget/order/OrderForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
+ </screen>
+
+
+
+
+ <screen name="SalesOrderReport">
+ <section>
+ <actions>
+ <entity-condition entity-name="SalesOrderItemStarSchema" list="SalesReportList">
+ <condition-list combine="and">
+ <condition-expr field-name="orderDate" operator="greater-equals" from-field="parameters.fromOrderDate" ignore-if-null="true"/>
+ <condition-expr field-name="orderDate" operator="less" from-field="parameters.thruOrderDate" ignore-if-null="true"/>
+ </condition-list>
+ </entity-condition>
+ </actions>
+ <widgets>
+ <platform-specific>
+ <xml><html-template location="component://order/webapp/ordermgr/reports/SalesReport.rptdesign"/></xml>
+ </platform-specific>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="NetBeforeOverheadOrderReport">
+ <section>
+ <widgets>
+ <platform-specific>
+ <xml><html-template location="component://order/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign"/></xml>
+ </platform-specific>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="ProductDemandOrderReport ">
+ <section>
+ <widgets>
+ <platform-specific>
+ <xml><html-template location="component://order/webapp/ordermgr/reports/ProductDemandReport.rptdesign"/></xml>
+ </platform-specific>
+ </widgets>
+ </section>
+ </screen>
+
+</screens>
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/build.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/build.xml (original)
+++ ofbiz/trunk/specialpurpose/build.xml Fri Jul 13 09:48:32 2012
@@ -36,6 +36,7 @@
crowd/build.xml,
webpos/build.xml
googlecheckout/build.xml,
+ birt/build.xml,
example/build.xml
"/>
<!-- For the old OFBiz Workflow Engine add "workflow/build.xml" to the list above -->
Modified: ofbiz/trunk/specialpurpose/component-load.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/component-load.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/component-load.xml (original)
+++ ofbiz/trunk/specialpurpose/component-load.xml Fri Jul 13 09:48:32 2012
@@ -37,6 +37,7 @@ under the License.
<load-component component-location="crowd"/>
<load-component component-location="ldap"/>
<load-component component-location="webpos"/>
+ <load-component component-location="birt"/>
<load-component component-location="example"/>
<load-component component-location="exampleext"/>
<!-- The component below are not maintained by the community, or at least not very actively
Modified: ofbiz/trunk/specialpurpose/example/config/ExampleUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/config/ExampleUiLabels.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/config/ExampleUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/example/config/ExampleUiLabels.xml Fri Jul 13 09:48:32 2012
@@ -53,27 +53,6 @@
<value xml:lang="de">Verion des Content Knoten</value>
<value xml:lang="en">Version of the base content node</value>
</property>
- <property key="ExampleBirtExamples">
- <value xml:lang="en">BIRT Examples</value>
- <value xml:lang="th">à¸à¸±à¸§à¸à¸¢à¹à¸²à¸ BIRT</value>
- </property>
- <property key="ExampleBirtChartReport">
- <value xml:lang="en">HTML chart report</value>
- <value xml:lang="fr">Graphiques HTML</value>
- </property>
- <property key="ExampleBirtChartViewHandler">
- <value xml:lang="en">PDF chart report</value>
- <value xml:lang="fr">Graphiques PDF</value>
- </property>
- <property key="ExampleBirtMail">
- <value xml:lang="en">Send any format through Mail</value>
- </property>
- <property key="ExampleBirtReport">
- <value xml:lang="en">HTML</value>
- </property>
- <property key="ExampleBirtViewHandler">
- <value xml:lang="en">PDF</value>
- </property>
<property key="ExampleCalendarFromLayer">
<value xml:lang="en">Calendar field (only test purp.)</value>
<value xml:lang="fr">Calendrier (only test)</value>
Modified: ofbiz/trunk/specialpurpose/example/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/ofbiz-component.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/example/ofbiz-component.xml Fri Jul 13 09:48:32 2012
@@ -60,12 +60,5 @@ under the License.
location="webapp/example"
base-permission="OFBTOOLS,EXAMPLE"
mount-point="/example"/>
- <webapp name="birt"
- title="BIRT"
- server="default-server"
- location="webapp/birt"
- base-permission="OFBTOOLS,WEBTOOLS"
- mount-point="/birt"
- app-bar-display="false"/>
-
+
</ofbiz-component>
Modified: ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/controller.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/controller.xml Fri Jul 13 09:48:32 2012
@@ -25,7 +25,6 @@ under the License.
elements found in the common-controller.xml file. -->
<include location="component://common/webcommon/WEB-INF/common-controller.xml"/>
<include location="component://common/webcommon/WEB-INF/portal-controller.xml"/>
- <include location="component://example/webapp/birt/WEB-INF/controller.xml"/>
<description>Example Component Site Configuration File</description>
@@ -218,22 +217,6 @@ under the License.
<request-map uri="ExampleOsmGeoLocationPointSet2"><security https="true" auth="true"/><response name="success" type="view" value="ExampleOsmGeoLocationPointSet2"/></request-map>
<request-map uri="ExampleOsmGeoLocationPointSet3"><security https="true" auth="true"/><response name="success" type="view" value="ExampleOsmGeoLocationPointSet3"/></request-map>
<request-map uri="ExampleOsmGeoLocationPointSet4"><security https="true" auth="true"/><response name="success" type="view" value="ExampleOsmGeoLocationPointSet4"/></request-map>
-
- <!-- BIRT example Requests -->
- <request-map uri="BirtMain">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="BirtMain"/>
- </request-map>
-
- <!--flot example requests-->
- <request-map uri="ExampleBarChart">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="ExampleBarChart"/>
- </request-map>
- <request-map uri="ExamplePieChart">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="ExamplePieChart"/>
- </request-map>
<!-- end of request mappings -->
<!-- View Mappings -->
@@ -273,9 +256,6 @@ under the License.
<view-map name="ExampleOsmGeoLocationPointSet3" type="screen" page="component://example/widget/example/ExampleScreens.xml#ExampleOsmGeoLocationPointSet3"/>
<view-map name="ExampleOsmGeoLocationPointSet4" type="screen" page="component://example/widget/example/ExampleScreens.xml#ExampleOsmGeoLocationPointSet4"/>
- <!-- BIRT example View Mappings -->
- <view-map name="BirtMain" type="screen" page="component://example/widget/example/BirtScreens.xml#main"/>
-
<!-- Flot view mapping -->
<view-map name="ExampleBarChart" page="component://example/widget/example/ExampleScreens.xml#ExampleBarChart" type="screen"/>
<view-map name="ExamplePieChart" page="component://example/widget/example/ExampleScreens.xml#ExamplePieChart" type="screen"/>
Modified: ofbiz/trunk/specialpurpose/example/widget/example/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/widget/example/CommonScreens.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/widget/example/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/example/widget/example/CommonScreens.xml Fri Jul 13 09:48:32 2012
@@ -232,44 +232,6 @@ under the License.
</section>
</screen>
- <screen name="CommonBirtDecorator">
- <section>
- <actions>
- <set field="headerItem" value="Birt"/>
- </actions>
- <widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="pre-body">
- <section>
- <!-- do check for WEBTOOLS, _VIEW permission -->
- <condition>
- <if-has-permission permission="ENTITY_MAINT"/>
- </condition>
- <widgets>
- <include-menu name="BirtTabBar" location="component://example/widget/example/ExampleMenus.xml"/>
- </widgets>
- </section>
- </decorator-section>
- <decorator-section name="body">
- <container style="clear" />
- <section>
- <!-- do check for WEBTOOLS, _VIEW permission -->
- <condition>
- <if-has-permission permission="ENTITY_MAINT"/>
- </condition>
- <widgets>
- <decorator-section-include name="body"/>
- </widgets>
- <fail-widgets>
- <label style="h3">${uiLabelMap.WebtoolsPermissionError}</label>
- </fail-widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
-
<screen name="CommonExampleChartsDecorator">
<section>
<actions>
Modified: ofbiz/trunk/specialpurpose/example/widget/example/ExampleMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/widget/example/ExampleMenus.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/widget/example/ExampleMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/example/widget/example/ExampleMenus.xml Fri Jul 13 09:48:32 2012
@@ -42,12 +42,6 @@ under the License.
<menu-item name="ExampleGeoLocation" title="${uiLabelMap.CommonGeoLocation}">
<link target="ExampleGeoLocationPointSet1"/>
</menu-item>
- <menu-item name="Birt" title="${uiLabelMap.ExampleBirtExamples}">
- <link target="BirtMain"/>
- </menu-item>
- <menu-item name="ExampleCharts" title="Chart examples">
- <link target="ExampleBarChart"/>
- </menu-item>
</menu>
<menu name="EditExample" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
@@ -88,15 +82,6 @@ under the License.
<menu-item name="ExampleOsmGeoLocationPointSet4" title="${uiLabelMap.OsmPointSet4}"><link target="ExampleOsmGeoLocationPointSet4"/></menu-item>
</menu>
- <menu name="BirtTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
- <menu-item name="Report" title="${uiLabelMap.ExampleBirtReport}"><link target="Report"/></menu-item>
- <menu-item name="Export" title="${uiLabelMap.ExampleBirtViewHandler}"><link target="ViewHandler"/></menu-item>
- <menu-item name="Mail" title="${uiLabelMap.ExampleBirtMail}"><link target="Mail"/></menu-item>
- <!-- Reports using charts-->
- <menu-item name="chartReport" title="${uiLabelMap.ExampleBirtChartReport}"><link target="chartReport"/></menu-item>
- <menu-item name="chartExport" title="${uiLabelMap.ExampleBirtChartViewHandler}"><link target="chartViewHandler"/></menu-item>
- </menu>
-
<menu name="ExampleCharts" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
<menu-item name="ExampleBarChart" title="Bar chart"><link target="ExampleBarChart"/></menu-item>
<menu-item name="ExamplePieChart" title="Pie chart"><link target="ExamplePieChart"/></menu-item>