From 6dbb7747d78d5b0b8c48108b39cf6aa1e6d5267a Mon Sep 17 00:00:00 2001
From: Imo John <john@memtext.de>
Date: Fri, 8 Aug 2025 09:00:43 +0200
Subject: [PATCH] =?UTF-8?q?SWF=20Pr=C3=BCfungsergebnisse,=20UDE=20Stammdat?=
 =?UTF-8?q?en,=20TUHH=20Beh=C3=B6rdenbericht?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src-modules/module/rpta/conf/rpta.xml         |   9 +-
 .../excel_into_stip_meldung.ktr               | 740 ++++++++++++++++++
 .../stip_meldung_fuellen.sql                  |  33 +
 .../stip_meldung_upload.kjb                   | 443 +++++++++++
 .../stip_meldung_upload/sx_jobs_fuellen.sql   |  41 +
 .../module/rpta/masken/48220_felderinfo.unl   |  16 +-
 .../module/rpta/masken/48220_maskeninfo.unl   | 132 +---
 .../management_datenblatt_virtuell.sql        |   6 +
 ...exam_unit_dim_studiengang_note_fuellen.sql |  12 +
 ...t_man_kennz_aggr_tuhh_behoerdenbericht.sql | 129 +++
 ...umn_layout_sos_stud_astat_stip_fuellen.sql |   2 +-
 ...mn_layout_sxc_zahl_wert_stammdaten_nrw.sql |  52 +-
 ...ayout_sxc_zahl_wert_stammdaten_nrw_lfb.sql |  12 +
 .../48110_leistungen_und_studiengaenge.jrxml  |  69 +-
 ...ungen_und_studiengaenge_shortcomment.jrxml |  61 +-
 15 files changed, 1580 insertions(+), 177 deletions(-)
 create mode 100644 src-modules/module/rpta/etl/stip_meldung_upload/excel_into_stip_meldung.ktr
 create mode 100644 src-modules/module/rpta/etl/stip_meldung_upload/stip_meldung_fuellen.sql
 create mode 100644 src-modules/module/rpta/etl/stip_meldung_upload/stip_meldung_upload.kjb
 create mode 100644 src-modules/module/rpta/etl/stip_meldung_upload/sx_jobs_fuellen.sql
 create mode 100644 src-modules/module/rpta/schluesseltabellen/rpta_column_layout_man_kennz_aggr_tuhh_behoerdenbericht.sql

diff --git a/src-modules/module/rpta/conf/rpta.xml b/src-modules/module/rpta/conf/rpta.xml
index c06424f..aedca87 100644
--- a/src-modules/module/rpta/conf/rpta.xml
+++ b/src-modules/module/rpta/conf/rpta.xml
@@ -360,7 +360,12 @@ parent="Berichtsassistent">Abfragen zur Administration von Berichtsassistent </t
 					<path>$RPTA_PFAD/masken</path>
 				</src>
 			</maske>
-
+<maske tid="48280" name="SuperX-Connect Kennzahlen" thema="Berichtsassistent">
+				<description></description>
+				<src>
+					<path>$RPTA_PFAD/masken</path>
+				</src>
+			</maske>
 			<!--<maske tid="48140" name="Leistungen und Studiengänge (Makro)" thema="Berichtsassistent">
 				<description>Leistungen und Studiengänge</description>
 				<src>
@@ -529,6 +534,7 @@ scriptfile="" database=""/>
 <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/personal_virtuell.sql" database=""/>
 <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/pruefungen_nach_ppruef_virtuell.sql" database=""/>
 <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/management_datenblatt_virtuell.sql" database=""/>
+<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/sxconnect_kennzahlen_virtuell.sql" database=""/>
 <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_exam_unit_dim_studiengang_virtuell.sql" database=""/>
 <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_sos_stud_astat_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_sgd_pbe_pbv_fuellen.sql" database=""/>
@@ -537,6 +543,7 @@ scriptfile="" database=""/>
 <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_sos_stud_astat_stip_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_sos_stud_astat_stip_meldung_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_man_kennz_aggr_studiengang.sql" database=""/>
+<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_sxc_zahl_wert_stammdaten_nrw.sql" database=""/>
 
 <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/macro_masken_bez_fuellen.sql" database=""/>
 </action>
