From 4a353049ea5f4a2da4ad22f71c9a895ae7e1af70 Mon Sep 17 00:00:00 2001
From: Imo John <john@memtext.de>
Date: Thu, 12 Jun 2025 06:59:07 +0200
Subject: [PATCH] Erweitere includes um jrxml; commit SWF Spaltenlayout

---
 src-modules/module/rpta/conf/includes.txt     |  1 +
 ...umn_layout_sos_stud_astat_stip_fuellen.sql | 34 ++++++++++++++++---
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src-modules/module/rpta/conf/includes.txt b/src-modules/module/rpta/conf/includes.txt
index 4187aa4..f5d574f 100644
--- a/src-modules/module/rpta/conf/includes.txt
+++ b/src-modules/module/rpta/conf/includes.txt
@@ -7,6 +7,7 @@ WEB-INF/conf/edustore/db/module/rpta/schluesseltabellen/sx_stylesheets_einfuegen
 WEB-INF/lib/superx-rpta.jar
 WEB-INF/reports/simple_table.jrtx
 WEB-INF/reports/48110_leistungen_und_studiengaenge.jrxml
+WEB-INF/reports/48110_leistungen_und_studiengaenge_shortcomment.jrxml
 xml/tabelle_jrxml_a4_quer.xsl
 xml/tabelle_jrxml_book_without_cover.xsl
 xml/tabelle_xls_48140.xsl
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 69b1b5f..a7db688 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
@@ -48,11 +48,12 @@ select count(*) from rpta_resultset where uniquename='sos_stud_astat';
 "is_aggregate":"0",
 "description":""
 },
-{"uniquename":"kz_rueck_beur_ein",
+{"uniquename":"kz_rueck_beur_ein_str",
 "caption":"Rückmeldestatus",
-"srcfieldname":"kz_rueck_beur_ein",
-"column_type":"physicalColumn",
-"col_function":"",
+"srcfieldname":"",
+"targetfieldname":"kz_rueck_beur_ein",
+"column_type":"logicalColumn",
+"col_function":"(case when kz_rueck_beur_ein=1 then ''E'' when kz_rueck_beur_ein=2 then ''N'' when kz_rueck_beur_ein=3 then ''R'' else ''unbekannt'' end)",
 "is_visible":"1",
 "visible_size":"10",
 "is_aggregate":"0",
@@ -80,6 +81,31 @@ select count(*) from rpta_resultset where uniquename='sos_stud_astat';
 "visible_size":10,
 "description":""
 },
+{"uniquename":"fach_sem_zahl",
+"caption_der_spalte":"Fach-Sem.",
+"caption_in_ergebnistabelle":"Fach-Sem.",
+"srcfieldname":"",
+"targetfieldname":"fach_sem_zahl",
+"column_type":"logicalColumn",
+"col_function":"(select LPAD(fach_sem_zahl::TEXT, 2, ''0''))",
+"format_code":"",
+"is_visible":"1",
+"is_aggregate":0,
+"visible_size":10,
+"description":""
+},
+{"uniquename":"individual_number_of_semesters_int",
+"caption_der_spalte":"Studierende (intern und amtlich) - Individuelle Regelstudienzeit",
+"caption_in_ergebnistabelle":"Individuelle Regelstudienzeit",
+"srcfieldname":"individual_number_of_semesters",
+"column_type":"physicalColumn",
+"col_function":"",
+"format_code":"INTEGER",
+"is_visible":"1",
+"is_aggregate":0,
+"visible_size":10,
+"description":""
+},
 {"uniquename":"adresszusatz",
 "caption":"Adresszusatz",
 "srcfieldname":"",