From 62d5708943c9803e89c55ea3a2309e2acdcf2e67 Mon Sep 17 00:00:00 2001
From: Imo John <john@memtext.de>
Date: Tue, 12 May 2026 11:19:44 +0200
Subject: [PATCH] =?UTF-8?q?Neuer=20Spaltentyp=20Sichtspalten=20mit=20zus?=
 =?UTF-8?q?=C3=A4tzlicher=20Kindebene?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rpta/schluesseltabellen/fm_templates.unl  | 23 +++++++++++++++----
 ...ayout_internationale_studierende_sicht.sql |  2 +-
 .../schluesseltabellen/rpta_column_type.unl   |  1 +
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src-modules/module/rpta/schluesseltabellen/fm_templates.unl b/src-modules/module/rpta/schluesseltabellen/fm_templates.unl
index 0a3401c..9f1ba70 100644
--- a/src-modules/module/rpta/schluesseltabellen/fm_templates.unl
+++ b/src-modules/module/rpta/schluesseltabellen/fm_templates.unl
@@ -276,7 +276,11 @@ drop TABLE tmp_rpta_column2layout;\
 	select \
 		--zuerst die Basisdaten:\
 		<#foreach column in columns>\
-			<#if column.coltype=="treeColumn">\
+			<#if column.coltype=="treeColumn" || column.coltype=="treechildColumn">\
+				<#assign maxEbenePlusEins=0 />\
+				<#if column.coltype=="treechildColumn">\
+					<#assign maxEbenePlusEins=1 />\
+				</#if>\
 				<#assign columnLayoutHasTreeColumn=1 />\
 				<#assign treeColumnSrcFieldname=column.srcfieldname />\
 				<#assign treeColumnTargetFieldname=column.targetfieldname />\
@@ -396,6 +400,7 @@ drop TABLE tmp_rpta_column2layout;\
 			<@addcomment "${einElement.name}"/>\
 			\
 			--zuerst Summenzeile:\
+			<#if einElement.level != maxEbene || maxEbenePlusEins=1>\
 			<#assign sortnr=sortnr+1>\
 			insert into tmp_stud3(\
 			<#foreach column in columns>\
@@ -431,10 +436,10 @@ drop TABLE tmp_rpta_column2layout;\
 			where ${treeColumnSrcFieldname} in ${einElement.subkeys}\
 			\
 			;\
+			</#if>\
 			\
 			--Unterste Ebene die Werte:\
-			<#if columnLayoutWithTreeColumnAdditionalGrouping != "" \
-			&& einElement.level == maxEbene >\
+			<#if einElement.level == maxEbene>\
 			<#assign sortnr=sortnr+1>\
 			insert into tmp_stud3(\
 			<#foreach column in columns>\
@@ -448,7 +453,7 @@ drop TABLE tmp_rpta_column2layout;\
 				<#if column.targetfieldname=treeColumnTargetFieldname>\
 				 	'${einElement.name}',\
 				<#elseif column.targetfieldname="ebene">\
-					<#if einElement.level == maxEbene >\
+					<#if maxEbenePlusEins=1>\
 				 	${einElement.level+ 1},\
 					<#else>\
 					${einElement.level},\
@@ -510,6 +515,16 @@ drop TABLE tmp_rpta_column2layout;\
 			</#if> \
 		</#foreach>\
 	from tmp_stud2\
+	where 1=1 and\
+		<#foreach column in columns>\
+			<#if column.is_aggregate==1>\
+				<#if column?is_last>\
+					${column.targetfieldname} is not null\
+				<#else>\
+					${column.targetfieldname} is not null or\
+				</#if>\
+			</#if>\
+		</#foreach>\
 	order by \
 		<#if rpta_column_layout.sortclause?has_content>\
 			${rpta_column_layout.sortclause}\
diff --git a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_internationale_studierende_sicht.sql b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_internationale_studierende_sicht.sql
index 27d83e2..0dfa8b4 100644
--- a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_internationale_studierende_sicht.sql
+++ b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_internationale_studierende_sicht.sql
@@ -43,7 +43,7 @@ select count(*) from rpta_resultset where uniquename='sos_stud_astat';
 "caption":"Studiengang",
 "srcfieldname":"s_tid_stg",
 "targetfieldname":"studiengang",
-"column_type":"treeColumn",
+"column_type":"treechildColumn",
 "col_function":"Studiengang",
 "is_visible":"1",
 "format_code":"",
diff --git a/src-modules/module/rpta/schluesseltabellen/rpta_column_type.unl b/src-modules/module/rpta/schluesseltabellen/rpta_column_type.unl
index 6930c80..5decb68 100644
--- a/src-modules/module/rpta/schluesseltabellen/rpta_column_type.unl
+++ b/src-modules/module/rpta/schluesseltabellen/rpta_column_type.unl
@@ -5,3 +5,4 @@
 5^processingColumn^Weiterverarbeitende Spalte^
 6^preparingColumn^Vorbereitende Spalte^
 7^treeColumn^Sicht-Spalten^
+8^treechildColumn^Sicht-Spalten mit zusätzlicher Kindebene^