diff --git a/src-modules/module/rpta/etl/stip_meldung_upload/excel_into_stip_meldung.ktr b/src-modules/module/rpta/etl/stip_meldung_upload/excel_into_stip_meldung.ktr
new file mode 100644
index 0000000..bd313fe
--- /dev/null
+++ b/src-modules/module/rpta/etl/stip_meldung_upload/excel_into_stip_meldung.ktr
@@ -0,0 +1,740 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<transformation>
+  <info>
+    <name>excel_into_tmp_stip_meldung</name>
+    <description/>
+    <extended_description/>
+    <trans_version/>
+    <trans_type>Normal</trans_type>
+    <trans_status>0</trans_status>
+    <directory>&#x2f;</directory>
+    <parameters>
+      <parameter>
+        <name>Hochschule</name>
+        <default_value>361</default_value>
+        <description/>
+      </parameter>
+      <parameter>
+        <name>Modus</name>
+        <default_value>2</default_value>
+        <description>2&#x3d;L&#xf6;schen und Hinzuf&#xfc;gen oder nur 1&#x3d;Hinzuf&#xfc;gen</description>
+      </parameter>
+      <parameter>
+        <name>PATH_TO_UPLOADFILE</name>
+        <default_value>file&#x3a;&#x2f;&#x2f;&#x2f;home&#x2f;superx&#x2f;Downloads&#x2f;Template_f&#xfc;r_die_manuelle_Schnittstelle_des_STBB.xlsx</default_value>
+        <description>Pfad zur  Exceldatei mit Quelldaten</description>
+      </parameter>
+    </parameters>
+    <log>
+      <trans-log-table>
+        <connection/>
+        <schema/>
+        <table/>
+        <size_limit_lines/>
+        <interval/>
+        <timeout_days/>
+        <field>
+          <id>ID_BATCH</id>
+          <enabled>Y</enabled>
+          <name>ID_BATCH</name>
+        </field>
+        <field>
+          <id>CHANNEL_ID</id>
+          <enabled>Y</enabled>
+          <name>CHANNEL_ID</name>
+        </field>
+        <field>
+          <id>TRANSNAME</id>
+          <enabled>Y</enabled>
+          <name>TRANSNAME</name>
+        </field>
+        <field>
+          <id>STATUS</id>
+          <enabled>Y</enabled>
+          <name>STATUS</name>
+        </field>
+        <field>
+          <id>LINES_READ</id>
+          <enabled>Y</enabled>
+          <name>LINES_READ</name>
+          <subject/>
+        </field>
+        <field>
+          <id>LINES_WRITTEN</id>
+          <enabled>Y</enabled>
+          <name>LINES_WRITTEN</name>
+          <subject/>
+        </field>
+        <field>
+          <id>LINES_UPDATED</id>
+          <enabled>Y</enabled>
+          <name>LINES_UPDATED</name>
+          <subject/>
+        </field>
+        <field>
+          <id>LINES_INPUT</id>
+          <enabled>Y</enabled>
+          <name>LINES_INPUT</name>
+          <subject/>
+        </field>
+        <field>
+          <id>LINES_OUTPUT</id>
+          <enabled>Y</enabled>
+          <name>LINES_OUTPUT</name>
+          <subject/>
+        </field>
+        <field>
+          <id>LINES_REJECTED</id>
+          <enabled>Y</enabled>
+          <name>LINES_REJECTED</name>
+          <subject/>
+        </field>
+        <field>
+          <id>ERRORS</id>
+          <enabled>Y</enabled>
+          <name>ERRORS</name>
+        </field>
+        <field>
+          <id>STARTDATE</id>
+          <enabled>Y</enabled>
+          <name>STARTDATE</name>
+        </field>
+        <field>
+          <id>ENDDATE</id>
+          <enabled>Y</enabled>
+          <name>ENDDATE</name>
+        </field>
+        <field>
+          <id>LOGDATE</id>
+          <enabled>Y</enabled>
+          <name>LOGDATE</name>
+        </field>
+        <field>
+          <id>DEPDATE</id>
+          <enabled>Y</enabled>
+          <name>DEPDATE</name>
+        </field>
+        <field>
+          <id>REPLAYDATE</id>
+          <enabled>Y</enabled>
+          <name>REPLAYDATE</name>
+        </field>
+        <field>
+          <id>LOG_FIELD</id>
+          <enabled>Y</enabled>
+          <name>LOG_FIELD</name>
+        </field>
+        <field>
+          <id>EXECUTING_SERVER</id>
+          <enabled>N</enabled>
+          <name>EXECUTING_SERVER</name>
+        </field>
+        <field>
+          <id>EXECUTING_USER</id>
+          <enabled>N</enabled>
+          <name>EXECUTING_USER</name>
+        </field>
+        <field>
+          <id>CLIENT</id>
+          <enabled>N</enabled>
+          <name>CLIENT</name>
+        </field>
+      </trans-log-table>
+      <perf-log-table>
+        <connection/>
+        <schema/>
+        <table/>
+        <interval/>
+        <timeout_days/>
+        <field>
+          <id>ID_BATCH</id>
+          <enabled>Y</enabled>
+          <name>ID_BATCH</name>
+        </field>
+        <field>
+          <id>SEQ_NR</id>
+          <enabled>Y</enabled>
+          <name>SEQ_NR</name>
+        </field>
+        <field>
+          <id>LOGDATE</id>
+          <enabled>Y</enabled>
+          <name>LOGDATE</name>
+        </field>
+        <field>
+          <id>TRANSNAME</id>
+          <enabled>Y</enabled>
+          <name>TRANSNAME</name>
+        </field>
+        <field>
+          <id>STEPNAME</id>
+          <enabled>Y</enabled>
+          <name>STEPNAME</name>
+        </field>
+        <field>
+          <id>STEP_COPY</id>
+          <enabled>Y</enabled>
+          <name>STEP_COPY</name>
+        </field>
+        <field>
+          <id>LINES_READ</id>
+          <enabled>Y</enabled>
+          <name>LINES_READ</name>
+        </field>
+        <field>
+          <id>LINES_WRITTEN</id>
+          <enabled>Y</enabled>
+          <name>LINES_WRITTEN</name>
+        </field>
+        <field>
+          <id>LINES_UPDATED</id>
+          <enabled>Y</enabled>
+          <name>LINES_UPDATED</name>
+        </field>
+        <field>
+          <id>LINES_INPUT</id>
+          <enabled>Y</enabled>
+          <name>LINES_INPUT</name>
+        </field>
+        <field>
+          <id>LINES_OUTPUT</id>
+          <enabled>Y</enabled>
+          <name>LINES_OUTPUT</name>
+        </field>
+        <field>
+          <id>LINES_REJECTED</id>
+          <enabled>Y</enabled>
+          <name>LINES_REJECTED</name>
+        </field>
+        <field>
+          <id>ERRORS</id>
+          <enabled>Y</enabled>
+          <name>ERRORS</name>
+        </field>
+        <field>
+          <id>INPUT_BUFFER_ROWS</id>
+          <enabled>Y</enabled>
+          <name>INPUT_BUFFER_ROWS</name>
+        </field>
+        <field>
+          <id>OUTPUT_BUFFER_ROWS</id>
+          <enabled>Y</enabled>
+          <name>OUTPUT_BUFFER_ROWS</name>
+        </field>
+      </perf-log-table>
+      <channel-log-table>
+        <connection/>
+        <schema/>
+        <table/>
+        <timeout_days/>
+        <field>
+          <id>ID_BATCH</id>
+          <enabled>Y</enabled>
+          <name>ID_BATCH</name>
+        </field>
+        <field>
+          <id>CHANNEL_ID</id>
+          <enabled>Y</enabled>
+          <name>CHANNEL_ID</name>
+        </field>
+        <field>
+          <id>LOG_DATE</id>
+          <enabled>Y</enabled>
+          <name>LOG_DATE</name>
+        </field>
+        <field>
+          <id>LOGGING_OBJECT_TYPE</id>
+          <enabled>Y</enabled>
+          <name>LOGGING_OBJECT_TYPE</name>
+        </field>
+        <field>
+          <id>OBJECT_NAME</id>
+          <enabled>Y</enabled>
+          <name>OBJECT_NAME</name>
+        </field>
+        <field>
+          <id>OBJECT_COPY</id>
+          <enabled>Y</enabled>
+          <name>OBJECT_COPY</name>
+        </field>
+        <field>
+          <id>REPOSITORY_DIRECTORY</id>
+          <enabled>Y</enabled>
+          <name>REPOSITORY_DIRECTORY</name>
+        </field>
+        <field>
+          <id>FILENAME</id>
+          <enabled>Y</enabled>
+          <name>FILENAME</name>
+        </field>
+        <field>
+          <id>OBJECT_ID</id>
+          <enabled>Y</enabled>
+          <name>OBJECT_ID</name>
+        </field>
+        <field>
+          <id>OBJECT_REVISION</id>
+          <enabled>Y</enabled>
+          <name>OBJECT_REVISION</name>
+        </field>
+        <field>
+          <id>PARENT_CHANNEL_ID</id>
+          <enabled>Y</enabled>
+          <name>PARENT_CHANNEL_ID</name>
+        </field>
+        <field>
+          <id>ROOT_CHANNEL_ID</id>
+          <enabled>Y</enabled>
+          <name>ROOT_CHANNEL_ID</name>
+        </field>
+      </channel-log-table>
+      <step-log-table>
+        <connection/>
+        <schema/>
+        <table/>
+        <timeout_days/>
+        <field>
+          <id>ID_BATCH</id>
+          <enabled>Y</enabled>
+          <name>ID_BATCH</name>
+        </field>
+        <field>
+          <id>CHANNEL_ID</id>
+          <enabled>Y</enabled>
+          <name>CHANNEL_ID</name>
+        </field>
+        <field>
+          <id>LOG_DATE</id>
+          <enabled>Y</enabled>
+          <name>LOG_DATE</name>
+        </field>
+        <field>
+          <id>TRANSNAME</id>
+          <enabled>Y</enabled>
+          <name>TRANSNAME</name>
+        </field>
+        <field>
+          <id>STEPNAME</id>
+          <enabled>Y</enabled>
+          <name>STEPNAME</name>
+        </field>
+        <field>
+          <id>STEP_COPY</id>
+          <enabled>Y</enabled>
+          <name>STEP_COPY</name>
+        </field>
+        <field>
+          <id>LINES_READ</id>
+          <enabled>Y</enabled>
+          <name>LINES_READ</name>
+        </field>
+        <field>
+          <id>LINES_WRITTEN</id>
+          <enabled>Y</enabled>
+          <name>LINES_WRITTEN</name>
+        </field>
+        <field>
+          <id>LINES_UPDATED</id>
+          <enabled>Y</enabled>
+          <name>LINES_UPDATED</name>
+        </field>
+        <field>
+          <id>LINES_INPUT</id>
+          <enabled>Y</enabled>
+          <name>LINES_INPUT</name>
+        </field>
+        <field>
+          <id>LINES_OUTPUT</id>
+          <enabled>Y</enabled>
+          <name>LINES_OUTPUT</name>
+        </field>
+        <field>
+          <id>LINES_REJECTED</id>
+          <enabled>Y</enabled>
+          <name>LINES_REJECTED</name>
+        </field>
+        <field>
+          <id>ERRORS</id>
+          <enabled>Y</enabled>
+          <name>ERRORS</name>
+        </field>
+        <field>
+          <id>LOG_FIELD</id>
+          <enabled>N</enabled>
+          <name>LOG_FIELD</name>
+        </field>
+      </step-log-table>
+      <metrics-log-table>
+        <connection/>
+        <schema/>
+        <table/>
+        <timeout_days/>
+        <field>
+          <id>ID_BATCH</id>
+          <enabled>Y</enabled>
+          <name>ID_BATCH</name>
+        </field>
+        <field>
+          <id>CHANNEL_ID</id>
+          <enabled>Y</enabled>
+          <name>CHANNEL_ID</name>
+        </field>
+        <field>
+          <id>LOG_DATE</id>
+          <enabled>Y</enabled>
+          <name>LOG_DATE</name>
+        </field>
+        <field>
+          <id>METRICS_DATE</id>
+          <enabled>Y</enabled>
+          <name>METRICS_DATE</name>
+        </field>
+        <field>
+          <id>METRICS_CODE</id>
+          <enabled>Y</enabled>
+          <name>METRICS_CODE</name>
+        </field>
+        <field>
+          <id>METRICS_DESCRIPTION</id>
+          <enabled>Y</enabled>
+          <name>METRICS_DESCRIPTION</name>
+        </field>
+        <field>
+          <id>METRICS_SUBJECT</id>
+          <enabled>Y</enabled>
+          <name>METRICS_SUBJECT</name>
+        </field>
+        <field>
+          <id>METRICS_TYPE</id>
+          <enabled>Y</enabled>
+          <name>METRICS_TYPE</name>
+        </field>
+        <field>
+          <id>METRICS_VALUE</id>
+          <enabled>Y</enabled>
+          <name>METRICS_VALUE</name>
+        </field>
+      </metrics-log-table>
+    </log>
+    <maxdate>
+      <connection/>
+      <table/>
+      <field/>
+      <offset>0.0</offset>
+      <maxdiff>0.0</maxdiff>
+    </maxdate>
+    <size_rowset>10000</size_rowset>
+    <sleep_time_empty>50</sleep_time_empty>
+    <sleep_time_full>50</sleep_time_full>
+    <unique_connections>N</unique_connections>
+    <feedback_shown>Y</feedback_shown>
+    <feedback_size>50000</feedback_size>
+    <using_thread_priorities>Y</using_thread_priorities>
+    <shared_objects_file/>
+    <capture_step_performance>N</capture_step_performance>
+    <step_performance_capturing_delay>1000</step_performance_capturing_delay>
+    <step_performance_capturing_size_limit>100</step_performance_capturing_size_limit>
+    <dependencies>
+    </dependencies>
+    <partitionschemas>
+    </partitionschemas>
+    <slaveservers>
+    </slaveservers>
+    <clusterschemas>
+    </clusterschemas>
+    <created_user>-</created_user>
+    <created_date>2022&#x2f;06&#x2f;27 15&#x3a;49&#x3a;54.602</created_date>
+    <modified_user>-</modified_user>
+    <modified_date>2022&#x2f;06&#x2f;27 15&#x3a;49&#x3a;54.602</modified_date>
+    <key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA&#x3d;</key_for_session_key>
+    <is_key_private>N</is_key_private>
+  </info>
+  <notepads>
+  </notepads>
+  <order>
+    <hop>
+      <from>Microsoft Excel Input</from>
+      <to>Table output tmp_stip_meldung</to>
+      <enabled>Y</enabled>
+    </hop>
+  </order>
+  <step>
+    <name>Microsoft Excel Input</name>
+    <type>ExcelInput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <header>Y</header>
+    <noempty>Y</noempty>
+    <stoponempty>N</stoponempty>
+    <filefield/>
+    <sheetfield/>
+    <sheetrownumfield/>
+    <rownumfield/>
+    <sheetfield/>
+    <filefield/>
+    <limit>0</limit>
+    <encoding>UTF-8</encoding>
+    <add_to_result_filenames>Y</add_to_result_filenames>
+    <accept_filenames>N</accept_filenames>
+    <accept_field/>
+    <accept_stepname/>
+    <file>
+      <name>&#x24;&#x7b;PATH_TO_UPLOADFILE&#x7d;</name>
+      <filemask/>
+      <exclude_filemask/>
+      <file_required>N</file_required>
+      <include_subfolders>N</include_subfolders>
+    </file>
+    <fields>
+      <field>
+        <name>Matrikel-Nr.</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format>&#x23;</format>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
+        <name>Vorname</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
+        <name>Nachname</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
+        <name>Status</name>
+        <type>Integer</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format/>
+        <currency/>
+        <decimal>.</decimal>
+        <group/>
+      </field>
+      <field>
+        <name>Fach</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
+        <name>Abschluss</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
+        <name>Adresszusatz</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
+        <name>Stra&#xdf;e</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
+        <name>PLZ</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
+        <name>Ort</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
+        <name>F&#xf6;rdermonat</name>
+        <type>Number</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
+        <name>Baf&#xf6;g</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+    </fields>
+    <sheets>
+      <sheet>
+        <name>Tabellenausgabe Studierend..1</name>
+        <startrow>3</startrow>
+        <startcol>0</startcol>
+        </sheet>
+    </sheets>
+    <strict_types>N</strict_types>
+    <error_ignored>N</error_ignored>
+    <error_line_skipped>N</error_line_skipped>
+    <bad_line_files_destination_directory/>
+    <bad_line_files_extension>warning</bad_line_files_extension>
+    <error_line_files_destination_directory/>
+    <error_line_files_extension>error</error_line_files_extension>
+    <line_number_files_destination_directory/>
+    <line_number_files_extension>line</line_number_files_extension>
+    <shortFileFieldName/>
+    <pathFieldName/>
+    <hiddenFieldName/>
+    <lastModificationTimeFieldName/>
+    <uriNameFieldName/>
+    <rootUriNameFieldName/>
+    <extensionFieldName/>
+    <sizeFieldName/>
+    <spreadsheet_type>POI</spreadsheet_type>
+    <cluster_schema/>
+    <remotesteps>
+      <input>
+      </input>
+      <output>
+      </output>
+    </remotesteps>
+    <GUI>
+      <xloc>112</xloc>
+      <yloc>112</yloc>
+      <draw>Y</draw>
+    </GUI>
+    </step>
+
+  <step>
+    <name>Table output tmp_stip_meldung</name>
+    <type>TableOutput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <connection>eduetl</connection>
+    <schema/>
+    <table>tmp_stip_meldung</table>
+    <commit>100000</commit>
+    <truncate>N</truncate>
+    <ignore_errors>N</ignore_errors>
+    <use_batch>Y</use_batch>
+    <specify_fields>Y</specify_fields>
+    <partitioning_enabled>N</partitioning_enabled>
+    <partitioning_field/>
+    <partitioning_daily>N</partitioning_daily>
+    <partitioning_monthly>Y</partitioning_monthly>
+    <tablename_in_field>N</tablename_in_field>
+    <tablename_field/>
+    <tablename_in_table>Y</tablename_in_table>
+    <return_keys>N</return_keys>
+    <return_field/>
+    <fields>
+        <field>
+          <column_name>matrikel_nr</column_name>
+          <stream_name>Matrikel-Nr.</stream_name>
+        </field>
+        <field>
+          <column_name>foerdermonat</column_name>
+          <stream_name>F&#xf6;rdermonat</stream_name>
+        </field>
+        <field>
+          <column_name>bafoeg</column_name>
+          <stream_name>Baf&#xf6;g</stream_name>
+        </field>
+    </fields>
+    <cluster_schema/>
+    <remotesteps>
+      <input>
+      </input>
+      <output>
+      </output>
+    </remotesteps>
+    <GUI>
+      <xloc>544</xloc>
+      <yloc>112</yloc>
+      <draw>Y</draw>
+    </GUI>
+    </step>
+
+  <step_error_handling>
+  </step_error_handling>
+  <slave-step-copy-partition-distribution>
+  </slave-step-copy-partition-distribution>
+  <slave_transformation>N</slave_transformation>
+</transformation>
diff --git a/src-modules/module/rpta/etl/stip_meldung_upload/stip_meldung_fuellen.sql b/src-modules/module/rpta/etl/stip_meldung_upload/stip_meldung_fuellen.sql
new file mode 100644
index 0000000..086ecdd
--- /dev/null
+++ b/src-modules/module/rpta/etl/stip_meldung_upload/stip_meldung_fuellen.sql
@@ -0,0 +1,33 @@
+update tmp_stip_meldung 
+set userinfo_id=1,
+	zeitstempel=now()
+;
+--delete from tmp_stip_meldung where bafoeg is null;
+--delete from tmp_stip_meldung where foerdermonat is null and bafoeg = 'j';
+
+
+delete from stip_meldung
+where matrikel_nr in (select M.matrikel_nr::integer from tmp_stip_meldung M) -- Hinzufügen
+;
+
+delete from stip_meldung where ${Modus}=2; -- Löschen und Hinzufügen
+
+INSERT INTO stip_meldung
+(
+  matrikel_nr,
+  foerdermonat,
+  bafoeg,
+  userinfo_id,
+  zeitstempel
+)
+select distinct
+  matrikel_nr::integer,
+  foerdermonat,
+  bafoeg,
+  userinfo_id,
+  zeitstempel
+from tmp_stip_meldung
+;
+
+
+drop table tmp_stip_meldung;
diff --git a/src-modules/module/rpta/etl/stip_meldung_upload/stip_meldung_upload.kjb b/src-modules/module/rpta/etl/stip_meldung_upload/stip_meldung_upload.kjb
new file mode 100644
index 0000000..7ca3422
--- /dev/null
+++ b/src-modules/module/rpta/etl/stip_meldung_upload/stip_meldung_upload.kjb
@@ -0,0 +1,443 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<job>
+  <name>stip_meldung_upload</name>
+  <description/>
+  <extended_description/>
+  <job_version/>
+  <job_status>0</job_status>
+  <directory>&#x2f;</directory>
+  <created_user>-</created_user>
+  <created_date>2022&#x2f;06&#x2f;27 14&#x3a;59&#x3a;09.135</created_date>
+  <modified_user>-</modified_user>
+  <modified_date>2022&#x2f;06&#x2f;27 14&#x3a;59&#x3a;09.135</modified_date>
+    <parameters>
+      <parameter>
+        <name>Hochschule</name>
+        <default_value>361</default_value>
+        <description/>
+      </parameter>
+      <parameter>
+        <name>Modus</name>
+        <default_value>1</default_value>
+        <description>2&#x3d;L&#xf6;schen und Hinzuf&#xfc;gen oder nur 1&#x3d;Hinzuf&#xfc;gen</description>
+      </parameter>
+      <parameter>
+        <name>PATH_TO_UPLOADFILE</name>
+        <default_value>file&#x3a;&#x2f;&#x2f;&#x2f;home&#x2f;superx&#x2f;Downloads&#x2f;Tabellenausgabe_Studierende_&#x28;amtlich_und_intern&#x29;-8.xlsx</default_value>
+        <description>Pfad zur  Exceldatei mit Quelldaten</description>
+      </parameter>
+    </parameters>
+    <slaveservers>
+    </slaveservers>
+      <job-log-table>
+        <connection/>
+        <schema/>
+        <table/>
+        <size_limit_lines/>
+        <interval/>
+        <timeout_days/>
+        <field>
+          <id>ID_JOB</id>
+          <enabled>Y</enabled>
+          <name>ID_JOB</name>
+        </field>
+        <field>
+          <id>CHANNEL_ID</id>
+          <enabled>Y</enabled>
+          <name>CHANNEL_ID</name>
+        </field>
+        <field>
+          <id>JOBNAME</id>
+          <enabled>Y</enabled>
+          <name>JOBNAME</name>
+        </field>
+        <field>
+          <id>STATUS</id>
+          <enabled>Y</enabled>
+          <name>STATUS</name>
+        </field>
+        <field>
+          <id>LINES_READ</id>
+          <enabled>Y</enabled>
+          <name>LINES_READ</name>
+        </field>
+        <field>
+          <id>LINES_WRITTEN</id>
+          <enabled>Y</enabled>
+          <name>LINES_WRITTEN</name>
+        </field>
+        <field>
+          <id>LINES_UPDATED</id>
+          <enabled>Y</enabled>
+          <name>LINES_UPDATED</name>
+        </field>
+        <field>
+          <id>LINES_INPUT</id>
+          <enabled>Y</enabled>
+          <name>LINES_INPUT</name>
+        </field>
+        <field>
+          <id>LINES_OUTPUT</id>
+          <enabled>Y</enabled>
+          <name>LINES_OUTPUT</name>
+        </field>
+        <field>
+          <id>LINES_REJECTED</id>
+          <enabled>Y</enabled>
+          <name>LINES_REJECTED</name>
+        </field>
+        <field>
+          <id>ERRORS</id>
+          <enabled>Y</enabled>
+          <name>ERRORS</name>
+        </field>
+        <field>
+          <id>STARTDATE</id>
+          <enabled>Y</enabled>
+          <name>STARTDATE</name>
+        </field>
+        <field>
+          <id>ENDDATE</id>
+          <enabled>Y</enabled>
+          <name>ENDDATE</name>
+        </field>
+        <field>
+          <id>LOGDATE</id>
+          <enabled>Y</enabled>
+          <name>LOGDATE</name>
+        </field>
+        <field>
+          <id>DEPDATE</id>
+          <enabled>Y</enabled>
+          <name>DEPDATE</name>
+        </field>
+        <field>
+          <id>REPLAYDATE</id>
+          <enabled>Y</enabled>
+          <name>REPLAYDATE</name>
+        </field>
+        <field>
+          <id>LOG_FIELD</id>
+          <enabled>Y</enabled>
+          <name>LOG_FIELD</name>
+        </field>
+        <field>
+          <id>EXECUTING_SERVER</id>
+          <enabled>N</enabled>
+          <name>EXECUTING_SERVER</name>
+        </field>
+        <field>
+          <id>EXECUTING_USER</id>
+          <enabled>N</enabled>
+          <name>EXECUTING_USER</name>
+        </field>
+        <field>
+          <id>START_JOB_ENTRY</id>
+          <enabled>N</enabled>
+          <name>START_JOB_ENTRY</name>
+        </field>
+        <field>
+          <id>CLIENT</id>
+          <enabled>N</enabled>
+          <name>CLIENT</name>
+        </field>
+      </job-log-table>
+      <jobentry-log-table>
+        <connection/>
+        <schema/>
+        <table/>
+        <timeout_days/>
+        <field>
+          <id>ID_BATCH</id>
+          <enabled>Y</enabled>
+          <name>ID_BATCH</name>
+        </field>
+        <field>
+          <id>CHANNEL_ID</id>
+          <enabled>Y</enabled>
+          <name>CHANNEL_ID</name>
+        </field>
+        <field>
+          <id>LOG_DATE</id>
+          <enabled>Y</enabled>
+          <name>LOG_DATE</name>
+        </field>
+        <field>
+          <id>JOBNAME</id>
+          <enabled>Y</enabled>
+          <name>TRANSNAME</name>
+        </field>
+        <field>
+          <id>JOBENTRYNAME</id>
+          <enabled>Y</enabled>
+          <name>STEPNAME</name>
+        </field>
+        <field>
+          <id>LINES_READ</id>
+          <enabled>Y</enabled>
+          <name>LINES_READ</name>
+        </field>
+        <field>
+          <id>LINES_WRITTEN</id>
+          <enabled>Y</enabled>
+          <name>LINES_WRITTEN</name>
+        </field>
+        <field>
+          <id>LINES_UPDATED</id>
+          <enabled>Y</enabled>
+          <name>LINES_UPDATED</name>
+        </field>
+        <field>
+          <id>LINES_INPUT</id>
+          <enabled>Y</enabled>
+          <name>LINES_INPUT</name>
+        </field>
+        <field>
+          <id>LINES_OUTPUT</id>
+          <enabled>Y</enabled>
+          <name>LINES_OUTPUT</name>
+        </field>
+        <field>
+          <id>LINES_REJECTED</id>
+          <enabled>Y</enabled>
+          <name>LINES_REJECTED</name>
+        </field>
+        <field>
+          <id>ERRORS</id>
+          <enabled>Y</enabled>
+          <name>ERRORS</name>
+        </field>
+        <field>
+          <id>RESULT</id>
+          <enabled>Y</enabled>
+          <name>RESULT</name>
+        </field>
+        <field>
+          <id>NR_RESULT_ROWS</id>
+          <enabled>Y</enabled>
+          <name>NR_RESULT_ROWS</name>
+        </field>
+        <field>
+          <id>NR_RESULT_FILES</id>
+          <enabled>Y</enabled>
+          <name>NR_RESULT_FILES</name>
+        </field>
+        <field>
+          <id>LOG_FIELD</id>
+          <enabled>N</enabled>
+          <name>LOG_FIELD</name>
+        </field>
+        <field>
+          <id>COPY_NR</id>
+          <enabled>N</enabled>
+          <name>COPY_NR</name>
+        </field>
+      </jobentry-log-table>
+      <channel-log-table>
+        <connection/>
+        <schema/>
+        <table/>
+        <timeout_days/>
+        <field>
+          <id>ID_BATCH</id>
+          <enabled>Y</enabled>
+          <name>ID_BATCH</name>
+        </field>
+        <field>
+          <id>CHANNEL_ID</id>
+          <enabled>Y</enabled>
+          <name>CHANNEL_ID</name>
+        </field>
+        <field>
+          <id>LOG_DATE</id>
+          <enabled>Y</enabled>
+          <name>LOG_DATE</name>
+        </field>
+        <field>
+          <id>LOGGING_OBJECT_TYPE</id>
+          <enabled>Y</enabled>
+          <name>LOGGING_OBJECT_TYPE</name>
+        </field>
+        <field>
+          <id>OBJECT_NAME</id>
+          <enabled>Y</enabled>
+          <name>OBJECT_NAME</name>
+        </field>
+        <field>
+          <id>OBJECT_COPY</id>
+          <enabled>Y</enabled>
+          <name>OBJECT_COPY</name>
+        </field>
+        <field>
+          <id>REPOSITORY_DIRECTORY</id>
+          <enabled>Y</enabled>
+          <name>REPOSITORY_DIRECTORY</name>
+        </field>
+        <field>
+          <id>FILENAME</id>
+          <enabled>Y</enabled>
+          <name>FILENAME</name>
+        </field>
+        <field>
+          <id>OBJECT_ID</id>
+          <enabled>Y</enabled>
+          <name>OBJECT_ID</name>
+        </field>
+        <field>
+          <id>OBJECT_REVISION</id>
+          <enabled>Y</enabled>
+          <name>OBJECT_REVISION</name>
+        </field>
+        <field>
+          <id>PARENT_CHANNEL_ID</id>
+          <enabled>Y</enabled>
+          <name>PARENT_CHANNEL_ID</name>
+        </field>
+        <field>
+          <id>ROOT_CHANNEL_ID</id>
+          <enabled>Y</enabled>
+          <name>ROOT_CHANNEL_ID</name>
+        </field>
+      </channel-log-table>
+   <pass_batchid>N</pass_batchid>
+   <shared_objects_file/>
+  <entries>
+    <entry>
+      <name>START</name>
+      <description/>
+      <type>SPECIAL</type>
+      <start>Y</start>
+      <dummy>N</dummy>
+      <repeat>N</repeat>
+      <schedulerType>0</schedulerType>
+      <intervalSeconds>0</intervalSeconds>
+      <intervalMinutes>60</intervalMinutes>
+      <hour>12</hour>
+      <minutes>0</minutes>
+      <weekDay>1</weekDay>
+      <DayOfMonth>1</DayOfMonth>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>64</xloc>
+      <yloc>112</yloc>
+    </entry>
+    <entry>
+      <name>tmp_stip_meldung</name>
+      <description/>
+      <type>SQL</type>
+      <sql>drop table if exists tmp_stip_meldung&#x3b;&#xa;&#xa;create table tmp_stip_meldung&#xa;&#x28;&#xa;   matrikel_nr       varchar&#x28;255&#x29;,&#xa;   foerdermonat  float,&#xa;   bafoeg   char&#x28;1&#x29;,&#xa;   userinfo_id   integer,&#xa;   zeitstempel        timestamp&#xa;&#x29;&#xa;&#x3b;</sql>
+      <useVariableSubstitution>F</useVariableSubstitution>
+      <sqlfromfile>F</sqlfromfile>
+      <sqlfilename/>
+      <sendOneStatement>F</sendOneStatement>
+      <connection>eduetl</connection>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>208</xloc>
+      <yloc>112</yloc>
+    </entry>
+    <entry>
+      <name>excel_into_stip_meldung</name>
+      <description/>
+      <type>TRANS</type>
+      <specification_method>filename</specification_method>
+      <trans_object_id/>
+      <filename>&#x24;&#x7b;Internal.Job.Filename.Directory&#x7d;&#x2f;excel_into_stip_meldung.ktr</filename>
+      <transname/>
+      <arg_from_previous>N</arg_from_previous>
+      <params_from_previous>N</params_from_previous>
+      <exec_per_row>N</exec_per_row>
+      <clear_rows>N</clear_rows>
+      <clear_files>N</clear_files>
+      <set_logfile>N</set_logfile>
+      <logfile/>
+      <logext/>
+      <add_date>N</add_date>
+      <add_time>N</add_time>
+      <loglevel>Basic</loglevel>
+      <cluster>N</cluster>
+      <slave_server_name/>
+      <set_append_logfile>N</set_append_logfile>
+      <wait_until_finished>Y</wait_until_finished>
+      <follow_abort_remote>N</follow_abort_remote>
+      <create_parent_folder>N</create_parent_folder>
+      <logging_remote_work>N</logging_remote_work>
+      <parameters>
+        <pass_all_parameters>Y</pass_all_parameters>
+      </parameters>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>448</xloc>
+      <yloc>112</yloc>
+    </entry>
+    <entry>
+      <name>Success</name>
+      <description/>
+      <type>SUCCESS</type>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>976</xloc>
+      <yloc>112</yloc>
+    </entry>
+    <entry>
+      <name>Update stip_meldung</name>
+      <description/>
+      <type>SQL</type>
+      <sql/>
+      <useVariableSubstitution>T</useVariableSubstitution>
+      <sqlfromfile>T</sqlfromfile>
+      <sqlfilename>&#x24;&#x7b;Internal.Job.Filename.Directory&#x7d;&#x2f;stip_meldung_fuellen.sql</sqlfilename>
+      <sendOneStatement>F</sendOneStatement>
+      <connection>eduetl</connection>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>688</xloc>
+      <yloc>112</yloc>
+    </entry>
+  </entries>
+  <hops>
+    <hop>
+      <from>START</from>
+      <to>tmp_stip_meldung</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>Y</unconditional>
+    </hop>
+    <hop>
+      <from>tmp_stip_meldung</from>
+      <to>excel_into_stip_meldung</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>Update stip_meldung</from>
+      <to>Success</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>excel_into_stip_meldung</from>
+      <to>Update stip_meldung</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+  </hops>
+  <notepads>
+  </notepads>
+</job>
diff --git a/src-modules/module/rpta/etl/stip_meldung_upload/sx_jobs_fuellen.sql b/src-modules/module/rpta/etl/stip_meldung_upload/sx_jobs_fuellen.sql
new file mode 100644
index 0000000..aa3ae25
--- /dev/null
+++ b/src-modules/module/rpta/etl/stip_meldung_upload/sx_jobs_fuellen.sql
@@ -0,0 +1,41 @@
+--Freemarker Template
+--Achtung: Macro fügt Inhalte ein
+--Bitte nur Freemarker Variablen füllen
+<sqlvars>
+<sqlvar name="sx_jobs_exists">select sp_table_exists('sx_jobs') from xdummy;</sqlvar>
+</sqlvars>
+
+<#assign jobs = [
+{"uniquename":"stip_meldung_upload", "caption":"Stipendiaten-Daten hochladen", "filepath":"rpta/etl/stip_meldung_upload/stip_meldung_upload.kjb","sachgebiete_id":330,
+  "kenn_profil":"","hs_nr":"","modus_supported":1,"params":"",
+"check_sql":"select count(*) from stip_meldung"}
+] />
+
+
+
+
+--- Freemarker Magic
+<#if sx_jobs_exists=1>
+<#foreach job in jobs>
+delete from sx_jobs where uniquename='${job.uniquename}';
+</#foreach>
+  <#if SQLdialect='Postgres'>
+   select sp_update_sequence('sx_jobs');
+  </#if>
+<#foreach job in jobs>
+insert into sx_jobs (uniquename,caption,filepath,sachgebiete_id,kenn_profil,hs_nr,modus_supported,params
+<#if SQLdialect='Postgres'>,check_sql
+</#if>)
+values ('${job.uniquename}','${job.caption}','${job.filepath}',${job.sachgebiete_id},<#if job.kenn_profil!="">${job.kenn_profil}<#else>null::integer</#if>,
+<#if job.hs_nr!="">${job.hs_nr}<#else>null::integer</#if>,${job.modus_supported},'${job.params}'
+<#if SQLdialect='Postgres'>
+,'${job.check_sql}'
+</#if>
+);
+</#foreach>
+
+<#if SQLdialect='Postgres'>
+   select sp_update_sequence('sx_jobs');
+  </#if>
+  
+  </#if>
diff --git a/src-modules/module/rpta/masken/48220_felderinfo.unl b/src-modules/module/rpta/masken/48220_felderinfo.unl
index 1725b12..482c7ae 100644
--- a/src-modules/module/rpta/masken/48220_felderinfo.unl
+++ b/src-modules/module/rpta/masken/48220_felderinfo.unl
@@ -1,15 +1,15 @@
 48220^Studiengang^39^0^0^150^200^6^char^30^0^12^<<SQL>> select tid,name,sortnr from sichten where art in ('MAN-STG-Kostenstellen-Sicht','MAN-Studiengang-Sicht') and aktiv=1 order by 3,2;^^^
-48221^Kennzahl^100^0^0^150^200^1^char^255^1^1^<<SQL>> select C.id,trim(C.name) || ' - (' || C.id || ')',P.sortnr,P.sortnr2\
+48221^Kennzahl^100^0^0^150^200^1^char^255^0^1^<<SQL>> select C.id,trim(C.name) || ' - (' || C.id || ')',P.sortnr,P.sortnr2\
 from man_reports R,man_catalogue_rpt P, man_catalogue C\
 where C.id=P.catalogue_id\
 and R.id=P.report_id\
 /* and P.report_id=<<Bericht>>*/\
 and P.active>=1\
 and R.active=1\
-and C.timeunit='S'\
-and C.calcratio=0\
-and C.cacheing>0\
-order by 3,4,2^^^
+--and C.timeunit='S'\
+--and C.calcratio=0\
+--and C.cacheing>0\
+order by 3,4,2^ ^ ^
 48222^Institution^2^0^0^150^200^1^char^30^0^12^<<SQL>>select tid,type,name from sichten where art ='MAN-Kostenstellen-Sicht' and aktiv=1 order by type,name;^^^
 48223^Start-Jahr^4^0^0^100^50^1^integer^30^0^1^<<SQL>> SELECT distinct tid,druck FROM man_jahr order by 1;^^<<SQL>> SELECT tid,druck FROM man_jahr where tid=(year(today())-5) ;^
 48224^Startsemester^7^0^0^140^80^1^integer^30^0^1^<<SQL>> select tid, eintrag from man_semester order by tid DESC;^^^
@@ -20,11 +20,11 @@ FROM rpta_column_layout \
 where resultset_id in (select R.tid from rpta_resultset R where R.uniquename='rpta_man_kennz_aggr'\
 and R.systeminfo_id=200)\
 order by sortnr, caption\
- ;^^<<SQL>>SELECT uniquename,\
+ ;^ ^<<SQL>>SELECT uniquename,\
        caption\
 FROM rpta_column_layout \
 where resultset_id in (select R.tid from rpta_resultset R where R.uniquename='rpta_man_kennz_aggr'\
-and R.systeminfo_id=200) and uniquename='man_kennz_aggr_studiengang';^
+and R.systeminfo_id=200) and uniquename='man_kennz_aggr_tuhh_behoerdenbericht';^
 48227^Spalten^3001^0^0^150^190^10^char^30^0^1^<<SQL>>\
 select C.uniquename, C.caption ,L.layout_id from rpta_column C, rpta_column2layout L where C.tid=L.column_id and layout_id in\
 (select tid from rpta_column_layout where uniquename=<<Spaltenlayout>>) order by 2;^^^
