From 07e49424dfefca3b2995270388a7fb26bc7fb583 Mon Sep 17 00:00:00 2001
From: Daniel Quathamer <danielq@memtext.de>
Date: Wed, 18 Sep 2024 08:49:04 +0200
Subject: [PATCH] Bufix Sortierung un dLabel von Spalten #4

---
 src-modules/module/rpta/conf/customize.sql.sam      |  2 ++
 src-modules/module/rpta/masken/45000_maskeninfo.unl | 13 +++++++++----
 .../studierende_datenblatt_virtuell.sql             |  4 ++--
 3 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 src-modules/module/rpta/conf/customize.sql.sam

diff --git a/src-modules/module/rpta/conf/customize.sql.sam b/src-modules/module/rpta/conf/customize.sql.sam
new file mode 100644
index 0000000..a9b4d26
--- /dev/null
+++ b/src-modules/module/rpta/conf/customize.sql.sam
@@ -0,0 +1,2 @@
+--rücksichern der eigenen Styles:
+\! cp $WEBAPP/WEB-INF/reports/simple_table_myorg.jrtx $WEBAPP/WEB-INF/reports/simple_table.jrtx 
diff --git a/src-modules/module/rpta/masken/45000_maskeninfo.unl b/src-modules/module/rpta/masken/45000_maskeninfo.unl
index 0a9153a..6cea65d 100644
--- a/src-modules/module/rpta/masken/45000_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/45000_maskeninfo.unl
@@ -142,8 +142,12 @@ group by\
 </#list>\
 ;\
 \
+<#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 />\
@@ -155,10 +159,11 @@ select \
 ${column.targetfieldname}${format_sql}\
 </#if>\
 <#if column_has_next>,</#if>\
+</#if> --wenn sichtbar\
 </#foreach>\
 from tmp_stud2\
-order by <#list 1..groupby as i>${i}\
-<#if i != groupby>\
+order by <#list 1..orderby as i>${i}\
+<#if i != orderby>\
 ,\
 </#if>\
 </#list>\
@@ -176,9 +181,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>\
+<#foreach column in columns><#if column.is_visible==1>\
 Column CID=0 heading_text="${column.caption}" center_heading explanation="${column.description}"\
    row_selectable heading_platform readonly\
    width=${column.visible_width} text_size=60\
-</#foreach>\
+</#if></#foreach>\
 @@@^Studienfach^Anzahl bzw. Anteil^Datenblatt Studierendenstatistik^drop table if exists tmp_stud2;                                                                                                                  drop table if exists tmp_stud3;^^2^850^540^^1^<<SQL>>SELECT description FROM rpta_column_layout where tid=<<Spaltenlayout>>;^
diff --git a/src-modules/module/rpta/schluesseltabellen/studierende_datenblatt_virtuell.sql b/src-modules/module/rpta/schluesseltabellen/studierende_datenblatt_virtuell.sql
index 436652f..32af230 100644
--- a/src-modules/module/rpta/schluesseltabellen/studierende_datenblatt_virtuell.sql
+++ b/src-modules/module/rpta/schluesseltabellen/studierende_datenblatt_virtuell.sql
@@ -391,14 +391,14 @@ insert into tmp_rpta_column(   uniquename,
        resultset_id,
        description)
        select  F.name as  uniquename,
-       F.caption,
+       coalesce(T.caption,T.name) || ' - ' || F.caption,
        F.name as srcfieldname,
        1 as column_type,
        (case when F.is_sum=1 then 'sum' else null::varchar end)  as col_function,
        (case when F.is_sum=1 then 1 else 0 end) as is_aggregate,
        R.tid as resultset_id,
        F.description
-from sx_fields F, rpta_resultset R
+from rpta_resultset R, sx_fields F left outer join sx_tables T on (T.name=F.table_name) 
 where F.table_name='${fact_table_target.name}'
 and R.uniquename='${fact_table_target.name}'
 and F.currentlyused=1