Codepflege

src-modules/module/rpta/schluesseltabellen/fm_templates.unl

@@ -400,29 +400,29 @@ drop TABLE tmp_rpta_column2layout;\
 			insert into tmp_stud3(\
 			<#foreach column in columns>\
 				<#if column.coltype!="preparingColumn">\
-				${column.targetfieldname},\
+					${column.targetfieldname},\
 				</#if>\
 			</#foreach>\
 			sortnr)\
 			select\
 			<#foreach column in columns>\
 				<#if column.coltype!="preparingColumn">\
-				<#if column.targetfieldname=treeColumnTargetFieldname>\
+					<#if column.targetfieldname=treeColumnTargetFieldname>\
-				 	'${einElement.name}',\
+						'${einElement.name}',\
-				<#elseif column.targetfieldname="ebene">\
+					<#elseif column.targetfieldname="ebene">\
-				 	${einElement.level},\
+						${einElement.level},\
-				<#elseif column.targetfieldname=treeColumnSrcFieldname>\
+					<#elseif column.targetfieldname=treeColumnSrcFieldname>\
-				 	null::char(1),\
+						null::char(1),\
-				 <#elseif column.is_aggregate==1 \
+					<#elseif column.is_aggregate==1 \
-				 	&& column.colfunction?has_content \
+						&& column.colfunction?has_content \
-					&& column.coltype=="processingColumn"> \
+						&& column.coltype=="processingColumn"> \
-						${column.colfunction} as ${column.targetfieldname},\
+							${column.colfunction} as ${column.targetfieldname},\
-				<#elseif column.is_aggregate==1 \
+					<#elseif column.is_aggregate==1 \
-					&& (column.coltype == "logicalColumn" || column.coltype == "lookupColumn" || column.coltype == "physicalColumn")> \
+						&& (column.coltype == "logicalColumn" || column.coltype == "lookupColumn" || column.coltype == "physicalColumn")> \
-					sum(${column.targetfieldname}) as ${column.targetfieldname},\
+						sum(${column.targetfieldname}) as ${column.targetfieldname},\
-				<#else>\
+					<#else>\
-				 	null,\
+						null,\
-				 </#if>\
+					</#if>\
 				</#if>\
 			</#foreach>\
 			 --(${einElement.level}*10000) + ${sortnr} as sortnr\
@@ -439,7 +439,7 @@ drop TABLE tmp_rpta_column2layout;\
 			insert into tmp_stud3(\
 			<#foreach column in columns>\
 				<#if column.coltype!="preparingColumn">\
-				${column.targetfieldname},\
+					${column.targetfieldname},\
 				</#if>\
 			</#foreach>\
 			sortnr)\
@@ -545,7 +545,6 @@ drop TABLE tmp_rpta_column2layout;\
 					</#if>\
 				 </#if>\
 	</#foreach>\
-	<#assign ret=ret + "" />\
 	<#return ret />\
 </#function>\
 <#macro rpta_column_fuellen>\