@@ -36,4 +36,4 @@ select C.uniquename, C.caption ,L.layout_id from rpta_column C, rpta_column2layo
 48233^Bericht^1^0^0^150^200^1^char^30^1^1^<<SQL>> select R.id,trim(R.name) || ' - (' || R.id || ')' from man_reports R where 0<(select count(*) from man_catalogue_rpt P, man_catalogue C\
 where C.id=P.catalogue_id\
 and C.fromclause is not null\
-and P.report_id=R.id) and R.active=1 order by 2^^<<SQL>> select id,name || ' - (' || id || ')' from man_reports where id='${MAN_DEFAULT_REPORT}' and active=1;^
+and P.report_id=R.id) and R.active=1 order by 2^ ^<<SQL>> select id,name || ' - (' || id || ')' from man_reports where id='TUHH_KENNZ' and active=1;^
diff --git a/src-modules/module/rpta/masken/48220_maskeninfo.unl b/src-modules/module/rpta/masken/48220_maskeninfo.unl
index cd8d66c..f62ae0a 100644
--- a/src-modules/module/rpta/masken/48220_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48220_maskeninfo.unl
@@ -39,7 +39,8 @@ select  caption,\
 <sqlvar name="rpta_column_layout" type="hash"><![CDATA[\
 select L.uniquename,\
        L.caption,\
-       L.whereclause\
+       L.whereclause,\
+       L.sortclause\
        from rpta_resultset R, rpta_column_layout L\
        where L.resultset_id=R.tid\
        and R.uniquename='${basetable.name}'\
@@ -78,20 +79,7 @@ and substring('' || tid from 5 for 1)='<<Semestertyp>>'\
 ;\
 \
 ]]></sqlvar>\
