From ea6df167865e6d864cf2de70b82de41288e4409f Mon Sep 17 00:00:00 2001 From: Daniel Quathamer Date: Mon, 26 Aug 2024 07:57:17 +0200 Subject: [PATCH] =?UTF-8?q?Verbesserter=20Assistent,=20Viewer=20Stylesheet?= =?UTF-8?q?s=20f=C3=BCr=20Kern=205.2=20#5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-modules/module/viz/conf/includes.txt | 3 +- src-modules/module/viz/conf/viz.xml | 22 +- .../module/viz/masken/44100_felderinfo.unl | 22 + .../viz/masken/44100_maske_system_bez.unl | 1 + .../viz/masken/44100_masken_felder_bez.unl | 19 + .../module/viz/masken/44100_maskeninfo.unl | 1 + .../viz/masken/44100_sachgeb_maske_bez.unl | 1 + .../module/viz/masken/44130_felderinfo.unl | 37 ++ .../viz/masken/44130_maske_system_bez.unl | 1 + .../viz/masken/44130_masken_felder_bez.unl | 23 + .../module/viz/masken/44130_maskeninfo.unl | 1 + .../viz/masken/44130_sachgeb_maske_bez.unl | 1 + .../module/viz/masken/44160_felderinfo.unl | 39 ++ .../viz/masken/44160_maske_system_bez.unl | 1 + .../viz/masken/44160_masken_felder_bez.unl | 19 + .../module/viz/masken/44160_maskeninfo.unl | 1 + .../viz/masken/44160_sachgeb_maske_bez.unl | 1 + .../sx_stylesheets_einfuegen.sql | 35 +- .../viz/schluesseltabellen/viz_chart.unl | 6 + .../viz/schluesseltabellen/viz_property.unl | 23 +- .../viz_property_input_type.unl | 1 + .../viz_property_renderer.unl | 19 +- .../viz/schluesseltabellen/viz_type.unl | 24 +- .../viz_type_plot_fuellen.sql | 122 +++-- .../schluesseltabellen/viz_type_property.unl | 515 +++++------------- superx/xml/js/viz/viz_functions.js | 128 ++++- superx/xml/viz_components.xsl | 321 ++++++++++- superx/xml/viz_html_chart.xsl | 29 - superx/xml/viz_html_chart_viewer.xsl | 43 +- superx/xml/viz_html_chart_viewer_grid.xsl | 248 +++++++++ superx/xml/viz_html_chart_viewer_mask.xsl | 235 ++++++++ .../test_viz/stud_zeitreihe_plot.html | 33 +- 32 files changed, 1419 insertions(+), 556 deletions(-) create mode 100644 src-modules/module/viz/masken/44100_felderinfo.unl create mode 100644 src-modules/module/viz/masken/44100_maske_system_bez.unl create mode 100644 src-modules/module/viz/masken/44100_masken_felder_bez.unl create mode 100644 src-modules/module/viz/masken/44100_maskeninfo.unl create mode 100644 src-modules/module/viz/masken/44100_sachgeb_maske_bez.unl create mode 100644 src-modules/module/viz/masken/44130_felderinfo.unl create mode 100644 src-modules/module/viz/masken/44130_maske_system_bez.unl create mode 100644 src-modules/module/viz/masken/44130_masken_felder_bez.unl create mode 100644 src-modules/module/viz/masken/44130_maskeninfo.unl create mode 100644 src-modules/module/viz/masken/44130_sachgeb_maske_bez.unl create mode 100644 src-modules/module/viz/masken/44160_felderinfo.unl create mode 100644 src-modules/module/viz/masken/44160_maske_system_bez.unl create mode 100644 src-modules/module/viz/masken/44160_masken_felder_bez.unl create mode 100644 src-modules/module/viz/masken/44160_maskeninfo.unl create mode 100644 src-modules/module/viz/masken/44160_sachgeb_maske_bez.unl create mode 100644 superx/xml/viz_html_chart_viewer_grid.xsl create mode 100644 superx/xml/viz_html_chart_viewer_mask.xsl diff --git a/src-modules/module/viz/conf/includes.txt b/src-modules/module/viz/conf/includes.txt index fe0d99c..33ee8ea 100644 --- a/src-modules/module/viz/conf/includes.txt +++ b/src-modules/module/viz/conf/includes.txt @@ -20,6 +20,7 @@ xml/pageComponents_html_final_viz.xsl.sam xml/viz_html_chart.xsl xml/viz_html_chart_sankey.xsl xml/viz_html_chart_viewer.xsl -xml/tabelle_html_viz.xsl +xml/viz_html_chart_viewer_mask.xsl +xml/viz_html_chart_viewer_grid.xsl xml/viz_components.xsl xml/viz_tableComponents.xsl diff --git a/src-modules/module/viz/conf/viz.xml b/src-modules/module/viz/conf/viz.xml index 37e7863..7ce06e5 100644 --- a/src-modules/module/viz/conf/viz.xml +++ b/src-modules/module/viz/conf/viz.xml @@ -20,6 +20,8 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[VIZ]" /> Grafik horizontal (H) oder vertikal (V) + + SVG-Beispiel @@ -347,7 +349,24 @@ parent="Visualisierungen">Abfragen zur Administration von Visualisierungen $VIZ_PFAD/masken - + + Studierende gesamt / 1. FS / 1.HS + + $VIZ_PFAD/masken + + + + + + $VIZ_PFAD/masken + + + + + + $VIZ_PFAD/masken + + @@ -456,6 +475,7 @@ parent="Visualisierungen">Abfragen zur Administration von Visualisierungen --> + diff --git a/src-modules/module/viz/masken/44100_felderinfo.unl b/src-modules/module/viz/masken/44100_felderinfo.unl new file mode 100644 index 0000000..7f43287 --- /dev/null +++ b/src-modules/module/viz/masken/44100_felderinfo.unl @@ -0,0 +1,22 @@ +44100^Köpfe oder Fälle ?^-3^0^0^130^150^1^sql^30^1^1^<> select apnr, eintrag from koepfe_oder_faelle;^hidden^<> select apnr, eintrag from koepfe_oder_faelle where eintrag = 'Köpfe';^ +44101^Seit Semester^1^0^0^130^80^1^integer^30^1^1^<> select tid, eintrag from semester order by tid DESC;^^<> select tid,eintrag from semester where today()-(3*365) between sem_beginn and sem_ende;^ +44102^Fächer^6^0^0^130^200^6^char^30^0^12^<> select tid,name,sortnr from sichten where art='Fächer-Sicht' order by 3,2;^^^ +44103^bis Fachsemester^23^330^-1^130^100^1^integer^30^0^0^^hidden^^ +44104^Hörerstatus^18^0^0^130^150^1^sql^30^0^1^<> select apnr, eintrag from hoererstatus order by 2^hidden^<> select apnr, eintrag from hoererstatus where eintrag='alle';^ +44105^Stichtag^-2^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';^ +44106^Status^11^330^-1^130^180^1^sql^30^0^1^<> select apnr,eintrag from sos_status order by 2^hidden^<> select apnr,eintrag from sos_status where eintrag='Alle ohne Beurl.';^ +44107^Bis Semester^3^330^-1^130^100^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;^ +44108^Abschluss^5^0^0^130^150^5^char^30^0^1^<> select apnr, trim(druck) || ' (' || trim(apnr) || ')' from cifx where key = 35 order by 2;^^^ +44109^Fachkennz.^16^330^-1^130^150^1^char^30^0^1^<> select apnr,druck from sos_k_kzfa order by 2^hidden^^ +44110^Vertiefung^7^330^-1^130^100^1^char^30^0^1^<> select apnr,druck from cifx where key=39 order by 2;^hidden^^ +44111^ab Fachsemester^22^0^0^130^100^1^integer^30^0^0^^hidden^^ +44112^Filter Studierende^120^0^0^130^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;^^^ +44113^Trennen nach^121^330^-1^130^100^1^char^20^0^1^<> \ +select 'Fach' from xdummy where (select count(*) from sos_gewichtungsvariante)=0 \ +union \ +select 'Abschluss' from xdummy^hidden^^ +44114^Studiengang^4^0^0^130^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;^^^ +44115^##line##^13^0^0^100^100^1^char^5000^0^8^^^1^ +44116^##line##^30^0^0^100^100^1^char^5000^0^8^^^1^ +44117^Grafik^1000^300^-1^170^150^1^integer^30^0^1^<> select tid, caption from viz_chart where maskeninfo_id=44100 order by 2;^ ^<> select tid, caption from viz_chart where maskeninfo_id=44100 order by 2 limit 1;^ +44118^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=44100 order by ord^ ^<> select filename,caption from sx_stylesheets S, sx_mask_style M where S.tid=M.stylesheet_id and M.maskeninfo_id=44100 order by ord limit 1^ diff --git a/src-modules/module/viz/masken/44100_maske_system_bez.unl b/src-modules/module/viz/masken/44100_maske_system_bez.unl new file mode 100644 index 0000000..3310d4d --- /dev/null +++ b/src-modules/module/viz/masken/44100_maske_system_bez.unl @@ -0,0 +1 @@ +44100^7^ diff --git a/src-modules/module/viz/masken/44100_masken_felder_bez.unl b/src-modules/module/viz/masken/44100_masken_felder_bez.unl new file mode 100644 index 0000000..39a3345 --- /dev/null +++ b/src-modules/module/viz/masken/44100_masken_felder_bez.unl @@ -0,0 +1,19 @@ +44100^44100^ +44100^44101^ +44100^44102^ +44100^44103^ +44100^44104^ +44100^44105^ +44100^44106^ +44100^44107^ +44100^44108^ +44100^44109^ +44100^44110^ +44100^44111^ +44100^44112^ +44100^44113^ +44100^44114^ +44100^44115^ +44100^44116^ +44100^44117^ +44100^44118^ diff --git a/src-modules/module/viz/masken/44100_maskeninfo.unl b/src-modules/module/viz/masken/44100_maskeninfo.unl new file mode 100644 index 0000000..2cea652 --- /dev/null +++ b/src-modules/module/viz/masken/44100_maskeninfo.unl @@ -0,0 +1 @@ +44100^Studierende Zeitreihe (VIZ)^select select_stmt from maskeninfo where tid=16000^select xil_proplist from maskeninfo where tid=16000^Semester^Anzahl^je Semester mit Geschlechtsangabe und Prozentwert^select cleanup_stmt from maskeninfo where tid=16000^-leer-^3^700^360^0^1^^ diff --git a/src-modules/module/viz/masken/44100_sachgeb_maske_bez.unl b/src-modules/module/viz/masken/44100_sachgeb_maske_bez.unl new file mode 100644 index 0000000..d9ebb84 --- /dev/null +++ b/src-modules/module/viz/masken/44100_sachgeb_maske_bez.unl @@ -0,0 +1 @@ +16^44100^ diff --git a/src-modules/module/viz/masken/44130_felderinfo.unl b/src-modules/module/viz/masken/44130_felderinfo.unl new file mode 100644 index 0000000..0f67283 --- /dev/null +++ b/src-modules/module/viz/masken/44130_felderinfo.unl @@ -0,0 +1,37 @@ +44130^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';^ +44131^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;^ +44132^Stichtag^1^350^-1^140^100^1^sql^30^0^1^<> select tid, name from sos_stichtag where stichtagsart='Studierende';^hidden^<> select tid, name from sos_stichtag where stichtagsart='Studierende' and appl_key='0';^ +44133^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;^^^ +44134^Status^14^350^-1^140^180^1^sql^30^0^1^<> select apnr,eintrag from sos_status order by 2^hidden^<> select apnr,eintrag from sos_status where eintrag='Alle ohne Beurl.';^ +44135^Hörerstatus^33^0^0^140^170^1^sql^30^0^1^<> select apnr, eintrag from hoererstatus order by 2^hidden^<> select apnr, eintrag from hoererstatus where eintrag='alle';^ +44136^Weitere Tabellen^123^0^0^140^140^10^char^30^0^1^<> select name,string_not_null(caption) || ' - ' || name from sx_tables where name in ('dim_studiengang','dim_staat')\ +order by 2^hidden^^ +44137^bis Fachsemester^35^350^-1^140^100^1^integer^30^0^0^^hidden^^ +44139^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;^ +44140^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;^^^ +44141^Geschlecht^37^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;^^^ +44142^Felder^125^0^0^150^190^10^char^30^0^1^<>\ +--freemarker template\ + select trim(F.table_name) || '.' || F.name,trim(T.caption) || ':' || trim(F.caption) || ' - ' || trim(F.name) from sx_fields F,\ + sx_tables T where F.table_name=T.name and F.currentlyused=1\ + --Pseudonyme eingeschaltet:\ + and (F.name != 'matrikel_nr' or 0=(select \ +count(*) from konstanten where beschreibung='SOS_MTKNR_EXT'\ +and apnr=1)) \ + and F.table_name in ('sos_stg_aggr','dim_staat','dim_studiengang') \ + order by 2;^hidden^sos_stg_aggr.alter,sos_stg_aggr.geschlecht,sos_stg_aggr.matrikel_nr,sos_stg_aggr.summe^ +44143^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;^^^ +44144^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^ +44145^tablestylesheet^121^0^0^100^200^1^char^200^1^1^<> select filename,X.caption,ord from sx_stylesheets X,sx_mask_style S where X.tid=S.stylesheet_id and S.maskeninfo_id=44130 order by ord^^<> select filename,X.caption from sx_stylesheets X,sx_mask_style S where X.tid=S.stylesheet_id and S.maskeninfo_id=44130 and ord=20 order by ord limit 1^ +44146^Ausgabeformat^2001^0^0^100^150^1^char^200^1^1^<> select element_value,description from menu_element where element='Ausgabeformat' and nature::smallint<100 order by nature::smallint^hidden^<> select element_value,description from menu_element where element='Ausgabeformat' and description='HTML'^ +44147^Grafik^1000^300^-1^170^150^1^integer^30^0^1^<> select tid, caption from viz_chart where maskeninfo_id=44130 order by 2;^^<> select tid, caption from viz_chart where maskeninfo_id=44130 order by 2 limit 1^ +44148^Jahrgang^42^350^-1^140^180^1^sql^30^0^13^<> select attributevalue from personattribute_value_list where personattributetype_id = (select personattributetype_id from personattributetype where attributevalue = 'Jahrgang');^hidden^^ +44149^Name der Hochschule^15^350^-1^140^80^1^char^255^0^13^<> select name from hochschulinfo;^Eintrag^<> select name from hochschulinfo;^ +44150^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;^hidden^<> SELECT 1,'1-spaltig' from xdummy^ +44151^Abschluss^7^0^0^140^170^5^char^30^0^1^<> select abint,dtxt from k_abint order by 2;^^^ +44152^Matrikel-Nr.^20^350^-1^150^180^1^char^200^0^0^^hidden^^ +44153^##line##^40^0^0^100^100^1^char^5000^0^8^^^1^ diff --git a/src-modules/module/viz/masken/44130_maske_system_bez.unl b/src-modules/module/viz/masken/44130_maske_system_bez.unl new file mode 100644 index 0000000..fc47bf8 --- /dev/null +++ b/src-modules/module/viz/masken/44130_maske_system_bez.unl @@ -0,0 +1 @@ +44130^7^ diff --git a/src-modules/module/viz/masken/44130_masken_felder_bez.unl b/src-modules/module/viz/masken/44130_masken_felder_bez.unl new file mode 100644 index 0000000..5d72b00 --- /dev/null +++ b/src-modules/module/viz/masken/44130_masken_felder_bez.unl @@ -0,0 +1,23 @@ +44130^44130^ +44130^44131^ +44130^44132^ +44130^44133^ +44130^44134^ +44130^44135^ +44130^44136^ +44130^44137^ +44130^44139^ +44130^44140^ +44130^44141^ +44130^44142^ +44130^44143^ +44130^44144^ +44130^44145^ +44130^44146^ +44130^44147^ +44130^44148^ +44130^44149^ +44130^44150^ +44130^44151^ +44130^44152^ +44130^44153^ diff --git a/src-modules/module/viz/masken/44130_maskeninfo.unl b/src-modules/module/viz/masken/44130_maskeninfo.unl new file mode 100644 index 0000000..541c64e --- /dev/null +++ b/src-modules/module/viz/masken/44130_maskeninfo.unl @@ -0,0 +1 @@ +44130^Studierende nach Alter (Boxplot)^select select_stmt from maskeninfo where tid=160440^select xil_proplist from maskeninfo where tid=160440^Altersgruppe^Anzahl^Altersverteilung der Studierenden als Boxplot^select cleanup_stmt from maskeninfo where tid=160440^^3^700^360^0^1^ ^ diff --git a/src-modules/module/viz/masken/44130_sachgeb_maske_bez.unl b/src-modules/module/viz/masken/44130_sachgeb_maske_bez.unl new file mode 100644 index 0000000..d924ca1 --- /dev/null +++ b/src-modules/module/viz/masken/44130_sachgeb_maske_bez.unl @@ -0,0 +1 @@ +16^44130^ diff --git a/src-modules/module/viz/masken/44160_felderinfo.unl b/src-modules/module/viz/masken/44160_felderinfo.unl new file mode 100644 index 0000000..b6fec5d --- /dev/null +++ b/src-modules/module/viz/masken/44160_felderinfo.unl @@ -0,0 +1,39 @@ +44160^Köpfe oder Fälle ?^0^0^0^140^150^1^sql^70^0^13^<> select apnr, eintrag from koepfe_oder_faelle order by 2^hidden^<> select apnr, eintrag from koepfe_oder_faelle where eintrag = 'Fälle';^ +44161^Seit Semester^3^0^0^140^80^1^integer^30^0^1^<> select tid, eintrag from semester order by tid DESC;^ ^<> select tid,eintrag from semester where today()-(3*365) between sem_beginn and sem_ende;^ +44162^Fächer^9^0^0^100^200^6^char^30^0^12^<> select tid from sichten where art='Fächer-Sicht' order by sortnr^ ^ ^ +44163^Staatsangehörigkeit^35^0^0^130^150^10^char^30^0^12^<> select tid,name,sortnr from sichten where art='SOS-Staaten-Sicht' order by 3,2;^ ^ ^ +44164^Bis Semester^4^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;^ +44165^Abschluss^12^0^0^100^100^6^char^30^0^1^<> select apnr, druck from cifx where key=35 order by druck;^hidden^ ^ +44166^Weitere Tabellen^123^0^0^140^140^3^char^30^0^1^<> \ +--freemarker template\ +select name,string_not_null(caption) || ' - ' || name from sx_tables where name in ('_xy')\ +<#if <>!='tabelle_html_datenblatt.xsl'>\ + and name in (select distinct tablename from stylesheet_field where stylesheet_id in (select tid from sx_stylesheets where filename=<>)) \ +\ +order by 2^hidden^^ +44167^Geschlecht^75^0^0^140^170^1^integer^4^0^1^<> select tid, beschreibung from konstanten where tid in (1,2);^ ^ ^ +44168^Felder^125^0^0^150^190^10^char^30^0^1^<>\ +--freemarker template\ + select trim(F.table_name) || '.' || F.name,trim(T.caption) || ':' || trim(F.caption) || ' - ' || trim(F.name) from sx_fields F,\ + sx_tables T where F.table_name=T.name and F.currentlyused=1 \ + and (F.table_name ='erfolg_ba_ma_uebergang'\ + /* or F.table_name in (<>) */) \ +and (F.name != 'matrikel_nr' or 0=(select \ +count(*) from konstanten where beschreibung='SOS_MTKNR_EXT'\ +and apnr=1))\ + order by 2;^hidden^erfolg_ba_ma_uebergang.einschr_nachher_abschluss,erfolg_ba_ma_uebergang.summe,erfolg_ba_ma_uebergang.abschluss_vorher_abschluss^ +44169^Fachebene^28^330^-1^130^100^1^char^30^1^1^<> select 'stg','Fach (intern)' from xdummy union\ +select 'stg_astat','Fach (amtlich)' from xdummy union\ +select 'lehr','Lehreinheit' from xdummy union\ +select 'fb','Fakultät' from xdummy union \ +select 'stg_astgrp','Fächergruppe' from xdummy \ +order by 1^hidden^<> select 'stg','Fach (intern)' from xdummy^ +44171^Hörerstatus^36^0^0^140^80^1^sql^30^0^1^<> select apnr, eintrag from hoererstatus where apnr like 'hrst%' order by 2^hidden^ ^ +44172^Richtung^38^0^0^150^190^1^char^30^1^1^<>select 'gw','Grundständig zu weiterf.' from xdummy union select 'wg','Weiterf. zu Grundständig' from xdummy order by 1;^hidden^<>select 'gw','Grundständig zu weiterf.' from xdummy^ +44173^Studiengang^15^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;^ ^ ^ +44174^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^ +44175^tablestylesheet^121^0^0^100^200^1^char^200^1^1^<> select distinct filename,X.caption from sx_stylesheets X,sx_mask_style S where X.tid=S.stylesheet_id and S.maskeninfo_id=44160^ ^<> select filename,X.caption from sx_stylesheets X,sx_mask_style S where X.tid=S.stylesheet_id and S.maskeninfo_id=44160 order by ord limit 1^ +44176^Ausgabeformat^2001^0^0^100^150^1^char^200^1^1^<> select element_value,description from menu_element where element='Ausgabeformat' and nature::smallint<100 order by nature::smallint^hidden^<> select element_value,description from menu_element where element='Ausgabeformat' and description='HTML'^ +44177^Grafik^1000^300^-1^170^150^1^integer^30^0^1^<> select tid, caption from viz_chart where maskeninfo_id=44160 order by 2;^^<> select tid, caption from viz_chart where maskeninfo_id=44160 order by 2 limit 1^ +44178^##line##^30^0^0^100^100^1^char^5000^0^8^^ ^1^ +44179^##line##^40^0^0^100^100^1^char^5000^0^8^^ ^1^ diff --git a/src-modules/module/viz/masken/44160_maske_system_bez.unl b/src-modules/module/viz/masken/44160_maske_system_bez.unl new file mode 100644 index 0000000..92aa72a --- /dev/null +++ b/src-modules/module/viz/masken/44160_maske_system_bez.unl @@ -0,0 +1 @@ +44160^120^ diff --git a/src-modules/module/viz/masken/44160_masken_felder_bez.unl b/src-modules/module/viz/masken/44160_masken_felder_bez.unl new file mode 100644 index 0000000..7eac313 --- /dev/null +++ b/src-modules/module/viz/masken/44160_masken_felder_bez.unl @@ -0,0 +1,19 @@ +44160^44160^ +44160^44161^ +44160^44162^ +44160^44163^ +44160^44164^ +44160^44165^ +44160^44166^ +44160^44167^ +44160^44168^ +44160^44169^ +44160^44171^ +44160^44172^ +44160^44173^ +44160^44174^ +44160^44175^ +44160^44176^ +44160^44177^ +44160^44178^ +44160^44179^ diff --git a/src-modules/module/viz/masken/44160_maskeninfo.unl b/src-modules/module/viz/masken/44160_maskeninfo.unl new file mode 100644 index 0000000..507336f --- /dev/null +++ b/src-modules/module/viz/masken/44160_maskeninfo.unl @@ -0,0 +1 @@ +44160^Übergang Bachelor/Master (Flussdiagramm)^select select_stmt from maskeninfo where tid=30190^select xil_proplist from maskeninfo where tid=30190^Altersgruppe^Anzahl^Übergang Bachelor-Master als Flussdiagramm (Sankey)^select cleanup_stmt from maskeninfo where tid=30190^^3^700^360^^1^^ diff --git a/src-modules/module/viz/masken/44160_sachgeb_maske_bez.unl b/src-modules/module/viz/masken/44160_sachgeb_maske_bez.unl new file mode 100644 index 0000000..5c14b50 --- /dev/null +++ b/src-modules/module/viz/masken/44160_sachgeb_maske_bez.unl @@ -0,0 +1 @@ +120^44160^ diff --git a/src-modules/module/viz/schluesseltabellen/sx_stylesheets_einfuegen.sql b/src-modules/module/viz/schluesseltabellen/sx_stylesheets_einfuegen.sql index 5a56059..f9c4149 100755 --- a/src-modules/module/viz/schluesseltabellen/sx_stylesheets_einfuegen.sql +++ b/src-modules/module/viz/schluesseltabellen/sx_stylesheets_einfuegen.sql @@ -3,10 +3,16 @@ --Bitte nur Freemarker Variablen füllen <#assign masken = [ -{"mask":"30220", "filename":"viz_html_chart_sankey.xsl", "ord":"120"}, -{"mask":"30220", "filename":"30220_html_chart_sankey.xsl", "ord":"130"}, {"mask":"44070", "filename":"tabelle_html_datenblatt.xsl", "ord":"20"}, -{"mask":"44070", "filename":"viz_html_chart_viewer.xsl", "ord":"1"} +{"mask":"44070", "filename":"viz_html_chart_viewer_grid.xsl", "ord":"1"}, +{"mask":"44100", "filename":"viz_html_chart_viewer.xsl", "ord":"1"}, +{"mask":"44100", "filename":"viz_html_chart_viewer_mask.xsl", "ord":"10"}, +{"mask":"44100", "filename":"tabelle_html_datenblatt.xsl", "ord":"20"}, +{"mask":"44130", "filename":"viz_html_chart_viewer.xsl", "ord":"1"}, +{"mask":"44130", "filename":"tabelle_html_datenblatt.xsl", "ord":"20"}, +{"mask":"44160", "filename":"viz_html_chart_viewer.xsl", "ord":"1"}, +{"mask":"44160", "filename":"tabelle_html_datenblatt.xsl", "ord":"20"}, +{"mask":"44160", "filename":"viz_html_chart_viewer_mask.xsl", "ord":"30"} ] /> @@ -18,28 +24,13 @@ "contenttype":"text/html", "is_generic":"1" }, -{"filename":"viz_html_chart_sankey.xsl", "caption":"Übergangsdiagramm (Sankey-Diagramm)", "description":"Kreuztabelle Studienanfänger MA und vorheriger BA", "relation":"table", "contenttype":"text/html","is_generic":"0"}, -{"filename":"30220_html_chart_sankey.xsl", "caption":"Übergangsdiagramm-Viewer(Sankey-Diagramm)", "description":"Kreuztabelle Studienanfänger MA und vorheriger BA", "relation":"table", "contenttype":"text/html","is_generic":"0"}, -{"filename":"viz_html_chart_viewer.xsl", "caption":"Dashboard", "description":"Viewer-Stylesheet für VIZ Charts", "relation":"table", "contenttype":"text/html","is_generic":"1"}, -{"filename":"tabelle_html_viz.xsl", "caption":"Tabelle + Visualisierung", "description":"Viewer-Stylesheet für Tabellen und VIZ Charts", "relation":"table", "contenttype":"text/html","is_generic":"1"} +{"filename":"viz_html_chart_viewer_grid.xsl", "caption":"Dashboard", "description":"Viewer-Stylesheet für VIZ Charts in einer Kachelansicht ", "relation":"table", "contenttype":"text/html","is_generic":"1"}, +{"filename":"viz_html_chart_viewer_mask.xsl", "caption":"Diagramm + Maskenfelder", "description":"Viewer-Stylesheet für VIZ Charts mit Maskenfeldern", "relation":"table", "contenttype":"text/html","is_generic":"1"}, +{"filename":"tabelle_html_viz.xsl", "caption":"Tabelle + Visualisierung", "description":"Viewer-Stylesheet für Tabellen und VIZ Charts", "relation":"table", "contenttype":"text/html","is_generic":"1"}, +{"filename":"viz_html_chart_viewer.xsl", "caption":"Diagramm-Viewer (einfach)", "description":"Viewer-Stylesheet für VIZ Charts in einer Einzelansicht ", "relation":"table", "contenttype":"text/html","is_generic":"1"} ] /> <#assign stylesheet_field = [ -{"filename":"viz_html_chart_sankey.xsl", "tablename":"erfolg_ba_ma_uebergang", "fieldname":"abschluss_vorher_abschluss"}, -{"filename":"viz_html_chart_sankey.xsl", "tablename":"erfolg_ba_ma_uebergang", "fieldname":"abschluss_vorher_abschlussart"}, -{"filename":"viz_html_chart_sankey.xsl", "tablename":"erfolg_ba_ma_uebergang", "fieldname":"abschluss_vorher_abschlusstyp"}, -{"filename":"viz_html_chart_sankey.xsl", "tablename":"erfolg_ba_ma_uebergang", "fieldname":"einschr_nachher_abschlussart"}, -{"filename":"viz_html_chart_sankey.xsl", "tablename":"erfolg_ba_ma_uebergang", "fieldname":"einschr_nachher_abschluss"}, -{"filename":"viz_html_chart_sankey.xsl", "tablename":"erfolg_ba_ma_uebergang", "fieldname":"einschr_nachher_abschlusstyp"}, -{"filename":"viz_html_chart_sankey.xsl", "tablename":"erfolg_ba_ma_uebergang", "fieldname":"summe"}, -{"filename":"30220_html_chart_sankey.xsl", "tablename":"erfolg_ba_ma_uebergang", "fieldname":"abschluss_vorher_abschluss"}, -{"filename":"30220_html_chart_sankey.xsl", "tablename":"erfolg_ba_ma_uebergang", "fieldname":"abschluss_vorher_abschlussart"}, -{"filename":"30220_html_chart_sankey.xsl", "tablename":"erfolg_ba_ma_uebergang", "fieldname":"abschluss_vorher_abschlusstyp"}, -{"filename":"30220_html_chart_sankey.xsl", "tablename":"erfolg_ba_ma_uebergang", "fieldname":"einschr_nachher_abschlussart"}, -{"filename":"30220_html_chart_sankey.xsl", "tablename":"erfolg_ba_ma_uebergang", "fieldname":"einschr_nachher_abschluss"}, -{"filename":"30220_html_chart_sankey.xsl", "tablename":"erfolg_ba_ma_uebergang", "fieldname":"einschr_nachher_abschlusstyp"}, -{"filename":"30220_html_chart_sankey.xsl", "tablename":"erfolg_ba_ma_uebergang", "fieldname":"summe"} - ] /> --Hier eventuell notwendige delete's auf die Tabellen sx_mask_style, sx_stylesheets oder stylesheet_field einfügen. diff --git a/src-modules/module/viz/schluesseltabellen/viz_chart.unl b/src-modules/module/viz/schluesseltabellen/viz_chart.unl index 135cb9f..608a8f3 100644 --- a/src-modules/module/viz/schluesseltabellen/viz_chart.unl +++ b/src-modules/module/viz/schluesseltabellen/viz_chart.unl @@ -7,3 +7,9 @@ 8^STUD_ENTW_SEM_STAAT_LINE_1HS^Studienanfänger_innen 1. HS nach Nationalität^ ^{"version":"0.2b","id":1,"name":"","renderer":"plot","dataSources":[{"value":"7","nr":8,"name":"Tab. 8","isDefault":true}],"targetDiv":"","chartElements":[{"nr":0,"vizTypeUniquename":"line","caption":"line","datasource":"7","elementTypeProperties":[{"nr":0,"vizTypePropertyUniquename":"x","caption":"X-Achse","propertyValue":"sos_stg_aggr_sem_rueck_beur_ein_str"},{"nr":0,"vizTypePropertyUniquename":"y","caption":"Y-Achse","propertyValue":"sos_stg_aggr_summe"},{"nr":0,"vizTypePropertyUniquename":"stroke","caption":"Serien-Dimension","propertyValue":"dim_staat_inl_ausl_lang"}]}],"chartPropertiesUsed":[{"name":"caption","vizPropertyVariablename":"caption","propertyValue":"Studienanfänger_innen 1. HS nach Nationalität"},{"name":"height","vizPropertyVariablename":"height","propertyValue":"450","propUnit":""},{"name":"width","vizPropertyVariablename":"width","propertyValue":"650","propUnit":""},{"name":"marginLeft","vizPropertyVariablename":"marginLeft","propertyValue":"100","propUnit":""},{"name":"marginTop","vizPropertyVariablename":"marginTop","propertyValue":"35","propUnit":""},{"name":"marginBottom","vizPropertyVariablename":"marginBottom","propertyValue":"96","propUnit":""},{"name":"backgroundColor","vizPropertyVariablename":"backgroundColor","propertyValue":"#ffffff","propUnit":""},{"name":"color","vizPropertyVariablename":"color","propertyValue":"#000000","propUnit":""},{"name":"fontFamily","vizPropertyVariablename":"fontFamily","propertyValue":"system_ui","propUnit":""},{"name":"fontSize","vizPropertyVariablename":"fontSize","propertyValue":"12","propUnit":"px"},{"name":"fill_static","vizPropertyVariablename":"fill","propertyValue":"#000000","propUnit":""},{"name":"label_y","vizPropertyVariablename":"label","propertyValue":"Anzahl Studierende","propUnit":""},{"name":"line_y","vizPropertyVariablename":"line","propertyValue":"true","propUnit":""},{"name":"label_x","vizPropertyVariablename":"label","propertyValue":"Semester","propUnit":""},{"name":"line_x","vizPropertyVariablename":"line","propertyValue":"true","propUnit":""},{"name":"tickRotate_x","vizPropertyVariablename":"tickRotate","propertyValue":"-30","propUnit":""},{"name":"scheme","vizPropertyVariablename":"scheme","propertyValue":"tableau10","propUnit":""},{"name":"legend","vizPropertyVariablename":"legend","propertyValue":"true","propUnit":""}],"dataTransformation":[{"tableId":7,"colname":"sos_stg_aggr_sem_rueck_beur_ein_str","colfunction":"switchWord1and2ff"}]}^ ^1^^^44070^ ^2^^^ 7^STUD_ENTW_SEM_GESCHL_LINE_1HS^Studienanfänger_innen 1. HS nach Geschlecht^ ^{"version":"0.2b","id":1,"name":"","renderer":"plot","dataSources":[{"value":"6","nr":7,"name":"Tab. 7","isDefault":true}],"targetDiv":"","chartElements":[{"nr":0,"vizTypeUniquename":"line","caption":"line","datasource":"6","elementTypeProperties":[{"nr":0,"vizTypePropertyUniquename":"x","caption":"X-Achse","propertyValue":"sos_stg_aggr_sem_rueck_beur_ein_str"},{"nr":0,"vizTypePropertyUniquename":"y","caption":"Y-Achse","propertyValue":"sos_stg_aggr_summe"},{"nr":0,"vizTypePropertyUniquename":"stroke","caption":"Serien-Dimension","propertyValue":"sos_stg_aggr_geschlecht_str"}]}],"chartPropertiesUsed":[{"name":"caption","vizPropertyVariablename":"caption","propertyValue":"Studienanfänger_innen 1. HS nach Geschlecht"},{"name":"height","vizPropertyVariablename":"height","propertyValue":"450","propUnit":""},{"name":"width","vizPropertyVariablename":"width","propertyValue":"650","propUnit":""},{"name":"marginLeft","vizPropertyVariablename":"marginLeft","propertyValue":"100","propUnit":""},{"name":"marginTop","vizPropertyVariablename":"marginTop","propertyValue":"35","propUnit":""},{"name":"marginBottom","vizPropertyVariablename":"marginBottom","propertyValue":"100","propUnit":""},{"name":"backgroundColor","vizPropertyVariablename":"backgroundColor","propertyValue":"#ffffff","propUnit":""},{"name":"color","vizPropertyVariablename":"color","propertyValue":"#000000","propUnit":""},{"name":"fontFamily","vizPropertyVariablename":"fontFamily","propertyValue":"system_ui","propUnit":""},{"name":"fontSize","vizPropertyVariablename":"fontSize","propertyValue":"12","propUnit":"px"},{"name":"fill_static","vizPropertyVariablename":"fill","propertyValue":"#000000","propUnit":""},{"name":"label_y","vizPropertyVariablename":"label","propertyValue":"Anzahl Studierende","propUnit":""},{"name":"line_y","vizPropertyVariablename":"line","propertyValue":"true","propUnit":""},{"name":"label_x","vizPropertyVariablename":"label","propertyValue":"Semester","propUnit":""},{"name":"line_x","vizPropertyVariablename":"line","propertyValue":"true","propUnit":""},{"name":"tickRotate_x","vizPropertyVariablename":"tickRotate","propertyValue":"-30","propUnit":""},{"name":"scheme","vizPropertyVariablename":"scheme","propertyValue":"tableau10","propUnit":""},{"name":"legend","vizPropertyVariablename":"legend","propertyValue":"true","propUnit":""}],"dataTransformation":[{"tableId":6,"colname":"sos_stg_aggr_sem_rueck_beur_ein_str","colfunction":"switchWord1and2ff"}]}^ ^1^^^44070^ ^2^^^ 9^STUD_ENTW_SEM_ABSCHLUSS_LINE_1HS^Studienanfänger_innen 1. HS nach Abschlussart^ ^{"version":"0.2b","id":1,"name":"","renderer":"plot","dataSources":[{"value":"8","nr":9,"name":"Tab. 9","isDefault":true}],"targetDiv":"","chartElements":[{"nr":0,"vizTypeUniquename":"line","caption":"line","datasource":"8","elementTypeProperties":[{"nr":0,"vizTypePropertyUniquename":"x","caption":"X-Achse","propertyValue":"sos_stg_aggr_sem_rueck_beur_ein_str"},{"nr":0,"vizTypePropertyUniquename":"y","caption":"Y-Achse","propertyValue":"sos_stg_aggr_summe"},{"nr":0,"vizTypePropertyUniquename":"stroke","caption":"Serien-Dimension","propertyValue":"dim_studiengang_abschlussart_str"}]}],"chartPropertiesUsed":[{"name":"caption","vizPropertyVariablename":"caption","propertyValue":"Studienanfänger_innen 1. HS nach Abschlussart"},{"name":"height","vizPropertyVariablename":"height","propertyValue":"450","propUnit":""},{"name":"width","vizPropertyVariablename":"width","propertyValue":"650","propUnit":""},{"name":"marginLeft","vizPropertyVariablename":"marginLeft","propertyValue":"100","propUnit":""},{"name":"marginTop","vizPropertyVariablename":"marginTop","propertyValue":"35","propUnit":""},{"name":"marginBottom","vizPropertyVariablename":"marginBottom","propertyValue":"96","propUnit":""},{"name":"backgroundColor","vizPropertyVariablename":"backgroundColor","propertyValue":"#ffffff","propUnit":""},{"name":"color","vizPropertyVariablename":"color","propertyValue":"#000000","propUnit":""},{"name":"fontFamily","vizPropertyVariablename":"fontFamily","propertyValue":"system_ui","propUnit":""},{"name":"fontSize","vizPropertyVariablename":"fontSize","propertyValue":"12","propUnit":"px"},{"name":"fill_static","vizPropertyVariablename":"fill","propertyValue":"#000000","propUnit":""},{"name":"label_y","vizPropertyVariablename":"label","propertyValue":"Anzahl Studierende","propUnit":""},{"name":"line_y","vizPropertyVariablename":"line","propertyValue":"true","propUnit":""},{"name":"label_x","vizPropertyVariablename":"label","propertyValue":"Semester","propUnit":""},{"name":"line_x","vizPropertyVariablename":"line","propertyValue":"true","propUnit":""},{"name":"tickRotate_x","vizPropertyVariablename":"tickRotate","propertyValue":"-30","propUnit":""},{"name":"scheme","vizPropertyVariablename":"scheme","propertyValue":"tableau10","propUnit":""},{"name":"legend","vizPropertyVariablename":"legend","propertyValue":"true","propUnit":""}],"dataTransformation":[{"tableId":8,"colname":"sos_stg_aggr_sem_rueck_beur_ein_str","colfunction":"switchWord1and2ff"}]}^ ^1^^^44070^ ^2^^^ +10^STUD_ZEITR_BAR^Studierende Zeitreihe Balkendiagramm^ ^{"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":"#1a5fb4","propertyType":"string"}]}],"chartPropertiesUsed":[{"name":"caption","vizPropertyVariablename":"caption","propertyValue":"Studierende Zeitreihe (VIZ)"},{"name":"height","vizPropertyVariablename":"height","propertyValue":"450","propUnit":""},{"name":"width","vizPropertyVariablename":"width","propertyValue":"650","propUnit":""},{"name":"marginLeft","vizPropertyVariablename":"marginLeft","propertyValue":"100","propUnit":""},{"name":"marginBottom","vizPropertyVariablename":"marginBottom","propertyValue":"100","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":"#1a5fb4","propUnit":""},{"name":"label_y","vizPropertyVariablename":"label","propertyValue":"Summe","propUnit":""},{"name":"line_y","vizPropertyVariablename":"line","propertyValue":"true","propUnit":""},{"name":"label_x","vizPropertyVariablename":"label","propertyValue":"Semester","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":"eintrag","propUnit":""},{"name":"y","vizPropertyVariablename":"y","propertyValue":"gesamt","propUnit":""}],"dataTransformation":[{"tableId":0,"colname":"eintrag","colfunction":"switchWord1and2ff"}]}^ ^^25.08.2024^25.08.2024^44100^ ^2^ ^ ^ +11^STUD_ZEITR_BAR_LINE^Studierende Zeitreihe Balken- und Liniendiagramm^ ^{"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"}]},{"elemID":2,"vizTypeUniquename":"line","caption":"line","datasource":"0","elementTypeProperties":[{"nr":2,"vizTypePropertyUniquename":"x","caption":"X-Achse","propertyValue":"eintrag"},{"nr":2,"vizTypePropertyUniquename":"y","caption":"Y-Achse","propertyValue":"ges_1fs"}]}],"chartPropertiesUsed":[{"name":"caption","vizPropertyVariablename":"caption","propertyValue":"Studierende Zeitreihe (VIZ)"},{"name":"height","vizPropertyVariablename":"height","propertyValue":"450","propUnit":""},{"name":"width","vizPropertyVariablename":"width","propertyValue":"650","propUnit":""},{"name":"marginLeft","vizPropertyVariablename":"marginLeft","propertyValue":"100","propUnit":""},{"name":"marginBottom","vizPropertyVariablename":"marginBottom","propertyValue":"100","propUnit":""},{"name":"backgroundColor","vizPropertyVariablename":"backgroundColor","propertyValue":"#dfe4f2","propUnit":""},{"name":"color","vizPropertyVariablename":"color","propertyValue":"#000000","propUnit":""},{"name":"stroke_static","vizPropertyVariablename":"stroke_static","propertyValue":"#000000","propUnit":""},{"name":"fill_static","vizPropertyVariablename":"fill","propertyValue":"#2ec27e","propUnit":""},{"name":"label_y","vizPropertyVariablename":"label","propertyValue":"Summe","propUnit":""},{"name":"line_y","vizPropertyVariablename":"line","propertyValue":"true","propUnit":""},{"name":"label_x","vizPropertyVariablename":"label","propertyValue":"Semester","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":"eintrag","propUnit":""},{"name":"y","vizPropertyVariablename":"y","propertyValue":"gesamt","propUnit":""}],"dataTransformation":[]}^ ^^25.08.2024^25.08.2024^44100^ ^2^ ^ ^ +12^STUD_ZEITR_BAR_LINE_DOT^Studierende Zeitreihe Balken-, Linien- und Punktediagramm^ ^{"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"}]},{"elemID":2,"vizTypeUniquename":"line","caption":"line","datasource":"0","elementTypeProperties":[{"nr":2,"vizTypePropertyUniquename":"x","caption":"X-Achse","propertyValue":"eintrag"},{"nr":2,"vizTypePropertyUniquename":"y","caption":"Y-Achse","propertyValue":"ges_1fs"}]},{"elemID":"3","vizTypeUniquename":"dot","caption":"dot","datasource":"0","elementTypeProperties":[{"nr":"3","vizTypePropertyUniquename":"x","caption":"X-Achse","propertyValue":"eintrag","propertyType":"string"},{"nr":"3","vizTypePropertyUniquename":"y","caption":"Y-Achse","propertyValue":"ges_1fs","propertyType":"string"},{"nr":"3","vizTypePropertyUniquename":"stroke_static","caption":"Strichfarbe","propertyValue":"#1a5fb4","propertyType":"string"},{"nr":"3","vizTypePropertyUniquename":"fill_static","caption":"Flächenfarbe","propertyValue":"#000000","propertyType":"string"}]}],"chartPropertiesUsed":[{"name":"caption","vizPropertyVariablename":"caption","propertyValue":"Studierende Zeitreihe (VIZ)"},{"name":"height","vizPropertyVariablename":"height","propertyValue":"450","propUnit":""},{"name":"width","vizPropertyVariablename":"width","propertyValue":"650","propUnit":""},{"name":"marginLeft","vizPropertyVariablename":"marginLeft","propertyValue":"100","propUnit":""},{"name":"marginBottom","vizPropertyVariablename":"marginBottom","propertyValue":"100","propUnit":""},{"name":"backgroundColor","vizPropertyVariablename":"backgroundColor","propertyValue":"#dfe4f2","propUnit":""},{"name":"color","vizPropertyVariablename":"color","propertyValue":"#000000","propUnit":""},{"name":"stroke_static","vizPropertyVariablename":"stroke_static","propertyValue":"#1a5fb4","propUnit":""},{"name":"fill_static","vizPropertyVariablename":"fill","propertyValue":"#000000","propUnit":""},{"name":"label_y","vizPropertyVariablename":"label","propertyValue":"Summe","propUnit":""},{"name":"line_y","vizPropertyVariablename":"line","propertyValue":"true","propUnit":""},{"name":"label_x","vizPropertyVariablename":"label","propertyValue":"Semester","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":"eintrag","propUnit":""},{"name":"y","vizPropertyVariablename":"y","propertyValue":"gesamt","propUnit":""}],"dataTransformation":[]}^ ^^25.08.2024^25.08.2024^44100^ ^2^ ^ ^ +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"}]},{"elemID":2,"vizTypeUniquename":"line","caption":"line","datasource":"0","elementTypeProperties":[{"nr":2,"vizTypePropertyUniquename":"x","caption":"X-Achse","propertyValue":"eintrag"},{"nr":2,"vizTypePropertyUniquename":"y","caption":"Y-Achse","propertyValue":"ges_1fs"}]},{"elemID":"3","vizTypeUniquename":"dot","caption":"dot","datasource":"0","elementTypeProperties":[{"nr":"3","vizTypePropertyUniquename":"x","caption":"X-Achse","propertyValue":"eintrag","propertyType":"string"},{"nr":"3","vizTypePropertyUniquename":"y","caption":"Y-Achse","propertyValue":"ges_1fs","propertyType":"string"},{"nr":"3","vizTypePropertyUniquename":"stroke_static","caption":"Strichfarbe","propertyValue":"#1a5fb4","propertyType":"string"},{"nr":"3","vizTypePropertyUniquename":"fill_static","caption":"Flächenfarbe","propertyValue":"#000000","propertyType":"string"}]},{"elemID":"4","vizTypeUniquename":"text","caption":"text","datasource":"0","elementTypeProperties":[{"nr":"4","vizTypePropertyUniquename":"x","caption":"X-Achse","propertyValue":"eintrag","propertyType":"string"},{"nr":"4","vizTypePropertyUniquename":"y","caption":"Y-Achse","propertyValue":"ges_1fs","propertyType":"string"},{"nr":"4","vizTypePropertyUniquename":"text","caption":"Beschriftung","propertyValue":"ges_1fs","propertyType":"string"},{"nr":"4","vizTypePropertyUniquename":"stroke_static","caption":"Strichfarbe","propertyValue":"#f8e45c","propertyType":"string"},{"nr":"4","vizTypePropertyUniquename":"fill_static","caption":"Flächenfarbe","propertyValue":"#000000","propertyType":"string"}]}],"chartPropertiesUsed":[{"name":"caption","vizPropertyVariablename":"caption","propertyValue":"Studierende Zeitreihe (VIZ)"},{"name":"height","vizPropertyVariablename":"height","propertyValue":"450","propUnit":""},{"name":"width","vizPropertyVariablename":"width","propertyValue":"650","propUnit":""},{"name":"marginLeft","vizPropertyVariablename":"marginLeft","propertyValue":"100","propUnit":""},{"name":"marginBottom","vizPropertyVariablename":"marginBottom","propertyValue":"100","propUnit":""},{"name":"backgroundColor","vizPropertyVariablename":"backgroundColor","propertyValue":"#dfe4f2","propUnit":""},{"name":"color","vizPropertyVariablename":"color","propertyValue":"#000000","propUnit":""},{"name":"stroke_static","vizPropertyVariablename":"stroke_static","propertyValue":"#f8e45c","propUnit":""},{"name":"fill_static","vizPropertyVariablename":"fill","propertyValue":"#000000","propUnit":""},{"name":"label_y","vizPropertyVariablename":"label","propertyValue":"Summe","propUnit":""},{"name":"line_y","vizPropertyVariablename":"line","propertyValue":"true","propUnit":""},{"name":"label_x","vizPropertyVariablename":"label","propertyValue":"Semester","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":"eintrag","propUnit":""},{"name":"y","vizPropertyVariablename":"y","propertyValue":"ges_1fs","propUnit":""},{"name":"text","vizPropertyVariablename":"text","propertyValue":"ges_1fs","propUnit":""}],"dataTransformation":[]}^ ^^25.08.2024^25.08.2024^44100^ ^2^ ^ ^ +14^STUD_ALTER_BOXPLOT_H^Studierende nach Alter Boxplot horizontal^ ^{"version":"0.2b","id":1,"name":"","renderer":"plot","dataSources":[{"value":"0","nr":1,"name":"Tab. 1","isDefault":true}],"targetDiv":"","chartElements":[{"elemID":"1","vizTypeUniquename":"box_x","caption":"box_x","datasource":"0","elementTypeProperties":[{"nr":"1","vizTypePropertyUniquename":"x","caption":"X-Achse","propertyValue":"sos_stg_aggr_alter","propertyType":"string"},{"nr":"1","vizTypePropertyUniquename":"y","caption":"Y-Achse","propertyValue":"sos_stg_aggr_geschlecht_str","propertyType":"string"},{"nr":"1","vizTypePropertyUniquename":"stroke_static","caption":"Strichfarbe","propertyValue":"#26a269","propertyType":"string"},{"nr":"1","vizTypePropertyUniquename":"fill_static","caption":"Flächenfarbe","propertyValue":"#1c71d8","propertyType":"string"},{"nr":"1","vizTypePropertyUniquename":"tip","caption":"Tooltip einschalten","propertyValue":"true","propertyType":"boolean"}]}],"chartPropertiesUsed":[{"name":"caption","vizPropertyVariablename":"caption","propertyValue":"Studierende nach Alter"},{"name":"height","vizPropertyVariablename":"height","propertyValue":"450","propUnit":""},{"name":"width","vizPropertyVariablename":"width","propertyValue":"650","propUnit":""},{"name":"marginLeft","vizPropertyVariablename":"marginLeft","propertyValue":"120","propUnit":""},{"name":"tip","vizPropertyVariablename":"tip","propertyValue":"true","propUnit":""},{"name":"backgroundColor","vizPropertyVariablename":"backgroundColor","propertyValue":"#dfe4f2","propUnit":""},{"name":"color","vizPropertyVariablename":"color","propertyValue":"#000000","propUnit":""},{"name":"stroke_static","vizPropertyVariablename":"stroke_static","propertyValue":"#26a269","propUnit":""},{"name":"fill_static","vizPropertyVariablename":"fill","propertyValue":"#1c71d8","propUnit":""},{"name":"label_y","vizPropertyVariablename":"label","propertyValue":"Geschlecht","propUnit":""},{"name":"line_y","vizPropertyVariablename":"line","propertyValue":"true","propUnit":""},{"name":"label_x","vizPropertyVariablename":"label","propertyValue":"Alter","propUnit":""},{"name":"line_x","vizPropertyVariablename":"line","propertyValue":"true","propUnit":""},{"name":"scale_x","vizPropertyVariablename":"type","propertyValue":"band","propUnit":""},{"name":"x","vizPropertyVariablename":"x","propertyValue":"sos_stg_aggr_alter","propUnit":""},{"name":"y","vizPropertyVariablename":"y","propertyValue":"sos_stg_aggr_geschlecht_str","propUnit":""}],"dataTransformation":[]}^ ^^25.08.2024^25.08.2024^44130^ ^2^ ^ ^ +15^ERFOLG_BA_MA_SANKEY^Bachelor-Master Übergang Sankey Diagramm^ ^{"version":"0.2b","id":1,"name":"","renderer":"d3js","dataSources":[{"value":"0","nr":1,"name":"Tab. 1","isDefault":true}],"targetDiv":"","chartElements":[{"elemID":1,"vizTypeUniquename":"sankey","caption":"sankey","datasource":"0","elementTypeProperties":[{"nr":1,"vizTypePropertyUniquename":"dimension1","caption":"Dimension 1","propertyValue":"erfolg_ba_ma_uebergang_abschluss_vorher_abschluss_str","propertyType":"string"},{"nr":1,"vizTypePropertyUniquename":"dimension2","caption":"Dimension 2","propertyValue":"erfolg_ba_ma_uebergang_einschr_nachher_abschluss_str","propertyType":"string"},{"nr":1,"vizTypePropertyUniquename":"measure1","caption":"Maß 1","propertyValue":"erfolg_ba_ma_uebergang_summe","propertyType":"string"}]}],"chartPropertiesUsed":[{"name":"caption","vizPropertyVariablename":"caption","propertyValue":"Übergang Bachelor/Master (Flussdiagramm)"},{"name":"height","vizPropertyVariablename":"height","propertyValue":"450","propUnit":""},{"name":"width","vizPropertyVariablename":"width","propertyValue":"650","propUnit":""},{"name":"marginLeft","vizPropertyVariablename":"marginLeft","propertyValue":"100","propUnit":""},{"name":"null_value_mask","vizPropertyVariablename":"null_value_mask","propertyValue":"Kein Master","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":"#000000","propUnit":""},{"name":"line_y","vizPropertyVariablename":"line","propertyValue":"true","propUnit":""},{"name":"line_x","vizPropertyVariablename":"line","propertyValue":"true","propUnit":""},{"name":"scale_x","vizPropertyVariablename":"type","propertyValue":"band","propUnit":""}],"dataTransformation":[]}^ ^^25.08.2024^25.08.2024^44160^ ^2^ ^ ^ diff --git a/src-modules/module/viz/schluesseltabellen/viz_property.unl b/src-modules/module/viz/schluesseltabellen/viz_property.unl index b3ed54c..29d8b3e 100644 --- a/src-modules/module/viz/schluesseltabellen/viz_property.unl +++ b/src-modules/module/viz/schluesseltabellen/viz_property.unl @@ -5,7 +5,7 @@ 5^Schriftfarbe^color^ ^ ^0^black^0^3^11^Farbe von Text- und Diagrammelementen^202^^^string^ 6^Schriftgröße^fontSize^^px^0^ ^0^4^11^Schriftgröße der Skalenbeschriftung^204^^^integer^ 7^Schriftfamilie^fontFamily^^ ^0^serif|sans-serif|monospace|system_ui^0^2^11^Schriftfamlilie der Skalenbeschriftung^203^^^string^ -8^Flächenfarbe^fill_static^ ^ ^0^ ^0^3^11^Nur für Grafikelemente Flächen und Balken. Füllfarbe.^305^^^string^ +8^Flächenfarbe^fill_static^ ^ ^0^ ^0^3^11^Nur für Grafikelemente Flächen und Balken. Füllfarbe.^1300^^^string^ 11^X: Schriftneigung^tickRotate_x^^ ^0^ ^0^1^18^Neigungswinkel der Achsenwerte^604^^^integer^ 12^X: Skalierung^ticks_x^^ ^0^ ^0^1^18^Feinheit der Wertegliederung^605^^^integer^ 13^X: Schriftgröße^tickSize_x^^ ^0^ ^0^1^18^Größe der Achsenwerte^603^^^integer^ @@ -20,8 +20,8 @@ 23^Innenrand rechts^insetRight^ ^^0^ ^0^4^10^Abstand zwischen Grafik und Achsenbeschriftung rechts^110^^^integer^ 24^Farbschema^scheme^ ^ ^0^blues|greens|greys|oranges|purples|reds|paired|set1|pastel1|pastel2|tableau10|category10|accent|dark2^0^2^22^Nur für Grafikelemente Balken und Linien: Farbtonschema für Serien.^303^^^string^ 25^Farbtyp^type^^ ^0^einfarbig|mehrfarbig|zyklisch^0^2^20^Ein-/Mehrfarbigkeit von Diagrammelementen^302^^^string^ -43^Farbsättigung^fillOpacity^^ ^0^ ^0^4^20^Deckkraft der Füllfarbe von Diagrammelementen^306^^^string^ -45^Strichdicke^strokeWidth^^ ^0^ ^0^1^12^Strichdicke von Diagrammelementen (relevant für Plot.dot, Plot.tickX/Y)^308^^^string^ +43^Deckungsgrad Farbe^fillOpacity^ ^ ^0^ ^0^1^11^Deckungsrad (opacity) zwischen 0 und 1^1800^0^1^string^ +45^Strichlinie Breite^strokeWidth^ ^px^0^ ^0^1^11^Strichbreite in Pixel^2100^^^integer^ 56^Fortlaufende Skala^continous scales^^ ^0^identity|linear|log|pow|sqrt|symlog^0^2^15^Art der Skalen-Gliederung^401^^^string^ 57^Kategorie-Skala^categorical scales^^ ^0^point|band^0^2^15^Art der Skalen-Gliederung^402^^^string^ 58^Datums-Skala^date scales^^ ^0^time|utc^0^2^15^Art der Skalen-Gliederung^403^^^string^ @@ -30,12 +30,12 @@ 63^X: Label-Abstand^labelOffset_x^^^0^ ^0^1^18^Label-Abstand von Achse^602^^^integer^ 68^Maß: Chart-Abstand^gridChartOffset^^ ^0^ ^0^1^18^ ^607^^^string^ 69^Maß: Label-Höhe^gridLabelHeight^^^0^ ^0^1^18^ ^608^^^integer^ -70^X-Achse^x^^ ^0^ ^0^1^5^ ^608^^^string^ -72^Y-Achse^y^^ ^0^ ^0^1^6^ ^608^^^string^ +70^X-Achse^x^ ^ ^0^ ^0^1^5^X-Achsendefinition^100^^^string^ +72^Y-Achse^y^ ^ ^0^ ^0^1^5^Y-Achsendefinition^200^^^string^ 73^Maß 1^measure1^^ ^0^ ^0^1^6^ ^608^^^string^ -76^Serien-Dimension^stroke^^ ^0^ ^0^1^5^ ^608^^^string^ +76^Serien-Dimension^stroke^ ^ ^0^ ^0^1^5^Serien-Dimension zusätzlich zu Achsen^300^^^string^ 78^Legende^legend^ ^ ^0^true|false^0^2^22^ ^303^^^boolean^ -79^Beschriftung^text^ ^ ^0^ ^0^1^5^ ^608^^^string^ +79^Beschriftung^text^ ^ ^0^ ^0^1^5^Nur für Grafikelement Wertelabel^400^^^string^ 80^Serienfarbe^fill^ ^ ^0^ ^0^1^22^Nur für Grafikelemente Balken und Linien: Merkmal der Serien-Dimension^305^^^string^ 81^Y: Label-Abstand^labelOffset_y^^^0^ ^0^1^21^Label-Abstand von Achse^602^^^integer^ 82^Y: Label-Ausrichtung^labelAnchor_y^^ ^0^left|center|right^0^2^21^Label-Position^601^^^string^ @@ -54,3 +54,12 @@ 97^Leerzeilen-Maskierung^null_value_mask^ ^ ^0^ ^0^1^10^Text, der ersetzt wird, wenn eine Dimension leer ist, z.B. *Andere Hochschule* bei BA-MA-Übergang^700^^^string^ 98^Y-Wertebereich^domain^ ^ ^1^ ^0^1^21^Bittte Wertebereich mit [] eingeben, z.B. [0,100] für 0-100^1000^^^js^ 99^X: Skala^scale_x^band^ ^1^linear|identity|point|band|time^0^2^18^ ^1000^^^string^ +100^Strichlinie Abstand-Intervalle^strokeDasharray^ ^ ^0^ ^0^1^11^Abstand von Bindestrichen (Komma-separierte Pixel), z.B. [10,5] für 10 und dann 5 Pixel Abstand^2000^^^string^ +101^Offset (horizontal)^dx^ ^px^0^ ^0^1^10^Horizontales Offset des Grafikelements in Pixel^1600^^^integer^ +102^Offset (vertikal)^dy^ ^px^0^ ^0^1^10^Vertikales Offset des Grafikelements in Pixel^1700^^^integer^ +103^Textuelle Beschreibung des Grafikelements^ariaDescription^ ^ ^0^ ^0^1^11^für barrierearme Grafiken^1100^^^string^ +104^CSS-Klasse^className^ ^ ^0^ ^0^1^11^Klassenname des Grafikelements für CSS-basierte Layouts^1400^^^string^ +105^CSS-Filter für Bilder^imageFilter^ ^ ^0^ ^0^1^11^z.B. blur(5px)^1500^^^string^ +106^Deckungsgrad Objekt^opacity^ ^ ^0^ ^0^1^11^Deckungsrad (opacity) des Grafikelements zwischen 0 und 1^1900^0^1^string^ +107^Tooltip einschalten^tip^ ^ ^0^true|false^0^2^10^Sollen implizite Tooltips angezeigt werden (true,false)^2200^^^boolean^ +108^Strichfarbe^stroke_static^ ^ ^0^ ^0^3^11^Strichfarbe (einfach)^1200^^^string^ diff --git a/src-modules/module/viz/schluesseltabellen/viz_property_input_type.unl b/src-modules/module/viz/schluesseltabellen/viz_property_input_type.unl index a4256fd..6a1cff0 100644 --- a/src-modules/module/viz/schluesseltabellen/viz_property_input_type.unl +++ b/src-modules/module/viz/schluesseltabellen/viz_property_input_type.unl @@ -3,3 +3,4 @@ 3^COLOR^Farbauswahl^ 4^RANGE^Schieberegler^ 5^TEXTAREA^Großes Textfeld^ +6^CHECKBOX^Ankreuzfeld^ diff --git a/src-modules/module/viz/schluesseltabellen/viz_property_renderer.unl b/src-modules/module/viz/schluesseltabellen/viz_property_renderer.unl index b826ca0..fb59a91 100644 --- a/src-modules/module/viz/schluesseltabellen/viz_property_renderer.unl +++ b/src-modules/module/viz/schluesseltabellen/viz_property_renderer.unl @@ -4,12 +4,10 @@ 4^2^7^fontFamily^ 5^2^6^fontSize^ 6^2^1^height^ -7^2^8^fill^ 8^2^16^marginLeft^ 9^2^11^tickRotate^ 10^2^74^x^ 11^2^75^y^ -12^2^76^stroke^ 14^2^24^scheme^ 15^2^78^legend^ 16^2^17^marginRight^ @@ -22,9 +20,24 @@ 23^2^86^label^ 25^2^87^label^ 26^2^84^tickRotate^ -27^2^79^text^ 28^2^93^line^ 29^2^94^line^ 30^1^97^null_value_mask^ 31^2^98^domain^ 32^2^99^type^ +246^2^70^x^ +247^2^72^y^ +248^2^76^stroke^ +249^2^79^text^ +250^2^107^tip^ +251^2^101^dx^ +252^2^102^dy^ +253^2^108^stroke_static^ +254^2^8^fill^ +255^2^103^ariaDescription^ +256^2^104^className^ +257^2^105^imageFilter^ +258^2^43^fillOpacity^ +259^2^106^opacity^ +260^2^100^strokeDasharray^ +261^2^45^strokeWidth^ diff --git a/src-modules/module/viz/schluesseltabellen/viz_type.unl b/src-modules/module/viz/schluesseltabellen/viz_type.unl index 26cde59..d92aa56 100644 --- a/src-modules/module/viz/schluesseltabellen/viz_type.unl +++ b/src-modules/module/viz/schluesseltabellen/viz_type.unl @@ -1,12 +1,12 @@ -1^bar_x^Balken (horizontal)^2^ ^ ^H^ -2^bar_y^Balken (vertikal)^2^ ^ ^V^ -3^line^Linien (vertikal)^2^ ^ ^V^ -5^area_y^Flächen (vertikal)^2^^^V^ -6^dot^Punkte (vertikal)^2^^^V^ -7^box_x^Boxplot (horizontal)^2^ ^ ^H^ -8^area_x^Flächen (horizontal)^2^^^H^ -9^box_y^Boxplot (vertikal)^2^ ^ ^V^ -10^text^Wertelabel^2^ ^ ^^ -11^bar_x_d3^Balken (horizontal)^1^^^H^ -12^sankey^Sankey^1^ ^^H^ -13^worldmap^Weltkarte^1^ ^^H^ +1^bar_x^Balkendiagramm (horizontal)^2^ ^ ^H^ ^^ +2^bar_y^Balkendiagramm (vertikal)^2^ ^ ^V^ ^^ +3^line^Linien (vertikal)^2^ ^ ^V^ ^^ +5^area_y^Flächendiagramm (vertikal)^2^^^V^ ^^ +6^dot^Punkte (vertikal)^2^^^V^ ^^ +7^box_x^Boxplot (horizontal)^2^ ^ ^H^ ^^ +8^area_x^Flächendiagramm (horizontal)^2^^^H^ ^^ +9^box_y^Boxplot (vertikal)^2^ ^ ^V^ ^^ +10^text^Wertelabel (vertikal)^2^ ^ ^V^ ^^ +11^bar_x_d3^Balken (horizontal)^1^^^H^^^ +12^sankey^Sankey^1^ ^^H^^^ +13^worldmap^Weltkarte^1^ ^^H^^^ diff --git a/src-modules/module/viz/schluesseltabellen/viz_type_plot_fuellen.sql b/src-modules/module/viz/schluesseltabellen/viz_type_plot_fuellen.sql index d84f5a6..286df74 100644 --- a/src-modules/module/viz/schluesseltabellen/viz_type_plot_fuellen.sql +++ b/src-modules/module/viz/schluesseltabellen/viz_type_plot_fuellen.sql @@ -11,33 +11,42 @@ <#assign viz_types = [ {"uniquename":"bar_x", "caption":"Balkendiagramm (horizontal)", "orientation":"H", -"description":"Horizontales Balkendiagramm"}, +"description":"Horizontales Balkendiagramm", +"explanation":""}, {"uniquename":"bar_y", "caption":"Balkendiagramm (vertikal)", "orientation":"V", -"description":"Vertikales Balkendiagramm"}, +"description":"Vertikales Balkendiagramm", +"explanation":""}, {"uniquename":"line", "caption":"Linien (vertikal)", "orientation":"V", -"description":"Vertikales Liniendiagramm"}, +"description":"Vertikales Liniendiagramm", +"explanation":""}, {"uniquename":"area_x", "caption":"Flächendiagramm (horizontal)", "orientation":"H", -"description":"Horizontales Flächendiagramm"}, +"description":"Horizontales Flächendiagramm", +"explanation":""}, {"uniquename":"area_y", "caption":"Flächendiagramm (vertikal)", "orientation":"V", -"description":"Vertikales Flächendiagramm"}, +"description":"Vertikales Flächendiagramm", +"explanation":""}, {"uniquename":"dot", "caption":"Punkte (vertikal)", "orientation":"V", -"description":"Vertikales Punktdiagramm"}, +"description":"Vertikales Punktdiagramm", +"explanation":""}, {"uniquename":"box_x", "caption":"Boxplot (horizontal)", "orientation":"H", -"description":"Horizontales Boxplot"}, +"description":"Horizontales Boxplot", +"explanation":""}, {"uniquename":"box_y", "caption":"Boxplot (vertikal)", "orientation":"V", -"description":"Vertikales Boxplot"}, +"description":"Vertikales Boxplot", +"explanation":""}, {"uniquename":"text", "caption":"Wertelabel (vertikal)", "orientation":"V", -"description":"Wertelabel für vertikales Diagramm"} +"description":"Wertelabel für vertikales Diagramm", +"explanation":""} ] /> @@ -56,7 +65,7 @@ "sortnr":"", "range_from":"", "range_to":"", -"prop_value_type":"STRING" +"prop_value_type":"string" }, { "caption":"Y-Achse", "prop_uniquename":"y", @@ -71,7 +80,7 @@ "sortnr":"", "range_from":"", "range_to":"", -"prop_value_type":"STRING" +"prop_value_type":"string" } , { "caption":"Serien-Dimension", @@ -87,24 +96,7 @@ "sortnr":"", "range_from":"", "range_to":"", -"prop_value_type":"STRING" -} -, -{ "caption":"Flächenfarbe", -"prop_uniquename":"fill_static", -"explanation":"Nur für Grafikelemente Flächen und Balken. Füllfarbe.", -"prop_default":"", -"prop_unit":"", -"is_generic":"0", -"static_values":"", -"is_mandatory":"0", -"input_type_uniquename":"COLOR", -"property_group_uniquename":"STYLE", -"sortnr":"", -"range_from":"", -"range_to":"", -"prop_value_type":"STRING", -"variable_name":"fill" +"prop_value_type":"string" }, { "caption":"Beschriftung", "prop_uniquename":"text", @@ -119,7 +111,7 @@ "sortnr":"", "range_from":"", "range_to":"", -"prop_value_type":"STRING" +"prop_value_type":"string" } ] /> @@ -229,7 +221,39 @@ "sortnr":"", "range_from":"", "range_to":"", -"prop_value_type":"STRING" +"prop_value_type":"string" +}, +{ "caption":"Strichfarbe", +"prop_uniquename":"stroke_static", +"explanation":"Strichfarbe (einfach)", +"prop_default":"", +"prop_unit":"", +"is_generic":"0", +"static_values":"", +"is_mandatory":"0", +"input_type_uniquename":"COLOR", +"property_group_uniquename":"STYLE", +"sortnr":"", +"range_from":"", +"range_to":"", +"prop_value_type":"string" +} +, +{ "caption":"Flächenfarbe", +"prop_uniquename":"fill_static", +"explanation":"Nur für Grafikelemente Flächen und Balken. Füllfarbe.", +"prop_default":"", +"prop_unit":"", +"is_generic":"0", +"static_values":"", +"is_mandatory":"0", +"input_type_uniquename":"COLOR", +"property_group_uniquename":"STYLE", +"sortnr":"", +"range_from":"", +"range_to":"", +"prop_value_type":"string", +"variable_name":"fill" }, { "caption":"CSS-Klasse", "prop_uniquename":"className", @@ -244,7 +268,7 @@ "sortnr":"", "range_from":"", "range_to":"", -"prop_value_type":"STRING" +"prop_value_type":"string" } , { "caption":"CSS-Filter für Bilder", @@ -260,7 +284,7 @@ "sortnr":"", "range_from":"", "range_to":"", -"prop_value_type":"STRING" +"prop_value_type":"string" }, { "caption":"Offset (horizontal)", "prop_uniquename":"dx", @@ -275,7 +299,7 @@ "sortnr":"", "range_from":"", "range_to":"", -"prop_value_type":"STRING" +"prop_value_type":"integer" }, { "caption":"Offset (vertikal)", "prop_uniquename":"dy", @@ -290,7 +314,7 @@ "sortnr":"", "range_from":"", "range_to":"", -"prop_value_type":"STRING" +"prop_value_type":"integer" }, { "caption":"Deckungsgrad Farbe", "prop_uniquename":"fillOpacity", @@ -305,7 +329,7 @@ "sortnr":"", "range_from":"0", "range_to":"1", -"prop_value_type":"STRING" +"prop_value_type":"string" }, { "caption":"Deckungsgrad Objekt", "prop_uniquename":"opacity", @@ -320,7 +344,7 @@ "sortnr":"", "range_from":"0", "range_to":"1", -"prop_value_type":"STRING" +"prop_value_type":"string" }, { "caption":"Strichlinie Abstand-Intervalle", @@ -336,7 +360,7 @@ "sortnr":"", "range_from":"", "range_to":"", -"prop_value_type":"STRING" +"prop_value_type":"string" }, { "caption":"Strichlinie Breite", "prop_uniquename":"strokeWidth", @@ -351,7 +375,7 @@ "sortnr":"", "range_from":"", "range_to":"", -"prop_value_type":"STRING" +"prop_value_type":"integer" } , { "caption":"Tooltip einschalten", @@ -360,14 +384,14 @@ "prop_default":"", "prop_unit":"", "is_generic":"0", -"static_values":"", +"static_values":"true|false", "is_mandatory":"0", -"input_type_uniquename":"TEXT", -"property_group_uniquename":"STYLE", +"input_type_uniquename":"SELECT", +"property_group_uniquename":"LAYOUT", "sortnr":"", "range_from":"", "range_to":"", -"prop_value_type":"STRING" +"prop_value_type":"boolean" } ] /> @@ -401,12 +425,14 @@ insert into tmp_viz_type(tid, renderer_id, -- srcpath, -- method, - orientation) + orientation, + explanation) select T.tid, '${viz_type_p.uniquename}', '${viz_type_p.caption}', ${renderer_plot_id}, -'${viz_type_p.orientation}' +'${viz_type_p.orientation}', +'${viz_type_p.explanation}' from xdummy left outer join viz_type T on ( T.uniquename='${viz_type_p.uniquename}' and T.renderer_id=${renderer_plot_id} @@ -437,7 +463,8 @@ update viz_type set renderer_id=T.renderer_id, -- srcpath, -- method, - orientation=T.orientation + orientation=T.orientation, + explanation=T.explanation from tmp_viz_type T where T.tid=viz_type.tid and viz_type.tid in (select distinct T.tid from tmp_viz_type); @@ -523,7 +550,8 @@ CREATE temp TABLE tmp_viz_type srcpath varchar(255), method varchar(255), orientation char(1), - description text + description text, + explanation text ); CREATE temp TABLE tmp_viz_type_property diff --git a/src-modules/module/viz/schluesseltabellen/viz_type_property.unl b/src-modules/module/viz/schluesseltabellen/viz_type_property.unl index 44720e6..53e2032 100644 --- a/src-modules/module/viz/schluesseltabellen/viz_type_property.unl +++ b/src-modules/module/viz/schluesseltabellen/viz_type_property.unl @@ -1,388 +1,141 @@ -1^1^70^1^1^ -3^1^72^1^10^ -8^2^70^1^0^ -9^2^72^1^10^ -10^3^70^1^0^ -12^5^70^1^0^ -13^3^72^1^10^ -15^5^72^1^10^ -16^6^70^1^0^ -17^6^72^1^10^ -20^1^76^0^20^ -22^2^76^0^20^ -24^5^76^0^20^ -26^3^76^0^20^ -27^6^76^0^20^ -33^7^70^1^0^ -34^7^72^0^0^ -35^9^70^0^0^ -36^9^72^1^0^ -37^8^76^0^20^ -38^8^72^1^10^ -39^8^70^1^0^ -41^10^70^0^0^ -42^10^72^0^10^ -43^10^76^0^20^ 44^11^95^1^0^ 45^11^73^1^0^ 46^12^73^1^20^ 47^12^95^1^1^ 48^12^96^1^10^ -49^1^3^0^^ -50^1^4^0^201^ -51^1^5^0^202^ -52^1^6^0^204^ -53^1^7^0^203^ -54^1^8^0^305^ -55^1^11^0^604^ -56^1^12^0^605^ -57^1^13^0^603^ -58^1^15^0^601^ -59^1^16^0^103^ -60^1^17^0^104^ -61^1^18^0^105^ -62^1^19^0^106^ -63^1^20^0^107^ -64^1^21^0^108^ -65^1^22^0^109^ -66^1^23^0^110^ -67^1^25^0^302^ -68^1^43^0^306^ -69^1^45^0^308^ -70^1^56^0^401^ -71^1^57^0^402^ -72^1^58^0^403^ -73^1^60^0^304^ -74^1^61^0^301^ -75^1^63^0^602^ -76^1^68^0^607^ -77^1^69^0^608^ -78^1^81^0^602^ -79^1^82^0^601^ -80^1^83^0^603^ -81^1^84^0^604^ -82^1^85^0^605^ -83^1^86^0^602^ -84^1^87^0^602^ -85^1^93^0^602^ -86^1^94^0^602^ -87^2^3^0^^ -88^2^4^0^201^ -89^2^5^0^202^ -90^2^6^0^204^ -91^2^7^0^203^ -92^2^8^0^305^ -93^2^11^0^604^ -94^2^12^0^605^ -95^2^13^0^603^ -96^2^15^0^601^ -97^2^16^0^103^ -98^2^17^0^104^ -99^2^18^0^105^ -100^2^19^0^106^ -101^2^20^0^107^ -102^2^21^0^108^ -103^2^22^0^109^ -104^2^23^0^110^ -105^2^25^0^302^ -106^2^43^0^306^ -107^2^45^0^308^ -108^2^56^0^401^ -109^2^57^0^402^ -110^2^58^0^403^ -111^2^60^0^304^ -112^2^61^0^301^ -113^2^63^0^602^ -114^2^68^0^607^ -115^2^69^0^608^ -116^2^81^0^602^ -117^2^82^0^601^ -118^2^83^0^603^ -119^2^84^0^604^ -120^2^85^0^605^ -121^2^86^0^602^ -122^2^87^0^602^ -123^2^93^0^602^ -124^2^94^0^602^ -125^3^3^0^^ -126^3^4^0^201^ -127^3^5^0^202^ -128^3^6^0^204^ -129^3^7^0^203^ -130^3^8^0^305^ -131^3^11^0^604^ -132^3^12^0^605^ -133^3^13^0^603^ -134^3^15^0^601^ -135^3^16^0^103^ -136^3^17^0^104^ -137^3^18^0^105^ -138^3^19^0^106^ -139^3^20^0^107^ -140^3^21^0^108^ -141^3^22^0^109^ -142^3^23^0^110^ -143^3^25^0^302^ -144^3^43^0^306^ -145^3^45^0^308^ -146^3^56^0^401^ -147^3^57^0^402^ -148^3^58^0^403^ -149^3^60^0^304^ -150^3^61^0^301^ -151^3^63^0^602^ -152^3^68^0^607^ -153^3^69^0^608^ -154^3^81^0^602^ -155^3^82^0^601^ -156^3^83^0^603^ -157^3^84^0^604^ -158^3^85^0^605^ -159^3^86^0^602^ -160^3^87^0^602^ -161^3^93^0^602^ -162^3^94^0^602^ -163^5^3^0^^ -164^5^4^0^201^ -165^5^5^0^202^ -166^5^6^0^204^ -167^5^7^0^203^ -168^5^8^0^305^ -169^5^11^0^604^ -170^5^12^0^605^ -171^5^13^0^603^ -172^5^15^0^601^ -173^5^16^0^103^ -174^5^17^0^104^ -175^5^18^0^105^ -176^5^19^0^106^ -177^5^20^0^107^ -178^5^21^0^108^ -179^5^22^0^109^ -180^5^23^0^110^ -181^5^25^0^302^ -182^5^43^0^306^ -183^5^45^0^308^ -184^5^56^0^401^ -185^5^57^0^402^ -186^5^58^0^403^ -187^5^60^0^304^ -188^5^61^0^301^ -189^5^63^0^602^ -190^5^68^0^607^ -191^5^69^0^608^ -192^5^81^0^602^ -193^5^82^0^601^ -194^5^83^0^603^ -195^5^84^0^604^ -196^5^85^0^605^ -197^5^86^0^602^ -198^5^87^0^602^ -199^5^93^0^602^ -200^5^94^0^602^ -201^6^3^0^^ -202^6^4^0^201^ -203^6^5^0^202^ -204^6^6^0^204^ -205^6^7^0^203^ -206^6^8^0^305^ -207^6^11^0^604^ -208^6^12^0^605^ -209^6^13^0^603^ -210^6^15^0^601^ -211^6^16^0^103^ -212^6^17^0^104^ -213^6^18^0^105^ -214^6^19^0^106^ -215^6^20^0^107^ -216^6^21^0^108^ -217^6^22^0^109^ -218^6^23^0^110^ -219^6^25^0^302^ -220^6^43^0^306^ -221^6^45^0^308^ -222^6^56^0^401^ -223^6^57^0^402^ -224^6^58^0^403^ -225^6^60^0^304^ -226^6^61^0^301^ -227^6^63^0^602^ -228^6^68^0^607^ -229^6^69^0^608^ -230^6^81^0^602^ -231^6^82^0^601^ -232^6^83^0^603^ -233^6^84^0^604^ -234^6^85^0^605^ -235^6^86^0^602^ -236^6^87^0^602^ -237^6^93^0^602^ -238^6^94^0^602^ -239^7^3^0^^ -240^7^4^0^201^ -241^7^5^0^202^ -242^7^6^0^204^ -243^7^7^0^203^ -245^7^11^0^604^ -246^7^12^0^605^ -247^7^13^0^603^ -248^7^15^0^601^ -249^7^16^0^103^ -250^7^17^0^104^ -251^7^18^0^105^ -252^7^19^0^106^ -253^7^20^0^107^ -254^7^21^0^108^ -255^7^22^0^109^ -256^7^23^0^110^ -257^7^25^0^302^ -258^7^43^0^306^ -259^7^45^0^308^ -260^7^56^0^401^ -261^7^57^0^402^ -262^7^58^0^403^ -263^7^60^0^304^ -264^7^61^0^301^ -265^7^63^0^602^ -266^7^68^0^607^ -267^7^69^0^608^ -268^7^81^0^602^ -269^7^82^0^601^ -270^7^83^0^603^ -271^7^84^0^604^ -272^7^85^0^605^ -273^7^86^0^602^ -274^7^87^0^602^ -275^7^93^0^602^ -276^7^94^0^602^ -277^8^3^0^^ -278^8^4^0^201^ -279^8^5^0^202^ -280^8^6^0^204^ -281^8^7^0^203^ -282^8^8^0^305^ -283^8^11^0^604^ -284^8^12^0^605^ -285^8^13^0^603^ -286^8^15^0^601^ -287^8^16^0^103^ -288^8^17^0^104^ -289^8^18^0^105^ -290^8^19^0^106^ -291^8^20^0^107^ -292^8^21^0^108^ -293^8^22^0^109^ -294^8^23^0^110^ -295^8^25^0^302^ -296^8^43^0^306^ -297^8^45^0^308^ -298^8^56^0^401^ -299^8^57^0^402^ -300^8^58^0^403^ -301^8^60^0^304^ -302^8^61^0^301^ -303^8^63^0^602^ -304^8^68^0^607^ -305^8^69^0^608^ -306^8^81^0^602^ -307^8^82^0^601^ -308^8^83^0^603^ -309^8^84^0^604^ -310^8^85^0^605^ -311^8^86^0^602^ -312^8^87^0^602^ -313^8^93^0^602^ -314^8^94^0^602^ -315^9^3^0^^ -316^9^4^0^201^ -317^9^5^0^202^ -318^9^6^0^204^ -319^9^7^0^203^ -321^9^11^0^604^ -322^9^12^0^605^ -323^9^13^0^603^ -324^9^15^0^601^ -325^9^16^0^103^ -326^9^17^0^104^ -327^9^18^0^105^ -328^9^19^0^106^ -329^9^20^0^107^ -330^9^21^0^108^ -331^9^22^0^109^ -332^9^23^0^110^ -333^9^25^0^302^ -334^9^43^0^306^ -335^9^45^0^308^ -336^9^56^0^401^ -337^9^57^0^402^ -338^9^58^0^403^ -339^9^60^0^304^ -340^9^61^0^301^ -341^9^63^0^602^ -342^9^68^0^607^ -343^9^69^0^608^ -344^9^81^0^602^ -345^9^82^0^601^ -346^9^83^0^603^ -347^9^84^0^604^ -348^9^85^0^605^ -349^9^86^0^602^ -350^9^87^0^602^ -351^9^93^0^602^ -352^9^94^0^602^ -353^10^3^0^^ -354^10^4^0^201^ -355^10^5^0^202^ -356^10^6^0^204^ -357^10^7^0^203^ -358^10^8^0^305^ -359^10^11^0^604^ -360^10^12^0^605^ -361^10^13^0^603^ -362^10^15^0^601^ -363^10^16^0^103^ -364^10^17^0^104^ -365^10^18^0^105^ -366^10^19^0^106^ -367^10^20^0^107^ -368^10^21^0^108^ -369^10^22^0^109^ -370^10^23^0^110^ -371^10^25^0^302^ -372^10^43^0^306^ -373^10^45^0^308^ -374^10^56^0^401^ -375^10^79^0^40^ -376^10^58^0^403^ -377^10^60^0^304^ -378^10^61^0^301^ -379^10^63^0^602^ -380^10^68^0^607^ -381^10^69^0^608^ -382^10^81^0^602^ -383^10^82^0^601^ -384^10^83^0^603^ -385^10^84^0^604^ -386^10^85^0^605^ -387^10^86^0^602^ -388^10^87^0^602^ -389^10^93^0^602^ -390^10^94^0^602^ -391^2^78^0^300^ -392^2^24^0^400^ -393^1^78^0^400^ -394^1^24^0^410^ -395^8^78^0^400^ -396^8^24^0^410^ -397^5^78^0^400^ -398^5^24^0^410^ -399^3^78^0^400^ -400^3^24^0^410^ -401^6^78^0^400^ -402^6^24^0^410^ -403^12^97^0^100^ -404^12^6^10^0^ -405^12^7^0^0^ -406^12^5^20^0^ 407^13^73^1^10^ 408^13^95^1^1^ +605^8^70^0^100^ +606^8^72^0^200^ +608^8^76^0^300^ +610^5^70^0^100^ +611^5^72^0^200^ +613^5^76^0^300^ +1565^1^108^0^1200^ +1566^1^107^0^2200^ +1567^1^101^0^1600^ +1568^1^102^0^1700^ +1569^1^8^0^1300^ +1570^1^103^0^1100^ +1571^1^105^0^1500^ +1572^1^104^0^1400^ +1573^1^43^0^1800^ +1574^1^106^0^1900^ +1575^1^100^0^2000^ +1576^1^45^0^2100^ +1577^1^70^1^1^ +1578^1^72^1^10^ +1579^1^76^0^20^ +1580^2^108^0^1200^ +1581^2^107^0^2200^ +1582^2^101^0^1600^ +1583^2^102^0^1700^ +1584^2^8^0^1300^ +1585^2^103^0^1100^ +1586^2^105^0^1500^ +1587^2^104^0^1400^ +1588^2^43^0^1800^ +1589^2^106^0^1900^ +1590^2^100^0^2000^ +1591^2^45^0^2100^ +1592^2^70^1^1^ +1593^2^72^1^10^ +1594^2^76^0^20^ +1595^3^108^0^1200^ +1596^3^107^0^2200^ +1597^3^101^0^1600^ +1598^3^102^0^1700^ +1599^3^8^0^1300^ +1600^3^103^0^1100^ +1601^3^105^0^1500^ +1602^3^104^0^1400^ +1603^3^43^0^1800^ +1604^3^106^0^1900^ +1605^3^100^0^2000^ +1606^3^45^0^2100^ +1607^3^70^1^1^ +1608^3^72^1^10^ +1609^3^76^0^20^ +1610^8^108^0^1200^ +1611^8^107^0^2200^ +1612^8^101^0^1600^ +1613^8^102^0^1700^ +1614^8^8^0^1300^ +1615^8^103^0^1100^ +1616^8^105^0^1500^ +1617^8^104^0^1400^ +1618^8^43^0^1800^ +1619^8^106^0^1900^ +1620^8^100^0^2000^ +1621^8^45^0^2100^ +1622^5^108^0^1200^ +1623^5^107^0^2200^ +1624^5^101^0^1600^ +1625^5^102^0^1700^ +1626^5^8^0^1300^ +1627^5^103^0^1100^ +1628^5^105^0^1500^ +1629^5^104^0^1400^ +1630^5^43^0^1800^ +1631^5^106^0^1900^ +1632^5^100^0^2000^ +1633^5^45^0^2100^ +1634^6^108^0^1200^ +1635^6^107^0^2200^ +1636^6^101^0^1600^ +1637^6^102^0^1700^ +1638^6^8^0^1300^ +1639^6^103^0^1100^ +1640^6^105^0^1500^ +1641^6^104^0^1400^ +1642^6^43^0^1800^ +1643^6^106^0^1900^ +1644^6^100^0^2000^ +1645^6^45^0^2100^ +1646^6^70^1^1^ +1647^6^72^1^10^ +1648^6^76^0^20^ +1649^7^108^0^1200^ +1650^7^107^0^2200^ +1651^7^101^0^1600^ +1652^7^102^0^1700^ +1653^7^8^0^1300^ +1654^7^103^0^1100^ +1655^7^105^0^1500^ +1656^7^104^0^1400^ +1657^7^43^0^1800^ +1658^7^106^0^1900^ +1659^7^100^0^2000^ +1660^7^45^0^2100^ +1661^7^70^1^1^ +1662^7^72^1^10^ +1663^9^108^0^1200^ +1664^9^107^0^2200^ +1665^9^101^0^1600^ +1666^9^102^0^1700^ +1667^9^8^0^1300^ +1668^9^103^0^1100^ +1669^9^105^0^1500^ +1670^9^104^0^1400^ +1671^9^43^0^1800^ +1672^9^106^0^1900^ +1673^9^100^0^2000^ +1674^9^45^0^2100^ +1675^9^70^1^1^ +1676^9^72^1^10^ +1677^10^108^0^1200^ +1678^10^107^0^2200^ +1679^10^101^0^1600^ +1680^10^102^0^1700^ +1681^10^8^0^1300^ +1682^10^103^0^1100^ +1683^10^105^0^1500^ +1684^10^104^0^1400^ +1685^10^43^0^1800^ +1686^10^106^0^1900^ +1687^10^100^0^2000^ +1688^10^45^0^2100^ +1689^10^70^1^1^ +1690^10^72^1^10^ +1691^10^76^0^20^ +1692^10^79^0^30^ diff --git a/superx/xml/js/viz/viz_functions.js b/superx/xml/js/viz/viz_functions.js index 80fb08c..bd03136 100644 --- a/superx/xml/js/viz/viz_functions.js +++ b/superx/xml/js/viz/viz_functions.js @@ -43,12 +43,13 @@ this.propertyValue=propertyValue; this.propUnit=propUnit; } -function usedVizTypeProperty(nr,vizTypePropertyUniquename,caption,propertyValue ) +function usedVizTypeProperty(nr,vizTypePropertyUniquename,caption,propertyValue,propertyType ) { this.nr=nr; this.vizTypePropertyUniquename=vizTypePropertyUniquename; this.caption=caption; this.propertyValue=propertyValue; +this.propertyType=propertyType; } function dataTransformationCol(tableId,colname,colfunction) @@ -330,7 +331,8 @@ function getPlotOptionsObj(chartPropertiesUsed) if(commonChartProperties[k].groupVariableName==commonChartPropertyGroups[i].groupVariableName && commonChartProperties[k].variableName!="" - && getChartPropertyValue(chartPropertiesUsed,commonChartProperties[k].name)!="") + && getChartPropertyValue(chartPropertiesUsed,commonChartProperties[k].name)!="" + && !isChartPropertyValidForChartelements(commonChartProperties[k])) { textDelim=(commonChartProperties[k].propValueType=="string" || commonChartProperties[k].propUnit!="")?"\"":""; optionsString+=",\""+commonChartProperties[k].variableName+"\":"+textDelim+getChartPropertyValue(chartPropertiesUsed,commonChartProperties[k].name)+textDelim; @@ -342,6 +344,7 @@ function getPlotOptionsObj(chartPropertiesUsed) optionsString+= ", \"marks\":[]"; optionsString+=" }"; //close tag + console.log("General Options: "+optionsString); var chartOptions=JSON.parse(optionsString); return chartOptions; @@ -602,11 +605,12 @@ function saveChartElementConfig() var propertyCounter=0; for(var k=0;k < vizTypeProperties.length;k++) { + if(vizTypeUniquename==vizTypeProperties[k].typeUniquename && document.getElementById(vizTypeProperties[k].propUniquename) && document.getElementById(vizTypeProperties[k].propUniquename).value !="") { - var myUsedVizTypeProperty=new usedVizTypeProperty(elemID,vizTypeProperties[k].propUniquename, vizTypeProperties[k].caption,document.getElementById(vizTypeProperties[k].propUniquename).value); //))nr,vizTypePropertyUniquename,caption,propertyValue ) + var myUsedVizTypeProperty=new usedVizTypeProperty(elemID,vizTypeProperties[k].propUniquename, vizTypeProperties[k].caption,document.getElementById(vizTypeProperties[k].propUniquename).value,vizTypeProperties[k].propertyType); //))nr,vizTypePropertyUniquename,caption,propertyValue ) myVizType.elementTypeProperties.push(myUsedVizTypeProperty); } } @@ -1190,7 +1194,6 @@ function renderGeneralChartPropertiesForm(formDiv,myCommonChartProperties,render if(groupUniquename!="" && groupUniquename != previousGroup && myCommonChartProperties[k].groupVariableName !="" - //&& isChartPropertyValidForChartelements(myCommonChartProperties[k]) ) { var newcommonChartPropertyGroup = new commonChartPropertyGroup(myCommonChartProperties[k].groupCaption,groupUniquename,""); @@ -1237,6 +1240,7 @@ function renderGeneralChartPropertiesForm(formDiv,myCommonChartProperties,render if(myCommonChartProperties[k].groupUniquename==commonChartPropertyGroups[i].groupUniquename && myCommonChartProperties[k].variableName!="" //&& isChartPropertyValidForChartelements(myCommonChartProperties[k]) + && !isChartPropertyValidForChartelements(myCommonChartProperties[k]) ) columnGroupBodyDiv.appendChild(renderChartPropertyField(null,myCommonChartProperties[k],true)); } @@ -1318,7 +1322,7 @@ function renderChartPropertyField(elemID,chartProperty,isCommon) fieldElem.appendChild(labelElem); //input: const inputControlElem = document.createElement("div"); - inputControlElem.classList.add("control-new"); + //inputControlElem.classList.add("control-new"); const inputFieldElem = document.createElement("div"); inputFieldElem.classList.add("field"); const inputElem = document.createElement("div"); @@ -1400,6 +1404,25 @@ function renderChartPropertyField(elemID,chartProperty,isCommon) inputElem.appendChild(rangeElem); inputFieldElem.appendChild(inputElem); break; + case "CHECKBOX2": //klappt noch nicht + const checkboxElem = document.createElement("input"); + checkboxElem.type="CHECKBOX"; + //checkboxElem.value="1"; + if(chartProperty.variableName=="") + { + checkboxElem.disabled="disabled"; + checkboxElem.readonly="readonly"; + } + checkboxElem.name=chartProperty.name; + checkboxElem.id=chartProperty.name; + checkboxElem.value= (propValue=="")?chartProperty.defaultValue:propValue; + checkboxElem.onchange= function () { + updateChartModel(); + renderChart('chartDiv',myChartModel); + }; + inputElem.appendChild(checkboxElem); + inputFieldElem.appendChild(inputElem); + break; default: //Einfaches Texteingabefeld: const inpElem = document.createElement("input"); @@ -1749,14 +1772,24 @@ return plotMark; function prepareChartPropertiesForPlotMark(chartType,chartElem) { var orientation=getVizTypeOrientation(chartElem.vizTypeUniquename); + var optionString="{\"dummy\": \"1\""; for(var k=0;k-1) + splitchar="\|"; + var currentFieldValueArray = currentFieldValue.split(splitchar); + var currentFieldValueCount=currentFieldValueArray.length; + */ + + params=encodeURIComponent(params); + //alert(params); + var jspPage="maske_combo_laden.jsp"; + if(feldart==12) + jspPage="maske_sicht_laden.jsp"; + var editurl="/superx/edit/kern/"+jspPage+"?tid="+maskentid+ "&Feldname="+getEncoded(fname)+"&previousValue="+currentFieldValue; + editurl +="&zeilenanzahl="+zeilenanzahl+"¶ms="+params; + neu2=window.open(editurl,"_blank","directories=no,location=no,menubar=no,scrollbars=yes,resizable=yes,toolbar=no,width=800,height=660"); + + + +} diff --git a/superx/xml/viz_components.xsl b/superx/xml/viz_components.xsl index eeb7d7b..bc3722e 100644 --- a/superx/xml/viz_components.xsl +++ b/superx/xml/viz_components.xsl @@ -263,13 +263,14 @@ vizTypes.push(newVizType); -function vizTypeProperty(propUniquename,caption,typeUniquename,groupUniquename,isMandatory,explanation) +function vizTypeProperty(propUniquename,caption,typeUniquename,groupUniquename,isMandatory,propertyType,explanation) { this.propUniquename=propUniquename; this.caption=caption; this.groupUniquename=groupUniquename; this.typeUniquename=typeUniquename; this.isMandatory=isMandatory; +this.propertyType=propertyType; this.explanation=explanation; } @@ -294,8 +295,9 @@ var newVizTypeProperty = new vizTypeProperty(" false -,"" -); +," + +",""); vizTypeProperties.push(newVizTypeProperty); @@ -632,4 +634,317 @@ Stand:

