From 35b2a4fa21a32bcaa4ddb44bbfebd03a6d3fb478 Mon Sep 17 00:00:00 2001
From: Imo John <john@memtext.de>
Date: Thu, 30 Apr 2026 08:10:34 +0200
Subject: [PATCH] neues resultset lm_ects_soll_ist inkl. Maske, Spaltenlayout

---
 src-modules/module/rpta/conf/rpta.xml         |   6 +
 .../lm_ects_soll_ist_virtuell.sql             | 384 ++++++++++++++++++
 ...a_column_layout_lm_ects_soll_ist_sicht.sql | 104 +++++
 ...a_column_rpta_lm_ects_soll_ist_fuellen.sql | 134 ++++++
 4 files changed, 628 insertions(+)
 create mode 100644 src-modules/module/rpta/schluesseltabellen/lm_ects_soll_ist_virtuell.sql
 create mode 100644 src-modules/module/rpta/schluesseltabellen/rpta_column_layout_lm_ects_soll_ist_sicht.sql
 create mode 100644 src-modules/module/rpta/schluesseltabellen/rpta_column_rpta_lm_ects_soll_ist_fuellen.sql

diff --git a/src-modules/module/rpta/conf/rpta.xml b/src-modules/module/rpta/conf/rpta.xml
index d4d959f..1952928 100644
--- a/src-modules/module/rpta/conf/rpta.xml
+++ b/src-modules/module/rpta/conf/rpta.xml
@@ -423,6 +423,12 @@
           <path>$RPTA_PFAD/masken</path>
         </src>
       </maske>
+      <maske tid="48520" name="ECTS-Konten" thema="Berichtsassistent">
+        <description />
+        <src>
+          <path>$RPTA_PFAD/masken</path>
+        </src>
+      </maske>
       <!--<maske tid="48140" name="Leistungen und Studiengänge (Makro)" thema="Berichtsassistent">
            <description>Leistungen und Studiengänge</description>
            <src>
