diff --git a/src-modules/module/rpta/masken/45000_maskeninfo.unl b/src-modules/module/rpta/masken/45000_maskeninfo.unl index 6cea65d..f92dba9 100644 --- a/src-modules/module/rpta/masken/45000_maskeninfo.unl +++ b/src-modules/module/rpta/masken/45000_maskeninfo.unl @@ -65,6 +65,7 @@ order by CL.sortnr\ <#assign filter="<>\ /* and sem_rueck_beur_ein >= <> */\ /* and sem_rueck_beur_ein <= <> */\ +/* and sem_rueck_beur_ein = <> */\ /* and stichtag = <> */\ /* and <> */\ /* and <>*/\ @@ -134,6 +135,8 @@ sum(${column.targetfieldname}) as ${column.targetfieldname},\ null::char(1) as dummycol\ into temp tmp_stud2\ from tmp_stud\ +where 1=1\ +/* ${<>} */\ group by\ <#list 1..groupby as i>${i}\ <#if i != groupby>\ @@ -142,12 +145,8 @@ group by\ \ ;\ \ -<#assign orderby=0 />\ -\ select \ <#foreach column in columns>\ -<#if column.is_visible==1>\ -<#assign orderby=orderby +1 />\ <#assign format_sql="" />\ <#if column.format_sql?string != "">\ <#assign format_sql=column.format_sql />\ @@ -159,11 +158,10 @@ select \ ${column.targetfieldname}${format_sql}\ \ <#if column_has_next>,\ - --wenn sichtbar\ \ from tmp_stud2\ -order by <#list 1..orderby as i>${i}\ -<#if i != orderby>\ +order by <#list 1..groupby as i>${i}\ +<#if i != groupby>\ ,\ \ \ @@ -181,9 +179,9 @@ drop table if exists tmp_stud;\ drop_and_delete movable_columns \ white_space_color=COLOR_WHITE fixed_columns=1\ min_heading_height=55\ -<#foreach column in columns><#if column.is_visible==1>\ +<#foreach column in columns>\ Column CID=0 heading_text="${column.caption}" center_heading explanation="${column.description}"\ row_selectable heading_platform readonly\ width=${column.visible_width} text_size=60\ -\ +\ @@@^Studienfach^Anzahl bzw. Anteil^Datenblatt Studierendenstatistik^drop table if exists tmp_stud2; drop table if exists tmp_stud3;^^2^850^540^^1^<>SELECT description FROM rpta_column_layout where tid=<>;^