+ + + +
+
+
+Platzhalter +
+
+

+ +Vergrößern ... + + +Mehr Infos ... + +

+ +
+ + + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +" value=" + " + + ]]> + + + + + + + + + + + +
+ + + + + +
+ + +
+
+
+
+ + + + + + + + + + + + + + + + + + +vizTabelleComboOderSichtLaden( + + ,' + + ',' + + ',' + + ', + + ,' + + '); + +
+
+

+ + + + + + +

+
+   +   + +
+

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+   +   +   +   + + +
+
+ + + + + + + + + + + + + + + + + + + + + diff --git a/superx/xml/viz_html_chart.xsl b/superx/xml/viz_html_chart.xsl index fff907b..db685f9 100644 --- a/superx/xml/viz_html_chart.xsl +++ b/superx/xml/viz_html_chart.xsl @@ -787,35 +787,6 @@ Stand:

- - - -
-
-
-Platzhalter -
-
-

- -Vergrößern ... - - -Mehr Infos ... - -

- - -
- - diff --git a/superx/xml/viz_html_chart_viewer.xsl b/superx/xml/viz_html_chart_viewer.xsl index a627c62..b18ab4b 100644 --- a/superx/xml/viz_html_chart_viewer.xsl +++ b/superx/xml/viz_html_chart_viewer.xsl @@ -19,6 +19,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util ' " +is-full @@ -75,7 +76,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util - + customfooter @@ -98,7 +99,8 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util - + +

