From 73af261b25ab9e433cb066de3b079604daa618d7 Mon Sep 17 00:00:00 2001
From: Imo John <john@memtext.de>
Date: Tue, 12 May 2026 11:32:33 +0200
Subject: [PATCH] Codepflege

---
 .../rpta/schluesseltabellen/fm_templates.unl  | 160 +++++++++---------
 1 file changed, 80 insertions(+), 80 deletions(-)

diff --git a/src-modules/module/rpta/schluesseltabellen/fm_templates.unl b/src-modules/module/rpta/schluesseltabellen/fm_templates.unl
index 9f1ba70..ad18526 100644
--- a/src-modules/module/rpta/schluesseltabellen/fm_templates.unl
+++ b/src-modules/module/rpta/schluesseltabellen/fm_templates.unl
@@ -401,89 +401,89 @@ drop TABLE tmp_rpta_column2layout;\
 			\
 			--zuerst Summenzeile:\
 			<#if einElement.level != maxEbene || maxEbenePlusEins=1>\
-			<#assign sortnr=sortnr+1>\
-			insert into tmp_stud3(\
-			<#foreach column in columns>\
-				<#if column.coltype!="preparingColumn">\
-					${column.targetfieldname},\
-				</#if>\
-			</#foreach>\
-			sortnr)\
-			select\
-			<#foreach column in columns>\
-				<#if column.coltype!="preparingColumn">\
-					<#if column.targetfieldname=treeColumnTargetFieldname>\
-						'${einElement.name}',\
-					<#elseif column.targetfieldname="ebene">\
-						${einElement.level},\
-					<#elseif column.targetfieldname=treeColumnSrcFieldname>\
-						null::char(1),\
-					<#elseif column.is_aggregate==1 \
-						&& column.colfunction?has_content \
-						&& column.coltype=="processingColumn"> \
-							${column.colfunction} as ${column.targetfieldname},\
-					<#elseif column.is_aggregate==1 \
-						&& (column.coltype == "logicalColumn" || column.coltype == "lookupColumn" || column.coltype == "physicalColumn")> \
-						sum(${column.targetfieldname}) as ${column.targetfieldname},\
-					<#else>\
-						null,\
-					</#if>\
-				</#if>\
-			</#foreach>\
-			 --(${einElement.level}*10000) + ${sortnr} as sortnr\
-			  ${sortnr} *10000 as sortnr\
-			from tmp_stud\
-			where ${treeColumnSrcFieldname} in ${einElement.subkeys}\
-			\
-			;\
+				<#assign sortnr=sortnr+1>\
+				insert into tmp_stud3(\
+					<#foreach column in columns>\
+						<#if column.coltype!="preparingColumn">\
+							${column.targetfieldname},\
+						</#if>\
+					</#foreach>\
+					sortnr)\
+				select\
+					<#foreach column in columns>\
+						<#if column.coltype!="preparingColumn">\
+							<#if column.targetfieldname=treeColumnTargetFieldname>\
+								'${einElement.name}',\
+							<#elseif column.targetfieldname="ebene">\
+								${einElement.level},\
+							<#elseif column.targetfieldname=treeColumnSrcFieldname>\
+								null::char(1),\
+							<#elseif column.is_aggregate==1 \
+								&& column.colfunction?has_content \
+								&& column.coltype=="processingColumn"> \
+									${column.colfunction} as ${column.targetfieldname},\
+							<#elseif column.is_aggregate==1 \
+								&& (column.coltype == "logicalColumn" || column.coltype == "lookupColumn" || column.coltype == "physicalColumn")> \
+									sum(${column.targetfieldname}) as ${column.targetfieldname},\
+							<#else>\
+								null,\
+							</#if>\
+						</#if>\
+					</#foreach>\
+					--(${einElement.level}*10000) + ${sortnr} as sortnr\
+					${sortnr} *10000 as sortnr\
+				from tmp_stud\
+				where ${treeColumnSrcFieldname} in ${einElement.subkeys}\
+				\
+				;\
 			</#if>\
 			\
 			--Unterste Ebene die Werte:\
 			<#if einElement.level == maxEbene>\
