From c8eaf16b036042e44cbf102c260026cc78821792 Mon Sep 17 00:00:00 2001 From: Marlies Winterstein Date: Tue, 11 Feb 2025 09:32:26 +0100 Subject: [PATCH] =?UTF-8?q?L=C3=B6schen=20des=20Codes=20von=20fm=5Ftemplat?= =?UTF-8?q?es=20in=20den=20Skripten,=20dann=20Aufruf=20davon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rpta_column_layout_fuellen.sql | 79 +++++++ ...rpta_column_layout_sgd_pbe_pbv_fuellen.sql | 206 +----------------- ...a_column_layout_sos_stud_astat_fuellen.sql | 91 ++++++++ ...lumn_layout_sos_stud_astat_rsz_fuellen.sql | 206 +----------------- 4 files changed, 174 insertions(+), 408 deletions(-) create mode 100644 src-modules/module/rpta/schluesseltabellen/rpta_column_layout_fuellen.sql create mode 100644 src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sos_stud_astat_fuellen.sql diff --git a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_fuellen.sql b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_fuellen.sql new file mode 100644 index 0000000..bb04c2a --- /dev/null +++ b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_fuellen.sql @@ -0,0 +1,79 @@ +--freemarker template +<#include "RPTA-Makros"/> +<#assign rpta_column_layout = {"uniquename":"sos_stud_astat_rsz", +"caption":"MKW-Abfrage_Studierende_RSZ", +"rpta_resultset":"sos_stud_astat", +"whereclause":"fach_sem_zahl <= dim_studiengang_regel", +"description":"MKW-Abfrage_Studierende_RSZ" +} + /> + +<#assign rpta_columns = [ +{"uniquename":"sos_k_stort_astat", +"caption":"Hochschulnummer Statistik", +"srcfieldname":"sos_k_stort_astat", +"column_type":"physicalColumn", +"col_function":"", +"is_visible":"1", +"visible_size":"10", +"is_aggregate":"0" +}, +{"uniquename":"dim_studiengang_stg_astat", +"caption":"HSF-Schlüssel", +"srcfieldname":"dim_studiengang_stg_astat", +"column_type":"physicalColumn", +"col_function":"", +"is_visible":"1", +"visible_size":"10", +"is_aggregate":"0" +}, +{"uniquename":"sos_k_stufrm_astat", +"caption":"Art des Studiums", +"srcfieldname":"sos_k_stufrm_astat", +"column_type":"physicalColumn", +"col_function":"", +"is_visible":"1", +"visible_size":"10", +"is_aggregate":"0" +}, +{"uniquename":"dim_studiengang_abschluss_astat", +"caption":"Abschlussschlüssel Statistik NRW", +"srcfieldname":"dim_studiengang_abschluss_astat", +"column_type":"physicalColumn", +"col_function":"", +"is_visible":"1", +"visible_size":"10", +"is_aggregate":"0" +}, +{"uniquename":"sos_k_stutyp_astat", +"caption":"Vollzeit / Teilzeit / ausbildungsintegriert / praxisintegriert / berufsintegriert", +"srcfieldname":"sos_k_stutyp_astat", +"column_type":"physicalColumn", +"col_function":"", +"is_visible":"1", +"visible_size":"10", +"is_aggregate":"0" +}, +{"uniquename":"dim_studiengang_regel", +"caption":"Angabe der Regelstudienzeit", +"srcfieldname":"dim_studiengang_regel", +"column_type":"physicalColumn", +"col_function":"", +"is_visible":"1", +"visible_size":"10", +"is_aggregate":"0" +}, +{"uniquename":"summe", +"caption":"Anzahl der Studierenden in der Regelstudienzeit", +"srcfieldname":"summe", +"column_type":"physicalColumn", +"col_function":"sum", +"is_visible":"1", +"visible_size":"5", +"is_aggregate":"1" +} +] + /> + + +<@rpta_column_layout_fuellen /> diff --git a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sgd_pbe_pbv_fuellen.sql b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sgd_pbe_pbv_fuellen.sql index 919b1d2..95bacac 100644 --- a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sgd_pbe_pbv_fuellen.sql +++ b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sgd_pbe_pbv_fuellen.sql @@ -1,4 +1,5 @@ --freemarker template +<#include "RPTA-Makros"/> select count(*) from systeminfo where tid=330; @@ -177,208 +178,5 @@ select count(*) from systeminfo where tid=330; /> <#if rpta_installed==1> - ---ab hier nicht mehr ändern: -drop TABLE if exists tmp_rpta_column2layout; - -CREATE temp TABLE tmp_rpta_column -( - uniquename varchar(255) NOT NULL, - caption varchar(255), - srcfieldname varchar(255), - targetfieldname varchar(255), - column_type integer, - col_function text, - is_visible smallint, - visible_size smallint, - is_aggregate smallint, - resultset_id integer, - sortnr integer, - description TEXT -); - -CREATE temp TABLE tmp_rpta_column_layout -( - uniquename varchar(255) NOT NULL, - caption varchar(255), - resultset_id integer, - whereclause text, - description text -); - -insert into tmp_rpta_column_layout( -resultset_id, -uniquename, -caption, -whereclause, - description -) -select tid, -'${rpta_column_layout.uniquename}', -'${rpta_column_layout.caption}', -'${rpta_column_layout.whereclause}', -'${rpta_column_layout.description}' -FROM rpta_resultset -where uniquename='${rpta_column_layout.rpta_resultset}'; - -<#assign sortnr=0 /> -<#foreach column in rpta_columns> -<#assign sortnr=sortnr +1 /> - -INSERT INTO tmp_rpta_column -(resultset_id, - uniquename, - caption, - srcfieldname, - targetfieldname, - column_type, - col_function, - is_visible, - visible_size, - is_aggregate, - sortnr, - description - ) -select R.tid, -'${column.uniquename}', -'${column.caption}', -'${column.srcfieldname}', -<#if !column.targetfieldname?exists || column.targetfieldname=="">null::varchar <#else>'${column.targetfieldname}' , -T.tid as column_type, -'${column.col_function}', -${column.is_visible}, -${column.visible_size}, -${column.is_aggregate}, -${sortnr*10}, -'${column.description}' -FROM rpta_resultset R, rpta_column_type T -where R.uniquename='${rpta_column_layout.rpta_resultset}' -and T.uniquename='${column.column_type}'; - - - - -select * into temp tmp_rpta_column2layout -from rpta_column2layout -where layout_id in (select L.tid -from rpta_column_layout L,rpta_resultset R -where R.tid=L.resultset_id -and R.uniquename='${rpta_column_layout.rpta_resultset}' -and L.uniquename='${rpta_column_layout.uniquename}' -) -; - -select * into temp tmp_rpta_column_layout_target -from rpta_column_layout -where resultset_id in (select tid -FROM rpta_resultset -where uniquename='${rpta_column_layout.rpta_resultset}') -and uniquename in (select uniquename from tmp_rpta_column_layout) -; - -insert into rpta_column_layout -(uniquename, - caption, - resultset_id, - whereclause, - description) - select uniquename, - caption, - resultset_id, - whereclause, - description -FROM tmp_rpta_column_layout T -where 0=(select count(*) from tmp_rpta_column_layout_target T2 -where T.uniquename=T2.uniquename); - -drop table tmp_rpta_column_layout_target; - -delete from rpta_column2layout -where layout_id in (select L.tid -from rpta_column_layout L,rpta_resultset R -where R.tid=L.resultset_id -and R.uniquename='${rpta_column_layout.rpta_resultset}' -and L.uniquename='${rpta_column_layout.uniquename}' -) -; - -select * into temp tmp_rpta_column2 -from tmp_rpta_column T -where (resultset_id,uniquename) not in -(select resultset_id,uniquename from rpta_column); - -INSERT INTO rpta_column -(resultset_id, - uniquename, - caption, - srcfieldname, - targetfieldname, - column_type, - col_function, - is_aggregate, - description, - custom - ) - select -resultset_id, - uniquename, - caption, - srcfieldname, - targetfieldname, - column_type, - col_function, - is_aggregate, - description, - 0 as custom -from tmp_rpta_column2; - ---evtl. neuen Satz einfügen, dann alle updaten - -update rpta_column set ( caption, - srcfieldname, - targetfieldname, - column_type, - col_function, - is_aggregate, - description) - = (select caption, - srcfieldname, - targetfieldname, - column_type, - col_function, - is_aggregate, - description - from tmp_rpta_column T - where T.resultset_id=rpta_column.resultset_id - and T.uniquename=rpta_column.uniquename) - where custom=0 - and (resultset_id,uniquename) in -(select T.resultset_id,T.uniquename -from tmp_rpta_column T) -; - -drop table tmp_rpta_column2; - -insert into rpta_column2layout(column_id, - layout_id, - sortnr, - is_visible, - visible_size, - caption, - description) -select C.tid as column_id, - L.tid as layout_id, - T.sortnr, - T.is_visible, - T.visible_size, - T.caption, - T.description -FROM rpta_column C, rpta_column_layout L, tmp_rpta_column T -where C.uniquename=T.uniquename -and C.resultset_id=T.resultset_id -and L.uniquename='${rpta_column_layout.uniquename}' -and L.resultset_id=T.resultset_id - ; -drop table tmp_rpta_column; -drop TABLE tmp_rpta_column_layout; -drop TABLE tmp_rpta_column2layout; +<@rpta_column_layout_fuellen /> diff --git a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sos_stud_astat_fuellen.sql b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sos_stud_astat_fuellen.sql new file mode 100644 index 0000000..7ce405e --- /dev/null +++ b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sos_stud_astat_fuellen.sql @@ -0,0 +1,91 @@ +--freemarker template +<#include "RPTA-Makros"/> + + +select count(*) from rpta_resultset where uniquename='sos_stud_astat'; + + +<#assign rpta_column_layout = {"uniquename":"sos_stud_astat_rsz", +"caption":"MKW-Abfrage_Studierende_RSZ", +"rpta_resultset":"sos_stud_astat", +"whereclause":"fach_sem_zahl <= dim_studiengang_regel and dim_studiengang_regel between 1 and 20 and studiengang_nr <=2 and fach_nr <=4", +"description":"Fachbelegungen: 1. & 2. Studiengang; 1.-4. Fach; nur Studiengänge mit Angabe einer Regelstudienzeit" +} + /> + +<#assign rpta_columns = [ +{"uniquename":"sos_k_stort_astat", +"caption":"Hochschulnummer Statistik", +"srcfieldname":"sos_k_stort_astat", +"column_type":"physicalColumn", +"col_function":"", +"is_visible":"1", +"visible_size":"10", +"is_aggregate":"0", +"description":"Amtliche Standortnummer" +}, +{"uniquename":"dim_studiengang_stg_astat", +"caption":"HSF-Schlüssel", +"srcfieldname":"dim_studiengang_stg_astat", +"column_type":"physicalColumn", +"col_function":"", +"is_visible":"1", +"visible_size":"10", +"is_aggregate":"0", +"description":"Amtliches Fach" +}, +{"uniquename":"sos_k_stufrm_astat", +"caption":"Art des Studiums", +"srcfieldname":"sos_k_stufrm_astat", +"column_type":"physicalColumn", +"col_function":"", +"is_visible":"1", +"visible_size":"10", +"is_aggregate":"0", +"description":"Amtliche Studienform" +}, +{"uniquename":"dim_studiengang_abschluss_astat", +"caption":"Abschlussschlüssel Statistik NRW", +"srcfieldname":"dim_studiengang_abschluss_astat", +"column_type":"physicalColumn", +"col_function":"", +"is_visible":"1", +"visible_size":"10", +"is_aggregate":"0", +"description":"Amtlicher Abschluss" +}, +{"uniquename":"sos_k_stutyp_astat", +"caption":"Vollzeit / Teilzeit / ausbildungsintegriert / praxisintegriert / berufsintegriert", +"srcfieldname":"sos_k_stutyp_astat", +"column_type":"physicalColumn", +"col_function":"", +"is_visible":"1", +"visible_size":"10", +"is_aggregate":"0", +"description":"Amtlicher Studiumstyp" +}, +{"uniquename":"dim_studiengang_regel", +"caption":"Angabe der Regelstudienzeit", +"srcfieldname":"dim_studiengang_regel", +"column_type":"physicalColumn", +"col_function":"", +"is_visible":"1", +"visible_size":"10", +"is_aggregate":"0", +"description":"Regelstudienzeit in Semestern" +}, +{"uniquename":"summe", +"caption":"Anzahl der Studierenden in der Regelstudienzeit", +"srcfieldname":"summe", +"column_type":"physicalColumn", +"col_function":"sum", +"is_visible":"1", +"visible_size":"5", +"is_aggregate":"1", +"description":"Summe der Studierenden mit Fachsemester kleiner oder gleich der Regelstudienzeit" +} +] + /> + + +<@rpta_column_layout_fuellen /> diff --git a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sos_stud_astat_rsz_fuellen.sql b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sos_stud_astat_rsz_fuellen.sql index 294f7de..3ca12aa 100644 --- a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sos_stud_astat_rsz_fuellen.sql +++ b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sos_stud_astat_rsz_fuellen.sql @@ -1,4 +1,5 @@ --freemarker template +<#include "RPTA-Makros"/> select count(*) from rpta_resultset where uniquename='sos_stud_astat'; @@ -86,207 +87,4 @@ select count(*) from rpta_resultset where uniquename='sos_stud_astat'; ] /> - ---ab hier nicht mehr ändern: - -CREATE temp TABLE tmp_rpta_column -( - uniquename varchar(255) NOT NULL, - caption varchar(255), - srcfieldname varchar(255), - targetfieldname varchar(255), - column_type integer, - col_function text, - is_visible smallint, - visible_size smallint, - is_aggregate smallint, - resultset_id integer, - sortnr integer, - description TEXT -); - -CREATE temp TABLE tmp_rpta_column_layout -( - uniquename varchar(255) NOT NULL, - caption varchar(255), - resultset_id integer, - whereclause text, - description text -); - -insert into tmp_rpta_column_layout( -resultset_id, -uniquename, -caption, -whereclause, - description -) -select tid, -'${rpta_column_layout.uniquename}', -'${rpta_column_layout.caption}', -'${rpta_column_layout.whereclause}', -'${rpta_column_layout.description}' -FROM rpta_resultset -where uniquename='${rpta_column_layout.rpta_resultset}'; - -<#assign sortnr=0 /> -<#foreach column in rpta_columns> -<#assign sortnr=sortnr +1 /> - -INSERT INTO tmp_rpta_column -(resultset_id, - uniquename, - caption, - srcfieldname, - targetfieldname, - column_type, - col_function, - is_visible, - visible_size, - is_aggregate, - sortnr, - description - ) -select R.tid, -'${column.uniquename}', -'${column.caption}', -'${column.srcfieldname}', -<#if !column.targetfieldname?exists || column.targetfieldname=="">null::varchar <#else>'${column.targetfieldname}' , -T.tid as column_type, -'${column.col_function}', -${column.is_visible}, -${column.visible_size}, -${column.is_aggregate}, -${sortnr*10}, -'${column.description}' -FROM rpta_resultset R, rpta_column_type T -where R.uniquename='${rpta_column_layout.rpta_resultset}' -and T.uniquename='${column.column_type}'; - - - - -select * into temp tmp_rpta_column2layout -from rpta_column2layout -where layout_id in (select L.tid -from rpta_column_layout L,rpta_resultset R -where R.tid=L.resultset_id -and R.uniquename='${rpta_column_layout.rpta_resultset}' -and L.uniquename='${rpta_column_layout.uniquename}' -) -; - -select * into temp tmp_rpta_column_layout_target -from rpta_column_layout -where resultset_id in (select tid -FROM rpta_resultset -where uniquename='${rpta_column_layout.rpta_resultset}') -and uniquename in (select uniquename from tmp_rpta_column_layout) -; - -insert into rpta_column_layout -(uniquename, - caption, - resultset_id, - whereclause, - description) - select uniquename, - caption, - resultset_id, - whereclause, - description -FROM tmp_rpta_column_layout T -where 0=(select count(*) from tmp_rpta_column_layout_target T2 -where T.uniquename=T2.uniquename); - -drop table tmp_rpta_column_layout_target; - -delete from rpta_column2layout -where layout_id in (select L.tid -from rpta_column_layout L,rpta_resultset R -where R.tid=L.resultset_id -and R.uniquename='${rpta_column_layout.rpta_resultset}' -and L.uniquename='${rpta_column_layout.uniquename}' -) -; - -select * into temp tmp_rpta_column2 -from tmp_rpta_column T -where (resultset_id,uniquename) not in -(select resultset_id,uniquename from rpta_column); - -INSERT INTO rpta_column -(resultset_id, - uniquename, - caption, - srcfieldname, - targetfieldname, - column_type, - col_function, - is_aggregate, - description, - custom - ) - select -resultset_id, - uniquename, - caption, - srcfieldname, - targetfieldname, - column_type, - col_function, - is_aggregate, - description, - 0 as custom -from tmp_rpta_column2; - ---evtl. neuen Satz einfügen, dann alle updaten - -update rpta_column set ( caption, - srcfieldname, - targetfieldname, - column_type, - col_function, - is_aggregate, - description) - = (select caption, - srcfieldname, - targetfieldname, - column_type, - col_function, - is_aggregate, - description - from tmp_rpta_column T - where T.resultset_id=rpta_column.resultset_id - and T.uniquename=rpta_column.uniquename) - where custom=0 - and (resultset_id,uniquename) in -(select T.resultset_id,T.uniquename -from tmp_rpta_column T) -; - -drop table tmp_rpta_column2; - -insert into rpta_column2layout(column_id, - layout_id, - sortnr, - is_visible, - visible_size, - caption, - description) -select C.tid as column_id, - L.tid as layout_id, - T.sortnr, - T.is_visible, - T.visible_size, - T.caption, - T.description -FROM rpta_column C, rpta_column_layout L, tmp_rpta_column T -where C.uniquename=T.uniquename -and C.resultset_id=T.resultset_id -and L.uniquename='${rpta_column_layout.uniquename}' -and L.resultset_id=T.resultset_id - ; -drop table tmp_rpta_column; -drop TABLE tmp_rpta_column_layout; - - +<@rpta_column_layout_fuellen />