ReportGenerator: Beim der HTML-Ausgabe nur entweder raw_data oder data ausgeben;...

diff --git a/templates/webpages/report_generator/html_report_de.html b/templates/webpages/report_generator/html_report_de.html
index 00ae13b033af8f8d760592946b3eafe33686f115..8547b2812bd17b49838dcce1b10adc98e844a547 100644 (file)
--- a/templates/webpages/report_generator/html_report_de.html
+++ b/templates/webpages/report_generator/html_report_de.html
@@ -68,14 +68,17 @@
          [%- IF row.BORDER_BOTTOM %][%- SET tdclass = "$tdclass bottom_border" %][%- END %]
          [%- IF col.class %][%- SET tdclass = "$tdclass $col.class" %][%- END %]
          [%- IF tdclass %] class="[% tdclass %]"[%- END %]>
          [%- IF row.BORDER_BOTTOM %][%- SET tdclass = "$tdclass bottom_border" %][%- END %]
          [%- IF col.class %][%- SET tdclass = "$tdclass $col.class" %][%- END %]
          [%- IF tdclass %] class="[% tdclass %]"[%- END %]>

-       [%- IF col.raw_data %][%- col.raw_data %][%- END %]
-       [%- USE iterator(col.CELL_ROWS) %][%- FOREACH cell_row = iterator %]
-        [%- IF cell_row.data != '' %]
-         [%- IF cell_row.link %]<a href="[% cell_row.link %]">[%- END %]
-         [%- cell_row.data %]
-         [%- IF cell_row.link %]</a>[%- END %]
+       [%- IF col.raw_data %]
+        [%- col.raw_data %]
+       [%- ELSE %]
+        [%- USE iterator(col.CELL_ROWS) %][%- FOREACH cell_row = iterator %]
+         [%- IF cell_row.data != '' %]
+          [%- IF cell_row.link %]<a href="[% cell_row.link %]">[%- END %]
+          [%- cell_row.data %]
+          [%- IF cell_row.link %]</a>[%- END %]
+         [%- END %]
+        [%- UNLESS iterator.last %]<br>[%- END %]

         [%- END %]
         [%- END %]

-       [%- UNLESS iterator.last %]<br>[%- END %]

        [%- END %]
       </td>
       [%- END %]
        [%- END %]
       </td>
       [%- END %]

diff --git a/templates/webpages/report_generator/html_report_master.html b/templates/webpages/report_generator/html_report_master.html
index 279975db702e75fc0e238de9866fb7da45fbaa08..707657c56a5b55893b7660e990afe1180d1951fa 100644 (file)
--- a/templates/webpages/report_generator/html_report_master.html
+++ b/templates/webpages/report_generator/html_report_master.html
@@ -68,14 +68,17 @@
          [%- IF row.BORDER_BOTTOM %][%- SET tdclass = "$tdclass bottom_border" %][%- END %]
          [%- IF col.class %][%- SET tdclass = "$tdclass $col.class" %][%- END %]
          [%- IF tdclass %] class="[% tdclass %]"[%- END %]>
          [%- IF row.BORDER_BOTTOM %][%- SET tdclass = "$tdclass bottom_border" %][%- END %]
          [%- IF col.class %][%- SET tdclass = "$tdclass $col.class" %][%- END %]
          [%- IF tdclass %] class="[% tdclass %]"[%- END %]>

-       [%- IF col.raw_data %][%- col.raw_data %][%- END %]
-       [%- USE iterator(col.CELL_ROWS) %][%- FOREACH cell_row = iterator %]
-        [%- IF cell_row.data != '' %]
-         [%- IF cell_row.link %]<a href="[% cell_row.link %]">[%- END %]
-         [%- cell_row.data %]
-         [%- IF cell_row.link %]</a>[%- END %]
+       [%- IF col.raw_data %]
+        [%- col.raw_data %]
+       [%- ELSE %]
+        [%- USE iterator(col.CELL_ROWS) %][%- FOREACH cell_row = iterator %]
+         [%- IF cell_row.data != '' %]
+          [%- IF cell_row.link %]<a href="[% cell_row.link %]">[%- END %]
+          [%- cell_row.data %]
+          [%- IF cell_row.link %]</a>[%- END %]
+         [%- END %]
+        [%- UNLESS iterator.last %]<br>[%- END %]

         [%- END %]
         [%- END %]

-       [%- UNLESS iterator.last %]<br>[%- END %]

        [%- END %]
       </td>
       [%- END %]
        [%- END %]
       </td>
       [%- END %]