diff --git a/src-modules/module/viz/conf/viz.xml b/src-modules/module/viz/conf/viz.xml index 011a14f..6f8a46f 100644 --- a/src-modules/module/viz/conf/viz.xml +++ b/src-modules/module/viz/conf/viz.xml @@ -458,12 +458,19 @@ parent="Visualisierungen">Abfragen zur Administration von Visualisierungen $VIZ_PFAD/masken - + + Initialisierung für Makroberichte + + $VIZ_PFAD/masken + + + $VIZ_PFAD/masken - + + diff --git a/src-modules/module/viz/masken/44190_felderinfo.unl b/src-modules/module/viz/masken/44190_felderinfo.unl index 16a3c4d..3b0b94a 100644 --- a/src-modules/module/viz/masken/44190_felderinfo.unl +++ b/src-modules/module/viz/masken/44190_felderinfo.unl @@ -8,11 +8,12 @@ union SELECT 2,'2-spaltig' from xdummy \ union SELECT 3,'3-spaltig' from xdummy \ union SELECT 4,'4-spaltig' from xdummy \ -order by 1;^^<> SELECT 3,'3-spaltig' from xdummy^ -44197^bis Fachsemester^35^350^-1^140^100^1^integer^30^0^999^^^^ +order by 1;^^<> SELECT 2,'2-spaltig' from xdummy^ +44197^bis Fachsemester^35^350^-1^140^100^1^integer^30^0^0^ ^^^ 44199^Bis Semester^4^350^-1^140^80^1^integer^30^0^1^<> select tid, eintrag from semester order by tid DESC;^Eintrag^<> select tid,eintrag from semester where today() between sem_beginn and sem_ende;^ -44200^Filter Studierende^119^0^0^140^150^1^sql^20^0^999^<> 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;^^^ +44200^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;^^^ 44201^Geschlecht^37^0^0^140^80^1^integer^30^0^999^<> SELECT apnr,druck FROM cif where key = 9003 and apnr between 1 and 4 order by 1;^^^ +44202^Tabnr.^1000^0^0^140^80^1^integer^30^0^13^ ^^^ 44203^Studiengang^6^0^0^140^150^50^char^30^0^12^<> select tid,name,sortnr from sichten where art in ('SOS-Kostenstellen-Sicht', 'SOS-Studiengang-Sicht') order by 3,2;^^^ 44204^Schlüssel anzeigen^150^0^0^100^100^1^integer^30^1^1^<> select 1,'Ja' from xdummy union select 0,'Nein' from xdummy^hidden^<> select 1,'Ja' from xdummy^ 44205^tablestylesheet^150^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=44190 order by ord^ ^<> select filename,caption from sx_stylesheets S, sx_mask_style M where S.tid=M.stylesheet_id and M.maskeninfo_id=44190 order by ord limit 1^ diff --git a/src-modules/module/viz/masken/44190_masken_felder_bez.unl b/src-modules/module/viz/masken/44190_masken_felder_bez.unl index 3057709..1dca4eb 100644 --- a/src-modules/module/viz/masken/44190_masken_felder_bez.unl +++ b/src-modules/module/viz/masken/44190_masken_felder_bez.unl @@ -9,6 +9,7 @@ 44190^44199^ 44190^44200^ 44190^44201^ +44190^44202^ 44190^44203^ 44190^44204^ 44190^44205^ diff --git a/src-modules/module/viz/masken/44190_maskeninfo.unl b/src-modules/module/viz/masken/44190_maskeninfo.unl index 7c0101f..904b848 100644 --- a/src-modules/module/viz/masken/44190_maskeninfo.unl +++ b/src-modules/module/viz/masken/44190_maskeninfo.unl @@ -1 +1 @@ -44190^Studienanfänger_innen Übersicht^ ^ ^Altersgruppe^Anzahl^Studienanfänger_innen als Zeitreihe, nach Gesschlecht und Fakultät in verschiedenen Visualisierungen^drop table tmp_tabelle;^^3^700^360^0^1^^ +44190^Studierende Übersicht^ ^ ^Altersgruppe^Anzahl^Studienanfänger_innen als Zeitreihe, nach Gesschlecht und Fakultät in verschiedenen Visualisierungen^drop table tmp_tabelle;^^3^700^360^0^1^^ diff --git a/src-modules/module/viz/masken/44220_felderinfo.unl b/src-modules/module/viz/masken/44220_felderinfo.unl index 082287e..6f81460 100644 --- a/src-modules/module/viz/masken/44220_felderinfo.unl +++ b/src-modules/module/viz/masken/44220_felderinfo.unl @@ -18,6 +18,7 @@ order by sortnr, caption limit 1\ 44223^Abschluss^40^0^0^100^200^3^char^1500^0^1^<> select apnr, druck from cifx where key=35 order by 2;^ ^ ^ 44224^bis Fachsemester^1000^300^-1^200^100^1^integer^30^0^13^^ ^ ^ 44225^Grafik^4000^300^-1^170^150^1^char^30^0^1^<> select uniquename, caption from viz_chart where maskeninfo_id=44220 order by 2;^^<> select uniquename, caption from viz_chart where maskeninfo_id=44220 order by 2 limit 1;^ +44226^Nur Endsemester^1000^0^0^140^80^1^integer^30^0^1^<> select 1,'ja' from xdummy^Eintrag^ ^ 44227^Bis Semester^20^350^-1^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;^ 44228^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;^ ^ ^ 44229^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;^ ^ ^ diff --git a/src-modules/module/viz/masken/44220_masken_felder_bez.unl b/src-modules/module/viz/masken/44220_masken_felder_bez.unl index 3d8d376..2d4e43a 100644 --- a/src-modules/module/viz/masken/44220_masken_felder_bez.unl +++ b/src-modules/module/viz/masken/44220_masken_felder_bez.unl @@ -4,6 +4,7 @@ 44220^44223^ 44220^44224^ 44220^44225^ +44220^44226^ 44220^44227^ 44220^44228^ 44220^44229^ diff --git a/src-modules/module/viz/masken/44280_felderinfo.unl b/src-modules/module/viz/masken/44280_felderinfo.unl index ffb9e54..b010387 100644 --- a/src-modules/module/viz/masken/44280_felderinfo.unl +++ b/src-modules/module/viz/masken/44280_felderinfo.unl @@ -18,6 +18,7 @@ order by sortnr, caption limit 1\ 44283^Abschluss^40^0^0^100^200^3^char^1500^0^1^<> select apnr, druck from cifx where key=35 order by 2;^ ^ ^ 44284^bis Fachsemester^1000^300^-1^200^100^1^integer^30^0^13^^ ^ ^ 44285^Grafik^4000^300^-1^170^150^1^char^30^0^1^<> select uniquename, caption from viz_chart where maskeninfo_id=44280 and chart_active=1 order by 2;^^<> select uniquename, caption from viz_chart where maskeninfo_id=44280 and chart_active=1 order by 2 limit 1;^ +44286^Nur Endsemester^1000^0^0^140^80^1^integer^30^0^1^<> select 1,'ja' from xdummy^Eintrag^ ^ 44287^Bis Semester^20^350^-1^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;^ 44288^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;^ ^ ^ 44289^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;^ ^ ^ diff --git a/src-modules/module/viz/masken/44280_masken_felder_bez.unl b/src-modules/module/viz/masken/44280_masken_felder_bez.unl index ca99f83..7da5c28 100644 --- a/src-modules/module/viz/masken/44280_masken_felder_bez.unl +++ b/src-modules/module/viz/masken/44280_masken_felder_bez.unl @@ -4,6 +4,7 @@ 44280^44283^ 44280^44284^ 44280^44285^ +44280^44286^ 44280^44287^ 44280^44288^ 44280^44289^ diff --git a/src-modules/module/viz/masken/44310_felderinfo.unl b/src-modules/module/viz/masken/44310_felderinfo.unl index efe5ec9..dbecac7 100644 --- a/src-modules/module/viz/masken/44310_felderinfo.unl +++ b/src-modules/module/viz/masken/44310_felderinfo.unl @@ -18,6 +18,7 @@ order by sortnr, caption limit 1\ 44313^Abschluss^40^0^0^100^200^3^char^1500^0^1^<> select apnr, druck from cifx where key=35 order by 2;^ ^ ^ 44314^bis Fachsemester^1000^300^-1^200^100^1^integer^30^0^13^^ ^ ^ 44315^Grafik^4000^300^-1^170^150^1^char^30^0^1^<> select uniquename, caption from viz_chart where maskeninfo_id=44310 and chart_active=1 order by 2;^^<> select uniquename, caption from viz_chart where maskeninfo_id=44310 and chart_active=1 order by 2 limit 1;^ +44316^Nur Endsemester^1000^0^0^140^80^1^integer^30^0^1^<> select 1,'ja' from xdummy^Eintrag^ ^ 44317^Bis Semester^20^350^-1^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;^ 44318^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;^ ^ ^ 44319^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;^ ^ ^ diff --git a/src-modules/module/viz/masken/44310_masken_felder_bez.unl b/src-modules/module/viz/masken/44310_masken_felder_bez.unl index e6ad082..88a246f 100644 --- a/src-modules/module/viz/masken/44310_masken_felder_bez.unl +++ b/src-modules/module/viz/masken/44310_masken_felder_bez.unl @@ -4,6 +4,7 @@ 44310^44313^ 44310^44314^ 44310^44315^ +44310^44316^ 44310^44317^ 44310^44318^ 44310^44319^ diff --git a/src-modules/module/viz/masken/44340_felderinfo.unl b/src-modules/module/viz/masken/44340_felderinfo.unl index cc92583..b00de44 100644 --- a/src-modules/module/viz/masken/44340_felderinfo.unl +++ b/src-modules/module/viz/masken/44340_felderinfo.unl @@ -18,6 +18,7 @@ order by sortnr, caption limit 1\ 44343^Abschluss^40^0^0^100^200^3^char^1500^0^1^<> select apnr, druck from cifx where key=35 order by 2;^ ^ ^ 44344^bis Fachsemester^1000^300^-1^200^100^1^integer^30^0^13^^ ^ ^ 44345^Grafik^4000^300^-1^170^150^1^char^30^0^1^<> select uniquename, caption from viz_chart where maskeninfo_id=44340 and chart_active=1 order by 2;^^<> select uniquename, caption from viz_chart where maskeninfo_id=44340 and chart_active=1 order by 2 limit 1;^ +44346^Nur Endsemester^1000^0^0^140^80^1^integer^30^0^1^<> select 1,'ja' from xdummy^Eintrag^ ^ 44347^Bis Semester^20^350^-1^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;^ 44348^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;^ ^ ^ 44349^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;^ ^ ^ diff --git a/src-modules/module/viz/masken/44340_masken_felder_bez.unl b/src-modules/module/viz/masken/44340_masken_felder_bez.unl index d56abb3..d4722d0 100644 --- a/src-modules/module/viz/masken/44340_masken_felder_bez.unl +++ b/src-modules/module/viz/masken/44340_masken_felder_bez.unl @@ -4,6 +4,7 @@ 44340^44343^ 44340^44344^ 44340^44345^ +44340^44346^ 44340^44347^ 44340^44348^ 44340^44349^ diff --git a/src-modules/module/viz/masken/44570_felderinfo.unl b/src-modules/module/viz/masken/44570_felderinfo.unl index 740a142..9f81d40 100644 --- a/src-modules/module/viz/masken/44570_felderinfo.unl +++ b/src-modules/module/viz/masken/44570_felderinfo.unl @@ -6,11 +6,12 @@ 44575^Hörerstatus^33^0^0^140^170^1^sql^30^0^1^<> select apnr, eintrag from hoererstatus order by 2^apnr, eintrag^<> select apnr, eintrag from hoererstatus where eintrag='alle';^ 44577^bis Fachsemester^35^350^-1^140^100^1^integer^30^0^13^^^^ 44579^Bis Semester^4^350^-1^140^80^1^integer^30^0^1^<> select tid, eintrag from semester order by tid DESC;^Eintrag^<> select tid,eintrag from semester where today() between sem_beginn and sem_ende;^ -44580^Filter Studierende^119^0^0^140^150^1^sql^20^0^999^<> 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;^^^ +44580^Filter Studierende^119^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;^^^ 44581^Geschlecht^37^0^0^140^80^1^integer^30^0^999^<> SELECT apnr,druck FROM cif where key = 9003 and apnr between 1 and 4 order by 1;^^^ 44583^Studiengang^6^0^0^140^150^50^char^30^0^12^<> select tid,name,sortnr from sichten where art in ('SOS-Kostenstellen-Sicht', 'SOS-Studiengang-Sicht') order by 3,2;^^^ 44584^Jahr^110^0^0^140^80^1^integer^30^0^13^ ^ ^ ^ 44585^tablestylesheet^150^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=44570 order by ord^ ^<> select filename,caption from sx_stylesheets S, sx_mask_style M where S.tid=M.stylesheet_id and M.maskeninfo_id=44570 order by ord limit 1^ +44586^Grafiktitel^1010^0^0^100^100^1^char^255^0^0^ ^ ^ ^ 44587^Grafik^1000^300^-1^170^150^1^char^30^0^1^<> select uniquename, caption from viz_chart where maskeninfo_id=44570 order by 2;^ ^<> select uniquename, caption from viz_chart where maskeninfo_id=44570 order by 2 limit 1;^ 44588^Spaltenlayout^3000^350^-1^140^180^1^char^30^1^1^<>SELECT uniquename,\ caption\ diff --git a/src-modules/module/viz/masken/44570_masken_felder_bez.unl b/src-modules/module/viz/masken/44570_masken_felder_bez.unl index 3578e19..7c6e62a 100644 --- a/src-modules/module/viz/masken/44570_masken_felder_bez.unl +++ b/src-modules/module/viz/masken/44570_masken_felder_bez.unl @@ -11,6 +11,7 @@ 44570^44583^ 44570^44584^ 44570^44585^ +44570^44586^ 44570^44587^ 44570^44588^ 44570^44589^ diff --git a/src-modules/module/viz/masken/44600_felderinfo.unl b/src-modules/module/viz/masken/44600_felderinfo.unl index 1aec148..04c0404 100644 --- a/src-modules/module/viz/masken/44600_felderinfo.unl +++ b/src-modules/module/viz/masken/44600_felderinfo.unl @@ -18,6 +18,7 @@ order by sortnr, caption limit 1\ 44603^Abschluss^40^0^0^100^200^3^char^1500^0^1^<> select apnr, druck from cifx where key=35 order by 2;^ ^ ^ 44604^bis Fachsemester^1000^300^-1^200^100^1^integer^30^0^0^^ ^ ^ 44605^Grafik^4000^300^-1^170^150^1^char^30^0^1^<> select uniquename, caption from viz_chart where maskeninfo_id=44600 and chart_active=1 order by 2;^ ^<> select uniquename, caption from viz_chart where maskeninfo_id=44600 and chart_active=1order by 2 limit 1;^ +44606^Nur Endsemester^1000^0^0^140^80^1^integer^30^0^1^<> select 1,'ja' from xdummy^Eintrag^ ^ 44607^Bis Semester^20^350^-1^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;^ 44608^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;^ ^ ^ 44609^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;^ ^ ^ diff --git a/src-modules/module/viz/masken/44600_masken_felder_bez.unl b/src-modules/module/viz/masken/44600_masken_felder_bez.unl index 15d7ce7..d25c205 100644 --- a/src-modules/module/viz/masken/44600_masken_felder_bez.unl +++ b/src-modules/module/viz/masken/44600_masken_felder_bez.unl @@ -4,6 +4,7 @@ 44600^44603^ 44600^44604^ 44600^44605^ +44600^44606^ 44600^44607^ 44600^44608^ 44600^44609^ diff --git a/src-modules/module/viz/masken/44630_felderinfo.unl b/src-modules/module/viz/masken/44630_felderinfo.unl index 4e6e56c..6b3fced 100644 --- a/src-modules/module/viz/masken/44630_felderinfo.unl +++ b/src-modules/module/viz/masken/44630_felderinfo.unl @@ -1,6 +1,8 @@ 44630^Bis Semester^4^350^-1^140^80^1^integer^30^0^1^<> select tid, eintrag from semester order by tid DESC;^Eintrag^<> select tid,eintrag from semester where today() between sem_beginn and sem_ende;^ 44631^Studiengang^6^0^0^140^150^50^char^30^0^12^<> select tid,name,sortnr from sichten where art in ('SOS-Kostenstellen-Sicht', 'SOS-Studiengang-Sicht') order by 3,2;^^^ 44632^Jahr^110^0^0^140^80^1^integer^30^0^13^ ^ ^ ^ +44633^Tabnr.^1000^0^0^140^80^1^integer^30^0^13^ ^^^ +44634^Seit Semester^3^0^0^140^80^1^integer^30^0^1^<> select tid, eintrag from semester order by tid DESC;^Eintrag^<> select tid,eintrag from semester where today() between sem_beginn and sem_ende;^ 44645^tablestylesheet^150^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=44190 order by ord^ ^<> select filename,caption from sx_stylesheets S, sx_mask_style M where S.tid=M.stylesheet_id and M.maskeninfo_id=44190 order by ord limit 1^ 44647^Grafik^1000^300^-1^170^150^1^integer^30^0^1^<> select tid, caption from viz_chart order by 2;^hidden^ ^ 44649^Spaltenanzahl^5^350^-1^140^80^1^integer^255^0^1^<> SELECT 0,'Dynamisch' from xdummy \ diff --git a/src-modules/module/viz/masken/44630_masken_felder_bez.unl b/src-modules/module/viz/masken/44630_masken_felder_bez.unl index 89a9122..594a388 100644 --- a/src-modules/module/viz/masken/44630_masken_felder_bez.unl +++ b/src-modules/module/viz/masken/44630_masken_felder_bez.unl @@ -1,6 +1,8 @@ 44630^44630^ 44630^44631^ 44630^44632^ +44630^44633^ +44630^44634^ 44630^44645^ 44630^44647^ 44630^44649^ diff --git a/src-modules/module/viz/masken/44660_felderinfo.unl b/src-modules/module/viz/masken/44660_felderinfo.unl new file mode 100644 index 0000000..4c56b3b --- /dev/null +++ b/src-modules/module/viz/masken/44660_felderinfo.unl @@ -0,0 +1,26 @@ +44660^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^apnr, eintrag^<> select apnr, eintrag from koepfe_oder_faelle where eintrag='Köpfe';^ +44661^Seit Semester^3^0^0^140^80^1^integer^30^0^1^<> select tid, eintrag from semester order by tid DESC;^Eintrag^<> select tid,eintrag from semester where today() between sem_beginn and sem_ende;^ +44662^Stichtag^1^350^-1^140^100^1^sql^30^0^1^<> select tid, name from sos_stichtag where stichtagsart='Studierende';^^<> select tid, name from sos_stichtag where stichtagsart='Studierende' and appl_key='0';^ +44663^Staatsangehörigkeit^36^0^0^130^150^10^char^30^0^12^<> select tid,name,sortnr from sichten where art='SOS-Staaten-Sicht' order by 3,2;^hidden^^ +44664^Status^14^350^-1^140^180^1^sql^30^0^1^<> select apnr,eintrag from sos_status order by 2^^<> select apnr,eintrag from sos_status where eintrag='Alle ohne Beurl.';^ +44665^Hörerstatus^33^0^0^140^170^1^sql^30^0^1^<> select apnr, eintrag from hoererstatus order by 2^apnr, eintrag^<> select apnr, eintrag from hoererstatus where eintrag='alle';^ +44666^Spaltenanzahl^300^0^0^140^80^1^integer^30^0^1^<> SELECT 1,'1-spaltig' from xdummy \ +union SELECT 2,'2-spaltig' from xdummy \ +union SELECT 3,'3-spaltig' from xdummy \ +union SELECT 4,'4-spaltig' from xdummy \ +order by 1;^^<> SELECT 2,'2-spaltig' from xdummy^ +44667^bis Fachsemester^35^350^-1^140^100^1^integer^30^0^0^ ^^^ +44669^Bis Semester^4^350^-1^140^80^1^integer^30^0^1^<> select tid, eintrag from semester order by tid DESC;^Eintrag^<> select tid,eintrag from semester where today() between sem_beginn and sem_ende;^ +44670^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;^^^ +44671^Geschlecht^37^0^0^140^80^1^integer^30^0^999^<> SELECT apnr,druck FROM cif where key = 9003 and apnr between 1 and 4 order by 1;^^^ +44672^Tabnr.^1000^0^0^140^80^1^integer^30^0^13^ ^^1^ +44673^Studiengang^6^0^0^140^150^50^char^30^0^12^<> select tid,name,sortnr from sichten where art in ('SOS-Kostenstellen-Sicht', 'SOS-Studiengang-Sicht') order by 3,2;^^^ +44674^Schlüssel anzeigen^150^0^0^100^100^1^integer^30^1^1^<> select 1,'Ja' from xdummy union select 0,'Nein' from xdummy^hidden^<> select 1,'Ja' from xdummy^ +44675^tablestylesheet^150^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=44190 order by ord^ ^<> select filename,caption from sx_stylesheets S, sx_mask_style M where S.tid=M.stylesheet_id and M.maskeninfo_id=44190 order by ord limit 1^ +44677^Grafik^1000^300^-1^170^150^1^integer^30^0^1^<> select tid, caption from viz_chart order by 2;^hidden^ ^ +44678^Jahr^110^0^0^140^80^1^integer^30^0^13^ ^ ^ ^ +44679^Semestertyp^5^350^-1^140^80^1^integer^255^0^1^<> select 1,'nur Sommersemester' from xdummy union select 2,'nur Wintersemester' from xdummy^Eintrag^<> select 2,'nur Wintersemester' from xdummy^ +44680^##line##^30^0^0^100^100^1^char^5000^0^8^^^1^ +44681^Abschluss^7^0^0^140^170^5^char^30^0^1^<> select abint,dtxt from k_abint order by 2;^^^ +44682^Matrikel-Nr.^20^350^-1^150^180^1^char^200^0^13^^{InputCheck:matrikelnummern}^^ +44683^##line##^40^0^0^100^100^1^char^5000^0^8^^^1^ diff --git a/src-modules/module/viz/masken/44660_maske_system_bez.unl b/src-modules/module/viz/masken/44660_maske_system_bez.unl new file mode 100644 index 0000000..13ca074 --- /dev/null +++ b/src-modules/module/viz/masken/44660_maske_system_bez.unl @@ -0,0 +1 @@ +44660^7^ diff --git a/src-modules/module/viz/masken/44660_masken_felder_bez.unl b/src-modules/module/viz/masken/44660_masken_felder_bez.unl new file mode 100644 index 0000000..98595e6 --- /dev/null +++ b/src-modules/module/viz/masken/44660_masken_felder_bez.unl @@ -0,0 +1,22 @@ +44660^44660^ +44660^44661^ +44660^44662^ +44660^44663^ +44660^44664^ +44660^44665^ +44660^44666^ +44660^44667^ +44660^44669^ +44660^44670^ +44660^44671^ +44660^44672^ +44660^44673^ +44660^44674^ +44660^44675^ +44660^44677^ +44660^44678^ +44660^44679^ +44660^44680^ +44660^44681^ +44660^44682^ +44660^44683^ diff --git a/src-modules/module/viz/masken/44660_maskeninfo.unl b/src-modules/module/viz/masken/44660_maskeninfo.unl new file mode 100644 index 0000000..4a84250 --- /dev/null +++ b/src-modules/module/viz/masken/44660_maskeninfo.unl @@ -0,0 +1 @@ +44660^Campus-Dashboard Übersicht^ ^ ^Altersgruppe^Anzahl^Studienanfänger_innen als Zeitreihe, nach Gesschlecht und Fakultät in verschiedenen Visualisierungen^ ^^3^700^360^0^1^^ diff --git a/src-modules/module/viz/masken/44660_sachgeb_maske_bez.unl b/src-modules/module/viz/masken/44660_sachgeb_maske_bez.unl new file mode 100644 index 0000000..3e70b61 --- /dev/null +++ b/src-modules/module/viz/masken/44660_sachgeb_maske_bez.unl @@ -0,0 +1 @@ +16^44660^ diff --git a/src-modules/module/viz/schluesseltabellen/macro_masken_bez_fuellen.sql b/src-modules/module/viz/schluesseltabellen/macro_masken_bez_fuellen.sql index 0805a83..b657214 100644 --- a/src-modules/module/viz/schluesseltabellen/macro_masken_bez_fuellen.sql +++ b/src-modules/module/viz/schluesseltabellen/macro_masken_bez_fuellen.sql @@ -2,7 +2,8 @@ <#assign makros = [ {"tid":"44070"}, -{"tid":"44190"} +{"tid":"44190"}, +{"tid":"44660"} ] /> @@ -26,7 +27,14 @@ {"makro":"44190", "tid":"44310", "sortnr":"30"}, {"makro":"44190", "tid":"44310", "sortnr":"40"}, {"makro":"44190", "tid":"44340", "sortnr":"50"}, -{"makro":"44190", "tid":"44600", "sortnr":"60"} +{"makro":"44190", "tid":"44600", "sortnr":"60"}, + +{"makro":"44660", "tid":"44630", "sortnr":"0"}, +{"makro":"44660", "tid":"44570", "sortnr":"10"}, +{"makro":"44660", "tid":"44570", "sortnr":"20"}, +{"makro":"44660", "tid":"44570", "sortnr":"30"} + + ] /> @@ -94,46 +102,63 @@ {"makro":"44190", "sortnr":"1", "feldname":"Köpfe oder Fälle ?", "value":"studiengang_nr = 1 and fach_nr = 1"}, {"makro":"44190", "sortnr":"1", "feldname":"Spaltenlayout", "value":"sos_stud_sem"}, -{"makro":"44190", "sortnr":"1", "feldname":"Grafik", "value":"STUDANF_SEM_LINE"}, -{"makro":"44190", "sortnr":"1", "feldname":"bis Fachsemester", "value":"1"}, +{"makro":"44190", "sortnr":"1", "feldname":"Grafik", "value":"STUD_SEM_LINE"}, {"makro":"44190", "sortnr":"1", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"}, {"makro":"44190", "sortnr":"10", "feldname":"Köpfe oder Fälle ?", "value":"studiengang_nr = 1 and fach_nr = 1"}, {"makro":"44190", "sortnr":"10", "feldname":"Spaltenlayout", "value":"sos_stud_geschl"}, {"makro":"44190", "sortnr":"10", "feldname":"Grafik", "value":"STUD_GESCHL_W_DONUT"}, -{"makro":"44190", "sortnr":"10", "feldname":"bis Fachsemester", "value":"1"}, {"makro":"44190", "sortnr":"10", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"}, +{"makro":"44190", "sortnr":"10", "feldname":"Nur Endsemester", "value":"1"}, {"makro":"44190", "sortnr":"20", "feldname":"Köpfe oder Fälle ?", "value":"studiengang_nr = 1 and fach_nr = 1"}, {"makro":"44190", "sortnr":"20", "feldname":"Spaltenlayout", "value":"sos_stud_fak"}, {"makro":"44190", "sortnr":"20", "feldname":"Grafik", "value":"STUDANF_FAK_BAR"}, -{"makro":"44190", "sortnr":"20", "feldname":"bis Fachsemester", "value":"1"}, {"makro":"44190", "sortnr":"20", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"}, +{"makro":"44190", "sortnr":"20", "feldname":"Nur Endsemester", "value":"1"}, {"makro":"44190", "sortnr":"30", "feldname":"Köpfe oder Fälle ?", "value":"1=1"}, {"makro":"44190", "sortnr":"30", "feldname":"Spaltenlayout", "value":"sos_stud_abgrp"}, {"makro":"44190", "sortnr":"30", "feldname":"Grafik", "value":"STUDANF_ABGRP_BAR_Y_ECHART"}, -{"makro":"44190", "sortnr":"30", "feldname":"bis Fachsemester", "value":"1"}, {"makro":"44190", "sortnr":"30", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"}, +{"makro":"44190", "sortnr":"30", "feldname":"Nur Endsemester", "value":"1"}, {"makro":"44190", "sortnr":"40", "feldname":"Köpfe oder Fälle ?", "value":"1=1"}, {"makro":"44190", "sortnr":"40", "feldname":"Spaltenlayout", "value":"sos_stud_la"}, {"makro":"44190", "sortnr":"40", "feldname":"Grafik", "value":"STUD_LEHRAMT_DONUT"}, -{"makro":"44190", "sortnr":"40", "feldname":"bis Fachsemester", "value":"1"}, {"makro":"44190", "sortnr":"40", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"}, +{"makro":"44190", "sortnr":"40", "feldname":"Nur Endsemester", "value":"1"}, {"makro":"44190", "sortnr":"50", "feldname":"Köpfe oder Fälle ?", "value":"studiengang_nr = 1 and fach_nr = 1"}, {"makro":"44190", "sortnr":"50", "feldname":"Spaltenlayout", "value":"sos_stud_bildungstyp"}, {"makro":"44190", "sortnr":"50", "feldname":"Grafik", "value":"STUD_BILDUNGSTYP_DONUT"}, -{"makro":"44190", "sortnr":"50", "feldname":"bis Fachsemester", "value":"1"}, {"makro":"44190", "sortnr":"50", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"}, - +{"makro":"44190", "sortnr":"50", "feldname":"Nur Endsemester", "value":"1"}, {"makro":"44190", "sortnr":"60", "feldname":"Köpfe oder Fälle ?", "value":"studiengang_nr = 1 and fach_nr = 1"}, {"makro":"44190", "sortnr":"60", "feldname":"Spaltenlayout", "value":"sos_stud_hzb_bland"}, {"makro":"44190", "sortnr":"60", "feldname":"Grafik", "value":"STUDANF_HZB_LAND_BAR"}, -{"makro":"44190", "sortnr":"60", "feldname":"bis Fachsemester", "value":"1"}, -{"makro":"44190", "sortnr":"60", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"} +{"makro":"44190", "sortnr":"60", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"}, +{"makro":"44190", "sortnr":"60", "feldname":"Nur Endsemester", "value":"1"}, + +{"makro":"44660", "sortnr":"10", "feldname":"Köpfe oder Fälle ?", "value":"studiengang_nr = 1 and fach_nr = 1"}, +{"makro":"44660", "sortnr":"10", "feldname":"Spaltenlayout", "value":"sos_stud_sem"}, +{"makro":"44660", "sortnr":"10", "feldname":"Grafik", "value":"STUD_SEM_LINE"}, +{"makro":"44660", "sortnr":"10", "feldname":"Grafiktitel", "value":"Studienanfänger*innen 1.HS"}, +{"makro":"44660", "sortnr":"10", "feldname":"Filter Studierende", "value":"SOS_HSSEM_1"}, +{"makro":"44660", "sortnr":"10", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"}, + +{"makro":"44660", "sortnr":"20", "feldname":"Köpfe oder Fälle ?", "value":"studiengang_nr = 1 and fach_nr = 1"}, +{"makro":"44660", "sortnr":"20", "feldname":"Spaltenlayout", "value":"sos_stud_sem"}, +{"makro":"44660", "sortnr":"20", "feldname":"Grafik", "value":"STUD_SEM_LINE"}, +{"makro":"44660", "sortnr":"20", "feldname":"Grafiktitel", "value":"Studienanfänger*innen 1.FS"}, +{"makro":"44660", "sortnr":"20", "feldname":"bis Fachsemester", "value":"1"}, +{"makro":"44660", "sortnr":"20", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"}, + +{"makro":"44660", "sortnr":"30", "feldname":"Köpfe oder Fälle ?", "value":"studiengang_nr = 1 and fach_nr = 1"}, +{"makro":"44660", "sortnr":"30", "feldname":"Spaltenlayout", "value":"sos_stud_sem"}, +{"makro":"44660", "sortnr":"30", "feldname":"Grafik", "value":"STUD_SEM_LINE"}, +{"makro":"44660", "sortnr":"30", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"} ] /> diff --git a/src-modules/module/viz/schluesseltabellen/rpta_column_layout_sos_stud_bland_hzbkfz_fuellen.sql b/src-modules/module/viz/schluesseltabellen/rpta_column_layout_sos_stud_bland_hzbkfz_fuellen.sql index 8d27c9c..61ec31e 100644 --- a/src-modules/module/viz/schluesseltabellen/rpta_column_layout_sos_stud_bland_hzbkfz_fuellen.sql +++ b/src-modules/module/viz/schluesseltabellen/rpta_column_layout_sos_stud_bland_hzbkfz_fuellen.sql @@ -20,7 +20,7 @@ select count(*) from systeminfo where tid=330; "srcfieldname":"", "targetfieldname":"hzb_bland", "column_type":"logicalColumn", -"col_function":"case when (hzbkfzkz=0 and hzbkfz is not null and hzbkfz<>-9999 ) then (select B.druck from sos_hzb_wohnsitz W, sos_k_bland B where W.bland=B.apnr and W.astat=hzbkfz) else ''unbekannt/ außerhalb BRD'' end", +"col_function":"case when (hzbkfzkz=0 and hzbkfz is not null and hzbkfz<>-9999 ) then (select coalesce(B.druck,''Unbekannt'') from sos_hzb_wohnsitz W, sos_k_bland B where W.bland=B.apnr and W.astat=hzbkfz) else ''Unbekannt/ Ausland'' end", "is_visible":"1", "format_code":"", "visible_size":"5", diff --git a/src-modules/module/viz/schluesseltabellen/rpta_column_layout_sos_stud_zeitreihe_fuellen.sql b/src-modules/module/viz/schluesseltabellen/rpta_column_layout_sos_stud_zeitreihe_fuellen.sql index 524c1e3..f99d7b7 100644 --- a/src-modules/module/viz/schluesseltabellen/rpta_column_layout_sos_stud_zeitreihe_fuellen.sql +++ b/src-modules/module/viz/schluesseltabellen/rpta_column_layout_sos_stud_zeitreihe_fuellen.sql @@ -31,8 +31,10 @@ select count(*) from systeminfo where tid=330; "caption":"Semester Name", "srcfieldname":"sem_rueck_beur_ein", "targetfieldname":"semester_str", -"column_type":"lookupColumn", -"col_function":"select replace(replace(eintrag,''SoSe'',''''),''WiSe '','''') from semester SEM where SEM.tid=sem_rueck_beur_ein", +"column_type":"logicalColumn", +"col_function":"(case when substring(sem_rueck_beur_ein::varchar from 5 for 1)=''2'' then ''WS '' || substring(sem_rueck_beur_ein::varchar from 3 for 2) || ''/'' || lpad('''' || val(substring(sem_rueck_beur_ein::varchar from 3 for 2))+1,2,''0'') +when substring(sem_rueck_beur_ein::varchar from 5 for 1)=''1'' then ''SS '' || substring(sem_rueck_beur_ein::varchar from 3 for 2) +else '''' end)", "is_visible":"1", "format_code":"", "visible_size":"5", diff --git a/src-modules/module/viz/schluesseltabellen/sx_stylesheets_einfuegen.sql b/src-modules/module/viz/schluesseltabellen/sx_stylesheets_einfuegen.sql index 6ffe8d9..0e69767 100755 --- a/src-modules/module/viz/schluesseltabellen/sx_stylesheets_einfuegen.sql +++ b/src-modules/module/viz/schluesseltabellen/sx_stylesheets_einfuegen.sql @@ -56,7 +56,12 @@ {"mask":"44340", "filename":"tabelle_html_datenblatt.xsl", "ord":"10"}, {"mask":"44340", "filename":"viz_html_chart_viewer.xsl", "ord":"1"}, {"mask":"44340", "filename":"viz_html_chart_viewer_mask.xsl", "ord":"30"}, -{"mask":"44340", "filename":"viz_html_chart_viewer_mask_and_table.xsl", "ord":"40"} +{"mask":"44340", "filename":"viz_html_chart_viewer_mask_and_table.xsl", "ord":"40"}, + +{"mask":"44660", "filename":"tabelle_html_datenblatt.xsl", "ord":"20"}, +{"mask":"44660", "filename":"viz_html_chart_viewer_grid.xsl", "ord":"1"}, +{"mask":"44660", "filename":"viz_html_chart_viewer.xsl", "ord":"40"} + ] /> diff --git a/src-modules/module/viz/schluesseltabellen/viz_chart.unl b/src-modules/module/viz/schluesseltabellen/viz_chart.unl index a52bfa4..2cba591 100644 --- a/src-modules/module/viz/schluesseltabellen/viz_chart.unl +++ b/src-modules/module/viz/schluesseltabellen/viz_chart.unl @@ -6,11 +6,11 @@ {"value":"2","nr":3,"name":"Tab. 3","isDefault":false},\ {"value":"3","nr":4,"name":"Tab. 4","isDefault":false}],\ "targetDiv":"","chartElements":[{"elemID":1,"vizTypeUniquename":"echarts_bar_y","caption":"bar_y","datasource":"0","elementTypeProperties":[{"nr":1,"vizTypePropertyUniquename":"x","caption":"X-Achse","propertyValue":"dim_studiengang_abschluss_grp_str","propertyType":"string"},\ -{"nr":1,"vizTypePropertyUniquename":"y","caption":"Y-Achse","propertyValue":"anteil","propertyType":"string"},\ +{"nr":1,"vizTypePropertyUniquename":"y","caption":"Y-Achse","propertyValue":"summe","propertyType":"string"},\ {"nr":1,"vizTypePropertyUniquename":"stroke_static","caption":"Strichfarbe","propertyValue":"#000000","propertyType":"string"},\ {"nr":1,"vizTypePropertyUniquename":"fill_static","caption":"Flächenfarbe","propertyValue":"#004c93","propertyType":"string"}]}],\ "chartPropertiesUsed":[{"name":"caption","vizPropertyVariablename":"caption","propertyValue":"Studienanfänger_innen Übersicht"},\ -{"name":"subtitle","vizPropertyVariablename":"subtitle","propertyValue":"pro Abschlussgruppe in %"},\ +{"name":"subtitle","vizPropertyVariablename":"subtitle","propertyValue":"Summe pro Abschlussgruppe"},\ {"name":"height","vizPropertyVariablename":"height","propertyValue":"450","propUnit":""},\ {"name":"height","vizPropertyVariablename":"height","propertyValue":"450","propUnit":""},\ {"name":"width","vizPropertyVariablename":"width","propertyValue":"650","propUnit":""},\ @@ -23,6 +23,7 @@ {"name":"labelOpacity","vizPropertyVariablename":"labelOpacity","propertyValue":"70","propUnit":""},\ {"name":"backgroundColor","vizPropertyVariablename":"backgroundColor","propertyValue":"#ffffff","propUnit":""},\ {"name":"color","vizPropertyVariablename":"color","propertyValue":"#000000","propUnit":""},\ +{"name":"scheme","vizPropertyVariablename":"scheme","propertyValue":"unique","propUnit":""},\ {"name":"stroke_static","vizPropertyVariablename":"stroke_static","propertyValue":"#000000","propUnit":""},\ {"name":"fill_static","vizPropertyVariablename":"fill","propertyValue":"#004c93","propUnit":""},\ {"name":"label_y","vizPropertyVariablename":"label","propertyValue":"Studierende","propUnit":""},\ @@ -32,7 +33,7 @@ {"name":"tickRotate_x","vizPropertyVariablename":"tickRotate","propertyValue":"-45","propUnit":""},\ {"name":"scale_x","vizPropertyVariablename":"type","propertyValue":"band","propUnit":""},\ {"name":"x","vizPropertyVariablename":"x","propertyValue":"dim_studiengang_abschluss_grp_str","propUnit":""},\ -{"name":"y","vizPropertyVariablename":"y","propertyValue":"anteil","propUnit":""}],\ +{"name":"y","vizPropertyVariablename":"y","propertyValue":"summe","propUnit":""}],\ "dataTransformation":[]}^ ^^25.08.2024^25.08.2024^44310^ ^3^ ^ ^1^ 13^STUD_ZEITR_BAR_LINE_DOT_TEXT^Studierende Zeitreihe Balken-, Linien,- Punktdiagramm mit Beschriftung^ ^{"version":"0.2b","id":1,"name":"","renderer":"plot","dataSources":[{"value":"0","nr":1,"name":"Tab. 1","isDefault":true}],"targetDiv":"","chartElements":[{"elemID":"1","vizTypeUniquename":"bar_y","caption":"bar_y","datasource":"0","elementTypeProperties":[{"nr":"1","vizTypePropertyUniquename":"x","caption":"X-Achse","propertyValue":"eintrag","propertyType":"string"},{"nr":"1","vizTypePropertyUniquename":"y","caption":"Y-Achse","propertyValue":"gesamt","propertyType":"string"},{"nr":"1","vizTypePropertyUniquename":"stroke_static","caption":"Strichfarbe","propertyValue":"#000000","propertyType":"string"},{"nr":"1","vizTypePropertyUniquename":"fill_static","caption":"Flächenfarbe","propertyValue":"#2ec27e","propertyType":"string"},\ {"nr":"1","vizTypePropertyUniquename":"sortchannel","caption":"Zusätzl. Sortierung","propertyValue":"rownr","propertyType":"string"}\ @@ -193,13 +194,90 @@ {"name":"dimension1","vizPropertyVariablename":"dimension1","propertyValue":"dim_studiengang_fb","propUnit":""},\ {"name":"measure1","vizPropertyVariablename":"measure1","propertyValue":"summe","propUnit":""}],\ "dataTransformation":[]}^ ^^25.08.2024^25.08.2024^44280^ ^1^ ^ ^0^ +37^STUDANF_KOHORTEN_BAR_Y_ECHART^Studierende nach Kohorten Balken vertikal (Echart)^ ^{"version":"0.2b","id":1,"name":"","renderer":"echarts","dataSources":[{"value":"0","nr":1,"name":"Tab. 1","isDefault":true}],\ +"targetDiv":"",\ +"chartElements":[{"elemID":1,"vizTypeUniquename":"echarts_native","sourceCode":\ +{\ + legend: {show:true,itemGap:5,itemHeight:6,\ + data: [{\ + name: 'Studienanfänger:innen',\ + icon: 'roundRect'},\ + {\ + name: 'Aktives Studium',\ + icon: 'roundRect'\ + }, {\ + name: 'Studienfachwechsel',\ + icon: 'roundRect'\ +}, {\ + name: 'Abschluss des Studiums',\ + icon: 'roundRect'\ + }, {\ + name: 'Inaktives Studium',\ + icon: 'roundRect'\ +},\ + {\ + name: 'Exmatrikulation',\ + icon: 'roundRect'},\ + {\ + name: 'Abschlüsse je Semester',\ + icon: 'circle'},\ + {\ + name: 'Schwund je Semester',\ + icon: 'circle'}\ +]\ + },\ + tooltip: {},\ + \ + xAxis: [\ + { type: 'category', axisLabel:{rotate:30}}\ + ],\ + yAxis: [{name:'Studierende', nameLocation:'middle', nameGap:40,id:0 }],\ + \ + series: [\ + { name:'Studienanfänger:innen',type: 'bar', encode:{x:'eintrag',y:'anz_ein'}, color:'#004a93',\ + label: {\ + show: true\ + }},\ + { name:'Aktives Studium',type: 'bar',encode:{x:'eintrag',y:'anz_aktiv_sem'},stack:'summe', color:'#afcde4',\ + label: {\ + show: true\ + }},\ + { name:'Studienfachwechsel',type: 'bar',encode:{x:'eintrag',y:'anz_wechsel_kum'},stack:'summe', color:'#878787',\ + label: {\ + show: true\ + }} ,\ + { name:'Abschluss des Studiums',type: 'bar', encode:{x:'eintrag',y:'anz_hp_kum'},stack:'summe', color:'#6dbe99',\ + label: {\ + show: true\ + }} ,\ + { name:'Inaktives Studium',type: 'bar', encode:{x:'eintrag',y:'anz_inaktiv_sem'},stack:'summe', color:'#379dc3',\ + label: {\ + show: true\ + }} ,\ + { name:'Exmatrikulation',type: 'bar', encode:{x:'eintrag',y:'anz_exm_kum'},stack:'summe', color:'#d8c65a',\ + label: {\ + show: true\ + }},\ + { name:'Abschlüsse je Semester',type: 'line', encode:{x:'eintrag',y:'anz_hp'}, color:'#54ab52',\ + label: {\ + show: true, fontWeight:'bold'\ + }},\ + { name:'Schwund je Semester',type: 'line', encode:{x:'eintrag',y:'anz_exm'}, color:'#ed7374',\ + label: {\ + show: true, fontWeight:'bold'\ + }}\ + ]\ +}\ +}\ +]\ +}^ ^^25.08.2024^25.08.2024^800000550^ ^3^ ^ ^1^ 35^STUD_LEHRAMT_DONUT^Studierende nach Lehramt (ja/nein) (Donutdiagramm)^ ^{"version":"0.2b","id":1,"name":"","renderer":"echarts","dataSources":[{"value":"0","nr":1,"name":"Tab. 1","isDefault":true}],\ "targetDiv":"","chartElements":[{"elemID":"1","vizTypeUniquename":"echarts_pie","caption":"pie","datasource":"0","elementTypeProperties":[{"nr":"1","vizTypePropertyUniquename":"dimension1","caption":"Dimension 1","propertyValue":"dim_studiengang_la","propertyType":"string"},\ {"nr":"1","vizTypePropertyUniquename":"measure1","caption":"Maß 1","propertyValue":"anteil","propertyType":"string"},\ {"nr":"1","vizTypePropertyUniquename":"width","caption":"Grafik-Breite","propertyValue":"650","propertyType":"integer"},\ {"nr":"1","vizTypePropertyUniquename":"height","caption":"Grafik-Höhe","propertyValue":"450","propertyType":"integer"},\ {"nr":"1","vizTypePropertyUniquename":"backgroundColor","caption":"Hintergrundfarbe","propertyValue":"#ffffff","propertyType":"string"},\ -{"nr":"1","vizTypePropertyUniquename":"scheme","caption":"Farbschema","propertyValue":"greens","propertyType":"string"},\ +{"nr":"1","vizTypePropertyUniquename":"scheme","caption":"Farbschema","propertyValue":"dichotom","propertyType":"string"},\ {"nr":"1","vizTypePropertyUniquename":"innerRadius","caption":"Innerer Radius","propertyValue":"0","propertyType":"string"},\ {"nr":"1","vizTypePropertyUniquename":"cornerRadius","caption":"Kanten-Radius","propertyValue":"0","propertyType":"string"},\ {"nr":"1","vizTypePropertyUniquename":"labelRadiusFactor","caption":"Beschriftung Radius","propertyValue":"80","propertyType":"string"},\ @@ -218,7 +296,7 @@ {"name":"line_y","vizPropertyVariablename":"line","propertyValue":"true","propUnit":""},\ {"name":"line_x","vizPropertyVariablename":"line","propertyValue":"true","propUnit":""},\ {"name":"scale_x","vizPropertyVariablename":"type","propertyValue":"band","propUnit":""},\ -{"name":"scheme","vizPropertyVariablename":"scheme","propertyValue":"greens","propUnit":""},\ +{"name":"scheme","vizPropertyVariablename":"scheme","propertyValue":"dichotom","propUnit":""},\ {"name":"dimension1","vizPropertyVariablename":"dimension1","propertyValue":"dim_studiengang_la","propUnit":""},\ {"name":"measure1","vizPropertyVariablename":"measure1","propertyValue":"anteil","propUnit":""}],\ "dataTransformation":[]}^ ^^25.08.2024^25.08.2024^44310^ ^3^ ^ ^1^ @@ -228,7 +306,7 @@ {"nr":"1","vizTypePropertyUniquename":"width","caption":"Grafik-Breite","propertyValue":"650","propertyType":"integer"},\ {"nr":"1","vizTypePropertyUniquename":"height","caption":"Grafik-Höhe","propertyValue":"450","propertyType":"integer"},\ {"nr":"1","vizTypePropertyUniquename":"backgroundColor","caption":"Hintergrundfarbe","propertyValue":"#ffffff","propertyType":"string"},\ -{"nr":"1","vizTypePropertyUniquename":"scheme","caption":"Farbschema","propertyValue":"greens","propertyType":"string"},\ +{"nr":"1","vizTypePropertyUniquename":"scheme","caption":"Farbschema","propertyValue":"dichotom","propertyType":"string"},\ {"nr":"1","vizTypePropertyUniquename":"innerRadius","caption":"Innerer Radius","propertyValue":"0","propertyType":"string"},\ {"nr":"1","vizTypePropertyUniquename":"cornerRadius","caption":"Kanten-Radius","propertyValue":"0","propertyType":"string"},\ {"nr":"1","vizTypePropertyUniquename":"labelRadiusFactor","caption":"Beschriftung Radius","propertyValue":"80","propertyType":"string"},\ @@ -247,7 +325,7 @@ {"name":"line_y","vizPropertyVariablename":"line","propertyValue":"true","propUnit":""},\ {"name":"line_x","vizPropertyVariablename":"line","propertyValue":"true","propUnit":""},\ {"name":"scale_x","vizPropertyVariablename":"type","propertyValue":"band","propUnit":""},\ -{"name":"scheme","vizPropertyVariablename":"scheme","propertyValue":"greens","propUnit":""},\ +{"name":"scheme","vizPropertyVariablename":"scheme","propertyValue":"dichotom","propUnit":""},\ {"name":"dimension1","vizPropertyVariablename":"dimension1","propertyValue":"sos_stud_bildungstyp","propUnit":""},\ {"name":"measure1","vizPropertyVariablename":"measure1","propertyValue":"anteil","propUnit":""}],\ "dataTransformation":[]}^ ^^25.08.2024^25.08.2024^44340^ ^3^ ^ ^1^ @@ -283,10 +361,78 @@ {"name":"dimension1","vizPropertyVariablename":"dimension1","propertyValue":"sos_stg_aggr_geschlecht_str","propUnit":""},\ {"name":"measure1","vizPropertyVariablename":"measure1","propertyValue":"sos_stg_aggr_summe","propUnit":""}],\ "dataTransformation":[]}^ ^1^ -29^STUDANF_SEM_LINE^Studienanfänger_innen nach Semester^ ^{"version":"0.2b","id":1,"name":"","renderer":"echarts","dataSources":[{"value":"0","nr":1,"name":"Tab. 1","isDefault":true}],\ +33^STUDANF_HZB_LAND_BAR^Studierende nach HZB-Land^ ^{"version":"0.2b","id":1,"name":"","renderer":"echarts","dataSources":[{"value":"0","nr":1,"name":"Tab. 1","isDefault":true},\ +{"value":"1","nr":2,"name":"Tab. 2","isDefault":false},\ +{"value":"2","nr":3,"name":"Tab. 3","isDefault":false},\ +{"value":"3","nr":4,"name":"Tab. 4","isDefault":false}],\ +"targetDiv":"","chartElements":[{"elemID":1,"vizTypeUniquename":"echarts_bar_x","caption":"bar_x","datasource":"3","elementTypeProperties":[{"nr":1,"vizTypePropertyUniquename":"x","caption":"X-Achse","propertyValue":"summe","propertyType":"string"},\ +{"nr":1,"vizTypePropertyUniquename":"y","caption":"Y-Achse","propertyValue":"hzb_bland","propertyType":"string"},\ +{"nr":1,"vizTypePropertyUniquename":"stroke_static","caption":"Strichfarbe","propertyValue":"#000000","propertyType":"string"},\ +{"nr":1,"vizTypePropertyUniquename":"fill_static","caption":"Flächenfarbe","propertyValue":"#004c93","propertyType":"string"}]}],\ +"chartPropertiesUsed":[{"name":"caption","vizPropertyVariablename":"caption","propertyValue":"Studierende nach Bundesland der HZB"},\ +{"name":"subtitle","vizPropertyVariablename":"caption","propertyValue":"Summe der Studierenden"},\ +{"name":"height","vizPropertyVariablename":"height","propertyValue":"450","propUnit":""},\ +{"name":"height","vizPropertyVariablename":"height","propertyValue":"450","propUnit":""},\ +{"name":"width","vizPropertyVariablename":"width","propertyValue":"650","propUnit":""},\ +{"name":"width","vizPropertyVariablename":"width","propertyValue":"650","propUnit":""},\ +{"name":"marginLeft","vizPropertyVariablename":"marginLeft","propertyValue":"100","propUnit":""},\ +{"name":"marginBottom","vizPropertyVariablename":"marginBottom","propertyValue":"80","propUnit":""},\ +{"name":"innerRadius","vizPropertyVariablename":"innerRadius","propertyValue":"0","propUnit":""},\ +{"name":"labelRadiusFactor","vizPropertyVariablename":"labelRadiusFactor","propertyValue":"80","propUnit":""},\ +{"name":"cornerRadius","vizPropertyVariablename":"cornerRadius","propertyValue":"10","propUnit":"px"},\ +{"name":"labelOpacity","vizPropertyVariablename":"labelOpacity","propertyValue":"70","propUnit":""},\ +{"name":"backgroundColor","vizPropertyVariablename":"backgroundColor","propertyValue":"#ffffff","propUnit":""},\ +{"name":"color","vizPropertyVariablename":"color","propertyValue":"#000000","propUnit":""},\ +{"name":"stroke_static","vizPropertyVariablename":"stroke_static","propertyValue":"#000000","propUnit":""},\ +{"name":"fill_static","vizPropertyVariablename":"fill","propertyValue":"#004c93","propUnit":""},\ +{"name":"label_y","vizPropertyVariablename":"label","propertyValue":"Studierende","propUnit":""},\ +{"name":"line_y","vizPropertyVariablename":"line","propertyValue":"true","propUnit":""},\ +{"name":"label_x","vizPropertyVariablename":"label","propertyValue":"Fakultät","propUnit":""},\ +{"name":"line_x","vizPropertyVariablename":"line","propertyValue":"true","propUnit":""},\ +{"name":"tickRotate_x","vizPropertyVariablename":"tickRotate","propertyValue":"-45","propUnit":""},\ +{"name":"scale_x","vizPropertyVariablename":"type","propertyValue":"band","propUnit":""},\ +{"name":"scheme","vizPropertyVariablename":"scheme","propertyValue":"blandLocalized","propUnit":""},\ +{"name":"x","vizPropertyVariablename":"x","propertyValue":"summe","propUnit":""},\ +{"name":"y","vizPropertyVariablename":"y","propertyValue":"hzb_bland","propUnit":""}],\ +"dataTransformation":[]}^ ^^25.08.2024^25.08.2024^44600^ ^3^ ^ ^1^ +18^STUDANF_FAK_BAR^Studierende nach Fakultät Balken^ ^{"version":"0.2b","id":1,"name":"","renderer":"echarts","dataSources":[{"value":"0","nr":1,"name":"Tab. 1","isDefault":true},\ +{"value":"1","nr":2,"name":"Tab. 2","isDefault":false},\ +{"value":"2","nr":3,"name":"Tab. 3","isDefault":false},\ +{"value":"3","nr":4,"name":"Tab. 4","isDefault":false}],\ +"targetDiv":"","chartElements":[{"elemID":1,"vizTypeUniquename":"echarts_bar_y","caption":"bar_y","datasource":"3","elementTypeProperties":[{"nr":1,"vizTypePropertyUniquename":"x","caption":"X-Achse","propertyValue":"dim_studiengang_fb_str","propertyType":"string"},\ +{"nr":1,"vizTypePropertyUniquename":"y","caption":"Y-Achse","propertyValue":"summe","propertyType":"string"},\ +{"nr":1,"vizTypePropertyUniquename":"stroke_static","caption":"Strichfarbe","propertyValue":"#000000","propertyType":"string"},\ +{"nr":1,"vizTypePropertyUniquename":"fill_static","caption":"Flächenfarbe","propertyValue":"#004c93","propertyType":"string"}]}],\ +"chartPropertiesUsed":[{"name":"caption","vizPropertyVariablename":"caption","propertyValue":"Studierende nach Fakultät"},\ +{"name":"subtitle","vizPropertyVariablename":"caption","propertyValue":"Anzahl der Studierenden"},\ +{"name":"height","vizPropertyVariablename":"height","propertyValue":"450","propUnit":""},\ +{"name":"height","vizPropertyVariablename":"height","propertyValue":"450","propUnit":""},\ +{"name":"width","vizPropertyVariablename":"width","propertyValue":"650","propUnit":""},\ +{"name":"width","vizPropertyVariablename":"width","propertyValue":"650","propUnit":""},\ +{"name":"marginLeft","vizPropertyVariablename":"marginLeft","propertyValue":"100","propUnit":""},\ +{"name":"marginBottom","vizPropertyVariablename":"marginBottom","propertyValue":"80","propUnit":""},\ +{"name":"innerRadius","vizPropertyVariablename":"innerRadius","propertyValue":"0","propUnit":""},\ +{"name":"labelRadiusFactor","vizPropertyVariablename":"labelRadiusFactor","propertyValue":"80","propUnit":""},\ +{"name":"cornerRadius","vizPropertyVariablename":"cornerRadius","propertyValue":"10","propUnit":"px"},\ +{"name":"labelOpacity","vizPropertyVariablename":"labelOpacity","propertyValue":"70","propUnit":""},\ +{"name":"backgroundColor","vizPropertyVariablename":"backgroundColor","propertyValue":"#ffffff","propUnit":""},\ +{"name":"color","vizPropertyVariablename":"color","propertyValue":"#000000","propUnit":""},\ +{"name":"scheme","vizPropertyVariablename":"scheme","propertyValue":"unique","propUnit":""},\ +{"name":"stroke_static","vizPropertyVariablename":"stroke_static","propertyValue":"#000000","propUnit":""},\ +{"name":"fill_static","vizPropertyVariablename":"fill","propertyValue":"#004c93","propUnit":""},\ +{"name":"label_y","vizPropertyVariablename":"label","propertyValue":"Studierende","propUnit":""},\ +{"name":"line_y","vizPropertyVariablename":"line","propertyValue":"true","propUnit":""},\ +{"name":"label_x","vizPropertyVariablename":"label","propertyValue":"Fakultät","propUnit":""},\ +{"name":"line_x","vizPropertyVariablename":"line","propertyValue":"true","propUnit":""},\ +{"name":"tickRotate_x","vizPropertyVariablename":"tickRotate","propertyValue":"-45","propUnit":""},\ +{"name":"scale_x","vizPropertyVariablename":"type","propertyValue":"band","propUnit":""},\ +{"name":"x","vizPropertyVariablename":"x","propertyValue":"dim_studiengang_fb_str","propUnit":""},\ +{"name":"y","vizPropertyVariablename":"y","propertyValue":"summe","propUnit":""}],\ +"dataTransformation":[]}^ ^^25.08.2024^25.08.2024^44280^ ^3^ ^ ^1^ +29^STUD_SEM_LINE^Studierende nach Semester^ ^{"version":"0.2b","id":1,"name":"","renderer":"echarts","dataSources":[{"value":"0","nr":1,"name":"Tab. 1","isDefault":true}],\ "targetDiv":"","chartElements":[{"elemID":"1","vizTypeUniquename":"echarts_line_y","caption":"line","datasource":"0","elementTypeProperties":[{"nr":"1","vizTypePropertyUniquename":"x","caption":"X-Achse","propertyValue":"semester_str","propertyType":"string"},\ {"nr":"1","vizTypePropertyUniquename":"y","caption":"Y-Achse","propertyValue":"summe","propertyType":"string"},\ -{"nr":"1","vizTypePropertyUniquename":"stroke_static","caption":"Strichfarbe","propertyValue":"#1a5fb4","propertyType":"string"},\ +{"nr":"1","vizTypePropertyUniquename":"stroke_static","caption":"Strichfarbe","propertyValue":"#004c93","propertyType":"string"},\ {"nr":"1","vizTypePropertyUniquename":"fill_static","caption":"Flächenfarbe","propertyValue":"#ffffff","propertyType":"string"}]},\ {"elemID":2,"vizTypeUniquename":"dot","caption":"dot","datasource":"0","elementTypeProperties":[{"nr":2,"vizTypePropertyUniquename":"x","caption":"X-Achse","propertyValue":"semester_str","propertyType":"string"},\ {"nr":2,"vizTypePropertyUniquename":"y","caption":"Y-Achse","propertyValue":"summe","propertyType":"string"},\ @@ -299,7 +445,7 @@ {"nr":"3","vizTypePropertyUniquename":"fill_static","caption":"Flächenfarbe","propertyValue":"#000000","propertyType":"string"},\ {"nr":"3","vizTypePropertyUniquename":"dx","caption":"Offset (horizontal)","propertyValue":"4","propertyType":"integer"},\ {"nr":"3","vizTypePropertyUniquename":"dy","caption":"Offset (vertikal)","propertyValue":"-20","propertyType":"integer"}]}],\ -"chartPropertiesUsed":[{"name":"caption","vizPropertyVariablename":"caption","propertyValue":"Studienanfänger_innen nach Semester"},\ +"chartPropertiesUsed":[{"name":"caption","vizPropertyVariablename":"caption","propertyValue":"Studierende nach Semester"},\ {"name":"subtitle","vizPropertyVariablename":"caption","propertyValue":"Zeitverlauf"},\ {"name":"height","vizPropertyVariablename":"height","propertyValue":"450","propUnit":""},\ {"name":"height","vizPropertyVariablename":"height","propertyValue":"450","propUnit":""},\ @@ -317,6 +463,7 @@ {"name":"dy","vizPropertyVariablename":"dy","propertyValue":"-20","propUnit":"px"},\ {"name":"backgroundColor","vizPropertyVariablename":"backgroundColor","propertyValue":"#ffffff","propUnit":""},\ {"name":"color","vizPropertyVariablename":"color","propertyValue":"#000000","propUnit":""},\ +{"name":"scheme","vizPropertyVariablename":"scheme","propertyValue":"unique","propUnit":""},\ {"name":"fontFamily","vizPropertyVariablename":"fontFamily","propertyValue":"sans-serif","propUnit":""},\ {"name":"fontSize","vizPropertyVariablename":"fontSize","propertyValue":"14","propUnit":"px"},\ {"name":"stroke_static","vizPropertyVariablename":"stroke_static","propertyValue":"#000000","propUnit":""},\ @@ -376,72 +523,84 @@ {"name":"y","vizPropertyVariablename":"y","propertyValue":"summe","propUnit":""},\ {"name":"text","vizPropertyVariablename":"text","propertyValue":"summe","propUnit":""}],\ "dataTransformation":[]}^ ^1^ -18^STUDANF_FAK_BAR^Studierende nach Fakultät Balken^ ^{"version":"0.2b","id":1,"name":"","renderer":"echarts","dataSources":[{"value":"0","nr":1,"name":"Tab. 1","isDefault":true},\ -{"value":"1","nr":2,"name":"Tab. 2","isDefault":false},\ -{"value":"2","nr":3,"name":"Tab. 3","isDefault":false},\ -{"value":"3","nr":4,"name":"Tab. 4","isDefault":false}],\ -"targetDiv":"","chartElements":[{"elemID":1,"vizTypeUniquename":"echarts_bar_y","caption":"bar_y","datasource":"3","elementTypeProperties":[{"nr":1,"vizTypePropertyUniquename":"x","caption":"X-Achse","propertyValue":"dim_studiengang_fb_str","propertyType":"string"},\ -{"nr":1,"vizTypePropertyUniquename":"y","caption":"Y-Achse","propertyValue":"anteil","propertyType":"string"},\ -{"nr":1,"vizTypePropertyUniquename":"stroke_static","caption":"Strichfarbe","propertyValue":"#000000","propertyType":"string"},\ -{"nr":1,"vizTypePropertyUniquename":"fill_static","caption":"Flächenfarbe","propertyValue":"#004c93","propertyType":"string"}]}],\ -"chartPropertiesUsed":[{"name":"caption","vizPropertyVariablename":"caption","propertyValue":"Studierende nach Fakultät"},\ -{"name":"subtitle","vizPropertyVariablename":"caption","propertyValue":"Anteil in %"},\ -{"name":"height","vizPropertyVariablename":"height","propertyValue":"450","propUnit":""},\ -{"name":"height","vizPropertyVariablename":"height","propertyValue":"450","propUnit":""},\ -{"name":"width","vizPropertyVariablename":"width","propertyValue":"650","propUnit":""},\ -{"name":"width","vizPropertyVariablename":"width","propertyValue":"650","propUnit":""},\ -{"name":"marginLeft","vizPropertyVariablename":"marginLeft","propertyValue":"100","propUnit":""},\ -{"name":"marginBottom","vizPropertyVariablename":"marginBottom","propertyValue":"80","propUnit":""},\ -{"name":"innerRadius","vizPropertyVariablename":"innerRadius","propertyValue":"0","propUnit":""},\ -{"name":"labelRadiusFactor","vizPropertyVariablename":"labelRadiusFactor","propertyValue":"80","propUnit":""},\ -{"name":"cornerRadius","vizPropertyVariablename":"cornerRadius","propertyValue":"10","propUnit":"px"},\ -{"name":"labelOpacity","vizPropertyVariablename":"labelOpacity","propertyValue":"70","propUnit":""},\ -{"name":"backgroundColor","vizPropertyVariablename":"backgroundColor","propertyValue":"#ffffff","propUnit":""},\ -{"name":"color","vizPropertyVariablename":"color","propertyValue":"#000000","propUnit":""},\ -{"name":"stroke_static","vizPropertyVariablename":"stroke_static","propertyValue":"#000000","propUnit":""},\ -{"name":"fill_static","vizPropertyVariablename":"fill","propertyValue":"#004c93","propUnit":""},\ -{"name":"label_y","vizPropertyVariablename":"label","propertyValue":"Studierende","propUnit":""},\ -{"name":"line_y","vizPropertyVariablename":"line","propertyValue":"true","propUnit":""},\ -{"name":"label_x","vizPropertyVariablename":"label","propertyValue":"Fakultät","propUnit":""},\ -{"name":"line_x","vizPropertyVariablename":"line","propertyValue":"true","propUnit":""},\ -{"name":"tickRotate_x","vizPropertyVariablename":"tickRotate","propertyValue":"-45","propUnit":""},\ -{"name":"scale_x","vizPropertyVariablename":"type","propertyValue":"band","propUnit":""},\ -{"name":"x","vizPropertyVariablename":"x","propertyValue":"dim_studiengang_fb_str","propUnit":""},\ -{"name":"y","vizPropertyVariablename":"y","propertyValue":"anteil","propUnit":""}],\ -"dataTransformation":[]}^ ^^25.08.2024^25.08.2024^44280^ ^3^ ^ ^1^ -33^STUDANF_HZB_LAND_BAR^Studierende nach HZB-Land^ ^{"version":"0.2b","id":1,"name":"","renderer":"echarts","dataSources":[{"value":"0","nr":1,"name":"Tab. 1","isDefault":true},\ -{"value":"1","nr":2,"name":"Tab. 2","isDefault":false},\ -{"value":"2","nr":3,"name":"Tab. 3","isDefault":false},\ -{"value":"3","nr":4,"name":"Tab. 4","isDefault":false}],\ -"targetDiv":"","chartElements":[{"elemID":1,"vizTypeUniquename":"echarts_bar_x","caption":"bar_x","datasource":"3","elementTypeProperties":[{"nr":1,"vizTypePropertyUniquename":"x","caption":"X-Achse","propertyValue":"summe","propertyType":"string"},\ -{"nr":1,"vizTypePropertyUniquename":"y","caption":"Y-Achse","propertyValue":"hzb_bland","propertyType":"string"},\ -{"nr":1,"vizTypePropertyUniquename":"stroke_static","caption":"Strichfarbe","propertyValue":"#000000","propertyType":"string"},\ -{"nr":1,"vizTypePropertyUniquename":"fill_static","caption":"Flächenfarbe","propertyValue":"#004c93","propertyType":"string"}]}],\ -"chartPropertiesUsed":[{"name":"caption","vizPropertyVariablename":"caption","propertyValue":"Studierende nach Bundesland der HZB"},\ -{"name":"subtitle","vizPropertyVariablename":"caption","propertyValue":"Summe der Studierenden"},\ -{"name":"height","vizPropertyVariablename":"height","propertyValue":"450","propUnit":""},\ -{"name":"height","vizPropertyVariablename":"height","propertyValue":"450","propUnit":""},\ -{"name":"width","vizPropertyVariablename":"width","propertyValue":"650","propUnit":""},\ -{"name":"width","vizPropertyVariablename":"width","propertyValue":"650","propUnit":""},\ -{"name":"marginLeft","vizPropertyVariablename":"marginLeft","propertyValue":"100","propUnit":""},\ -{"name":"marginBottom","vizPropertyVariablename":"marginBottom","propertyValue":"80","propUnit":""},\ -{"name":"innerRadius","vizPropertyVariablename":"innerRadius","propertyValue":"0","propUnit":""},\ -{"name":"labelRadiusFactor","vizPropertyVariablename":"labelRadiusFactor","propertyValue":"80","propUnit":""},\ -{"name":"cornerRadius","vizPropertyVariablename":"cornerRadius","propertyValue":"10","propUnit":"px"},\ -{"name":"labelOpacity","vizPropertyVariablename":"labelOpacity","propertyValue":"70","propUnit":""},\ -{"name":"backgroundColor","vizPropertyVariablename":"backgroundColor","propertyValue":"#ffffff","propUnit":""},\ -{"name":"color","vizPropertyVariablename":"color","propertyValue":"#000000","propUnit":""},\ -{"name":"stroke_static","vizPropertyVariablename":"stroke_static","propertyValue":"#000000","propUnit":""},\ -{"name":"fill_static","vizPropertyVariablename":"fill","propertyValue":"#004c93","propUnit":""},\ -{"name":"label_y","vizPropertyVariablename":"label","propertyValue":"Studierende","propUnit":""},\ -{"name":"line_y","vizPropertyVariablename":"line","propertyValue":"true","propUnit":""},\ -{"name":"label_x","vizPropertyVariablename":"label","propertyValue":"Fakultät","propUnit":""},\ -{"name":"line_x","vizPropertyVariablename":"line","propertyValue":"true","propUnit":""},\ -{"name":"tickRotate_x","vizPropertyVariablename":"tickRotate","propertyValue":"-45","propUnit":""},\ -{"name":"scale_x","vizPropertyVariablename":"type","propertyValue":"band","propUnit":""},\ -{"name":"x","vizPropertyVariablename":"x","propertyValue":"dim_studiengang_fb_str","propUnit":""},\ -{"name":"y","vizPropertyVariablename":"y","propertyValue":"anteil","propUnit":""}],\ -"dataTransformation":[]}^ ^^25.08.2024^25.08.2024^44600^ ^3^ ^ ^1^ +38^STUDANF_KOHORTEN_BAR_Y_ECHART_INVERTED^Studierende nach Kohorten Balken vertikal invertiert (Echart)^ ^{"version":"0.2b","id":1,"name":"","renderer":"echarts","dataSources":[{"value":"0","nr":1,"name":"Tab. 1","isDefault":true}],\ +"targetDiv":"",\ +"chartElements":[{"elemID":1,"vizTypeUniquename":"echarts_native","sourceCode":\ +{\ + legend: {show:true,itemGap:5,itemHeight:6,\ + data: [{\ + name: 'Studienanfänger:innen',\ + icon: 'roundRect'},\ + {\ + name: 'Aktives Studium',\ + icon: 'roundRect'\ + }, {\ + name: 'Studienfachwechsel',\ + icon: 'roundRect'\ +}, {\ + name: 'Abschluss des Studiums',\ + icon: 'roundRect'\ + }, {\ + name: 'Inaktives Studium',\ + icon: 'roundRect'\ +},\ + {\ + name: 'Exmatrikulation',\ + icon: 'roundRect'},\ + {\ + name: 'Abschlüsse je Semester',\ + icon: 'circle'},\ + {\ + name: 'Schwund je Semester',\ + icon: 'circle'}\ +]\ + },\ + tooltip: {},\ + \ + xAxis: [\ + { type: 'category', axisLabel:{rotate:30}}\ + ],\ + yAxis: [{name:'Studierende', nameLocation:'middle', nameGap:40,id:0 },\ + {id:1,name:'100-Studierende', nameLocation:'middle', nameGap:40,inverse:true,show:false }],\ + \ + series: [\ + { name:'Studienanfänger:innen',type: 'bar', encode:{x:'eintrag',y:'anz_ein'}, color:'#004a93',\ + label: {\ + show: true\ + }},\ + { name:'Aktives Studium',type: 'bar',encode:{x:'eintrag',y:'anz_aktiv_sem'},stack:'summe', color:'#afcde4',\ + label: {\ + show: true\ + }},\ + { name:'Studienfachwechsel',type: 'bar',encode:{x:'eintrag',y:'anz_wechsel_kum'},stack:'summe', color:'#878787',\ + label: {\ + show: true\ + }} ,\ + { name:'Abschluss des Studiums',type: 'bar', encode:{x:'eintrag',y:'anz_hp_kum'},stack:'summe', color:'#6dbe99',\ + label: {\ + show: true\ + }} ,\ + { name:'Inaktives Studium',type: 'bar', encode:{x:'eintrag',y:'anz_inaktiv_sem'},stack:'summe', color:'#379dc3',\ + label: {\ + show: true\ + }} ,\ + { name:'Exmatrikulation',type: 'bar', encode:{x:'eintrag',y:'anz_exm_kum'},stack:'summe', color:'#d8c65a',\ + label: {\ + show: true\ + }},\ + { name:'Abschlüsse je Semester',type: 'line', encode:{x:'eintrag',y:'anz_hp'}, color:'#54ab52',yAxisIndex:1,\ + label: {\ + show: true, fontWeight:'bold'\ + }},\ + { name:'Schwund je Semester',type: 'line', encode:{x:'eintrag',y:'anz_exm'}, color:'#ed7374',\ + label: {\ + show: true, fontWeight:'bold'\ + }}\ + ]\ +}\ +}\ +]\ +}^ ^^25.08.2024^25.08.2024^800000550^ ^3^ ^ ^1^ 28^STUDANF_JAHR_BAR^Studienanfänger_innen nach Jahr Balken^ ^{"version":"0.2b","id":1,"name":"","renderer":"plot","dataSources":[{"value":"0","nr":1,"name":"Tab. 4","isDefault":true}],\ "targetDiv":"","chartElements":[{"elemID":1,"vizTypeUniquename":"bar_y","caption":"bar_y","datasource":"0","elementTypeProperties":[{"nr":1,"vizTypePropertyUniquename":"x","caption":"X-Achse","propertyValue":"jahr","propertyType":"string"},\ {"nr":1,"vizTypePropertyUniquename":"y","caption":"Y-Achse","propertyValue":"summe","propertyType":"string"},\ @@ -689,7 +848,7 @@ {"name":"line_y","vizPropertyVariablename":"line","propertyValue":"true","propUnit":""},\ {"name":"line_x","vizPropertyVariablename":"line","propertyValue":"true","propUnit":""},\ {"name":"scale_x","vizPropertyVariablename":"type","propertyValue":"band","propUnit":""},\ -{"name":"scheme","vizPropertyVariablename":"scheme","propertyValue":"greens","propUnit":""},\ +{"name":"scheme","vizPropertyVariablename":"scheme","propertyValue":"quadroColor","propUnit":""},\ {"name":"dimension1","vizPropertyVariablename":"dimension1","propertyValue":"geschlecht_str","propUnit":""},\ {"name":"measure1","vizPropertyVariablename":"measure1","propertyValue":"anteil","propUnit":""}],\ "dataTransformation":[]}^ ^^25.08.2024^25.08.2024^44220^ ^3^{"version":"0.2b","id":1,"name":"","renderer":"d3js","dataSources":[{"value":"1","nr":2,"name":"Tab. 2","isDefault":true}],\ diff --git a/superx/xml/js/viz/viz_viewer.js b/superx/xml/js/viz/viz_viewer.js index 100abca..f5b28eb 100644 --- a/superx/xml/js/viz/viz_viewer.js +++ b/superx/xml/js/viz/viz_viewer.js @@ -161,14 +161,124 @@ function openModalCardDetail(ergebniselementOrdnr) function fillEchartsDataSet(myRs,myRsMetaData,currentChartModel) { + var dataset =new Array(); var chartType=currentChartModel.chartElements[0].vizTypeUniquename; //Identify dimensions and measures: - if(chartType=="echarts_pie") - { - //bei pie charts ist die erste Spalte der Name, die zweite der Wert: -var measure1Fldname=getChartElementPropertyValue(currentChartModel,"1","measure1"); -var dimension1Fldname=getChartElementPropertyValue(currentChartModel,"1","dimension1"); - var datasetSourceRow=new Array(); + switch (chartType) { + case "echarts_pie": + var measure1Fldname=getChartElementPropertyValue(currentChartModel,"1","measure1"); + var dimension1Fldname=getChartElementPropertyValue(currentChartModel,"1","dimension1"); + dataset=fillEchartsDataSetNameValue(myRs,myRsMetaData,dimension1Fldname,measure1Fldname); + break; + case "echarts_bar_y_stack": + //TODO klappt nich tnicht) + var measure1Fldname=getChartElementPropertyValue(currentChartModel,"1","measure1"); + var dimension1Fldname=getChartElementPropertyValue(currentChartModel,"1","dimension1"); + var dimension2Fldname=getChartElementPropertyValue(currentChartModel,"1","dimension2"); + dataset=fillEchartsDataSetCrosstab(myRs,myRsMetaData,dimension1Fldname,dimension2Fldname,measure1Fldname); + break; + default: + dataset=fillEchartsDataSetSimpleCopy(myRs,myRsMetaData); + break; + } + + + return dataset; +} +function fillEchartsDataSetSimpleCopy(myRs,myRsMetaData) +{ + var myDimensions=[]; + var mySource=[]; + myRsMetaData.forEach((row) => { + for (var col in row) { + console.log(col +"-"+row[col]); + if(col=="colname" && row[col]) + { + myDimensions.push(row[col]); + } + } + }); + + var rowcount=myRs.length; + var rownr=1; + console.log("Zeilenanzahl " +rowcount); + myRs.forEach((row) => { + mySource.push(row); + rownr++; + } + ); + //TODO:Sorting and filtering + + return {dimensions:myDimensions, source: mySource }; +} +function fillEchartsDataSetCrosstab(myRs,myRsMetaData,dimension1Fldname,dimension2Fldname,measure1Fldname) +{ + //TODO, klappt noch nicht + var datasetSourceRow=new Array(); + var datasetSourceCol=new Array(); + + var columnCount=myRsMetaData.length; + var rowCount=myRs.length; + + //zuerst die Überschrift: + //erste Spalte enthält Dimension 1, die weiteren Spalten dann die Ausprägungen von Dimension 2: + var dimension1Value; + var dimension2Value; + var previousDimension1Value=""; + var previousDimension2Value=""; + var measure1Value; + var isFirstTargetRow=true; + myRs.forEach((row) => { + for (var col in row) { + //console.log(col +"-"+row[col]); + if(col==dimension1Fldname) + dimension1Value=row[col]; + if(col==dimension2Fldname) + dimension2Value=row[col]; + if(col==measure1Fldname) + measure1Value=row[col]; + + if(dimension1Value!=previousDimension1Value) + { + var datasetSourceRow=new Array(); + var datasetSourceCol=new Array(); + datasetSourceCol.push(dimension1Value); + if(dimension2Value!=previousDimension2Value) + datasetSourceCol.push(dimension2Value); + + } + + var datasetSourceCol=new Array(); + datasetSourceCol.push(dimension1Value); + datasetSourceCol.push(measure1Value); + + datasetSourceRow.push(datasetSourceCol); + + } + }); + + //datasetSourceCol=[dimension1Fldname,dimension2Fldname,measure1Fldname]; + + //datasetSourceRow.push(datasetSourceCol); + //now the data: + //bei pie chartdimensions:myDimensionss ist die erste Spalte der Name, die zweite der Wert: + + + + /* + for(var i=0;i < rowCount;i++) + { + var datasetSourceCol=new Array(); + datasetSourceCol.push(myRs[i].dim_studiengang_fb); + datasetSourceCol.push(myRs[i].summe); + + datasetSourceRow.push(datasetSourceCol); + }*/ + return datasetSourceRow; +} +function fillEchartsDataSetNameValue(myRs,myRsMetaData,dimension1Fldname,measure1Fldname) +{ + var datasetSourceRow=new Array(); var datasetSourceCol=new Array(); var columnCount=myRsMetaData.length; @@ -209,35 +319,6 @@ var dimension1Fldname=getChartElementPropertyValue(currentChartModel,"1","dimens datasetSourceRow.push(datasetSourceCol); }*/ return datasetSourceRow; - } - else - { - //bar, line etc.: - var myDimensions=[]; - var mySource=[]; - myRsMetaData.forEach((row) => { - for (var col in row) { - console.log(col +"-"+row[col]); - if(col=="colname" && row[col]) - { - myDimensions.push(row[col]); - } - } - }); - - var rowcount=myRs.length; - var rownr=1; - console.log("Zeilenanzahl " +rowcount); - myRs.forEach((row) => { - mySource.push(row); - rownr++; - } - ); - //TODO:Sorting and filtering - - var dataset={dimensions:myDimensions, source: mySource }; - return dataset; - } } /* plot and d3 start:*/ @@ -1097,11 +1178,14 @@ function getPlotOptionsObj(chartPropertiesUsed,currentChartModel) } /*echarts:*/ -function renderEChart2(currentChartModel,chartDiv,ergebniselementOrdnr) +function renderEChart2(currentChartModel,chartDiv,ergebniselementOrdnr,chartTitle) { // Initialize the echarts instance based on the prepared dom var myChart = echarts.init(document.getElementById(chartDiv),null, { renderer: 'svg' }); var chartType=currentChartModel.chartElements[0].vizTypeUniquename; + var titleText=chartTitle; + if(chartTitle=="") + titleText=getChartPropertyValue(currentChartModel.chartPropertiesUsed,"caption"); var myDataset=fillEchartsDataSet(rs[ergebniselementOrdnr],rsColumnMetaData[ergebniselementOrdnr],currentChartModel); var option; @@ -1111,17 +1195,22 @@ function renderEChart2(currentChartModel,chartDiv,ergebniselementOrdnr) case "echarts_bar_y": case "echarts_line_x": case "echarts_line_y": - option=getEchartOptionsBarLine(currentChartModel,myDataset,chartType); + option=getEchartOptionsBarLine(currentChartModel,myDataset,chartType,titleText); break; case "echarts_pie": - option=getEchartOptionsPie(currentChartModel,myDataset); + option=getEchartOptionsPie(currentChartModel,myDataset,titleText); + break; + case "echarts_native": + + option=getEchartOptionsNative(currentChartModel,myDataset,titleText); break; default: alert("Unknown chart type"); break; } // Display the chart using the configuration items and data just specified. + console.log("ECharts-SRC:"+JSON.stringify(option)); myChart.setOption(option); @@ -1182,7 +1271,7 @@ function closeModalCardDetail(ergebniselementOrdnr) myModalCard.classList.remove('is-active'); } -function getEchartOptionsBarLine(currentChartModel,myDataset,chartType) +function getEchartOptionsBarLine(currentChartModel,myDataset,chartType,titleText) { //TODO: bar_x und y abfangen' var chartTypes = chartType.split(/_/); @@ -1203,9 +1292,9 @@ if(orientation=="x") } var measure1Fldname=getChartPropertyValue(currentChartModel.chartPropertiesUsed,measure1Axis); var dimension1Fldname=getChartPropertyValue(currentChartModel.chartPropertiesUsed,dimension1Axis); -var titleText=getChartPropertyValue(currentChartModel.chartPropertiesUsed,"caption"); var subtitleText=getChartPropertyValue(currentChartModel.chartPropertiesUsed,"subtitle"); - +var scheme = getChartPropertyValue(currentChartModel.chartPropertiesUsed,"scheme"); +var myPalette=getSchemeArray(scheme); var encodeObj={x:dimension1Fldname,y:measure1Fldname}; if(orientation=="x") encodeObj={y:dimension1Fldname,x:measure1Fldname}; @@ -1271,24 +1360,41 @@ if(orientation=="x") color: '#dfe4f2' }, margin: 50, - fontSize: 12, - colorBy: 'data' - + fontSize: 14, + colorBy: 'data', + lineStyle: { + width: 7 + }, + label: { + show: true + } } ], - color:['#488a7c','#374ca9','#ffd705','#a68eca','#e84035','#64a6d9','#ff933e','#ee79ad','#7aa2ba','#c3df35','#9bceab','#782f88','#96BFFF'] + color:myPalette }; return option; } + +function getEchartOptionsNative(currentChartModel,myDataset) +{ + var options=currentChartModel.chartElements[0].sourceCode; + options.dataset=myDataset; + //var dataset ={dataset}; + //dataset.source=myDataset; + //options=Object.assign(myDataset,options); + return options; + +} function getEchartOptionsPie(currentChartModel,myDataset) { var measure1Fldname=getChartElementPropertyValue(currentChartModel,"1","measure1"); var dimension1Fldname=getChartElementPropertyValue(currentChartModel,"1","dimension1"); var titleText=getChartPropertyValue(currentChartModel.chartPropertiesUsed,"caption"); - +var scheme = getChartPropertyValue(currentChartModel.chartPropertiesUsed,"scheme"); +var myPalette=getSchemeArray(scheme); var option = { dataset: { @@ -1322,27 +1428,14 @@ var option = { show: true, formatter: '{c}', width:200 + }, fontSize: 12, - radius: ['10%', '50%'], //1. Parameter inside radius, macht ihn zum Donut. 2.Parameter definiert den Anteil des Kreises am ganzen Viewport" - color: [ - '#ec7206', - '#61a27c', - '#b8103b', - '#feca00', - '#FFDB5C', - '#ff9f7f', - '#fb7293', - '#E062AE', - '#E690D1', - '#e7bcf3', - '#9d96f5', - '#8378EA', - '#96BFFF' - ], + radius: ['30%', '80%'], //1. Parameter inside radius, macht ihn zum Donut. 2.Parameter definiert den Anteil des Kreises am ganzen Viewport" + color: myPalette, itemStyle: { - borderRadius: [20, 5, 5, 10], //abgerundete Ecken der Tortenstücke + //borderRadius: [20, 5, 5, 10], //abgerundete Ecken der Tortenstücke borderColor: '#fff', borderWidth: 2 } @@ -1727,4 +1820,72 @@ function getColumnCaption(columnName) colCaption=rsMetaData[i].colcaption; } return colCaption; +} + +function getSchemeArray(schemeName) +{ + var schemeArray=new Array(); + switch (schemeName) { + case "abgrp": + /*Bachelor: BA blau #374ca und 80 % , LA BA #5e70ba +Master: #64a6d9 #8cb7e1 +Promotion: #7aa2ba +Sonstige: #98b4c9*/ + schemeArray=['#374ca','#5e70ba','#64a6d9','#8cb7e1','#7aa2ba','#98b4c9','#ff933e']; + break; + case "fak": + schemeArray=['#488a7c','#374ca9','#ffd705','#a68eca','#e84035','#64a6d9','#ff933e','#ee79ad','#7aa2ba','#c3df35','#9bceab','#782f88','#96BFFF']; + break; + case "unique": + schemeArray=['#004c93']; + break; + case "dichotom": + schemeArray=['rgb(97,162,124)','#c3df35','#9d96f5','#e7bcf3']; + break; + case "quadroColor": + schemeArray=['#374ca9','#5e70ba','#8794cb','#afb7dc']; + break; + case "blandLocalized": + myBland=9; + for(var j=0;j < 17;j++) + { + if(j==myBland) + schemeArray[j]='#004c93'; + else + schemeArray[j]='#666666'; + } + break; + case "colorGrades": + //cooles Tool:https://mdigi.tools/lighten-color/ in 7% Schritten heller + schemeArray=['#374ca9','#3c53b8','#455cc3','#556ac8','##6477cc','#7384d1','#8291d6','#919fdb','#a0ace0','#afb9e5','#bec6ea','#cdd4ef','#dce1f4','#eceef9','#f4f6fb','#f6f7fc']; + break; + default: + schemeArray=[ + '#ec7206', + '#61a27c', + '#b8103b', + '#feca00', + '#FFDB5C', + '#ff9f7f', + '#fb7293', + '#E062AE', + '#E690D1', + '#e7bcf3', + '#9d96f5', + '#8378EA', + '#96BFFF' + ]; + break; + } + + return schemeArray; +} + +function openDashboardTab(tabnr,maskennr,params) +{ +document.forms[0].elements["tid"].value=maskennr; +document.forms[0].elements["Tabnr."].value=tabnr; + +document.forms[0].submit(); + } \ No newline at end of file diff --git a/superx/xml/viz_components.xsl b/superx/xml/viz_components.xsl index e508d3e..30e660c 100644 --- a/superx/xml/viz_components.xsl +++ b/superx/xml/viz_components.xsl @@ -483,6 +483,7 @@ var rsNr=0; + @@ -508,7 +509,11 @@ myDiv="]]> rsNr=]]> + + -
+
Details... @@ -1409,5 +1414,85 @@ Platzhalter - + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + " value=" + " + + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+