diff --git a/src-modules/module/rpta/conf/includes.txt b/src-modules/module/rpta/conf/includes.txt index cc0ae2c..e77e69a 100644 --- a/src-modules/module/rpta/conf/includes.txt +++ b/src-modules/module/rpta/conf/includes.txt @@ -4,5 +4,6 @@ images/icons/magic.svg WEB-INF/conf/edustore/db/module/rpta/schluesseltabellen/sx_stylesheets_einfuegen.sql WEB-INF/reports/simple_table.jrtx xml/tabelle_jrxml_a4_quer.xsl +xml/tabelle_jrxml_book_without_cover.xsl xml/rpta_templates.xsl xml/rpta_assistent.xsl diff --git a/src-modules/module/rpta/schluesseltabellen/sx_stylesheets_einfuegen.sql b/src-modules/module/rpta/schluesseltabellen/sx_stylesheets_einfuegen.sql index 39844f1..5113ee9 100755 --- a/src-modules/module/rpta/schluesseltabellen/sx_stylesheets_einfuegen.sql +++ b/src-modules/module/rpta/schluesseltabellen/sx_stylesheets_einfuegen.sql @@ -17,17 +17,6 @@ "stylesheet_type":"XSL_JRXML", "jr_datasource":"RS" }, -{"filename":"tabelle_jrxml_book_without_cover.xsl", -"caption":"Booklet aus Makrobericht", -"description":"Makrobericht zu Excel-Tabellen", -"relation":"table", -"contenttype":"text/xml", -"is_generic":"1", -"toolbar_icon_filepath":"", -"usage_resultset_data":"T", -"stylesheet_type":"XSL_JRXML", -"jr_datasource":"" -}, {"filename":"rpta_assistent.xsl", "caption":"Berichtsassistent", "description":"Export als formatierter Bericht", diff --git a/superx/WEB-INF/reports/simple_table.jrtx b/superx/WEB-INF/reports/simple_table.jrtx index 6168b43..e7f63a5 100644 --- a/superx/WEB-INF/reports/simple_table.jrtx +++ b/superx/WEB-INF/reports/simple_table.jrtx @@ -8,6 +8,10 @@ + +

- +
@@ -1200,7 +1201,7 @@ var platform='superx';

- +
@@ -1234,7 +1235,7 @@ var platform='superx';

- +
diff --git a/superx/xml/rpta_templates.xsl b/superx/xml/rpta_templates.xsl index b10fcaa..75b540d 100644 --- a/superx/xml/rpta_templates.xsl +++ b/superx/xml/rpta_templates.xsl @@ -11,6 +11,7 @@ xmlns="http://jasperreports.sourceforge.net/jasperreports"> + @@ -32,7 +33,7 @@ columnWidth="{$druckbreite}" leftMargin="{$seitenrand}" rightMargin="{$seitenrand}" topMargin="{$seitenrand}" -bottomMargin="{$seitenrand}" +bottomMargin="{$bottomMargin}" isIgnorePagination="{$isIgnorePagination}" > @@ -87,21 +88,25 @@ isIgnorePagination="{$isIgnorePagination}" > + - - + + + - - + + + + @@ -386,6 +391,7 @@ isIgnorePagination="{$isIgnorePagination}" > + 0 @@ -394,6 +400,9 @@ isIgnorePagination="{$isIgnorePagination}" > + + + + @@ -410,11 +419,17 @@ isIgnorePagination="{$isIgnorePagination}" > + + + + + + @@ -536,7 +551,7 @@ isIgnorePagination="{$isIgnorePagination}" > +": "+ -+";")) ++"; ")) @@ -552,29 +567,35 @@ isIgnorePagination="{$isIgnorePagination}" > + + colId= - - - + + + - - + + + + + + @@ -595,40 +616,62 @@ isIgnorePagination="{$isIgnorePagination}" > - - - - - + + + + " + + + + + " + + + - + - - + + + - - + + + + + - - - - - - + + + + + " + + + + +" + + + + @@ -675,6 +718,7 @@ isIgnorePagination="{$isIgnorePagination}" > + @@ -685,7 +729,9 @@ isIgnorePagination="{$isIgnorePagination}" > - + + + @@ -700,18 +746,17 @@ isIgnorePagination="{$isIgnorePagination}" > - +0]]> - - + @@ -931,4 +976,19 @@ isIgnorePagination="{$isIgnorePagination}" > + + + + + + \n + + + + + + + + + diff --git a/superx/xml/tabelle_jrxml_book_without_cover.xsl b/superx/xml/tabelle_jrxml_book_without_cover.xsl index 8261e54..ea8b10b 100644 --- a/superx/xml/tabelle_jrxml_book_without_cover.xsl +++ b/superx/xml/tabelle_jrxml_book_without_cover.xsl @@ -10,6 +10,7 @@ xmlns="http://jasperreports.sourceforge.net/jasperreports" + @@ -35,6 +36,7 @@ xmlns="http://jasperreports.sourceforge.net/jasperreports" + + +-->