From 58f67457e1b2a2932749ee4c80339bd2d6303c39 Mon Sep 17 00:00:00 2001 From: Marlies Winterstein Date: Tue, 6 Feb 2024 11:05:52 +0100 Subject: [PATCH] =?UTF-8?q?Makro=2047060=20ruft=2047030=20auf,=20Definiton?= =?UTF-8?q?=20in=20xcube=5Finstall,=20Einf=C3=BCgen=20der=20Werte=20in=20m?= =?UTF-8?q?acro=5Fmasken=5Fbez=20und=20macro=5Ffeld=5Fwert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/sxc/masken/47060_felderinfo.unl | 38 +++++++++++++ .../sxc/masken/47060_maske_system_bez.unl | 1 + .../sxc/masken/47060_masken_felder_bez.unl | 30 +++++++++++ .../module/sxc/masken/47060_maskeninfo.unl | 1 + .../sxc/masken/47060_sachgeb_maske_bez.unl | 1 + .../sxc/masken/macro_feld_wert_fuellen.sql | 31 +++++++++++ .../sxc/masken/macro_masken_bez_fuellen.sql | 9 ++++ .../sxc/schluesseltabellen/xcube_install.sql | 53 ++++++++++++++++++- 8 files changed, 162 insertions(+), 2 deletions(-) create mode 100644 src-modules/module/sxc/masken/47060_felderinfo.unl create mode 100644 src-modules/module/sxc/masken/47060_maske_system_bez.unl create mode 100644 src-modules/module/sxc/masken/47060_masken_felder_bez.unl create mode 100644 src-modules/module/sxc/masken/47060_maskeninfo.unl create mode 100644 src-modules/module/sxc/masken/47060_sachgeb_maske_bez.unl create mode 100644 src-modules/module/sxc/masken/macro_feld_wert_fuellen.sql create mode 100644 src-modules/module/sxc/masken/macro_masken_bez_fuellen.sql diff --git a/src-modules/module/sxc/masken/47060_felderinfo.unl b/src-modules/module/sxc/masken/47060_felderinfo.unl new file mode 100644 index 0000000..2ca3baa --- /dev/null +++ b/src-modules/module/sxc/masken/47060_felderinfo.unl @@ -0,0 +1,38 @@ +47060^Hochschule^0^0^0^100^150^3^char^30^0^12^<> select tid, type, name,sortnr from sichten where art in('KENN-Kostenstellen-Sicht','KENN-Hochschulen-Sicht') order by sortnr, name;^^ ^ +47061^Seit Semester^1^0^0^130^80^1^integer^30^0^1^<> select tid,druck from kenn_semester where tid in (select semester from sxc_stud_sem_da_geschl_hs) order by tid DESC;^^<> select tid,druck from kenn_semester where today() between sem_beginn and sem_ende;^ +47062^Bis Semester^3^330^-1^130^100^1^integer^30^0^1^<> select tid,druck from kenn_semester where tid in (select semester from sxc_stud_sem_da_geschl_hs) order by tid DESC;^ ^<> select tid,druck from kenn_semester where today() between sem_beginn and sem_ende;^ +47071^Geschlecht^37^0^0^140^80^1^char^30^0^1^<> select apnr, name from xcube_dims where id='auspraegung_code_3' order by 1^hidden^^ +47072^Felder^125^0^0^150^190^10^char^30^0^999^<>\ +--freemarker template\ + select trim(F.table_name) || '.' || F.name,trim(T.caption) || ':' || trim(F.caption) || ' - ' || trim(F.name) from sx_fields F,\ + sx_tables T where F.table_name=T.name and F.currentlyused=1\ + --Pseudonyme eingeschaltet:\ + and (F.name != 'matrikel_nr' or 0=(select \ +count(*) from konstanten where beschreibung='SOS_MTKNR_EXT'\ +and apnr=1)) \ +<#if <>='tabelle_html_datenblatt.xsl'>\ + and (F.table_name ='sos_stg_aggr'\ + /* or F.table_name in (<>) */) \ +<#else>\ +and trim(F.table_name) || '.' || F.name in (select trim(tablename)||'.'||trim(fieldname) from stylesheet_field where stylesheet_id in \ +(select tid from sx_stylesheets where filename=<>))\ +\ + order by 2;^^^ +47073^Nationalität^38^0^0^100^150^3^char^30^0^1^<> select apnr, name from xcube_dims where id='auspraegung_code_2' order by 1^hidden^ ^ +47074^Schlüssel anzeigen^150^0^0^100^100^1^integer^30^1^999^<> select 1,'Ja' from xdummy union select 0,'Nein' from xdummy^^<> select 1,'Ja' from xdummy^ +47075^Ansicht in Ergebniszeilen^121^0^0^100^200^1^char^200^1^1^<> select name,caption from xcube_dimconfig where maskeninfo_id=${Maskennummer} and is_rowdim=1 order by 2^hidden^<> select name,caption from xcube_dimconfig where maskeninfo_id=${Maskennummer} and is_rowdefault=1^ +47076^Ansicht in Ergebnisspalten^2001^0^0^100^150^1^char^200^1^1^<> select name,caption from xcube_dimconfig where maskeninfo_id=${Maskennummer} and is_coldim=1 order by 2^hidden^<> select name,caption from xcube_dimconfig where maskeninfo_id=${Maskennummer} and is_coldefault=1^ +47079^Leere Zeilen ausblenden^130^350^-1^140^80^1^char^30^0^1^<> select 'ja','ja' from xdummy union select 'nein','nein' from xdummy^ ^<> select 'ja','ja' from xdummy^ +47080^Leere Spalten ausblenden^2020^0^0^100^100^1^char^30^0^1^<> select 'ja','ja' from xdummy union select 'nein','nein' from xdummy^^<> select 'ja','ja' from xdummy^ +47082^Kennzahl^3000^350^-1^150^180^1^integer^200^1^1^<> select tid,name from xcube_kennzahl where maskeninfo_id=${Maskennummer} order by sortnr,name;^hidden^<> select tid,name from xcube_kennzahl where maskeninfo_id=${Maskennummer} and is_default=1^ +47083^2.Ansicht in Zeilen^125^0^0^100^100^1^char^50^0^999^<> select name,caption from xcube_dimconfig where maskeninfo_id=${Maskennummer} and is_secondrowdim=1 order by 1^hidden^1^ +47084^Visualisierung auf Ebene^10001^0^0^140^80^1^integer^30^0^0^ ^^^ +47088^Spaltenvisualisierung^10000^0^0^140^80^1^char^30^0^1^<> select '_graph','Balken (horiz. linksb.)' from xdummy\ +union select '_graphbarright','Balken (horiz. rechtsb.)' from xdummy\ +union select '_graphbaralternating','Balken (horiz. rechtsb./linksb.)' from xdummy\ +union select '_sparkbar','Balkendiagramm' from xdummy\ +where 0 < (select count(*) from sx_stylesheets where filename='tabelle_html_viz.xsl')\ +union select '_sparkline','Liniendiagramm' from xdummy\ +where 0 < (select count(*) from sx_stylesheets where filename='tabelle_html_viz.xsl')\ +order by 1^^^ +47089^Zeilenfilter bis Ebene^140^0^0^140^80^1^integer^30^0^0^ ^^^ diff --git a/src-modules/module/sxc/masken/47060_maske_system_bez.unl b/src-modules/module/sxc/masken/47060_maske_system_bez.unl new file mode 100644 index 0000000..f902aa6 --- /dev/null +++ b/src-modules/module/sxc/masken/47060_maske_system_bez.unl @@ -0,0 +1 @@ +47060^360^ diff --git a/src-modules/module/sxc/masken/47060_masken_felder_bez.unl b/src-modules/module/sxc/masken/47060_masken_felder_bez.unl new file mode 100644 index 0000000..97050df --- /dev/null +++ b/src-modules/module/sxc/masken/47060_masken_felder_bez.unl @@ -0,0 +1,30 @@ +47060^47060^ +47060^47061^ +47060^47062^ +47060^47063^ +47060^47064^ +47060^47065^ +47060^47066^ +47060^47067^ +47060^47068^ +47060^47069^ +47060^47070^ +47060^47071^ +47060^47072^ +47060^47073^ +47060^47074^ +47060^47075^ +47060^47076^ +47060^47077^ +47060^47078^ +47060^47079^ +47060^47080^ +47060^47081^ +47060^47082^ +47060^47083^ +47060^47084^ +47060^47085^ +47060^47086^ +47060^47087^ +47060^47088^ +47060^47089^ diff --git a/src-modules/module/sxc/masken/47060_maskeninfo.unl b/src-modules/module/sxc/masken/47060_maskeninfo.unl new file mode 100644 index 0000000..d99db7c --- /dev/null +++ b/src-modules/module/sxc/masken/47060_maskeninfo.unl @@ -0,0 +1 @@ +47060^Gesamtbericht Studierende nach Geschlecht und Nationalität^ ^ ^Altersgruppe^Anzahl^Makro zu Studierendenzahlen. Es ruft die Abfrage Kreuztabelle Studierendenzahlen auf: Ausgaben zu Geschlecht-Semester, Nationalität-Semester, Geschlecht-Hochschule, Nationalität-Hochschule^ ^ ^1^700^360^0^1^ ^ diff --git a/src-modules/module/sxc/masken/47060_sachgeb_maske_bez.unl b/src-modules/module/sxc/masken/47060_sachgeb_maske_bez.unl new file mode 100644 index 0000000..b6b10e1 --- /dev/null +++ b/src-modules/module/sxc/masken/47060_sachgeb_maske_bez.unl @@ -0,0 +1 @@ +360^47060^ diff --git a/src-modules/module/sxc/masken/macro_feld_wert_fuellen.sql b/src-modules/module/sxc/masken/macro_feld_wert_fuellen.sql new file mode 100644 index 0000000..d66bd54 --- /dev/null +++ b/src-modules/module/sxc/masken/macro_feld_wert_fuellen.sql @@ -0,0 +1,31 @@ +delete from macro_feld_wert where macro=47060; + +insert into macro_feld_wert (macro, sortnr, feldname, value, active) +values (47060,10,'Ansicht in Ergebniszeilen','<> select name,caption from xcube_dimconfig where maskeninfo_id=47030 and caption=''Semester'' order by 2',1); +insert into macro_feld_wert (macro, sortnr, feldname, value, active) +values (47060,10,'Ansicht in Ergebnisspalten','<> select name,caption from xcube_dimconfig where maskeninfo_id=47030 and caption=''Geschlecht'' order by 2',1); + +insert into macro_feld_wert (macro, sortnr, feldname, value, active) +values (47060,20,'Ansicht in Ergebniszeilen','<> select name,caption from xcube_dimconfig where maskeninfo_id=47030 and caption=''Semester'' order by 2',1); +insert into macro_feld_wert (macro, sortnr, feldname, value, active) +values (47060,20,'Ansicht in Ergebnisspalten','<> select name,caption from xcube_dimconfig where maskeninfo_id=47030 and caption=''Nationalität'' order by 2',1); + +insert into macro_feld_wert (macro, sortnr, feldname, value, active) +values (47060,30,'Ansicht in Ergebniszeilen','<> select name,caption from xcube_dimconfig where maskeninfo_id=47030 and caption=''Hochschule'' order by 2',1); +insert into macro_feld_wert (macro, sortnr, feldname, value, active) +values (47060,30,'Ansicht in Ergebnisspalten','<> select name,caption from xcube_dimconfig where maskeninfo_id=47030 and caption=''Geschlecht'' order by 2',1); + + +insert into macro_feld_wert (macro, sortnr, feldname, value, active) +values (47060,40,'Ansicht in Ergebniszeilen','<> select name,caption from xcube_dimconfig where maskeninfo_id=47030 and caption=''Hochschule'' order by 2',1); +insert into macro_feld_wert (macro, sortnr, feldname, value, active) +values (47060,40,'Ansicht in Ergebnisspalten','<> select name,caption from xcube_dimconfig where maskeninfo_id=47030 and caption=''Nationalität'' order by 2',1); + +insert into macro_feld_wert (macro, sortnr, feldname, value, active) +values (47060,10,'Kennzahl','<> select tid,name from xcube_kennzahl where maskeninfo_id=47030 order by sortnr,name;',1); +insert into macro_feld_wert (macro, sortnr, feldname, value, active) +values (47060,20,'Kennzahl','<> select tid,name from xcube_kennzahl where maskeninfo_id=47030 order by sortnr,name;',1); +insert into macro_feld_wert (macro, sortnr, feldname, value, active) +values (47060,30,'Kennzahl','<> select tid,name from xcube_kennzahl where maskeninfo_id=47030 order by sortnr,name;',1); +insert into macro_feld_wert (macro, sortnr, feldname, value, active) +values (47060,40,'Kennzahl','<> select tid,name from xcube_kennzahl where maskeninfo_id=47030 order by sortnr,name;',1); diff --git a/src-modules/module/sxc/masken/macro_masken_bez_fuellen.sql b/src-modules/module/sxc/masken/macro_masken_bez_fuellen.sql new file mode 100644 index 0000000..1b9a3f6 --- /dev/null +++ b/src-modules/module/sxc/masken/macro_masken_bez_fuellen.sql @@ -0,0 +1,9 @@ +delete from macro_masken_bez where maskeninfo_id1=47060; +insert into macro_masken_bez(maskeninfo_id1, maskeninfo_id2, active, sortnr) +values (47060,47030,1,10); +insert into macro_masken_bez(maskeninfo_id1, maskeninfo_id2, active, sortnr) +values (47060,47030,1,20); +insert into macro_masken_bez(maskeninfo_id1, maskeninfo_id2, active, sortnr) +values (47060,47030,1,30); +insert into macro_masken_bez(maskeninfo_id1, maskeninfo_id2, active, sortnr) +values (47060,47030,1,40); diff --git a/src-modules/module/sxc/schluesseltabellen/xcube_install.sql b/src-modules/module/sxc/schluesseltabellen/xcube_install.sql index 05f1a96..92aeb34 100644 --- a/src-modules/module/sxc/schluesseltabellen/xcube_install.sql +++ b/src-modules/module/sxc/schluesseltabellen/xcube_install.sql @@ -6,7 +6,13 @@ "sachgebiet":16, "table_name":"sxc_stud_sem_da_geschl_hs", "maskeninfo_id":47030 -} +}, +{"name":"Makro_Studierendenwürfel_SXC", + "uniquename":"xcube_sxc_stud_sem_da_geschl_hs", + "sachgebiet":16, + "table_name":"sxc_stud_sem_da_geschl_hs", + "maskeninfo_id":47030 +} ] /> <#assign xcube_kennzahl = [ @@ -17,6 +23,15 @@ "restriction":"bil002__studierende__q='e'", "datatype":"integer", "is_default":1, + "sortnr":1}, + + { "maskeninfo_id":47060, + "apnr":"makro_sxc_stud", + "name":"Makro_Studierende", + "aggrfunction":"sum(bil002__studierende__anzahl)", + "restriction":"bil002__studierende__q='e'", + "datatype":"integer", + "is_default":1, "sortnr":1} ] /> @@ -53,7 +68,41 @@ "foreignkey_col":"apnr", "foreignkey_cap":"name", "foreignkey_cond":"id='auspraegung_code_2'", - "sortfield":"sort1"} + + "sortfield":"sort1"} , + <#-- Makro_SXC_Studierendenwürfel --> + {"maskeninfo_id":47060, + "name":"semester", + "caption":"Semester", + "is_coldefault":1, + "foreignkey_tab":"kenn_semester", + "foreignkey_col":"tid", + "foreignkey_cap":"druck", + "sortfield":"tid", + "calc_gesamt":0}, + {"maskeninfo_id":47060, + "name":"hs_nr", + "caption":"Hochschule", + "is_rowdefault":1, + "is_sicht":1}, +{"maskeninfo_id":47060, + "name":"auspraegung_code_3", + "caption":"Geschlecht", + "foreignkey_tab":"xcube_dims", + "foreignkey_col":"apnr", + "foreignkey_cap":"name", + "foreignkey_cond":"id='auspraegung_code_3'", + "attrib_nachbearbeitung": "update <> set <>='UNB' where <> is NULL", + "sortfield":"sort1"}, +{"maskeninfo_id":47060, + "name":"auspraegung_code_2", + "caption":"Nationalität", + "foreignkey_tab":"xcube_dims", + "foreignkey_col":"apnr", + "foreignkey_cap":"name", + "foreignkey_cond":"id='auspraegung_code_2'", + + "sortfield":"sort1"} ] />