Anpassung Datenmodell STammdaten #53

src-modules/module/rpta/conf/rpta.xml

@@ -593,6 +593,7 @@
         <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_man_kennz_aggr_studiengang.sql" database="" />
         <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout__pbv__dm_fuellen.sql" database="" />
         <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_sxc_zahl_wert_stammdaten_nrw.sql" database="" />
+        <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_sxc_zahl_wert_stammdaten_nrw_lfb.sql" database="" />
         <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_zul_antr_aggr_basic.sql" database="" />
         <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_zul_antr_aggr_basic_archiv.sql" database="" />
         <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_internationale_studierende_sicht.sql" database="" />
@@ -652,6 +653,7 @@
         <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_man_kennz_aggr_studiengang.sql" database="" />
         <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout__pbv__dm_fuellen.sql" database="" />
         <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_sxc_zahl_wert_stammdaten_nrw.sql" database="" />
+        <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_sxc_zahl_wert_stammdaten_nrw_lfb.sql" database="" />
         <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_zul_antr_aggr_basic.sql" database="" />
         <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_zul_antr_aggr_basic_archiv.sql" database="" />
         <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_internationale_studierende_sicht.sql" database="" />

src-modules/module/rpta/masken/48280_felderinfo.unl

@@ -1,10 +1,10 @@
 48280^Studiengang^39^0^0^150^200^6^char^30^0^999^<<SQL>> select tid,name,sortnr from sichten where art in ('MAN-STG-Kostenstellen-Sicht','MAN-Studiengang-Sicht') and aktiv=1 order by 3,2;^ ^ ^
 48281^Kennzahl^100^0^0^150^200^2^char^255^0^1^<<SQL>> select C.id,trim(C.name) || ' - (' || C.id || ')'\
-from kenn_katalog C\
+from sxc_katalog C\
 where \
-C.id in (select distinct kenn_zahl from sxc_zahl_wert where sxc_bestand_id=<<Bestand>>)\
+C.id in (select distinct katalog_id from sxc_zahl_wert where bestand_id=<<Bestand>>)\
 order by id^ ^ ^
-48282^Institution^2^0^0^150^200^1^char^30^0^999^<<SQL>>select tid,type,name from sichten where art ='MAN-Kostenstellen-Sicht' and aktiv=1 order by type,name;^ ^ ^
+48282^Lehr- und Forschungsbereich^3001^0^0^150^200^2^char^30^0^1^<<SQL>>select distinct lfb,lfb_str from k_astat_lfb_fg where lfb in (select target_value from sxc_mapping_bestand where object_type='Lehr- und Forschungsbereich') order by 2;^ ^ ^
 48283^Start-Jahr^4^0^0^100^50^1^integer^30^0^1^<<SQL>> SELECT distinct ord,name FROM aggregierung where kategorie='KENN-Jahr' order by 1;^ ^<<SQL>> SELECT ord,name FROM aggregierung where kategorie='KENN-Jahr' and ord=(year(today())-1) ;^
 48284^Startsemester^7^0^0^140^80^1^integer^30^0^999^<<SQL>> select tid, eintrag from man_semester order by tid DESC;^ ^ ^
 48285^tablestylesheet^121^0^0^100^200^1^char^200^0^13^<<SQL>> select distinct filename,X.caption from sx_stylesheets X,sx_mask_style S where X.tid=S.stylesheet_id and S.maskeninfo_id=888881430^hidden^<<SQL>> select distinct filename,X.caption from sx_stylesheets X,sx_mask_style S where X.tid=S.stylesheet_id and S.maskeninfo_id=888881430 and S.ord=1^

src-modules/module/rpta/masken/48280_maskeninfo.unl

@@ -99,9 +99,10 @@ and substring('' || tid from 5 for 1)='<<Semestertyp>>'\
 <#assign filter="1=1\
 /* and hs_nr in (<<Hochschule>>) */\
 /* and geschlecht=<<Geschlecht>> */\
-/* and kenn_katalog.id in (<<Kennzahl>>) */ \
+/* and sxc_katalog.id in (<<Kennzahl>>) */ \
 /* and jahr >= <<Start-Jahr>> */\
 /* and jahr <= <<End-Jahr>> */\
+/* and generic_dim1 in (select object_value from sxc_mapping_bestand where target_value=<<Lehr- und Forschungsbereich>>) */\
 " />\
 \
 \

src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sxc_zahl_wert_stammdaten_nrw.sql

@@ -8,7 +8,7 @@ select count(*) from rpta_resultset where uniquename='rpta_sxc_zahl_wert';
 <#assign rpta_column_layout = {"uniquename":"sxc_zahl_wert_stammdaten_nrw",
 "caption":"Stammdaten NRW",
 "rpta_resultset":"rpta_sxc_zahl_wert",
-"whereclause":"kenn_zahl in (select katalog_id from kenn_katalog_rpt where report_id =''MKWNRW_1'')",
+"whereclause":"bestand_id = 1",
 "sortclause":"",
 "description":""
 }
@@ -38,10 +38,10 @@ select count(*) from rpta_resultset where uniquename='rpta_sxc_zahl_wert';
 "is_aggregate":"0",
 "description":""
 },
