details: /erp/devel/pi/rev/f22a255278e5
changeset: 6961:f22a255278e5
user: Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com>
date: Fri Apr 09 10:34:36 2010 +0530
summary: Fixes issue 12454: Errors in Daily Work Requirements Report
diffstat:
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDaily.java |
25 +-
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEdit.jrxml |
1501 ++++-----
src/org/openbravo/erpCommon/ad_reports/SubreportWorkRequirementDaily.jrxml |
125 +
3 files changed, 845 insertions(+), 806 deletions(-)
diffs (truncated from 1695 to 300 lines):
diff -r 695c4b4aee08 -r f22a255278e5
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDaily.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDaily.java
Thu Apr 08 18:08:45 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDaily.java
Fri Apr 09 10:34:36 2010 +0530
@@ -26,6 +26,12 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JasperCompileManager;
+import net.sf.jasperreports.engine.JasperReport;
+import net.sf.jasperreports.engine.design.JasperDesign;
+import net.sf.jasperreports.engine.xml.JRXmlLoader;
+
import org.openbravo.base.secureApp.HttpSecureAppServlet;
import org.openbravo.base.secureApp.VariablesSecureApp;
import org.openbravo.erpCommon.businessUtility.WindowTabs;
@@ -87,9 +93,9 @@
"#AccessibleOrgTree", "ReportWorkRequirementDaily"), strStartDateFrom,
strStartDateTo,
strmaProcessPlan);
for (int i = 0; i < data.length; i++) {
- ReportWorkRequirementDailyData[] product =
ReportWorkRequirementDailyData.producedproduct(
- this, data[i].wrpid);
- data[i].prodproduct = product[0].name;
+ // ReportWorkRequirementDailyData[] product =
ReportWorkRequirementDailyData.producedproduct(
+ // this, data[i].wrpid);
+ // data[i].prodproduct = product[0].name;
String strqty = ReportWorkRequirementDailyData.inprocess(this,
data[i].wrid,
data[i].productid);
data[i].inprocess = strqty;
@@ -98,9 +104,22 @@
}
}
+ String strLanguage = vars.getLanguage();
+ String strBaseDesign = getBaseDesignPath(strLanguage);
+ JasperReport jasperReportProducts;
+ try {
+ JasperDesign jasperDesignProducts = JRXmlLoader.load(strBaseDesign
+ +
"/org/openbravo/erpCommon/ad_reports/SubreportWorkRequirementDaily.jrxml");
+ jasperReportProducts =
JasperCompileManager.compileReport(jasperDesignProducts);
+ } catch (JRException e) {
+ e.printStackTrace();
+ throw new ServletException(e.getMessage());
+ }
+
String strReportName =
"@basedesign@/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEdit.jrxml";
HashMap<String, Object> parameters = new HashMap<String, Object>();
+ parameters.put("PRODUCTS", jasperReportProducts);
renderJR(vars, response, strReportName, strOutput, parameters, data, null);
}
diff -r 695c4b4aee08 -r f22a255278e5
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEdit.jrxml
---
a/src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEdit.jrxml
Thu Apr 08 18:08:45 2010 +0200
+++
b/src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEdit.jrxml
Fri Apr 09 10:34:36 2010 +0530
@@ -1,138 +1,123 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- Created with iReport - A designer for JasperReports -->
-<!DOCTYPE jasperReport PUBLIC "//JasperReports//DTD Report Design//EN"
"http://jasperreports.sourceforge.net/dtds/jasperreport.dtd";>
-<jasperReport
- name="ReportWorkRequirementDailyEdit"
- columnCount="1"
- printOrder="Vertical"
- orientation="Portrait"
- pageWidth="595"
- pageHeight="842"
- columnWidth="535"
- columnSpacing="0"
- leftMargin="30"
- rightMargin="30"
- topMargin="20"
- bottomMargin="20"
- whenNoDataType="NoPages"
- isTitleNewPage="false"
- isSummaryNewPage="false">
- <property name="ireport.scriptlethandling" value="0" />
- <property name="ireport.encoding" value="UTF-8" />
- <import value="java.util.*" />
- <import value="net.sf.jasperreports.engine.*" />
- <import value="net.sf.jasperreports.engine.data.*" />
-
- <style
- name="default"
- isDefault="false"
- vAlign="Middle"
- fontName="Bitstream Vera Sans"
- fontSize="10"
- >
- </style>
- <style
- name="Report_Title"
- isDefault="false"
- fontName="Bitstream Vera Sans"
- fontSize="18"
- >
- <box leftPadding="5"></box>
- </style>
- <style
- name="Report_Subtitle"
- isDefault="false"
- forecolor="#555555"
- fontName="Bitstream Vera Sans"
- fontSize="14"
- >
- <box leftPadding="5"></box>
- </style>
- <style
- name="Total_Field"
- isDefault="false"
- mode="Opaque"
- forecolor="#000000"
- backcolor="#CCCCCC"
- vAlign="Middle"
- >
- <box leftPadding="5"></box>
- </style>
- <style
- name="Detail_Header"
- isDefault="false"
- mode="Opaque"
- forecolor="#FFFFFF"
- backcolor="#555555"
- vAlign="Middle"
- >
- <box leftPadding="5">
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
- <rightPen lineWidth="1.0"
lineStyle="Solid" lineColor="#FFFFFF"/>
-</box>
- </style>
- <style
- name="GroupHeader_DarkGray"
- isDefault="false"
- mode="Opaque"
- forecolor="#FFFFFF"
- backcolor="#555555"
- vAlign="Middle"
- fontName="Bitstream Vera Sans"
- fontSize="14"
- >
- <box leftPadding="5"></box>
- </style>
- <style
- name="GroupHeader_Gray"
- isDefault="false"
- mode="Opaque"
- backcolor="#999999"
- >
- </style>
- <style
- name="Detail_Line"
- isDefault="false"
- >
-
- <conditionalStyle>
- <conditionExpression><![CDATA[new
Boolean($V{PHASE_COUNT}.intValue()%2==1)]]></conditionExpression>
- <style
- name="Detail_Line"
- isDefault="false"
- mode="Opaque"
- backcolor="#CCCCCC"
- >
- </style>
- </conditionalStyle>
- </style>
- <style
- name="Total_Gray"
- isDefault="false"
- mode="Opaque"
- forecolor="#000000"
- backcolor="#CCCCCC"
- >
- </style>
-
- <parameter name="ATTACH" isForPrompting="false"
class="java.lang.String"/>
- <parameter name="BASE_WEB" isForPrompting="false"
class="java.lang.String"/>
- <parameter name="BASE_DESIGN" isForPrompting="false"
class="java.lang.String"/>
- <parameter name="LANGUAGE" isForPrompting="false"
class="java.lang.String">
- <defaultValueExpression
><![CDATA["en_US"]]></defaultValueExpression>
- </parameter>
- <parameter name="USER_CLIENT" isForPrompting="false"
class="java.lang.String">
- <defaultValueExpression
><![CDATA["(1000000)"]]></defaultValueExpression>
- </parameter>
- <parameter name="USER_ORG" isForPrompting="false"
class="java.lang.String">
- <defaultValueExpression
><![CDATA["(0)"]]></defaultValueExpression>
- </parameter>
- <parameter name="REPORT_TITLE" isForPrompting="false"
class="java.lang.String">
- <defaultValueExpression ><![CDATA["REPORT
TITLE"]]></defaultValueExpression>
- </parameter>
- <parameter name="REPORT_SUBTITLE" isForPrompting="false"
class="java.lang.String"/>
- <parameter name="NUMBERFORMAT" isForPrompting="false"
class="java.text.DecimalFormat"/>
- <parameter name="LOCALE" isForPrompting="false"
class="java.util.Locale"/>
- <queryString><![CDATA[SELECT wr.MA_WorkRequirement_ID AS wrid, pp.NAME
AS processplan, wr.STARTDATE AS startdate, wr.ENDDATE AS enddate,
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- Created with iReport - A designer for JasperReports -->
+<!DOCTYPE jasperReport PUBLIC "//JasperReports//DTD Report Design//EN"
"http://jasperreports.sourceforge.net/dtds/jasperreport.dtd";>
+<jasperReport
+ name="ReportWorkRequirementDailyEdit"
+ columnCount="1"
+ printOrder="Vertical"
+ orientation="Portrait"
+ pageWidth="595"
+ pageHeight="842"
+ columnWidth="535"
+ columnSpacing="0"
+ leftMargin="30"
+ rightMargin="30"
+ topMargin="20"
+ bottomMargin="20"
+ whenNoDataType="NoPages"
+ isTitleNewPage="false"
+ isSummaryNewPage="false">
+ <property name="ireport.scriptlethandling" value="0" />
+ <property name="ireport.encoding" value="UTF-8" />
+ <import value="java.util.*" />
+ <import value="net.sf.jasperreports.engine.*" />
+ <import value="net.sf.jasperreports.engine.data.*" />
+
+ <style
+ name="default"
+ isDefault="false"
+ vAlign="Middle"
+ fontName="Bitstream Vera Sans"
+ fontSize="10"
+ />
+ <style
+ name="Report_Title"
+ isDefault="false"
+ fontName="Bitstream Vera Sans"
+ fontSize="18"
+ />
+ <style
+ name="Report_Subtitle"
+ isDefault="false"
+ forecolor="#555555"
+ fontName="Bitstream Vera Sans"
+ fontSize="14"
+ />
+ <style
+ name="Total_Field"
+ isDefault="false"
+ mode="Opaque"
+ forecolor="#000000"
+ backcolor="#CCCCCC"
+ vAlign="Middle"
+ />
+ <style
+ name="Detail_Header"
+ isDefault="false"
+ mode="Opaque"
+ forecolor="#FFFFFF"
+ backcolor="#555555"
+ vAlign="Middle"
+ />
+ <style
+ name="GroupHeader_DarkGray"
+ isDefault="false"
+ mode="Opaque"
+ forecolor="#FFFFFF"
+ backcolor="#555555"
+ vAlign="Middle"
+ fontName="Bitstream Vera Sans"
+ fontSize="14"
+ />
+ <style
+ name="GroupHeader_Gray"
+ isDefault="false"
+ mode="Opaque"
+ backcolor="#999999"
+ />
+ <style
+ name="Detail_Line"
+ isDefault="false"
+ >
+
+ <conditionalStyle>
+ <conditionExpression><![CDATA[new
Boolean($V{PHASE_COUNT}.intValue()%2==1)]]></conditionExpression>
+ <style
+ name="Detail_Line"
+ isDefault="false"
+ mode="Opaque"
+ backcolor="#CCCCCC"
+ />
+ </conditionalStyle>
+ </style>
+ <style
+ name="Total_Gray"
+ isDefault="false"
+ mode="Opaque"
+ forecolor="#000000"
+ backcolor="#CCCCCC"
+ />
+
+ <parameter name="ATTACH" isForPrompting="false" class="java.lang.String"/>
+ <parameter name="BASE_WEB" isForPrompting="false"
class="java.lang.String"/>
+ <parameter name="BASE_DESIGN" isForPrompting="false"
class="java.lang.String"/>
+ <parameter name="LANGUAGE" isForPrompting="false" class="java.lang.String">
+ <defaultValueExpression ><![CDATA["en_US"]]></defaultValueExpression>
+ </parameter>
+ <parameter name="USER_CLIENT" isForPrompting="false"
class="java.lang.String">
+ <defaultValueExpression
><![CDATA["(1000000)"]]></defaultValueExpression>
+ </parameter>
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
