diff --git a/src-modules/module/sxc/masken/47000_felderinfo.unl b/src-modules/module/sxc/masken/47000_felderinfo.unl index 14dd916..922e901 100644 --- a/src-modules/module/sxc/masken/47000_felderinfo.unl +++ b/src-modules/module/sxc/masken/47000_felderinfo.unl @@ -1,3 +1,3 @@ 47000^Hochschule^0^0^0^100^150^1^char^30^0^12^<> select tid, type, name,sortnr from sichten where art in('SXC_Hochschulen-Sicht') and aktiv=1 order by sortnr, name;^^ ^ -47001^Seit Semester^1^0^0^130^80^1^integer^30^0^1^<> select tid,druck from kenn_semester order by tid DESC;^^<> select tid,druck from kenn_semester where today() between sem_beginn and sem_ende;^ -47007^Bis Semester^3^330^-1^130^100^1^integer^30^0^1^<> select tid,druck from kenn_semester order by tid DESC;^ ^<> select tid,druck from kenn_semester where today() between sem_beginn and sem_ende;^ +47001^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 tid in (select semester from sxc_stud_sem_da_geschl_hs) order by tid limit 1^ +47007^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 tid in (select semester from sxc_stud_sem_da_geschl_hs) order by tid DESC limit 1;^ diff --git a/src-modules/module/sxc/masken/47000_maskeninfo.unl b/src-modules/module/sxc/masken/47000_maskeninfo.unl index 5b0b00f..adef342 100644 --- a/src-modules/module/sxc/masken/47000_maskeninfo.unl +++ b/src-modules/module/sxc/masken/47000_maskeninfo.unl @@ -99,13 +99,13 @@ Column CID=1 heading_text="Gesamtzahl" explanation="@@@sos_gesamtzahl@@@" cente Column CID=2 heading_text="Studierende nach Geschlecht\\000weiblich" explanation="" center_heading\ row_selectable col_selectable rightJust heading_platform readonly\ width=8\ -Column CID=2 heading_text="Studierende nach Geschlecht\\000männlich" explanation="" center_heading\ +Column CID=2 heading_text="Studierende nach Geschlecht\\000nicht weiblich" explanation="" center_heading\ row_selectable col_selectable rightJust heading_platform readonly\ width=8\ Column CID=2 heading_text="Studierende nach Geschlecht\\000weiblich\\n(graphisch)" explanation="" center_heading\ row_selectable col_selectable rightJust heading_platform readonly\ width=8\ -Column CID=2 heading_text="Studierende nach Geschlecht\\000männlich\\n(graphisch)" explanation="" center_heading\ +Column CID=2 heading_text="Studierende nach Geschlecht\\000nicht weiblich\\n(graphisch)" explanation="" center_heading\ row_selectable col_selectable rightJust heading_platform readonly\ width=8\ Column CID=3 heading_text="Studierende nach Geschlecht\\000Anteil weibl. in %" explanation="" center_heading\ diff --git a/src-modules/module/sxc/masken/47030_felderinfo.unl b/src-modules/module/sxc/masken/47030_felderinfo.unl index 8462c09..5e87334 100644 --- a/src-modules/module/sxc/masken/47030_felderinfo.unl +++ b/src-modules/module/sxc/masken/47030_felderinfo.unl @@ -1,7 +1,7 @@ 47030^Hochschule^0^0^0^100^150^3^char^30^0^12^<> select tid, type, name,sortnr from sichten where art in('SXC_Hochschulen-Sicht') order by sortnr, name;^^ ^ -47031^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;^ -47032^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;^ -47041^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^^^ +47031^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 tid in (select semester from sxc_stud_sem_da_geschl_hs) order by tid limit 1^ +47032^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 tid in (select semester from sxc_stud_sem_da_geschl_hs) order by tid DESC limit 1;^ +47041^Geschlecht^37^0^0^140^80^1^char^30^0^1^<> select apnr, name from xcube_dims where id='geschlecht_w' order by 1^^^ 47042^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,\ @@ -18,7 +18,7 @@ and trim(F.table_name) || '.' || F.name in (select trim(tablename)||'.'||trim(fi (select tid from sx_stylesheets where filename=<>))\ \ order by 2;^^^ -47043^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^^ ^ +47043^Nationalität^38^0^0^100^150^3^char^30^0^1^<> select apnr, name from xcube_dims where id='nationalitaet_a' order by 1^^ ^ 47044^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^ 47045^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^^<> select name,caption from xcube_dimconfig where maskeninfo_id=${Maskennummer} and is_rowdefault=1^ 47046^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^^<> select name,caption from xcube_dimconfig where maskeninfo_id=${Maskennummer} and is_coldefault=1^ @@ -26,13 +26,10 @@ and trim(F.table_name) || '.' || F.name in (select trim(tablename)||'.'||trim(fi 47050^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^ 47052^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^ 47053^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^ -47054^Visualisierung auf Ebene^10001^0^0^140^80^1^integer^30^0^0^ ^^^ +47054^Visualisierung auf Ebene^10001^0^0^140^80^1^integer^30^0^0^ ^hidden^^ 47058^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^^^ 47059^Zeilenfilter bis Ebene^140^0^0^140^80^1^integer^30^0^0^ ^^^ diff --git a/src-modules/module/sxc/masken/47090_felderinfo.unl b/src-modules/module/sxc/masken/47090_felderinfo.unl index b7d81d1..6fa714c 100644 --- a/src-modules/module/sxc/masken/47090_felderinfo.unl +++ b/src-modules/module/sxc/masken/47090_felderinfo.unl @@ -5,4 +5,4 @@ 47094^Stichwort^60^0^0^170^100^1^char^30^0^0^^^ ^ 47095^Standort^20^0^0^170^100^1^char^30^0^1^<> select standort_nr, trim(kurzname) || ' Standort ' || standort_ort from sxc_hochschulen_standorte where 1=1 /* and hs_nr in <@printkeys Hochschule.allNeededKeysList/> --<> */ order by 2;^^ ^ 47096^Trägerschaft^17^0^0^170^200^1^integer^30^0^1^<> select laufnummer,bezeichnung from sxc_hsk_traegerschaftstypen order by 1^ ^ ^ -47097^Fächer^30^0^0^100^200^1^char^30^0^12^<> select tid,name,sortnr from sichten where art='KENN-Fächer-Sicht' order by sortnr,name;^^^ +47097^Fächer^30^0^0^100^200^10^char^30^0^12^<> select tid,name,sortnr from sichten where art='KENN-Fächer-Sicht' order by sortnr,name;^^^ diff --git a/src-modules/module/sxc/masken/47090_maskeninfo.unl b/src-modules/module/sxc/masken/47090_maskeninfo.unl index 0e19e2d..8143a9b 100644 --- a/src-modules/module/sxc/masken/47090_maskeninfo.unl +++ b/src-modules/module/sxc/masken/47090_maskeninfo.unl @@ -22,7 +22,7 @@ SELECT --hs_nr,\ /* and <> between gueltig_ab_semester and gueltig_bis_semester */\ \ /* and studienfach_land in (select L.schluessel from k_astat_studienfach_land L\ -where '0' || L.keybund in <@printkeys Fächer.allNeededKeysList/> \ +where L.keybund in <@printkeys Fächer.allNeededKeysList/> \ and L.land=5) --<> */\ \ /* and abschluss_land in (select substring(L.schluessel from 2 for 2) from k_astat_abschluss3steller_land L\ diff --git a/src-modules/module/sxc/masken/47140_felderinfo.unl b/src-modules/module/sxc/masken/47140_felderinfo.unl index d04616c..9407544 100644 --- a/src-modules/module/sxc/masken/47140_felderinfo.unl +++ b/src-modules/module/sxc/masken/47140_felderinfo.unl @@ -20,7 +20,7 @@ and R.systeminfo_id=7) and uniquename='sos_stud_geschl_sxc';^ 47148^Staatsangehörigkeit^150^0^0^140^150^10^char^30^0^12^<> select tid,name,sortnr from sichten where art='SOS-Staaten-Sicht' order by 3,2;^ ^ ^ 47149^Studiengang^25^0^0^140^150^50^char^1000^0^12^<> select tid,name,sortnr from sichten where art in ('SOS-Kostenstellen-Sicht', 'SOS-Studiengang-Sicht') order by 3,2;^ ^ ^ 47150^Semester^100^0^0^140^80^1^integer^30^0^1^<> select tid, eintrag from semester order by tid DESC;^hidden^ ^ -47151^Stichtag^23^330^-1^130^100^1^sql^30^1^1^<> select tid, name from sos_stichtag where stichtagsart='Studierende';^ ^<> select tid, name from sos_stichtag where stichtagsart='Studierende' and appl_key='0';^ +47151^Stichtag^23^330^-1^130^100^1^sql^30^1^1^<> select tid, name from sos_stichtag where stichtagsart='Studierende';^ ^<> select tid, name from sos_stichtag where stichtagsart='Studierende' and appl_key='1';^ 47153^Jahr^110^0^0^140^80^1^integer^30^0^13^ ^ ^ ^ 47154^Filter Studierende^100^0^0^140^150^1^sql^20^0^1^<> SELECT id,caption from sx_repository where aktiv =1 and today() between gueltig_seit and gueltig_bis and art='SOS_STUD_FILTER' order by 2;^^^ 47155^Nur Endsemester^21^0^0^140^80^1^integer^30^0^1^<> select 1,'ja' from xdummy^hidden^ ^ @@ -32,7 +32,7 @@ select 0,'Keine Visualisierungen verfügbar' from xdummy;\ ^ ^<>--freemarker template\ <#if K_VIZ_ZEITR_SEM_ANZ?exists>select uniquename, caption from viz_chart where maskeninfo_id=47140 and chart_active=1 order by 2 limit 1;\ ^ -47158^Köpfe oder Fälle ?^0^0^0^140^150^1^sql^70^0^1^<> select apnr, eintrag from koepfe_oder_faelle order by 2^ ^<> select apnr, eintrag from koepfe_oder_faelle where eintrag = 'Fälle';^ +47158^Köpfe oder Fälle ?^0^0^0^140^150^1^sql^70^0^1^<> select apnr, eintrag from koepfe_oder_faelle order by 2^hidden^<> select apnr, eintrag from koepfe_oder_faelle where eintrag = 'Köpfe';^ 47159^tablestylesheet^1500^0^0^100^100^1^char^255^1^1^<> select filename,caption from sx_stylesheets S, sx_mask_style M where S.tid=M.stylesheet_id and M.maskeninfo_id=47140 order by ord^ ^<> select filename,caption from sx_stylesheets S, sx_mask_style M where S.tid=M.stylesheet_id and M.maskeninfo_id=47140 order by ord limit 1^ 47162^Geschlecht^110^0^0^140^80^1^integer^30^0^1^<> SELECT apnr,druck FROM cif where key = 9003 and apnr between 1 and 4 order by 1;^hidden^ ^ 47163^Vergleichshochschule^100^0^0^140^80^1^char^255^0^18^ ^ ^<> select '../edit/sxc/sxc_hochschule_vergleichsgruppe_list.jsp' from xdummy;^ diff --git a/src-modules/module/sxc/schluesseltabellen/rpta_column_layout_sxc_stud_anf_zeitreihe_fuellen.sql b/src-modules/module/sxc/schluesseltabellen/rpta_column_layout_sxc_stud_anf_zeitreihe_fuellen.sql index f51c602..66319aa 100644 --- a/src-modules/module/sxc/schluesseltabellen/rpta_column_layout_sxc_stud_anf_zeitreihe_fuellen.sql +++ b/src-modules/module/sxc/schluesseltabellen/rpta_column_layout_sxc_stud_anf_zeitreihe_fuellen.sql @@ -9,8 +9,8 @@ select count(*) from systeminfo where tid=330; {"uniquename":"sos_stud_anf_sxc", "caption":"Studierende und Anteil der Studienanfänger_innen (Hochschulvergleich)", "rpta_resultset":"sos_stud_astat", -"whereclause":"", -"description":"Studienanfänger_innen mit Anteil an Studierenden, im Vergleich mit anderen Hochschulen", +"whereclause":"studiengang_nr=1 and fach_nr=1 and kz_rueck_beur_ein in (1,2,3) and hrst not in (select apnr from sos_k_hrst where astat=''4'')", +"description":"Studienanfänger_innen (Köpfe, ohne Gasthörer, ohne Exmatr. und ohne Beurlaubte) mit Anteil an Studierenden, im Vergleich mit anderen Hochschulen", "sortclause":"sem_rueck_beur_ein" } /> diff --git a/src-modules/module/sxc/schluesseltabellen/rpta_column_layout_sxc_stud_geschl_zeitreihe_fuellen.sql b/src-modules/module/sxc/schluesseltabellen/rpta_column_layout_sxc_stud_geschl_zeitreihe_fuellen.sql index 8f24bb1..65e6f7c 100644 --- a/src-modules/module/sxc/schluesseltabellen/rpta_column_layout_sxc_stud_geschl_zeitreihe_fuellen.sql +++ b/src-modules/module/sxc/schluesseltabellen/rpta_column_layout_sxc_stud_geschl_zeitreihe_fuellen.sql @@ -9,8 +9,8 @@ select count(*) from systeminfo where tid=330; {"uniquename":"sos_stud_geschl_sxc", "caption":"Studierende nach Geschlecht (Hochschulvergleich)", "rpta_resultset":"sos_stud_astat", -"whereclause":"", -"description":"Studierende nach Geschlecht mit Anteil, im Vergleich mit anderen Hochschulen.", +"whereclause":"studiengang_nr=1 and fach_nr=1 and kz_rueck_beur_ein in (1,2,3) and hrst not in (select apnr from sos_k_hrst where astat=''4'')", +"description":"Studierende (Köpfe, ohne Gasthörer, ohne Exmatr. und ohne Beurlaubte) nach Geschlecht mit Anteil, im Vergleich mit anderen Hochschulen.", "sortclause":"sem_rueck_beur_ein desc" } /> diff --git a/src-modules/module/sxc/schluesseltabellen/rpta_column_layout_sxc_stud_geschl_zeitreihe_viz_fuellen.sql b/src-modules/module/sxc/schluesseltabellen/rpta_column_layout_sxc_stud_geschl_zeitreihe_viz_fuellen.sql index 33aa258..662c73e 100644 --- a/src-modules/module/sxc/schluesseltabellen/rpta_column_layout_sxc_stud_geschl_zeitreihe_viz_fuellen.sql +++ b/src-modules/module/sxc/schluesseltabellen/rpta_column_layout_sxc_stud_geschl_zeitreihe_viz_fuellen.sql @@ -9,8 +9,8 @@ select count(*) from systeminfo where tid=330; {"uniquename":"sos_stud_geschl_sxc_viz", "caption":"Studierende nach Geschlecht (Hochschulvergleich) Datenbalken", "rpta_resultset":"sos_stud_astat", -"whereclause":"", -"description":"Studierende nach Geschlecht mit Anteil, im Vergleich mit anderen Hochschulen", +"whereclause":"studiengang_nr=1 and fach_nr=1 and kz_rueck_beur_ein in (1,2,3) and hrst not in (select apnr from sos_k_hrst where astat=''4'')", +"description":"Studierende (Köpfe, ohne Gasthörer, ohne Exmatr. und ohne Beurlaubte) nach Geschlecht mit Anteil, im Vergleich mit anderen Hochschulen.", "sortclause":"sem_rueck_beur_ein desc" } /> diff --git a/src-modules/module/sxc/schluesseltabellen/xcube_dims_install.sql b/src-modules/module/sxc/schluesseltabellen/xcube_dims_install.sql index 4058013..e2df5da 100644 --- a/src-modules/module/sxc/schluesseltabellen/xcube_dims_install.sql +++ b/src-modules/module/sxc/schluesseltabellen/xcube_dims_install.sql @@ -2,13 +2,11 @@ -- TableFieldExists wird genutzt, um zu prüfen, ob die entsprechende Tabelle existiert --Geschlecht <#if TableFieldExists('sxc_stud_sem_da_geschl_hs_aggr','geschlecht_w')> -delete from xcube_dims where id='auspraegung_code_3'; +delete from xcube_dims where id='geschlecht_w'; INSERT INTO xcube_dims (id,apnr,name,sort1) values -('geschlecht_w','0','männlich',1); +('geschlecht_w','0','nicht weiblich',1); INSERT INTO xcube_dims (id,apnr,name,sort1) values ('geschlecht_w','1','weiblich',2); -INSERT INTO xcube_dims (id,apnr,name,sort1) values -('geschlecht_w','UNB','nicht bekannt',3); <#if TableFieldExists('sxc_stud_sem_da_geschl_hs_aggr','nationalitaet_a')> delete from xcube_dims where id='nationalitaet_a'; diff --git a/src-modules/module/sxc/schluesseltabellen/xcube_install_restrictions.sql b/src-modules/module/sxc/schluesseltabellen/xcube_install_restrictions.sql index 14275fe..59452b7 100644 --- a/src-modules/module/sxc/schluesseltabellen/xcube_install_restrictions.sql +++ b/src-modules/module/sxc/schluesseltabellen/xcube_install_restrictions.sql @@ -1,10 +1,9 @@ update xcube set restriction='1=1 /* and semester >= <> */ - /*and semester <= <>*/ + /* and semester <= <>*/ /* and hs_nr::char(20) in <@printkeys Hochschule.allNeededKeysList /> --<> */ - /* and ((trim(auspraegung_code_3) = <> and trim(auspraegung_code_3) in (''GESM'',''GESW''))*/ - /* or (trim(auspraegung_code_3) is null and <> = ''UNB'')) */ - /* and trim(auspraegung_code_2) = <> */ + /* and geschlecht_w = <> */ + /* and nationalitaet_a = <> */ ' where maskeninfo_id=47030; diff --git a/src-modules/module/sxc/upgrade/sxc_upgrade_man.sql b/src-modules/module/sxc/upgrade/sxc_upgrade_man.sql index ec009e2..b056c99 100644 --- a/src-modules/module/sxc/upgrade/sxc_upgrade_man.sql +++ b/src-modules/module/sxc/upgrade/sxc_upgrade_man.sql @@ -2,4 +2,5 @@ delete from xcube_dims where id in ('auspraegung_code_2','auspraegung_code_3'); update sichten set sortnr=sortnr*1000+sortnr where systeminfoid=360 -and name_intern like '%nrw%'; +and name_intern like '%nrw%' +and sortnr < 100;