-{"uniquename":"kenn_katalog_id",
+{"uniquename":"sxc_katalog_id",
 "caption_der_spalte":"SuperX Connect Kennzahlen - : ID der Kennzahl",
 "caption_in_ergebnistabelle":"ID der Kennzahl",
-"srcfieldname":"kenn_katalog_id",
+"srcfieldname":"sxc_katalog_id",
 "targetfieldname":"",
 "column_type":"physicalColumn",
 "col_function":"",
@@ -50,10 +50,10 @@ select count(*) from rpta_resultset where uniquename='rpta_sxc_zahl_wert';
 "is_aggregate":"0",
 "description":""
 },
-{"uniquename":"kenn_katalog_name",
+{"uniquename":"sxc_katalog_name",
 "caption_der_spalte":"SuperX Connect Kennzahlen - : Name der Kennzahl",
 "caption_in_ergebnistabelle":"Kennzahl",
-"srcfieldname":"kenn_katalog_name",
+"srcfieldname":"sxc_katalog_name",
 "targetfieldname":"",
 "column_type":"physicalColumn",
 "col_function":"",
@@ -116,8 +116,8 @@ select count(*) from rpta_resultset where uniquename='rpta_sxc_zahl_wert';
 "srcfieldname":"wert",
 "targetfieldname":"wert_der_kennzahl",
 "column_type":"computedColumn",
-"col_function":"case when lfb_count>0 and kenn_katalog_id like ''%_quote%'' then wert_summe/lfb_count
+"col_function":"case when lfb_count>0 and sxc_katalog_id like ''%_quote%'' then wert_summe/lfb_count
-					when kenn_katalog_id not like ''%_quote%'' and kenn_katalog_id not like ''%_proz%'' then wert_summe
+					when sxc_katalog_id not like ''%_quote%'' and sxc_katalog_id not like ''%_proz%'' then wert_summe
 					else null end",
 "is_visible":"1",
 "visible_size":"10",
@@ -133,15 +133,15 @@ select count(*) from rpta_resultset where uniquename='rpta_sxc_zahl_wert';
 "col_function":"SELECT sum(summe_wert)/12 AS durchschnitt
 				FROM (
 					SELECT hs_nr, 
-						case when kenn_zahl like ''%_quote%'' then avg(wert)
+						case when katalog_id like ''%_quote%'' then avg(wert)
-						when kenn_zahl not like ''%_quote%'' and kenn_zahl not like ''%_proz%'' then sum(wert)
+						when katalog_id not like ''%_quote%'' and katalog_id not like ''%_proz%'' then sum(wert)
 						else null end AS summe_wert
 					FROM sxc_zahl_wert
 					WHERE hs_nr IN (''1480'',''1140'',''1080'',''1090'',''1130'',''0080'',''1100'',''1110'',''1120'',''0121'',''0130'',''0140'')
-						AND kenn_zahl = tmp_rpta_sxc_zahl_wert.kenn_zahl
+						AND katalog_id = tmp_rpta_sxc_zahl_wert.katalog_id
 						AND jahr = tmp_rpta_sxc_zahl_wert.jahr
 						AND wert IS NOT NULL
-					GROUP BY hs_nr,kenn_zahl
+					GROUP BY hs_nr,katalog_id
 				) AS summen_pro_hs
 ",
 "is_visible":"1",

src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sxc_zahl_wert_stammdaten_nrw_lfb.sql

@@ -8,7 +8,7 @@ select count(*) from rpta_resultset where uniquename='rpta_sxc_zahl_wert';
 <#assign rpta_column_layout = {"uniquename":"sxc_zahl_wert_stammdaten_nrw_lfb",
 "caption":"Stammdaten NRW nach LFB",
 "rpta_resultset":"rpta_sxc_zahl_wert",
-"whereclause":"kenn_zahl in (select katalog_id from kenn_katalog_rpt where report_id =''MKWNRW_1'')",
+"whereclause":"bestand_id = 1",
 "sortclause":"",
 "description":""
 }
@@ -62,10 +62,10 @@ select count(*) from rpta_resultset where uniquename='rpta_sxc_zahl_wert';
 "is_aggregate":"0",
 "description":""
 },
-{"uniquename":"kenn_katalog_name",
+{"uniquename":"sxc_katalog_name",
 "caption_der_spalte":"SuperX Connect Kennzahlen - : Name der Kennzahl",
 "caption_in_ergebnistabelle":"Kennzahl",
-"srcfieldname":"kenn_katalog_name",
+"srcfieldname":"sxc_katalog_name",
 "targetfieldname":"",
 "column_type":"physicalColumn",
 "col_function":"",

src-modules/module/rpta/schluesseltabellen/sxconnect_kennzahlen_virtuell.sql

@@ -12,8 +12,8 @@ select name
 select 1::smallint as sortnr,
 name, trim(name) ||'_'   as prefix,
 caption,
-'kenn_katalog.id=sxc_zahl_wert.kenn_zahl' as joinclause
+'sxc_katalog.id=sxc_zahl_wert.katalog_id' as joinclause
-       from sx_tables where name  in ('kenn_katalog')
+       from sx_tables where name  in ('sxc_katalog')
 order by 1
 </sqlvar>
 <sqlvar name="fields_target" type="hashsequence"><![CDATA[