diff --git a/src/de/superx/servlet/SuperXmlTabelle.java b/src/de/superx/servlet/SuperXmlTabelle.java index 36f2594..83eddd6 100644 --- a/src/de/superx/servlet/SuperXmlTabelle.java +++ b/src/de/superx/servlet/SuperXmlTabelle.java @@ -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 diff --git a/superx/WEB-INF/conf/edustore/db/install/conf/builddatum.txt b/superx/WEB-INF/conf/edustore/db/install/conf/builddatum.txt index b391bb7..ada1646 100644 --- a/superx/WEB-INF/conf/edustore/db/install/conf/builddatum.txt +++ b/superx/WEB-INF/conf/edustore/db/install/conf/builddatum.txt @@ -1 +1 @@ -15.10.2024 +16.10.2024 diff --git a/superx/WEB-INF/conf/obsoletfiles.txt b/superx/WEB-INF/conf/obsoletfiles.txt index 66f3ee4..43f61df 100644 --- a/superx/WEB-INF/conf/obsoletfiles.txt +++ b/superx/WEB-INF/conf/obsoletfiles.txt @@ -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 diff --git a/superx/WEB-INF/lib/jasperreports-chart-themes-6.20.0.jar b/superx/WEB-INF/lib/jasperreports-chart-themes-6.20.0.jar deleted file mode 100644 index 2353524..0000000 Binary files a/superx/WEB-INF/lib/jasperreports-chart-themes-6.20.0.jar and /dev/null differ diff --git a/superx/WEB-INF/lib/superx5.1.jar b/superx/WEB-INF/lib/superx5.1.jar index 2a6cbf8..25e9264 100644 Binary files a/superx/WEB-INF/lib/superx5.1.jar and b/superx/WEB-INF/lib/superx5.1.jar differ