@@ -111,21 +113,6 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util z.B. 6 Grafiken ergibt einen Umbruch nach der 3. Teiltabelle Formel: ANZ / 2 kaufm. gerundet --> - - - - - - - - - - - - - -   @@ -150,20 +137,13 @@ Formel: ANZ / 2 kaufm. gerundet - - - -
-
-]]> - +
- + - - +--> diff --git a/superx/xml/viz_html_chart_viewer_grid.xsl b/superx/xml/viz_html_chart_viewer_grid.xsl new file mode 100644 index 0000000..f1b221a --- /dev/null +++ b/superx/xml/viz_html_chart_viewer_grid.xsl @@ -0,0 +1,248 @@ + + + + + + + + + + + + + + + +' +" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + +
+
+
+
+
+
+ + + + + + customfooter +
+
+
+
+
+ +
+
+ + + + + + + + + + + + + + +

+ +

+ + + + + + + + + + + + + + + + + + + +  + + +
+
+
+ + + + + + + + +
+column is- + + + + + +
+ + + + +
+
+
+]]> + + +
+
+
+ + + + + + + + + diff --git a/superx/xml/viz_html_chart_viewer_mask.xsl b/superx/xml/viz_html_chart_viewer_mask.xsl new file mode 100644 index 0000000..c4b972b --- /dev/null +++ b/superx/xml/viz_html_chart_viewer_mask.xsl @@ -0,0 +1,235 @@ + + + + + + + + + + + + + + + +' +" +is-full + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + +
+
+
+
+
+
+ + + + + + customfooter +
+
+
+ +
+ + + +
+
+
+ +
+
+ + + + + + + + + + + + + + + +

