Compare commits

..

No commits in common. '41ab6f4b71d8f35cd72a42c5184ecdc2fd1e0328' and '2bcecc31a3fbd2ee4f7ed5202a71ce8a9a5370fc' have entirely different histories.

  1. 16
      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

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

@ -1904,31 +1904,15 @@ public class SuperXmlTabelle extends AbstractSuperXServlet {
} }
String rptContentype=request.getParameter("RPTContentype"); String rptContentype=request.getParameter("RPTContentype");
String rptPageFormat=request.getParameter("RPTPageFormat"); String rptPageFormat=request.getParameter("RPTPageFormat");
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")) if(rptPageFormat!=null && rptPageFormat.equalsIgnoreCase("a4"))
{ {
transformer.setParameter("seitenbreite", "842"); transformer.setParameter("seitenbreite", "842");
transformer.setParameter("seitenhoehe", "595"); transformer.setParameter("seitenhoehe", "595");
} }
if(rptPageFormat!=null && rptPageFormat.equalsIgnoreCase("a3")) if(rptPageFormat!=null && rptPageFormat.equalsIgnoreCase("a3"))
{ {
transformer.setParameter("seitenbreite", "1191"); transformer.setParameter("seitenbreite", "1191");
transformer.setParameter("seitenhoehe", "842"); transformer.setParameter("seitenhoehe", "842");
}
} }
transformer.transform(new javax.xml.transform.stream.StreamSource(s1), new javax.xml.transform.stream.StreamResult(myOutwriter)); transformer.transform(new javax.xml.transform.stream.StreamSource(s1), new javax.xml.transform.stream.StreamResult(myOutwriter));
if(rptContentype.equals("text/xml")) { if(rptContentype.equals("text/xml")) {

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

@ -1 +1 @@
16.10.2024 15.10.2024

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

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