-<sqlvar name="timeunit">\
-select K.timeunit\
-from man_catalogue K\
-where \
-K.id = <<Kennzahl>> \
-;\
-</sqlvar>\
-<sqlvar name="calcratio">\
-select K.calcratio\
-from man_catalogue K\
-where \
-K.id = <<Kennzahl>> \
-;\
-</sqlvar>\
+\
 </sqlvars>\
 \
 <#assign jahr_param="" />\
@@ -108,20 +96,13 @@ K.id = <<Kennzahl>> \
 \
 <#assign filter="1=1\
 /* and geschlecht=<<Geschlecht>> */\
-/* and catalogue_id=<<Kennzahl>> */\
-" />\
-<#if timeunit='S'>\
-<#assign filter = filter + " \
+/* and catalogue_id=<<Kennzahl>> */ \
 /* and sem >= <<Startsemester>> */\
 /* and sem <= <<Endsemester>> */\
-"/> \
-</#if>\
-<#if timeunit='J'>\
-<#assign filter = filter + " \
 /* and jahr >= <<Start-Jahr>> */\
 /* and jahr <= <<End-Jahr>> */\
-"/> \
-</#if>\
+" />\
+\
 \
 <#assign institutionparam="" />\
 /* <#assign institutionparam=<<Institution>> /> */\