-			<#assign sortnr=sortnr+1>\
-			insert into tmp_stud3(\
-			<#foreach column in columns>\
-				<#if column.coltype!="preparingColumn">\
-					${column.targetfieldname},\
-				</#if>\
-			</#foreach>\
-			sortnr)\
-			select\
-			<#foreach column in columns>\
-				<#if column.targetfieldname=treeColumnTargetFieldname>\
-				 	'${einElement.name}',\
-				<#elseif column.targetfieldname="ebene">\
-					<#if maxEbenePlusEins=1>\
-				 	${einElement.level+ 1},\
-					<#else>\
-					${einElement.level},\
-					</#if>\
-				<#elseif column.targetfieldname=treeColumnSrcFieldname>\
-				 	null::char(1),\
-				 <#elseif column.is_aggregate==1 \
-				 	&& column.colfunction?has_content \
-					&& column.coltype=="processingColumn"> \
-						${column.colfunction} as ${column.targetfieldname},\
-				<#elseif column.is_aggregate==1 \
-					&& (column.coltype == "logicalColumn" || column.coltype == "lookupColumn" || column.coltype == "physicalColumn")> \
-					sum(${column.targetfieldname}) as ${column.targetfieldname},\
-				<#else>\
-					<#if (column.is_aggregate==0 && column.coltype!="preparingColumn" && column.coltype!="processingColumn") || column.coltype=="computedColumn"> \
-						${column.targetfieldname},\
-					<#elseif column.is_aggregate==0 && column.coltype=="processingColumn"> \
-						<#if column.colfunction?has_content>\
-							${column.colfunction} as ${column.targetfieldname},\
+				<#assign sortnr=sortnr+1>\
+				insert into tmp_stud3(\
+					<#foreach column in columns>\
+						<#if column.coltype!="preparingColumn">\
+							${column.targetfieldname},\
+						</#if>\
+					</#foreach>\
+					sortnr)\
+				select\
+					<#foreach column in columns>\
+						<#if column.targetfieldname=treeColumnTargetFieldname>\
+							'${einElement.name}',\
+						<#elseif column.targetfieldname="ebene">\
+							<#if maxEbenePlusEins=1>\
+								${einElement.level+ 1},\
+							<#else>\
+								${einElement.level},\
+							</#if>\
+						<#elseif column.targetfieldname=treeColumnSrcFieldname>\
+							null::char(1),\
+						<#elseif column.is_aggregate==1 \
+							&& column.colfunction?has_content \
+							&& column.coltype=="processingColumn"> \
+								${column.colfunction} as ${column.targetfieldname},\
+						<#elseif column.is_aggregate==1 \
+							&& (column.coltype == "logicalColumn" || column.coltype == "lookupColumn" || column.coltype == "physicalColumn")> \
+								sum(${column.targetfieldname}) as ${column.targetfieldname},\
 						<#else>\
-							${column.srcfieldname} as ${column.targetfieldname},\
+							<#if (column.is_aggregate==0 && column.coltype!="preparingColumn" && column.coltype!="processingColumn") || column.coltype=="computedColumn"> \
+								${column.targetfieldname},\
+							<#elseif column.is_aggregate==0 && column.coltype=="processingColumn"> \
+								<#if column.colfunction?has_content>\
+									${column.colfunction} as ${column.targetfieldname},\
+								<#else>\
+									${column.srcfieldname} as ${column.targetfieldname},\
+								</#if>\
+							</#if>\
 						</#if>\
-					</#if>\
-				 </#if>\
-			</#foreach>\
-			 ${sortnr} *10000 --(${einElement.level}*10000) + ${sortnr} as sortnr\
-			from tmp_stud\
-			where s_tid_stg in ${einElement.subkeys}\
-			group by ${columnLayoutWithTreeColumnAdditionalGrouping}\
-			;\
+					</#foreach>\
+					${sortnr} *10000 --(${einElement.level}*10000) + ${sortnr} as sortnr\
+				from tmp_stud\
+				where s_tid_stg in ${einElement.subkeys}\
+				group by ${columnLayoutWithTreeColumnAdditionalGrouping}\
+				;\
 			</#if>\
 		</#foreach>\
 		\
@@ -530,9 +530,9 @@ drop TABLE tmp_rpta_column2layout;\
 			${rpta_column_layout.sortclause}\
 		<#else>\
 			<#list 1..number_of_visible_colums as i>${i}\
-			<#if i != number_of_visible_colums>\
-			,\
-			</#if>\
+				<#if i != number_of_visible_colums>\
+					,\
+				</#if>\
 			</#list>\
 		</#if>\
 	;\