From 4f97f2837e0d11d72803e30b9c86e006666ce611 Mon Sep 17 00:00:00 2001
From: Imo John <john@memtext.de>
Date: Fri, 16 Oct 2026 10:09:07 +0200
Subject: [PATCH] =?UTF-8?q?Prozedur=20f=C3=BCr=20sqlvar=20columnLayout?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src-modules/module/rpta/conf/rpta.xml         | 35 ++++++++++++++++++-
 .../module/rpta/masken/48000_maskeninfo.unl   |  2 +-
 .../module/rpta/masken/48080_maskeninfo.unl   |  2 +-
 .../module/rpta/masken/48110_maskeninfo.unl   |  2 +-
 .../module/rpta/masken/48220_maskeninfo.unl   |  2 +-
 .../module/rpta/masken/48250_maskeninfo.unl   |  2 +-
 .../module/rpta/masken/48280_maskeninfo.unl   |  2 +-
 .../module/rpta/masken/48310_maskeninfo.unl   |  2 +-
 .../module/rpta/masken/48430_maskeninfo.unl   |  2 +-
 .../module/rpta/masken/48460_maskeninfo.unl   |  2 +-
 .../module/rpta/masken/48490_maskeninfo.unl   |  2 +-
 .../module/rpta/masken/48520_maskeninfo.unl   |  2 +-
 .../module/rpta/masken/48550_maskeninfo.unl   |  2 +-
 ..._lm_ects_soll_ist_matrikelnummer_sicht.sql | 20 ++---------
 .../rpta_lm_ects_soll_ist_virtuell.sql        |  2 +-
 15 files changed, 50 insertions(+), 31 deletions(-)

diff --git a/src-modules/module/rpta/conf/rpta.xml b/src-modules/module/rpta/conf/rpta.xml
index 291c6c6..6bd9424 100644
--- a/src-modules/module/rpta/conf/rpta.xml
+++ b/src-modules/module/rpta/conf/rpta.xml
@@ -332,7 +332,7 @@
     <views />
     <functions >
     <function>
-        <name>sp_get_rpta_columns</name>
+        <name>sp_rpta_columns_in_layout</name>
         <description>Liefert die Spaltne eines Spaltenlayouts zurück</description>
         <parameters>
           <param>
@@ -358,6 +358,39 @@
           <comment>Liefert die Columns zurück</comment>
         </returns>
       </function>
+      
+    <function>
+        <name>sp_rpta_column_layout</name>
+        <description>Liefert Informationen zum Spaltenlayout</description>
+        <parameters>
+          <param>
+            <name>p_resultset_uniquename</name>
+            <type>varchar(255)</type>
+            <description>virtuelle Tabelle uniquename</description>
+          </param>
+          
+          <param>
+            <name>p_column_layout_uniquename</name>
+            <type>varchar(255)</type>
+            <description>Spaltenlayout uniquename</description>
+          </param>
+        </parameters>
+        <declaration />
+        <src>
+          <file>$RPTA_PFAD/prozeduren/proc_get_rpta_column_layout_p.sql</file>
+          <dbsystem>POSTGRES</dbsystem>
+          <type>function</type>
+        </src>
+       
+        <returns>
+          <param>
+            <name>column_layout</name>
+            <type>RECORD</type>
+            <description />
+          </param>
+          <comment>Liefert die Columns zurück</comment>
+        </returns>
+      </function>
       </functions>
     <themen>
       <thema name="Administration Berichtsassistent" parent="Berichtsassistent">Abfragen zur Administration von Berichtsassistent</thema>