@@ -163,107 +144,8 @@ and ${filter}\
 \
 \
 \
-select \
---zuerst die Basisdaten:\
-<#foreach column in columns>\
-<#if column.coltype="physicalColumn">\
-${column.srcfieldname},\
-<#elseif column.coltype="logicalColumn">\
-${column.colfunction} as ${column.targetfieldname},\
-<#elseif column.coltype="lookupColumn">\
-(${column.colfunction}) as ${column.targetfieldname},\
-<#elseif column.coltype="computedColumn">\
-null::decimal(19,6) as ${column.targetfieldname},\
-</#if>\
-</#foreach>\
-null::char(1) as dummycol\
-into temp tmp_stud\
-from ${basetable.runtime_tablename}\
-<#if rpta_column_layout.whereclause !="">\
-where ${rpta_column_layout.whereclause}\
-</#if>\
-;\
-\
-\
---ergebnistabelle:\
-select \
---zuerst die nicht-Aggregate:\
-<#assign groupby=0 />\
-<#foreach column in columns>\
-<#if column.is_aggregate==0>\
-<#assign groupby=groupby+1 />\
-${column.targetfieldname},\
-</#if>\
-</#foreach>\
---dann die Aggregate:\
-<#foreach column in columns>\
-<#if column.is_aggregate==1 &&  column.coltype!="computedColumn">\
-sum(${column.targetfieldname}) as ${column.targetfieldname},\
-</#if>\
-</#foreach>\
-null::char(1) as dummycol\
-into temp tmp_stud2\
-from tmp_stud\
-where 1=1\
-/*  ${<<Zusatzfilter>>} */\
-group by\
-<#list 1..groupby as i>${i}\
-<#if i != groupby>\
-,\
-</#if>\
-</#list>\
-;\
---für Prozentwerte alle Aggregate summieren:\
-select <#foreach column in columns>\
-<#if column.is_aggregate==1 &&  column.coltype!="computedColumn">\
-sum(${column.targetfieldname})::float as ${column.targetfieldname},\
-</#if>\
-</#foreach>\
-null::char(1) as dummycol\
-into temp tmp_gesamt\
-from tmp_stud2\
-where 1=1\
-;\
-\
-<#assign number_of_visible_colums=0 />\
-<#foreach column in columns>\
-<#if column.is_visible!=0>\
-<#assign number_of_visible_colums=number_of_visible_colums+1 />\
-</#if>\
-</#foreach>\
-<#assign colnr=0 />\
-select \
-<#foreach column in columns>\
-<#if column.is_visible!=0>\
-<#assign colnr=colnr+1 />\
-<#assign format_sql="" />\
-<#if column.format_sql?string != "">\
-<#assign format_sql=column.format_sql />\
-</#if>\
-\
-<#if column.coltype=="computedColumn">\
-(${column.colfunction})${format_sql} as ${column.targetfieldname}\
-<#else>\
-${column.targetfieldname}${format_sql} as ${column.targetfieldname}\
-</#if>\
-\
-<#if colnr &lt; number_of_visible_colums>,</#if>\
-</#if> --wenn sichtbar\
-</#foreach>\
-from tmp_stud2\
-order by <#list 1..number_of_visible_colums as i>${i}\
-<#if i != number_of_visible_colums>\
-,\
-</#if>\
-</#list>\
-;\
-<#if basetable.is_virtual==1>\
-drop table if exists ${basetable.runtime_tablename};\
-</#if>\
-\
+<@rpta_interpret_column_layout nonvirtualTableFilter=filter/>\
 \
