From fce91d3fe82da74d781b9e035cd1b0b4fa1db442 Mon Sep 17 00:00:00 2001 From: Imo John Date: Tue, 28 Apr 2026 17:28:40 +0200 Subject: [PATCH] Codepflege --- .../rpta/schluesseltabellen/fm_templates.unl | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/src-modules/module/rpta/schluesseltabellen/fm_templates.unl b/src-modules/module/rpta/schluesseltabellen/fm_templates.unl index 9b01b32..0a3401c 100644 --- a/src-modules/module/rpta/schluesseltabellen/fm_templates.unl +++ b/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},\ \ \ 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 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,\ + \ \ \ --(${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},\ \ \ sortnr)\ @@ -545,7 +545,6 @@ drop TABLE tmp_rpta_column2layout;\ \ \ \ - <#assign ret=ret + "" />\ <#return ret />\ \ <#macro rpta_column_fuellen>\