+ +

+ + + + + +  + + +
+
+
+ + + + + + + + +
+column is- + + + + + +
+ + + + +
+
+
+ + + + + + + + + diff --git a/test/webapps_superx/test_viz/stud_zeitreihe_plot.html b/test/webapps_superx/test_viz/stud_zeitreihe_plot.html index 107d9dc..f194640 100644 --- a/test/webapps_superx/test_viz/stud_zeitreihe_plot.html +++ b/test/webapps_superx/test_viz/stud_zeitreihe_plot.html @@ -2608,7 +2608,7 @@ var svgPlot=Plot.plot(plotcodeObj); } function plot_it(targetDiv) { -var chartOptions={"caption":"Studierende nach Erst- und Neueinschreibung (Zeitreihe)", +/*var chartOptions={"caption":"Studierende nach Erst- und Neueinschreibung (Zeitreihe)", "height":450, "width":650, "marginLeft":100, @@ -2618,20 +2618,24 @@ var chartOptions={"caption":"Studierende nach Erst- und Neueinschreibung (Zeitre "type":"band"}, "color":"blue", "marks":[ -Plot.barY ( rs[0],{"x":"eintrag","sort":"rownr","y":"gesamt","fill":"green","stroke":"orange"}), +Plot.barY ( rs[0],{"x":"eintrag","sort":"rownr","y":"gesamt","fill":"white","stroke":"orange"}), Plot.line ( rs[0],{"x":"eintrag","sort":"rownr","y":"ges_1fs","stroke":"red"}), Plot.line ( rs[0],{"x":"eintrag","sort":"rownr","y":"ges_1hs","stroke":"blue"}) ] } -chartOptions={"caption":"Studierende nach Erst- und Neueinschreibung (Zeitreihe)", +*/ +var chartOptions={"caption":"Studierende nach Erst- und Neueinschreibung (Zeitreihe)", "height":450, "width":650, "marginLeft":100, -"style":{"backgroundColor":"whitesmoke"}, +"style":{"backgroundColor":"yellow"}, "y":{"line":true}, "x":{"line":true, -"type":"band"}, +"type":"band", +"tickRotate":-45}, "color":"blue", +"fill":"orange", +"marginBottom":100, "marks":[ Plot.barY ( rs[0], { "x":"eintrag", @@ -2639,7 +2643,10 @@ Plot.barY ( rs[0], { "fill":"green", "stroke":"orange", channels: {sort1: {value: "rownr"}}, - sort: {x: "sort1"} }), + sort: {x: "sort1"} +} + +), Plot.line ( rs[0], { "x":"eintrag", "y":"ges_1fs", @@ -2647,7 +2654,19 @@ Plot.barY ( rs[0], { "stroke":"red", "strokeDasharray":[10,5], channels: {sort1: {value: "rownr"}}, - sort: {x: "sort1"} }) + sort: {x: "sort1"} , +"tip":true +}), + Plot.line ( rs[0], { +"x":"eintrag", +"y":"ges_1hs", +"stroke":"blue", + channels: {sort1: {value: "rownr"}}, + sort: {x: "sort1"} }), +Plot.dot ( rs[0],{"x":"eintrag","y":"ges_1hs","stroke":"blue", + channels: {sort1: {value: "rownr"}}, + sort: {x: "sort1"} + }) ] }