diff --git a/src-modules/module/rpta/schluesseltabellen/lm_ects_soll_ist_virtuell.sql b/src-modules/module/rpta/schluesseltabellen/lm_ects_soll_ist_virtuell.sql
new file mode 100644
index 0000000..c20b018
--- /dev/null
+++ b/src-modules/module/rpta/schluesseltabellen/lm_ects_soll_ist_virtuell.sql
@@ -0,0 +1,384 @@
+--freemarker template
+<sqlvars>
+<sqlvar name="lm_ects_soll_ist_exists">
+select sp_table_exists('lm_ects_soll_ist') from xdummy;
+</sqlvar>
+<sqlvar name="fact_table_source">
+select name
+       from sx_tables where name ='lm_ects_soll_ist'
+       
+</sqlvar>
+<sqlvar name="added_tables" type="hashsequence">
+select 1::smallint as sortnr,
+name, trim(name) ||'_'   as prefix,
+caption,
+'dim_studiengang.tid=lm_ects_soll_ist.tid_stg' as joinclause
+       from sx_tables where name  in ('dim_studiengang')
+order by 1
+</sqlvar>
+<sqlvar name="fields_target" type="hashsequence"><![CDATA[
+<#if fact_table_source?exists>
+select tid, table_name,
+       name,
+       name as targetname
+       from sx_fields where table_name ='${fact_table_source}'
+       and currentlyused=1
+       <#foreach added_table in added_tables>
+       union
+       select tid,table_name,
+       name,
+       '${added_table.prefix}' || name as targetname
+       from sx_fields where table_name ='${added_table.name}'
+       and currentlyused=1
+              
+       </#foreach>
+       order by 1
+</#if>
+]]>
+</sqlvar>
+</sqlvars>
+
+<#if lm_ects_soll_ist_exists==1 && fact_table_source?exists >
+
+<#assign  fact_table_target = {"name":"rpta_lm_ects_soll_ist", "caption":"ECTS-Soll-IST Vergleich"}
+   />
+
+
+CREATE temp table tmp_tables(
+name CHAR(255) , 
+caption CHAR(255) , 
+description CHAR(255) , 
+table_type CHAR(255) , 
+systeminfo_id INTEGER  , 
+systeminfo_orig INTEGER  , 
+thema CHAR(255) , 
+sachgebiete_id CHAR(255) 
+);
+CREATE temp TABLE tmp_fields(
+tid serial NOT NULL,
+table_name VARCHAR(255)  not null, 
+name VARCHAR(255)  not null, 
+caption VARCHAR(255) , 
+description VARCHAR(255) , 
+field_type VARCHAR(255)  not null, 
+field_size VARCHAR(255)  , 
+field_not_null smallint,
+currentlyused SMALLINT , 
+is_primarykey SMALLINT  default 0 , 
+foreignkey_tab VARCHAR(255) , 
+foreignkey_col VARCHAR(255) , 
+foreignkey_int VARCHAR(255) , 
+foreignkey_cap VARCHAR(255) , 
+foreignkey_cond VARCHAR(255) , 
+foreignkey_func VARCHAR(255) , 
+check_integrity SMALLINT, 
+is_sum SMALLINT  default 1,
+foreignkey_uniquename VARCHAR(255)
+
+);
+
+
+
+update sx_fields set 
+       is_sum=0
+       where table_name='lm_ects_soll_ist'
+       and name not in ('ects_soll','ects_ist','ects_soll_gew','ects_ist_gew');
+update sx_fields set 
+       is_sum=1
+       where table_name='lm_ects_soll_ist'
+       and name in ('ects_soll','ects_ist','ects_soll_gew','ects_ist_gew');
+       
+  
+insert into tmp_tables (
+name,
+caption,
+description,
+table_type,
+systeminfo_id,
+thema,
+sachgebiete_id
+) 
+select 
+'${fact_table_target.name}',
+'${fact_table_target.caption}',
+description,
+table_type,
+systeminfo_id,
+thema,
+sachgebiete_id
+from sx_tables where name='${fact_table_source}'
+;
+
+
+insert into tmp_fields (table_name,
+       name,
+       caption,
+       description,
+       field_type,
+       field_size,
+       field_not_null,
+       currentlyused,
+       is_primarykey,
+       foreignkey_tab,
+       foreignkey_col,
+       foreignkey_int,
+       foreignkey_cap,
+       foreignkey_cond,
+       foreignkey_func,
+       check_integrity,
+       is_sum,
+       foreignkey_uniquename) 
+select  '${fact_table_target.name}' as table_name,
+       name,
+       caption,
+       description,
+       field_type,
+       field_size,
+       field_not_null,
+       currentlyused,
+       is_primarykey,
+       foreignkey_tab,
+       foreignkey_col,
+       foreignkey_int,
+       foreignkey_cap,
+       foreignkey_cond,
+       foreignkey_func,
+       check_integrity,
+       is_sum,
+       foreignkey_uniquename
+       from sx_fields where table_name ='${fact_table_source}'
+       and currentlyused=1;
+<#foreach added_table in added_tables>
+insert into tmp_fields (table_name,
+       name,
+       caption,
+       description,
+       field_type,
+       field_size,
+       field_not_null,
+       currentlyused,
+       is_primarykey,
+       foreignkey_tab,
+       foreignkey_col,
+       foreignkey_int,
+       foreignkey_cap,
+       foreignkey_cond,
+       foreignkey_func,
+       check_integrity,
+       is_sum,
+       foreignkey_uniquename) 
+select  '${fact_table_target.name}' as table_name,
+       '${added_table.prefix}' || name,
+       '${added_table.caption}: ' || caption,
+       description,
+       field_type,
+       field_size,
+       field_not_null,
+       currentlyused,
+       is_primarykey,
+       foreignkey_tab,
+       foreignkey_col,
+       foreignkey_int,
+       foreignkey_cap,
+       foreignkey_cond,
+       foreignkey_func,
+       check_integrity,
+       is_sum,
+       foreignkey_uniquename
+       from sx_fields where table_name ='${added_table.name}'
+       and currentlyused=1;
+</#foreach>
+
+CREATE temp TABLE tmp_rpta_resultset
+(
+    caption        varchar(255),
+   uniquename     varchar(255),
+   fieldclause    text,
+   joinclause     text,
+   whereclause    text,
+   systeminfo_id  integer
+);
+
+insert into tmp_rpta_resultset(caption,
+       uniquename,
+       systeminfo_id)
+       select '${fact_table_target.caption}',
+       '${fact_table_target.name}',
+       7
+;
+
+
+update tmp_rpta_resultset set fieldclause='
+<#foreach field_target in fields_target>
+${field_target.table_name}.${field_target.name} as ${field_target.targetname},
+</#foreach>
+null::varchar as dummy',
+joinclause='${fact_table_source}
+<#foreach added_table in added_tables>
+left outer join ${added_table.name} on (${added_table.joinclause})
+</#foreach>',
+whereclause='';
+
+select * into temp tmp_rs1 
+from rpta_resultset
+;
+
+update rpta_resultset set caption=T.caption,
+       fieldclause=T.fieldclause,
+       joinclause=T.joinclause,
+       whereclause=T.whereclause
+       from tmp_rpta_resultset T
+       where T.systeminfo_id=rpta_resultset.systeminfo_id
+       and T.uniquename=rpta_resultset.uniquename
+       ;
+
+insert into rpta_resultset(caption,
+       uniquename,
+       fieldclause,
+       joinclause,
+       whereclause,
+       systeminfo_id)
+select caption,
+       uniquename,
+       fieldclause,
+       joinclause,
+       whereclause,
+       systeminfo_id
+       from tmp_rpta_resultset
+       where 0=(select count(*) 
+       from tmp_rs1 T
+       where T.systeminfo_id=tmp_rpta_resultset.systeminfo_id
+       and T.uniquename=tmp_rpta_resultset.uniquename)
+       ;
+drop table tmp_rpta_resultset;
+drop table tmp_rs1;
+
+delete from sx_tables where name
+in (select T.name from tmp_tables  T);
+
+insert into sx_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id)
+select name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id
+from tmp_tables;
+
+
+delete from sx_fields where table_name
+in (select T.table_name from tmp_fields T);
+
+insert into sx_fields (table_name,name,caption,description,field_type,
+field_size,
+field_not_null,
+currentlyUsed,
+foreignkey_tab,
+foreignkey_col,
+foreignkey_cap,
+foreignkey_int,
+foreignkey_cond,
+foreignkey_func,
+check_integrity,
+is_sum,
+foreignkey_uniquename
+)
+select 
+F.table_name,F.name,F.caption,F.description,F.field_type,
+F.field_size,
+F.field_not_null,
+F.currentlyUsed,
+F.foreignkey_tab,
+F.foreignkey_col,
+F.foreignkey_cap,
+F.foreignkey_int,
+F.foreignkey_cond,
+F.foreignkey_func,
+F.check_integrity,
+F.is_sum,
+F.foreignkey_uniquename
+
+from tmp_fields F;
+
+
+drop table tmp_fields;
+drop table tmp_tables;
+
+
+--rpta_column füllen:
+select * into temp tmp_rc1
+from rpta_column;
+
+
+create temp table tmp_rpta_column(
+ uniquename       varchar(255)   NOT NULL,
+   caption          varchar(255),
+   srcfieldname     varchar(255),
+   column_type      integer,
+   col_function     text,
+   is_aggregate     smallint,
+   resultset_id     integer,
+   description      text,
+   custom integer default 0
+   );
+
+insert into tmp_rpta_column(   uniquename,
+       caption,
+       srcfieldname,
+       column_type,
+       col_function,
+       is_aggregate,
+       resultset_id,
+       description)
+       select  F.name as  uniquename,
+       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 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
+;
+
+update rpta_column set 
+       caption=T.caption,
+       srcfieldname=T.srcfieldname,
+       column_type=T.column_type,
+       col_function=T.col_function,
+       is_aggregate=T.is_aggregate,
+       resultset_id=R.tid,
+       description=T.description,
+       custom=T.custom
+       from tmp_rpta_column T, rpta_resultset R
+where T.uniquename=rpta_column.uniquename
+and rpta_column.resultset_id=R.tid
+and R.uniquename='${fact_table_target.name}'
+;
+insert into rpta_column(   uniquename,
+       caption,
+       srcfieldname,
+       column_type,
+       col_function,
+       is_aggregate,
+       resultset_id,
+       description,
+       custom)
+select T.uniquename,
+T.caption,
+T.srcfieldname,
+T.column_type,
+T.col_function,
+T.is_aggregate,
+R.tid as resultset_id,
+T.description,
+T.custom
+       from tmp_rpta_column T, rpta_resultset R
+       where R.uniquename='${fact_table_target.name}'
+       and 0=(select count(*) from tmp_rc1 C
+       where C.uniquename=T.uniquename
+       and C.resultset_id=R.tid)
+       ;
+
+drop table tmp_rpta_column;
+drop table tmp_rc1;
+
+</#if> --wenn lm_ects_soll_ist_exists=1
diff --git a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_lm_ects_soll_ist_sicht.sql b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_lm_ects_soll_ist_sicht.sql
new file mode 100644
index 0000000..d44f0c8
--- /dev/null
+++ b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_lm_ects_soll_ist_sicht.sql
@@ -0,0 +1,104 @@
+--freemarker template
+<#include "RPTA-Makros"/>
+<sqlvars>
+<sqlvar name="rpta_lm_ects_soll_ist_exists">
+select count(*) from rpta_resultset where uniquename='rpta_lm_ects_soll_ist';
+</sqlvar>
+</sqlvars>
+<#assign rpta_column_layout = {"uniquename":"lm_ects_soll_ist_sicht",
+"caption":"ECTS-Soll-IST Vergleich nach Studiengang",
+"rpta_resultset":"rpta_lm_ects_soll_ist",
+"whereclause":"",
+"description":"ECTS-Soll-IST Vergleich mit Baumstruktur nach Studiengang-Sicht",
+"sortclause":"sortnr"
+}
+   />
+
+<#assign rpta_columns = [
+
+{"uniquename":"dim_studiengang_s_tid_stg",
+"caption_in_ergebnistabelle":"Studiengang Sichtelement-ID",
+"is_visible":"0",
+"visible_size":"4",
+"description_in_ergebnistabelle":"Studiengang Sichtelement-ID"
+},
+{"uniquename":"dim_studiengang_s_tid_stg_ebene",
+"caption_in_ergebnistabelle":"Ebene",
+"is_visible":"1",
+"format_code":"",
+"visible_size":"5",
+"description_in_ergebnistabelle":"Studiengang"
+},
+{"uniquename":"dim_studiengang_sicht",
+"caption_in_ergebnistabelle":"Studiengang",
+"is_visible":"1",
+"format_code":"",
+"visible_size":"30",
+"description_in_ergebnistabelle":"Studiengang"
+},
+{"uniquename":"matrikel_nr",
+"caption_in_ergebnistabelle":"Matrikelnr./Pseudonym",
+"is_visible":"1",
+"format_code":"",
+"visible_size":"5",
+"description_in_ergebnistabelle":"Matrikelnr./Pseudonym"
+},
+{"uniquename":"dim_studiengang_text",
+"caption_in_ergebnistabelle":"Studiengang",
+"is_visible":"1",
+"format_code":"",
+"visible_size":"5",
+"description_in_ergebnistabelle":""
+},
+{"uniquename":"dim_studiengang_regel",
+"caption_in_ergebnistabelle":"Regelstudienzeit",
+"is_visible":"1",
+"format_code":"",
+"visible_size":"5",
+"description_in_ergebnistabelle":""
+},
+{"uniquename":"lehr_eigen",
+"caption_in_ergebnistabelle":"Lehreinheit (eigen)",
+"is_visible":"1",
+"format_code":"",
+"visible_size":"5",
+"description_in_ergebnistabelle":""
+},
+{"uniquename":"fach_sem_zahl_max_student",
+"caption_in_ergebnistabelle":"Letztes Fachsem.",
+"is_visible":"1",
+"format_code":"",
+"visible_size":"5",
+"description_in_ergebnistabelle":""
+},
+{"uniquename":"endsemester",
+"caption_in_ergebnistabelle":"Endsemester",
+"is_visible":"1",
+"format_code":"",
+"visible_size":"5",
+"description_in_ergebnistabelle":""
+},
+{"uniquename":"ects_soll_prep",
+"caption_in_ergebnistabelle":"Soll-ECTS Vorbereitung",
+"is_visible":"0",
+"format_code":"",
+"visible_size":"5",
+"description_in_ergebnistabelle":"Vorbereitung für Aggregation max(ects_soll)"
+},
+{"uniquename":"ects_soll_max",
+"caption_in_ergebnistabelle":"Max Soll-ECTS",
+"is_visible":"1",
+"format_code":"",
+"visible_size":"5",
+"description_in_ergebnistabelle":"Aggregation max(ects_soll)"
+},
+{"uniquename":"ects_ist",
+"caption_in_ergebnistabelle":"Ist-ECTS",
+"is_visible":"1",
+"format_code":"",
+"visible_size":"5",
+"description_in_ergebnistabelle":""
+}
+]
+   />
+<@rpta_column2layout_fuellen />
diff --git a/src-modules/module/rpta/schluesseltabellen/rpta_column_rpta_lm_ects_soll_ist_fuellen.sql b/src-modules/module/rpta/schluesseltabellen/rpta_column_rpta_lm_ects_soll_ist_fuellen.sql
new file mode 100644
index 0000000..5fb7283
--- /dev/null
+++ b/src-modules/module/rpta/schluesseltabellen/rpta_column_rpta_lm_ects_soll_ist_fuellen.sql
@@ -0,0 +1,134 @@
+--freemarker template
+<#include "RPTA-Makros"/>
+<sqlvars>
+<sqlvar name="rpta_lm_ects_soll_ist_exists">
+select count(*) from rpta_resultset where uniquename='rpta_lm_ects_soll_ist';
+</sqlvar>
+</sqlvars>
+<#assign rpta_column_resultset = {
+"rpta_resultset":"rpta_lm_ects_soll_ist"
+}
+   />
+
+<#assign rpta_columns = [
+{"uniquename":"dim_studiengang_s_tid_stg",
+"caption_der_spalte":"Studiengang Sichtelement-ID",
+"srcfieldname":"",
+"targetfieldname":"s_tid_stg",
+"column_type":"logicalColumn",
+"col_function":"(''s_'' || tid_stg)::varchar(255)",
+"is_aggregate":"0",
+"description_der_spalte":"Studiengang"
+},
+{"uniquename":"dim_studiengang_s_tid_stg_ebene",
+"caption_der_spalte":"Ebene",
+"srcfieldname":"",
+"targetfieldname":"ebene",
+"column_type":"logicalColumn",
+"col_function":"null::integer",
+"is_aggregate":"0",
+"description_der_spalte":"Studiengang"
+},
+{"uniquename":"dim_studiengang_sicht",
+"caption_der_spalte":"Studiengang",
+"srcfieldname":"s_tid_stg",
+"targetfieldname":"studiengang",
+"column_type":"treeColumn",
+"col_function":"Studiengang",
+"is_aggregate":"0",
+"description_der_spalte":"Studiengang"
+},
+{"uniquename":"matrikel_nr",
+"caption_der_spalte":"Matrikelnr./Pseudonym",
+"srcfieldname":"matrikel_nr",
+"targetfieldname":"",
+"column_type":"physicalColumn",
+"col_function":"",
+"is_aggregate":"0",
+"description_der_spalte":""
+},
+{"uniquename":"dim_studiengang_text",
+"caption_der_spalte":"Studiengang",
+"srcfieldname":"dim_studiengang_text",
+"targetfieldname":"",
+"column_type":"physicalColumn",
+"col_function":"",
+"is_aggregate":"0",
+"description_der_spalte":""
+},
+{"uniquename":"dim_studiengang_regel",
+"caption_der_spalte":"Regelstudienzeit",
+"srcfieldname":"dim_studiengang_regel",
+"targetfieldname":"",
+"column_type":"physicalColumn",
+"col_function":"",
+"is_aggregate":"0",
+"description_der_spalte":""
+},
+{"uniquename":"lehr_eigen",
+"caption_der_spalte":"Lehreinheit (eigen)",
+"srcfieldname":"lehr_eigen",
+"targetfieldname":"",
+"column_type":"physicalColumn",
+"col_function":"",
+"is_aggregate":"0",
+"description_der_spalte":""
+},
+{"uniquename":"fach_sem_zahl_max_student",
+"caption_der_spalte":"Letztes Fachsem.",
+"srcfieldname":"fach_sem_zahl_max_student",
+"targetfieldname":"",
+"column_type":"physicalColumn",
+"col_function":"",
+"is_aggregate":"0",
+"description_der_spalte":""
+},
+{"uniquename":"endsemester",
+"caption_der_spalte":"Endsemester",
+"srcfieldname":"endsemester",
+"targetfieldname":"",
+"column_type":"physicalColumn",
+"col_function":"",
+"is_aggregate":"0",
+"description_der_spalte":""
+},
+{"uniquename":"ects_soll",
+"caption_der_spalte":"Soll-ECTS",
+"srcfieldname":"ects_soll",
+"targetfieldname":"",
+"column_type":"physicalColumn",
+"col_function":"",
+"is_aggregate":"1",
+"description_der_spalte":""
+},
+{"uniquename":"ects_soll_prep",
+"caption_der_spalte":"Soll-ECTS Vorbereitung",
+"srcfieldname":"",
+"targetfieldname":"ects_soll_prep",
+"column_type":"preparingColumn",
+"col_function":"ects_soll",
+"is_aggregate":"0",
+"description_der_spalte":"Vorbereitung für Aggregation max(ects_soll)"
+},
+{"uniquename":"ects_soll_max",
+"caption_der_spalte":"Max Soll-ECTS",
+"srcfieldname":"ects_soll_prep",
+"targetfieldname":"ects_soll_max",
+"column_type":"processingColumn",
+"col_function":"max(ects_soll_prep)",
+"is_aggregate":"1",
+"description_der_spalte":"Aggregation max(ects_soll)"
+},
+{"uniquename":"ects_ist",
+"caption_der_spalte":"Ist-ECTS",
+"srcfieldname":"ects_ist",
+"targetfieldname":"",
+"column_type":"physicalColumn",
+"col_function":"",
+"is_aggregate":"1",
+"description_der_spalte":""
+}
+
+]
+   />
+<@rpta_column_fuellen />