Verbesserung Makro <#macro rpta_column_layout_fuellen> für sortclause-Einträge

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

@@ -1,4 +1,4 @@
-91^RPTA-Makros^<#macro rpta_column_layout_fuellen>\
+169^RPTA-Makros^<#macro rpta_column_layout_fuellen>\
 CREATE temp TABLE tmp_rpta_column\
 (\
    uniquename       varchar(255)   NOT NULL,\
@@ -136,9 +136,7 @@ insert into rpta_column_layout\
        caption,\
        resultset_id,\
        whereclause,\
-       <#if rpta_column_layout.sortclause?has_content>\
        sortclause,\
-       </#if>\
   description,\
   is_virtual)\
  select uniquename,\
@@ -147,6 +145,8 @@ insert into rpta_column_layout\
        whereclause,\
        <#if rpta_column_layout.sortclause?has_content>\
        sortclause,\
+       <#else>\
+       null::text as sortclause,\
        </#if>\
   description,\
     is_virtual\
@@ -155,11 +155,13 @@ where not exists (select uniquename from tmp_rpta_column_layout_target);\
 \
 --falls geändert, uniquename muss bleiben\
 update rpta_column_layout\
-set (caption, resultset_id, whereclause,<#if rpta_column_layout.sortclause?has_content>sortclause,</#if> description,  is_virtual)\
+set (caption, resultset_id, whereclause,sortclause, description,  is_virtual)\
 = ( select  caption, resultset_id,\
        whereclause,\
        <#if rpta_column_layout.sortclause?has_content>\
        sortclause,\
+       <#else>\
+       null::text as sortclause,\
        </#if>\
   description,\
     is_virtual\
@@ -302,8 +304,12 @@ drop TABLE tmp_rpta_column2layout;\
 				${column.targetfieldname},\
 			<#elseif column.is_aggregate==0 && column.coltype=="processingColumn"> \
 				<#assign groupby=groupby+1 />\
+				<#if column.colfunction?has_content>\
+					${column.colfunction} as ${column.targetfieldname},\
+				<#else>\
 					${column.srcfieldname} as ${column.targetfieldname},\
 				</#if>\
+			</#if>\
 		</#foreach>\
 		--dann die Aggregate:\
 		-- preparingColumns ausgeschlossen, da sie von processingColumns aggregiert werden\