-drop table if exists tmp_stud;\
-drop table if exists tmp_gesamt;\
 \
 \
 </#if> --wenn columns?has_content^--Freemarker Template\
diff --git a/src-modules/module/rpta/schluesseltabellen/management_datenblatt_virtuell.sql b/src-modules/module/rpta/schluesseltabellen/management_datenblatt_virtuell.sql
index 6360e44..7efc322 100644
--- a/src-modules/module/rpta/schluesseltabellen/management_datenblatt_virtuell.sql
+++ b/src-modules/module/rpta/schluesseltabellen/management_datenblatt_virtuell.sql
@@ -20,6 +20,12 @@ name, trim(name) ||'_'   as prefix,
 caption,
 'man_organigramm.key_apnr=man_kennz_aggr.ch110_institut' as joinclause
        from sx_tables where name  in ('man_organigramm')
+union
+select 20::smallint as sortnr,
+name, trim(name) ||'_'   as prefix,
+caption,
+'man_catalogue.id=man_kennz_aggr.catalogue_id' as joinclause
+       from sx_tables where name  in ('man_catalogue')
 order by 1
 </sqlvar>
 <sqlvar name="fields_target" type="hashsequence"><![CDATA[
diff --git a/src-modules/module/rpta/schluesseltabellen/rptaColLay_rpta_exam_unit_dim_studiengang_note_fuellen.sql b/src-modules/module/rpta/schluesseltabellen/rptaColLay_rpta_exam_unit_dim_studiengang_note_fuellen.sql
index 6bea087..507f08e 100644
--- a/src-modules/module/rpta/schluesseltabellen/rptaColLay_rpta_exam_unit_dim_studiengang_note_fuellen.sql
+++ b/src-modules/module/rpta/schluesseltabellen/rptaColLay_rpta_exam_unit_dim_studiengang_note_fuellen.sql
@@ -171,6 +171,18 @@ select uniquename from rpta_resultset where uniquename='rpta_exam_unit_dim_studi
 "is_visible":"1",
 "is_aggregate":1,
 "visible_size":5,
+"description":""},
+
+  {"uniquename":"pvermerk_at_sum",
+"srcfieldname":"",
+"targetfieldname":"pvermerk_at_sum",
+"column_type":"logicalColumn",
+"col_function":"(case when pvermerk in (''AT'') then 1 else 0 end)",
+"format_code":"",
+"caption":"Rücktritt mit Attest",
+"is_visible":"1",
+"is_aggregate":1,
+"visible_size":5,
 "description":""},
 
 {"uniquename":"rpta_exam_unit_shortcomment",
diff --git a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_man_kennz_aggr_tuhh_behoerdenbericht.sql b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_man_kennz_aggr_tuhh_behoerdenbericht.sql
new file mode 100644
index 0000000..cef58b3
--- /dev/null
+++ b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_man_kennz_aggr_tuhh_behoerdenbericht.sql
@@ -0,0 +1,129 @@
+--freemarker template
+<#include "RPTA-Makros"/>
+<sqlvars>
+<sqlvar name="rpta_man_kennz_aggr_exists">
+select count(*) from rpta_resultset where uniquename='rpta_man_kennz_aggr';
+</sqlvar>
+</sqlvars>
+<#assign rpta_column_layout = {"uniquename":"man_kennz_aggr_tuhh_behoerdenbericht",
+"caption":"Management Kennz. des TUHH Behördenberichtes",
+"rpta_resultset":"rpta_man_kennz_aggr",
+"whereclause":"catalogue_id in (select catalogue_id from man_catalogue_rpt where report_id =''TUHH_KENNZ'')",
+"sortclause":"",
+"description":""
+}
+   />
+
+<#assign rpta_columns = [
+{"uniquename":"catalogue_id",
+"caption_der_spalte":"Management Kennzahlen - Kennzahl",
+"caption_in_ergebnistabelle":"ID der Kennzahl",
+"srcfieldname":"catalogue_id",
+"column_type":"physicalColumn",
+"col_function":"",
+"is_visible":"1",
+"visible_size":"10",
+"is_aggregate":"0",
+"description":""
+},
+{"uniquename":"jahr",
+"caption_der_spalte":"Management Kennzahlen - Jahr",
+"caption_in_ergebnistabelle":"Jahr",
+"srcfieldname":"jahr",
+"column_type":"physicalColumn",
+"col_function":"",
+"is_visible":"1",
+"visible_size":"10",
+"is_aggregate":"0",
+"description":""
+},
+{"uniquename":"man_catalogue_name",
+"caption_der_spalte":"Name der Kennzahl",
+"caption_in_ergebnistabelle":"Kennzahl",
+"srcfieldname":"man_catalogue_name",
+"targetfieldname":"",
+"column_type":"physicalColumn",
+"col_function":"",
+"is_visible":"1",
+"visible_size":"10",
+"is_aggregate":"0",
+"description":""
+},
+{"uniquename":"sem",
+"caption_der_spalte":"Semester",
+"caption_in_ergebnistabelle":"Semester",
+"srcfieldname":"sem",
+"targetfieldname":"sem",
+"column_type":"physicalColumn",
+"col_function":"",
+"is_visible":"1",
+"visible_size":"10",
+"is_aggregate":"0",
+"description":""
+},
+{"uniquename":"value1",
+"caption_der_spalte":"Management Kennzahlen - Wert 1 der Kennzahl bei Prozentwerten",
+"caption_in_ergebnistabelle":"Wert 1 der Kennzahl bei Prozentwerten",
+"srcfieldname":"value1",
+"targetfieldname":"",
+"column_type":"physicalColumn",
+"col_function":"sum",
+"is_visible":"1",
+"visible_size":"10",
+"is_aggregate":"1",
+"description":""
+},
+{"uniquename":"value2",
+"caption_der_spalte":"Management Kennzahlen - Wert 2 der Kennzahl bei Prozentwerten",
+"caption_in_ergebnistabelle":"Wert 2 der Kennzahl bei Prozentwerten",
+"srcfieldname":"value2",
+"targetfieldname":"",
+"column_type":"physicalColumn",
+"col_function":"sum",
+"is_visible":"1",
+"visible_size":"10",
+"is_aggregate":"1",
+"description":""
+},
+{"uniquename":"value",
+"caption_der_spalte":"Management Kennzahlen - Wert der Kennzahl",
+"caption_in_ergebnistabelle":"Management Kennzahlen - Wert der Kennzahl",
+"srcfieldname":"value",
+"targetfieldname":"value",
+"column_type":"physicalColumn",
+"col_function":"sum",
+"is_visible":"0",
+"visible_size":"10",
+"is_aggregate":"1",
+"description":""
+},
+{"uniquename":"man_catalogue_calcratio",
+"caption_der_spalte":"Management Kennzahlen - : Quote",
+"caption_in_ergebnistabelle":"Management Kennzahlen - : Quote",
+"srcfieldname":"man_catalogue_calcratio",
+"targetfieldname":"man_catalogue_calcratio",
+"column_type":"physicalColumn",
+"col_function":"",
+"is_visible":"0",
+"visible_size":"10",
+"is_aggregate":"0",
+"description":""
+},
+{"uniquename":"wert_der_kennzahl_tuhh_behoerdenbericht",
+"caption_der_spalte":"Wert der Kennzahl",
+"caption_in_ergebnistabelle":"Wert der Kennzahl",
+"srcfieldname":"",
+"targetfieldname":"wert_der_kennzahl_tuhh_behoerdenbericht",
+"column_type":"computedColumn",
+"col_function":"case when man_catalogue_calcratio>0 and man_catalogue_calcratio<100 then value1/value2 when man_catalogue_calcratio=100 then value1/value2*100 else value end",
+"is_visible":"1",
+"visible_size":"10",
+"is_aggregate":"1",
+"description":""
+}
+]
+   />
+
+
+
+<@rpta_column_layout_fuellen />
diff --git a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sos_stud_astat_stip_fuellen.sql b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sos_stud_astat_stip_fuellen.sql
index a7db688..e748e3e 100644
--- a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sos_stud_astat_stip_fuellen.sql
+++ b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sos_stud_astat_stip_fuellen.sql
@@ -156,7 +156,7 @@ select count(*) from rpta_resultset where uniquename='sos_stud_astat';
 "srcfieldname":"",
 "targetfieldname":"foerdermonat",
 "column_type":"lookupColumn",
-"col_function":"select M.foerdermonat from stip_meldung M where M.matrikel_nr=tmp_sos_stud_astat.matrikel_nr",
+"col_function":"select LPAD(M.foerdermonat::TEXT, 3, ''0'') from stip_meldung M where M.matrikel_nr=tmp_sos_stud_astat.matrikel_nr",
 "format_code":"",
 "is_visible":"1",
 "is_aggregate":0,
diff --git a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sxc_zahl_wert_stammdaten_nrw.sql b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sxc_zahl_wert_stammdaten_nrw.sql
index 0322204..bae67b9 100644
--- a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sxc_zahl_wert_stammdaten_nrw.sql
+++ b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sxc_zahl_wert_stammdaten_nrw.sql
@@ -100,35 +100,63 @@ select count(*) from rpta_resultset where uniquename='rpta_sxc_zahl_wert';
 },
 {"uniquename":"lfb_count",
 "caption_der_spalte":"Lehr- und Forschungsbereich",
-"caption_in_ergebnistabelle":"Lehr- und Forschungsbereich",
+"caption_in_ergebnistabelle":"Anzahl der LFBe",
 "srcfieldname":"",
 "targetfieldname":"lfb_count",
 "column_type":"processingColumn",
 "col_function":"count(lfb_mapping)",
-"is_visible":"0",
+"is_visible":"1",
 "visible_size":"10",
 "is_aggregate":"1",
 "description":""
 },