diff --git a/src-modules/module/rpta/masken/48000_maskeninfo.unl b/src-modules/module/rpta/masken/48000_maskeninfo.unl
index 070dccd..3a5c1f0 100644
--- a/src-modules/module/rpta/masken/48000_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48000_maskeninfo.unl
@@ -34,7 +34,7 @@ select * from rpta_resultset\
 \
 ]]></sqlvar>\
 <sqlvar name="rpta_column_layout" type="hash"><![CDATA[\
-       SELECT * from sp_rpta_column_layout('${basetable.name}',<<Spaltenlayout>>::varchar(255));\
+       SELECT * from sp_rpta_column_layout('${basetable.name}'::varchar(255),<<Spaltenlayout>>::varchar(255));\
 \
 ]]></sqlvar>\
 <sqlvar name="columns" type="hashsequence"><![CDATA[\
diff --git a/src-modules/module/rpta/masken/48080_maskeninfo.unl b/src-modules/module/rpta/masken/48080_maskeninfo.unl
index 01fc88f..25c1b49 100644
--- a/src-modules/module/rpta/masken/48080_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48080_maskeninfo.unl
@@ -26,7 +26,7 @@ select * from rpta_resultset\
 \
 ]]></sqlvar>\
 <sqlvar name="rpta_column_layout" type="hash"><![CDATA[\
-       SELECT * from sp_rpta_column_layout('${basetable.name}',<<Spaltenlayout>>::varchar(255));\
+       SELECT * from sp_rpta_column_layout('${basetable.name}'::varchar(255),<<Spaltenlayout>>::varchar(255));\
 \
 ]]></sqlvar>\
 <sqlvar name="columns" type="hashsequence"><![CDATA[\
diff --git a/src-modules/module/rpta/masken/48110_maskeninfo.unl b/src-modules/module/rpta/masken/48110_maskeninfo.unl
index 23c4b31..a8c274c 100644
--- a/src-modules/module/rpta/masken/48110_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48110_maskeninfo.unl
@@ -26,7 +26,7 @@ select * from rpta_resultset\
 \
 ]]></sqlvar>\
 <sqlvar name="rpta_column_layout" type="hash"><![CDATA[\
-       SELECT * from sp_rpta_column_layout('${basetable.name}',<<Spaltenlayout>>::varchar(255));\
+       SELECT * from sp_rpta_column_layout('${basetable.name}'::varchar(255),<<Spaltenlayout>>::varchar(255));\
 \
 ]]></sqlvar>\
 <sqlvar name="columns" type="hashsequence"><![CDATA[\
diff --git a/src-modules/module/rpta/masken/48220_maskeninfo.unl b/src-modules/module/rpta/masken/48220_maskeninfo.unl
index 1cf53ec..fc1c172 100644
--- a/src-modules/module/rpta/masken/48220_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48220_maskeninfo.unl
@@ -31,7 +31,7 @@ select * from rpta_resultset\
 \
 ]]></sqlvar>\
 <sqlvar name="rpta_column_layout" type="hash"><![CDATA[\
-       SELECT * from sp_rpta_column_layout('${basetable.name}',<<Spaltenlayout>>::varchar(255));\
+       SELECT * from sp_rpta_column_layout('${basetable.name}'::varchar(255),<<Spaltenlayout>>::varchar(255));\
 \
 ]]></sqlvar>\
 <sqlvar name="columns" type="hashsequence"><![CDATA[\
diff --git a/src-modules/module/rpta/masken/48250_maskeninfo.unl b/src-modules/module/rpta/masken/48250_maskeninfo.unl
index c2ec8d5..937045c 100644
--- a/src-modules/module/rpta/masken/48250_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48250_maskeninfo.unl
@@ -26,7 +26,7 @@ select * from rpta_resultset\
 \
 ]]></sqlvar>\
 <sqlvar name="rpta_column_layout" type="hash"><![CDATA[\
-       SELECT * from sp_rpta_column_layout('${basetable.name}',<<Spaltenlayout>>::varchar(255));\
+       SELECT * from sp_rpta_column_layout('${basetable.name}'::varchar(255),<<Spaltenlayout>>::varchar(255));\
 \
 ]]></sqlvar>\
 <sqlvar name="columns" type="hashsequence"><![CDATA[\
diff --git a/src-modules/module/rpta/masken/48280_maskeninfo.unl b/src-modules/module/rpta/masken/48280_maskeninfo.unl
index d918563..36c66d0 100644
--- a/src-modules/module/rpta/masken/48280_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48280_maskeninfo.unl
@@ -31,7 +31,7 @@ select * from rpta_resultset\
 \
 ]]></sqlvar>\
 <sqlvar name="rpta_column_layout" type="hash"><![CDATA[\
-       SELECT * from sp_rpta_column_layout('${basetable.name}',<<Spaltenlayout>>::varchar(255));\
+       SELECT * from sp_rpta_column_layout('${basetable.name}'::varchar(255),<<Spaltenlayout>>::varchar(255));\
 \
 ]]></sqlvar>\
 <sqlvar name="columns" type="hashsequence"><![CDATA[\
diff --git a/src-modules/module/rpta/masken/48310_maskeninfo.unl b/src-modules/module/rpta/masken/48310_maskeninfo.unl
index 6a6a62f..91fc39b 100644
--- a/src-modules/module/rpta/masken/48310_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48310_maskeninfo.unl
@@ -34,7 +34,7 @@ select * from rpta_resultset\
 \
 ]]></sqlvar>\
 <sqlvar name="rpta_column_layout" type="hash"><![CDATA[\
-       SELECT * from sp_rpta_column_layout('${basetable.name}',<<Spaltenlayout>>::varchar(255));\
+       SELECT * from sp_rpta_column_layout('${basetable.name}'::varchar(255),<<Spaltenlayout>>::varchar(255));\
 \
 ]]></sqlvar>\
 <sqlvar name="columns" type="hashsequence"><![CDATA[\
diff --git a/src-modules/module/rpta/masken/48430_maskeninfo.unl b/src-modules/module/rpta/masken/48430_maskeninfo.unl
index d1ebbad..c1e200a 100644
--- a/src-modules/module/rpta/masken/48430_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48430_maskeninfo.unl
@@ -34,7 +34,7 @@ select * from rpta_resultset\
 \
 ]]></sqlvar>\
 <sqlvar name="rpta_column_layout" type="hash"><![CDATA[\
-       SELECT * from sp_rpta_column_layout('${basetable.name}',<<Spaltenlayout>>::varchar(255));\
+       SELECT * from sp_rpta_column_layout('${basetable.name}'::varchar(255),<<Spaltenlayout>>::varchar(255));\
 \
 ]]></sqlvar>\
 <sqlvar name="columns" type="hashsequence"><![CDATA[\
diff --git a/src-modules/module/rpta/masken/48460_maskeninfo.unl b/src-modules/module/rpta/masken/48460_maskeninfo.unl
index abaa081..ed83550 100644
--- a/src-modules/module/rpta/masken/48460_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48460_maskeninfo.unl
@@ -34,7 +34,7 @@ select * from rpta_resultset\
 \
 ]]></sqlvar>\
 <sqlvar name="rpta_column_layout" type="hash"><![CDATA[\
-       SELECT * from sp_rpta_column_layout('${basetable.name}',<<Spaltenlayout>>::varchar(255));\
+       SELECT * from sp_rpta_column_layout('${basetable.name}'::varchar(255),<<Spaltenlayout>>::varchar(255));\
 \
 ]]></sqlvar>\
 <sqlvar name="columns" type="hashsequence"><![CDATA[\
diff --git a/src-modules/module/rpta/masken/48490_maskeninfo.unl b/src-modules/module/rpta/masken/48490_maskeninfo.unl
index 97cac4b..603cbbb 100644
--- a/src-modules/module/rpta/masken/48490_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48490_maskeninfo.unl
@@ -31,7 +31,7 @@ select * from rpta_resultset\
 \
 ]]></sqlvar>\
 <sqlvar name="rpta_column_layout" type="hash"><![CDATA[\
-       SELECT * from sp_rpta_column_layout('${basetable.name}',<<Spaltenlayout>>::varchar(255));\
+       SELECT * from sp_rpta_column_layout('${basetable.name}'::varchar(255),<<Spaltenlayout>>::varchar(255));\
 \
 ]]></sqlvar>\
 <sqlvar name="columns" type="hashsequence"><![CDATA[\
diff --git a/src-modules/module/rpta/masken/48520_maskeninfo.unl b/src-modules/module/rpta/masken/48520_maskeninfo.unl
index 147271c..c0c9a8d 100644
--- a/src-modules/module/rpta/masken/48520_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48520_maskeninfo.unl
@@ -31,7 +31,7 @@ select * from rpta_resultset\
 \
 ]]></sqlvar>\
 <sqlvar name="rpta_column_layout" type="hash"><![CDATA[\
-       SELECT * from sp_rpta_column_layout('${basetable.name}',<<Spaltenlayout>>::varchar(255));\
+       SELECT * from sp_rpta_column_layout('${basetable.name}'::varchar(255),<<Spaltenlayout>>::varchar(255));\
 \
 ]]></sqlvar>\
 <sqlvar name="columns" type="hashsequence"><![CDATA[\
diff --git a/src-modules/module/rpta/masken/48550_maskeninfo.unl b/src-modules/module/rpta/masken/48550_maskeninfo.unl
index 1bf0ad3..77ee05b 100644
--- a/src-modules/module/rpta/masken/48550_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48550_maskeninfo.unl
@@ -34,7 +34,7 @@ select * from rpta_resultset\
 \
 ]]></sqlvar>\
 <sqlvar name="rpta_column_layout" type="hash"><![CDATA[\
-       SELECT * from sp_rpta_column_layout('${basetable.name}',<<Spaltenlayout>>::varchar(255));\
+       SELECT * from sp_rpta_column_layout('${basetable.name}'::varchar(255),<<Spaltenlayout>>::varchar(255));\
 \
 ]]></sqlvar>\
 <sqlvar name="columns" type="hashsequence"><![CDATA[\
diff --git a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_lm_ects_soll_ist_matrikelnummer_sicht.sql b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_lm_ects_soll_ist_matrikelnummer_sicht.sql
index 5db6b9c..00f564a 100644
--- a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_lm_ects_soll_ist_matrikelnummer_sicht.sql
+++ b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_lm_ects_soll_ist_matrikelnummer_sicht.sql
@@ -57,29 +57,15 @@ select count(*) from rpta_resultset where uniquename='rpta_lm_ects_soll_ist';
 "visible_size":"5",
 "description_in_ergebnistabelle":""
 },
-{"uniquename":"ects_soll_prep",
-"caption_in_ergebnistabelle":"Soll-ECTS",
-"is_visible":"0",
-"format_code":"",
-"visible_size":"5",
-"description_in_ergebnistabelle":""
-},
-{"uniquename":"ects_soll_max",
+{"uniquename":"ects_soll",
 "caption_in_ergebnistabelle":"Soll-ECTS",
 "is_visible":"1",
 "format_code":"",
 "visible_size":"5",
 "description_in_ergebnistabelle":""
 },
-{"uniquename":"ects_ist_prep",
-"caption_in_ergebnistabelle":"Ist-ECTS gesamt",
-"is_visible":"0",
-"format_code":"",
-"visible_size":"5",
-"description_in_ergebnistabelle":""
-},
-{"uniquename":"ects_ist_max",
-"caption_in_ergebnistabelle":"Ist-ECTS gesamt",
+{"uniquename":"ects_ist",
+"caption_in_ergebnistabelle":"Ist-ECTS",
 "is_visible":"1",
 "format_code":"",
 "visible_size":"5",
diff --git a/src-modules/module/rpta/schluesseltabellen/rpta_lm_ects_soll_ist_virtuell.sql b/src-modules/module/rpta/schluesseltabellen/rpta_lm_ects_soll_ist_virtuell.sql
index df9aac3..3c9f9f5 100644
--- a/src-modules/module/rpta/schluesseltabellen/rpta_lm_ects_soll_ist_virtuell.sql
+++ b/src-modules/module/rpta/schluesseltabellen/rpta_lm_ects_soll_ist_virtuell.sql
@@ -218,7 +218,7 @@ joinclause='${fact_table_source}
 <#foreach added_table in added_tables>
 left outer join ${added_table.name} on (${added_table.joinclause})
 </#foreach>',
-whereclause='(lehr_eigen=lehr_dienst or (lehr_eigen is null and lehr_dienst is null)) and aktiv=1';
+whereclause='and (lehr_eigen=lehr_dienst or (lehr_eigen is null and lehr_dienst is null)) and aktiv=1';
 
 select * into temp tmp_rs1 
 from rpta_resultset