From c36f27506506ad64364bbb425ca25c9f31ca406b Mon Sep 17 00:00:00 2001 From: Andre Knieschewski Date: Wed, 23 Jul 2025 08:31:31 +0200 Subject: [PATCH] =?UTF-8?q?Anpassungen=20f=C3=BCr=20Gewichtung?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/rpta/masken/48000_felderinfo.unl | 4 +- .../module/rpta/masken/48000_maskeninfo.unl | 4 +- .../studierende_datenblatt_gew_virtuell.sql | 450 ++++++++++++++++++ 3 files changed, 454 insertions(+), 4 deletions(-) create mode 100644 src-modules/module/rpta/schluesseltabellen/studierende_datenblatt_gew_virtuell.sql diff --git a/src-modules/module/rpta/masken/48000_felderinfo.unl b/src-modules/module/rpta/masken/48000_felderinfo.unl index 8988de0..6235058 100644 --- a/src-modules/module/rpta/masken/48000_felderinfo.unl +++ b/src-modules/module/rpta/masken/48000_felderinfo.unl @@ -1,7 +1,7 @@ 48000^Spaltenlayout^3000^350^-1^140^180^1^char^30^1^1^<>SELECT uniquename,\ caption\ FROM rpta_column_layout \ -where resultset_id in (select R.tid from rpta_resultset R where R.uniquename='sos_stud_astat'\ +where resultset_id in (select R.tid from rpta_resultset R where R.uniquename in ('sos_stud_astat','sos_stud_astat_gew')\ and R.systeminfo_id=7)\ order by sortnr, caption\ ;^^<>SELECT uniquename,\ @@ -11,7 +11,7 @@ where resultset_id in (select R.tid from rpta_resultset R where R.uniquename='so and R.systeminfo_id=7) and uniquename='sos_stud_astat_rsz';^ 48001^Seit Semester^10^0^0^140^80^1^integer^30^0^1^<> select tid, eintrag from semester order by tid DESC;^ ^<> select tid,eintrag from semester where today() between sem_beginn and sem_ende;^ 48002^Fächer^30^0^0^130^200^6^integer^1000^0^12^<> select tid,name,sortnr from sichten where art='Fächer-Sicht' order by 3,2;^ ^ ^ -48003^Abschluss^40^0^0^100^200^3^char^1500^0^12^<> select tid,name,sortnr from sichten where art='SOS-Abschluss-Sicht' order by 3,2;^ ^ ^ +48003^Abschluss^40^0^0^100^200^3^char^1500^0^1^<> select apnr, druck from cifx where key=35 order by 2;^ ^ ^ 48004^bis Fachsemester^1000^300^-1^200^100^1^integer^30^0^0^^ ^ ^ 48005^Semestertyp^22^350^-1^140^80^1^integer^255^0^1^<> select 1,'nur Sommersemester' from xdummy union select 2,'nur Wintersemester' from xdummy^ ^<> select 2,'nur Wintersemester' from xdummy^ 48006^Hochschulzugangsberechtigung^120^300^-1^200^200^1^sql^30^0^1^hs_zugangsber^ ^ ^ diff --git a/src-modules/module/rpta/masken/48000_maskeninfo.unl b/src-modules/module/rpta/masken/48000_maskeninfo.unl index 546f22a..e6bb60d 100644 --- a/src-modules/module/rpta/masken/48000_maskeninfo.unl +++ b/src-modules/module/rpta/masken/48000_maskeninfo.unl @@ -114,6 +114,7 @@ and substring('' || tid from 5 for 1)='<>'\ /* and stichtag = <> */\ /* and <> */\ /* and <>*/\ +/* and abschluss in (<>) */\ /* and geschlecht = <> */\ /* and fach_sem_zahl <= <> */\ /* and substring('' || sem_rueck_beur_ein from 5 for 1)='<>' */\ @@ -128,7 +129,6 @@ and substring('' || tid from 5 for 1)='<>'\ <#assign filter = filter + " and 's_' || tid_stg in "+Studiengang.allNeededKeysList /> \ /* <#assign filter = filter + " and '' || ca12_staat in "+Staatsangehörigkeit.allNeededKeysList /> --<> */\ /* <#assign filter = filter + " and stg in "+Fächer.allNeededKeysList /> --<> */\ -/* <#assign filter = filter + " and tid_stg in (select L2.tid from lehr_stg_ab L2 where L2.abschluss in "+Abschluss.allNeededKeysList +")" /> --<> */\ \ <#if columns?has_content>\ \ @@ -145,7 +145,7 @@ and ${filter}\ \ \ \ -<@rpta_interpret_column_layout nonvirtualTableFilter=filter/>\ +<@rpta_interpret_column_layout />\ \ --wenn columns?has_content^--Freemarker Template\ XIL List\ diff --git a/src-modules/module/rpta/schluesseltabellen/studierende_datenblatt_gew_virtuell.sql b/src-modules/module/rpta/schluesseltabellen/studierende_datenblatt_gew_virtuell.sql new file mode 100644 index 0000000..eda2906 --- /dev/null +++ b/src-modules/module/rpta/schluesseltabellen/studierende_datenblatt_gew_virtuell.sql @@ -0,0 +1,450 @@ +--freemarker template + + +select sp_table_exists('sos_stud_gewichtung') from xdummy; + + +select name + from sx_tables where name ='sos_stud_gewichtung' + + + +select 1::smallint as sortnr, +name, trim(name) ||'_' as prefix, +caption, +'dim_studiengang_gew.tid=sos_stud_gewichtung.tid_stg' as joinclause + from sx_tables where name in ('dim_studiengang_gew') +union +select 10::smallint as sortnr, +name, trim(name) ||'_' as prefix, +caption, +'dim_studiengang_gew.stort=sos_k_stort.apnr' as joinclause + from sx_tables where name in ('sos_k_stort') +union +select 20::smallint as sortnr, +name, trim(name) ||'_' as prefix, +caption, +'sos_stud_gewichtung.stutyp=sos_k_stutyp.apnr' as joinclause + from sx_tables where name in ('sos_k_stutyp') +union +select 30::smallint as sortnr, +name, trim(name) ||'_' as prefix, +caption, +'sos_stud_gewichtung.stuart=sos_k_stuart.apnr' as joinclause + from sx_tables where name in ('sos_k_stuart') +union +select 40::smallint as sortnr, +name, trim(name) ||'_' as prefix, +caption, +'sos_stud_gewichtung.stufrm=sos_k_stufrm.apnr' as joinclause + from sx_tables where name in ('sos_k_stufrm') +union +select 50::smallint as sortnr, +name, trim(name) ||'_' as prefix, +caption, +'sos_stud_gewichtung.hrst=sos_k_hrst.apnr' as joinclause + from sx_tables where name in ('sos_k_hrst') +order by 1 + + +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 + + + order by 1 + +]]> + + + +<#if sos_stud_gewichtung_exists==1 && fact_table_source?exists > + +<#assign fact_table_target = {"name":"sos_stud_astat_gew", "caption":"Studierende (intern und amtlich) gewichtet"} + /> + + +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) + +); + + +--Vorbereitung: +UPDATE sx_tables + SET caption = 'Standorte' +WHERE name='sos_k_stort'; +UPDATE sx_tables + SET caption = 'Studienart' +WHERE name = 'sos_k_stuart'; +UPDATE sx_tables + SET caption = 'Studiumstyp' +WHERE name = 'sos_k_stutyp'; +UPDATE sx_tables + SET caption = 'Studienform' +WHERE name = 'sos_k_stufrm'; +UPDATE sx_tables + SET caption = 'Hörerstatus' +WHERE name = 'sos_k_hrst'; + + + +--drop view if exists sos_stud_astat; + + +drop VIEW sos_k_stutyp; + +CREATE VIEW sos_k_stutyp +( + apnr, + druck, + astat +) +AS + SELECT cifx.apnr, + cifx.druck, + astat + FROM cifx + WHERE cifx.key = 40; + + +update sx_fields set + is_sum=0 + where table_name='sos_stud_gewichtung' + and name!='summe'; +update sx_fields set + is_sum=1 + where table_name='sos_stud_gewichtung' + and name='summe'; + + +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; + + +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}, + +null::varchar as dummy', +joinclause='${fact_table_source} +<#foreach added_table in added_tables> +left outer join ${added_table.name} on (${added_table.joinclause}) +'; + +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; + + --wenn sos_stud_gewichtung_exists=1