-{"uniquename":"wert_summe_visible",
-"caption_der_spalte":"SuperX Connect Kennzahlen - Wert der Kennzahl - sichtbar",
-"caption_in_ergebnistabelle":"Wert - Summe",
+{"uniquename":"wert_der_kennzahl",
+"caption_der_spalte":"SuperX Connect Kennzahlen - Wert der Kennzahl",
+"caption_in_ergebnistabelle":"Wert der Kennzahl",
 "srcfieldname":"wert",
-"targetfieldname":"wert_summe_visible",
+"targetfieldname":"wert_der_kennzahl",
 "column_type":"computedColumn",
-"col_function":"case when kenn_katalog_id not like ''%_quote%'' and kenn_katalog_id not like ''%_proz%'' then wert_summe else null end",
+"col_function":"case when lfb_count>0 and kenn_katalog_id like ''%_quote%'' then wert_summe/lfb_count
+					when kenn_katalog_id not like ''%_quote%'' and kenn_katalog_id not like ''%_proz%'' then wert_summe
+					else null end",
 "is_visible":"1",
 "visible_size":"10",
 "is_aggregate":"0",
 "description":""
 },
-{"uniquename":"wert_quote",
-"caption_der_spalte":"SuperX Connect Kennzahlen - Wert der Kennzahl - Quote",
-"caption_in_ergebnistabelle":"Wert - Quote",
+{"uniquename":"nrw_schnitt_lfb_dec",
+"caption_der_spalte":"SuperX Connect Kennzahlen - NRW-Durchschnitt pro LFB",
+"caption_in_ergebnistabelle":"NRW-Durchschnitt",
+"srcfieldname":"",
+"targetfieldname":"nrw_schnitt_lfb",
+"column_type":"preparingColumn",
+"col_function":"generic_dim2::decimal(30,20)",
+"is_visible":"0",
+"visible_size":"10",
+"is_aggregate":"0",
+"description":""
+},
+{"uniquename":"nrw_schnitt_lfb_summe",
+"caption_der_spalte":"SuperX Connect Kennzahlen - NRW-Durchschnitt pro LFB summiert",
+"caption_in_ergebnistabelle":"NRW-Durchschnitt",
+"srcfieldname":"nrw_schnitt_lfb",
+"targetfieldname":"nrw_schnitt_lfb_summe",
+"column_type":"processingColumn",
+"col_function":"sum(nrw_schnitt_lfb)",
+"is_visible":"0",
+"visible_size":"10",
+"is_aggregate":"1",
+"description":""
+},
+{"uniquename":"nrw_schnitt_kennz",
+"caption_der_spalte":"SuperX Connect Kennzahlen - NRW-Durchschnitt der Kennzahl",
+"caption_in_ergebnistabelle":"NRW-Durchschnitt",
 "srcfieldname":"wert",
-"targetfieldname":"wert_quote",
+"targetfieldname":"nrw_schnitt_kennz",
 "column_type":"computedColumn",
-"col_function":"case when lfb_count>0 and kenn_katalog_id like ''%_quote%'' then wert_summe/lfb_count else null end",
+"col_function":"case when lfb_count>0 and kenn_katalog_id like ''%_quote%'' then nrw_schnitt_lfb_summe/lfb_count
+					when kenn_katalog_id not like ''%_quote%'' and kenn_katalog_id not like ''%_proz%'' then nrw_schnitt_lfb_summe
+					else null end",
 "is_visible":"1",
 "visible_size":"10",
 "is_aggregate":"0",
diff --git a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sxc_zahl_wert_stammdaten_nrw_lfb.sql b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sxc_zahl_wert_stammdaten_nrw_lfb.sql
index a7c2d78..9264d9f 100644
--- a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sxc_zahl_wert_stammdaten_nrw_lfb.sql
+++ b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sxc_zahl_wert_stammdaten_nrw_lfb.sql
@@ -97,6 +97,18 @@ select count(*) from rpta_resultset where uniquename='rpta_sxc_zahl_wert';
 "visible_size":"10",
 "is_aggregate":"0",
 "description":""
+},
+{"uniquename":"nrw_schnitt_lfb",
+"caption_der_spalte":"SuperX Connect Kennzahlen - NRW-Durchschnitt nach LFB",
+"caption_in_ergebnistabelle":"NRW-Durchschnitt",
+"srcfieldname":"generic_dim2",
+"targetfieldname":"",
+"column_type":"physicalColumn",
+"col_function":"",
+"is_visible":"1",
+"visible_size":"10",
+"is_aggregate":"0",
+"description":""
 }
 ]
    />
diff --git a/superx/WEB-INF/reports/48110_leistungen_und_studiengaenge.jrxml b/superx/WEB-INF/reports/48110_leistungen_und_studiengaenge.jrxml
index 00cefb4..c057b71 100644
--- a/superx/WEB-INF/reports/48110_leistungen_und_studiengaenge.jrxml
+++ b/superx/WEB-INF/reports/48110_leistungen_und_studiengaenge.jrxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Jaspersoft Studio version 6.21.3.final using JasperReports Library version 6.21.3-4a3078d20785ebe464f18037d738d12fc98c13cf  -->
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="Leistungen und Studiengänge" language="groovy" pageWidth="842" pageHeight="5595" orientation="Landscape" columnWidth="818" leftMargin="12" rightMargin="12" topMargin="12" bottomMargin="12" uuid="d58082fe-8941-478b-b06e-8d7250737b92">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="Leistungen und Studiengänge" language="groovy" pageWidth="969" pageHeight="5595" orientation="Landscape" columnWidth="945" leftMargin="12" rightMargin="12" topMargin="12" bottomMargin="12" uuid="d58082fe-8941-478b-b06e-8d7250737b92">
 	<property name="net.sf.jasperreports.export.xls.create.custom.palette" value="true"/>
 	<property name="net.sf.jasperreports.export.xls.detect.cell.type" value="true"/>
 	<property name="net.sf.jasperreports.export.xls.one.page.per.sheet" value="true"/>
@@ -12,15 +12,6 @@
 	<property name="net.sf.jasperreports.export.xlsx.exclude.origin.band.1" value="pageHeader"/>
 	<property name="net.sf.jasperreports.export.xlsx.exclude.origin.band.2" value="pageFooter"/>
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="Prüfungsergebnisse"/>
-	<property name="com.jaspersoft.studio.unit." value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.pageHeight" value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.pageWidth" value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.topMargin" value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.bottomMargin" value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.leftMargin" value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.rightMargin" value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.columnWidth" value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.columnSpacing" value="pixel"/>
 	<template><![CDATA["simple_table.jrtx"]]></template>
 	<style name="TableRowDetail" mode="Opaque" forecolor="#000000" backcolor="#FFFFFF" hTextAlign="Right" vTextAlign="Middle" isBlankWhenNull="true" fontName="Liberation Sans" fontSize="8" isBold="false">
 		<box rightPadding="2">
@@ -39,6 +30,12 @@
 	<queryString language="xPath">
 		<![CDATA[/ergebnisse/ergebnis/ergebniselement[@ordnr='0']/sqlerg/row]]>
 	</queryString>
+	<field name="Berichtsname" class="java.lang.String">
+		<fieldDescription><![CDATA[/ergebnisse/ergebnis[ @ordnr='0']/maskenname]]></fieldDescription>
+	</field>
+	<field name="Erlaeuterung" class="java.lang.String">
+		<fieldDescription><![CDATA[/ergebnisse/ergebnis[ @ordnr='0']/explanation]]></fieldDescription>
+	</field>
 	<field name="REPORT_HEADING_INSTITUTION" class="java.lang.String">
 		<fieldDescription><![CDATA[/ergebnisse/generalinfo/REPORT_HEADING_INSTITUTION]]></fieldDescription>
 	</field>
@@ -57,15 +54,6 @@
 	<field name="REPORT_DOCUMENTATION_URL" class="java.lang.String">
 		<fieldDescription><![CDATA[/ergebnisse/generalinfo/REPORT_DOCUMENTATION_URL]]></fieldDescription>
 	</field>
-	<field name="Berichtsname" class="java.lang.String">
-		<fieldDescription><![CDATA[/ergebnisse/ergebnis[ @ordnr='0']/maskenname]]></fieldDescription>
-	</field>
-	<field name="Erlaeuterung" class="java.lang.String">
-		<fieldDescription><![CDATA[/ergebnisse/ergebnis[ @ordnr='0']/explanation]]></fieldDescription>
-	</field>
-	<field name="Hinweis" class="java.lang.String">
-		<fieldDescription><![CDATA[/ergebnisse/ergebnis[ @ordnr='0']/hinweis]]></fieldDescription>
-	</field>
 	<field name="Fach" class="java.lang.String">
 		<fieldDescription><![CDATA[col[@id="0" and wert!=""]/wert]]></fieldDescription>
 	</field>
@@ -96,6 +84,12 @@
 	<field name="Nicht erschienen" class="java.lang.Integer">
 		<fieldDescription><![CDATA[col[@id="9" and wert!=""]/wert]]></fieldDescription>
 	</field>
+	<field name="Rücktritt mit Attest" class="java.lang.Integer">
+		<fieldDescription><![CDATA[col[@id="10" and wert!=""]/wert]]></fieldDescription>
+	</field>
+	<field name="Kurzkommentar" class="java.lang.String">
+		<fieldDescription><![CDATA[col[@id="11" and wert!=""]/wert]]></fieldDescription>
+	</field>
 	<field name="legende_Seit Semester_label" class="java.lang.String">
 		<fieldDescription><![CDATA[/ergebnisse/ergebnis/completefields/feld [@varname="Seit Semester"]/@varname]]></fieldDescription>
 	</field>
@@ -144,6 +138,12 @@
 	<field name="legende_Spaltenlayout_value" class="java.lang.String">
 		<fieldDescription><![CDATA[/ergebnisse/ergebnis/felder/feld [@varname="Spaltenlayout"]/value_caption]]></fieldDescription>
 	</field>
+	<field name="legende_tablestylesheet_label" class="java.lang.String">
+		<fieldDescription><![CDATA[/ergebnisse/ergebnis/completefields/feld [@varname="tablestylesheet"]/@varname]]></fieldDescription>
+	</field>
+	<field name="legende_tablestylesheet_value" class="java.lang.String">
+		<fieldDescription><![CDATA[/ergebnisse/ergebnis/felder/feld [@varname="tablestylesheet"]/value_caption]]></fieldDescription>
+	</field>
 	<field name="legende_Spalten_label" class="java.lang.String">
 		<fieldDescription><![CDATA[/ergebnisse/ergebnis/completefields/feld [@varname="Spalten"]/@varname]]></fieldDescription>
 	</field>
@@ -319,6 +319,21 @@
 					</textElement>
 					<textFieldExpression><![CDATA["Prüfungen nach dem "+$F{Semester der Prüfung}]]></textFieldExpression>
 				</textField>
+				<staticText>
+					<reportElement positionType="Float" x="818" y="30" width="127" height="15" uuid="48cebd3b-f679-4145-b041-2a7846eb7719">
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<box>
+						<topPen lineWidth="1.0"/>
+						<leftPen lineWidth="1.0"/>
+						<bottomPen lineWidth="1.0"/>
+						<rightPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font isBold="true"/>
+					</textElement>
+					<text><![CDATA[Rücktritt mit Attest]]></text>
+				</staticText>
 			</band>
 		</groupHeader>
 		<groupFooter>
@@ -327,7 +342,7 @@
 	</group>
 	<detail>
 		<band height="15" splitType="Stretch">
-			<property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.spreadsheet.SpreadsheetLayout"/>
+			<property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.FreeLayout"/>
 			<property name="com.jaspersoft.studio.unit.height" value="px"/>
 			<textField textAdjust="StretchHeight" isBlankWhenNull="true">
 				<reportElement stretchType="ContainerHeight" x="0" y="0" width="51" height="15" uuid="ab1dcbe4-f124-430c-9831-e3a1aba7e82d">
@@ -409,6 +424,20 @@
 				<textFieldExpression><![CDATA[$F{Nicht erschienen}]]></textFieldExpression>
 				<patternExpression><![CDATA["#,##0"]]></patternExpression>
 			</textField>
+			<textField textAdjust="StretchHeight" isBlankWhenNull="true">
+				<reportElement stretchType="ContainerHeight" x="818" y="0" width="127" height="15" uuid="37161ee3-893b-47d1-9c7b-97cab48f76f6">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<box>
+					<topPen lineWidth="0.5"/>
+					<leftPen lineWidth="0.5"/>
+					<bottomPen lineWidth="0.5"/>
+					<rightPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Right" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{Rücktritt mit Attest}]]></textFieldExpression>
+				<patternExpression><![CDATA["#,##0"]]></patternExpression>
+			</textField>
 		</band>
 	</detail>
 </jasperReport>
diff --git a/superx/WEB-INF/reports/48110_leistungen_und_studiengaenge_shortcomment.jrxml b/superx/WEB-INF/reports/48110_leistungen_und_studiengaenge_shortcomment.jrxml
index 720f302..2607607 100644
--- a/superx/WEB-INF/reports/48110_leistungen_und_studiengaenge_shortcomment.jrxml
+++ b/superx/WEB-INF/reports/48110_leistungen_und_studiengaenge_shortcomment.jrxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Jaspersoft Studio version 6.21.3.final using JasperReports Library version 6.21.3-4a3078d20785ebe464f18037d738d12fc98c13cf  -->
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="Leistungen und Studiengänge" language="groovy" pageWidth="969" pageHeight="5595" orientation="Landscape" columnWidth="945" leftMargin="12" rightMargin="12" topMargin="12" bottomMargin="12" uuid="d58082fe-8941-478b-b06e-8d7250737b92">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="Leistungen und Studiengänge" language="groovy" pageWidth="1096" pageHeight="5595" orientation="Landscape" columnWidth="1072" leftMargin="12" rightMargin="12" topMargin="12" bottomMargin="12" uuid="d58082fe-8941-478b-b06e-8d7250737b92">
 	<property name="net.sf.jasperreports.export.xls.create.custom.palette" value="true"/>
 	<property name="net.sf.jasperreports.export.xls.detect.cell.type" value="true"/>
 	<property name="net.sf.jasperreports.export.xls.one.page.per.sheet" value="true"/>
@@ -12,6 +12,15 @@
 	<property name="net.sf.jasperreports.export.xlsx.exclude.origin.band.1" value="pageHeader"/>
 	<property name="net.sf.jasperreports.export.xlsx.exclude.origin.band.2" value="pageFooter"/>
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="Prüfungsergebnisse"/>
+	<property name="com.jaspersoft.studio.unit." value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.pageHeight" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.pageWidth" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.topMargin" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.bottomMargin" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.leftMargin" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.rightMargin" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.columnWidth" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.columnSpacing" value="pixel"/>
 	<template><![CDATA["simple_table.jrtx"]]></template>
 	<style name="TableRowDetail" mode="Opaque" forecolor="#000000" backcolor="#FFFFFF" hTextAlign="Right" vTextAlign="Middle" isBlankWhenNull="true" fontName="Liberation Sans" fontSize="8" isBold="false">
 		<box rightPadding="2">
@@ -84,21 +93,18 @@
 	<field name="Nicht erschienen" class="java.lang.Integer">
 		<fieldDescription><![CDATA[col[@id="9" and wert!=""]/wert]]></fieldDescription>
 	</field>
-	<field name="Kurzkommentar" class="java.lang.String">
+	<field name="Rücktritt mit Attest" class="java.lang.Integer">
 		<fieldDescription><![CDATA[col[@id="10" and wert!=""]/wert]]></fieldDescription>
 	</field>
+	<field name="Kurzkommentar" class="java.lang.String">
+		<fieldDescription><![CDATA[col[@id="11" and wert!=""]/wert]]></fieldDescription>
+	</field>
 	<field name="legende_Seit Semester_label" class="java.lang.String">
 		<fieldDescription><![CDATA[/ergebnisse/ergebnis/completefields/feld [@varname="Seit Semester"]/@varname]]></fieldDescription>
 	</field>
 	<field name="legende_Seit Semester_value" class="java.lang.String">
 		<fieldDescription><![CDATA[/ergebnisse/ergebnis/felder/feld [@varname="Seit Semester"]/value_caption]]></fieldDescription>
 	</field>
-	<field name="legende_tablestylesheet_label" class="java.lang.String">
-		<fieldDescription><![CDATA[/ergebnisse/ergebnis/completefields/feld [@varname="tablestylesheet"]/@varname]]></fieldDescription>
-	</field>
-	<field name="legende_tablestylesheet_value" class="java.lang.String">
-		<fieldDescription><![CDATA[/ergebnisse/ergebnis/felder/feld [@varname="tablestylesheet"]/value_caption]]></fieldDescription>
-	</field>
 	<field name="legende_Bis Semester_label" class="java.lang.String">
 		<fieldDescription><![CDATA[/ergebnisse/ergebnis/completefields/feld [@varname="Bis Semester"]/@varname]]></fieldDescription>
 	</field>
@@ -141,6 +147,12 @@
 	<field name="legende_Spaltenlayout_value" class="java.lang.String">
 		<fieldDescription><![CDATA[/ergebnisse/ergebnis/felder/feld [@varname="Spaltenlayout"]/value_caption]]></fieldDescription>
 	</field>
+	<field name="legende_tablestylesheet_label" class="java.lang.String">
+		<fieldDescription><![CDATA[/ergebnisse/ergebnis/completefields/feld [@varname="tablestylesheet"]/@varname]]></fieldDescription>
+	</field>
+	<field name="legende_tablestylesheet_value" class="java.lang.String">
+		<fieldDescription><![CDATA[/ergebnisse/ergebnis/felder/feld [@varname="tablestylesheet"]/value_caption]]></fieldDescription>
+	</field>
 	<field name="legende_Spalten_label" class="java.lang.String">
 		<fieldDescription><![CDATA[/ergebnisse/ergebnis/completefields/feld [@varname="Spalten"]/@varname]]></fieldDescription>
 	</field>
@@ -317,7 +329,7 @@
 					<textFieldExpression><![CDATA["Prüfungen nach dem "+$F{Semester der Prüfung}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement positionType="Float" x="818" y="30" width="127" height="15" uuid="9b520c01-969e-42e1-96fc-5ee84aefed46">
+					<reportElement positionType="Float" x="945" y="30" width="127" height="15" uuid="9b520c01-969e-42e1-96fc-5ee84aefed46">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box>
@@ -331,6 +343,21 @@
 					</textElement>
 					<text><![CDATA[Kurzkommentar]]></text>
 				</staticText>
+				<staticText>
+					<reportElement positionType="Float" x="818" y="30" width="127" height="15" uuid="36fba572-5902-4a40-b38a-bf2a65126f71">
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<box>
+						<topPen lineWidth="1.0"/>
+						<leftPen lineWidth="1.0"/>
+						<bottomPen lineWidth="1.0"/>
+						<rightPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font isBold="true"/>
+					</textElement>
+					<text><![CDATA[Rücktritt mit Attest]]></text>
+				</staticText>
 			</band>
 		</groupHeader>
 		<groupFooter>
@@ -422,7 +449,7 @@
 				<patternExpression><![CDATA["#,##0"]]></patternExpression>
 			</textField>
 			<textField textAdjust="StretchHeight" isBlankWhenNull="true">
-				<reportElement stretchType="ContainerHeight" x="818" y="0" width="127" height="15" uuid="cc427426-27cb-47da-b300-1f472fcd9cd1">
+				<reportElement stretchType="ContainerHeight" x="945" y="0" width="127" height="15" uuid="cc427426-27cb-47da-b300-1f472fcd9cd1">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box>
@@ -435,6 +462,20 @@
 				<textFieldExpression><![CDATA[$F{Kurzkommentar}]]></textFieldExpression>
 				<patternExpression><![CDATA["#,##0"]]></patternExpression>
 			</textField>
+			<textField textAdjust="StretchHeight" isBlankWhenNull="true">
+				<reportElement stretchType="ContainerHeight" x="818" y="0" width="127" height="15" uuid="c53fb992-6d98-4d99-a4a4-6a3554befd98">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<box>
+					<topPen lineWidth="0.5"/>
+					<leftPen lineWidth="0.5"/>
+					<bottomPen lineWidth="0.5"/>
+					<rightPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Right" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{Rücktritt mit Attest}]]></textFieldExpression>
+				<patternExpression><![CDATA["#,##0"]]></patternExpression>
+			</textField>
 		</band>
 	</detail>
 </jasperReport>