Browse Source

Bugfix JR obsolete jar, DINA0 für RPTA #1

RELEASE_kern5.1
Daniel Quathamer 1 week ago
parent
commit
5b629a4d1b
  1. 18
      src/de/superx/servlet/SuperXmlTabelle.java
  2. 2
      superx/WEB-INF/conf/edustore/db/install/conf/builddatum.txt
  3. 1
      superx/WEB-INF/conf/obsoletfiles.txt
  4. BIN
      superx/WEB-INF/lib/jasperreports-chart-themes-6.20.0.jar
  5. BIN
      superx/WEB-INF/lib/superx5.1.jar

18
src/de/superx/servlet/SuperXmlTabelle.java

@ -1904,16 +1904,32 @@ public class SuperXmlTabelle extends AbstractSuperXServlet { @@ -1904,16 +1904,32 @@ public class SuperXmlTabelle extends AbstractSuperXServlet {
}
String rptContentype=request.getParameter("RPTContentype");
String rptPageFormat=request.getParameter("RPTPageFormat");
if(rptPageFormat!=null && rptPageFormat.equalsIgnoreCase("a4"))
String rptPageFormatX=request.getParameter("RPTPageFormatX");
String rptPageFormatY=request.getParameter("RPTPageFormatY");
//X- und Y Werte haben höhere Prio, das ist flexibler:
if(rptPageFormatX!=null && !rptPageFormatX.equalsIgnoreCase("")
&&rptPageFormatY!=null && !rptPageFormatY.equalsIgnoreCase(""))
{
transformer.setParameter("seitenbreite", rptPageFormatX);
transformer.setParameter("seitenhoehe", rptPageFormatY);
}
else
{
if(rptPageFormat!=null && rptPageFormat.equalsIgnoreCase("a4"))
{
transformer.setParameter("seitenbreite", "842");
transformer.setParameter("seitenhoehe", "595");
}
if(rptPageFormat!=null && rptPageFormat.equalsIgnoreCase("a3"))
{
transformer.setParameter("seitenbreite", "1191");
transformer.setParameter("seitenhoehe", "842");
}
}
transformer.transform(new javax.xml.transform.stream.StreamSource(s1), new javax.xml.transform.stream.StreamResult(myOutwriter));
if(rptContentype.equals("text/xml")) {
//JRXML-Sourcecode

2
superx/WEB-INF/conf/edustore/db/install/conf/builddatum.txt

@ -1 +1 @@ @@ -1 +1 @@
15.10.2024
16.10.2024

1
superx/WEB-INF/conf/obsoletfiles.txt

@ -61,6 +61,7 @@ WEB-INF/lib/jasperreports-javaflow-6.1.0.jar @@ -61,6 +61,7 @@ WEB-INF/lib/jasperreports-javaflow-6.1.0.jar
WEB-INF/lib/jasperreports-javaflow-6.4.1.jar
WEB-INF/lib/jasperreports-chart-customizers-6.4.1.jar
WEB-INF/lib/jasperreports-chart-themes-6.4.1.jar
WEB-INF/lib/jasperreports-chart-themes-6.20.0.jar
WEB-INF/lib/hsqldb-1.8.0.10.jar
#WEB-INF/lib/kettle-core-6.0.0.0-353.jar
#WEB-INF/lib/kettle-engine-6.0.0.0-353.jar

BIN
superx/WEB-INF/lib/jasperreports-chart-themes-6.20.0.jar

Binary file not shown.

BIN
superx/WEB-INF/lib/superx5.1.jar

Binary file not shown.
Loading…
Cancel
Save