diff --git a/src-modules/module/viz/conf/viz.xml b/src-modules/module/viz/conf/viz.xml index 64a3b3a..7ddba5b 100644 --- a/src-modules/module/viz/conf/viz.xml +++ b/src-modules/module/viz/conf/viz.xml @@ -691,6 +691,8 @@ parent="Visualisierungen">Abfragen zur Administration von Visualisierungen + + @@ -783,6 +785,8 @@ parent="Visualisierungen">Abfragen zur Administration von Visualisierungen + + diff --git a/src-modules/module/viz/masken/44660_felderinfo.unl b/src-modules/module/viz/masken/44660_felderinfo.unl index 5c36b0f..2888f7f 100644 --- a/src-modules/module/viz/masken/44660_felderinfo.unl +++ b/src-modules/module/viz/masken/44660_felderinfo.unl @@ -9,7 +9,7 @@ union 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^ +order by 1;^^<> SELECT 3,'3-spaltig' from xdummy^ 44667^bis Fachsemester^35^350^-1^140^100^1^integer^30^0^0^ ^^^ 44668^Nur Endsemester^1000^0^0^140^80^1^integer^30^0^1^<> select 1,'ja' from xdummy^Eintrag^ ^ 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;^ @@ -19,11 +19,11 @@ order by 1;^^<> SELECT 2,'2-spaltig' from xdummy^ 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=44660 order by ord^ ^<> select filename,caption from sx_stylesheets S, sx_mask_style M where S.tid=M.stylesheet_id and M.maskeninfo_id=44660 order by ord limit 1^ -44676^Kachelbreite^305^0^0^100^15^1^integer^5000^0^0^^^800^ +44676^Kachelbreite^305^0^0^100^15^1^integer^5000^0^0^^^600^ 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^Kachelhöhe^310^0^0^100^15^1^integer^5000^0^0^^^600^ +44682^Kachelhöhe^310^0^0^100^15^1^integer^5000^0^0^^^400^ 44683^##line##^40^0^0^100^100^1^char^5000^0^8^^^1^ diff --git a/src-modules/module/viz/masken/44690_felderinfo.unl b/src-modules/module/viz/masken/44690_felderinfo.unl index c45e7e1..7ac7e53 100644 --- a/src-modules/module/viz/masken/44690_felderinfo.unl +++ b/src-modules/module/viz/masken/44690_felderinfo.unl @@ -3,7 +3,7 @@ 44692^Stichtag2^1^350^-1^140^100^1^sql^30^0^13^<> select tid, name from sos_stichtag where stichtagsart='Studierende';^^<> select tid, name from sos_stichtag where stichtagsart='Studierende' and appl_key='0';^ 44693^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^^ 44694^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.';^ -44695^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';^ +44695^Hörerstatus^33^0^0^140^170^1^sql^255^0^1^<> select apnr, eintrag from hoererstatus order by 2^apnr, eintrag^<> select apnr, eintrag from hoererstatus where eintrag='alle';^ 44696^Spaltenanzahl^300^0^0^140^80^1^integer^30^0^1^<> SELECT 0,'Automatisch' from xdummy \ union SELECT 1,'1-spaltig' from xdummy \ union SELECT 2,'2-spaltig' from xdummy \ diff --git a/src-modules/module/viz/masken/44720_felderinfo.unl b/src-modules/module/viz/masken/44720_felderinfo.unl index 559def1..ea0f60e 100644 --- a/src-modules/module/viz/masken/44720_felderinfo.unl +++ b/src-modules/module/viz/masken/44720_felderinfo.unl @@ -1,9 +1,9 @@ -44720^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';^ -44721^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;^ +44720^Köpfe oder Fälle ?^0^0^0^140^150^1^sql^70^0^1^<> select apnr, eintrag from koepfe_oder_faelle order by 2^ ^<> select apnr, eintrag from koepfe_oder_faelle where eintrag='Fälle';^ +44721^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()-(4*365) between sem_beginn and sem_ende;^ 44722^Stichtag^1^350^-1^140^100^1^sql^30^0^13^<> select tid, name from sos_stichtag where stichtagsart='Prüfungen';^^<> select tid, name from sos_stichtag where stichtagsart='Prüfungen' and appl_key='2';^ 44723^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^^ 44724^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.';^ -44725^Hörerstatus^33^0^0^140^170^1^sql^30^0^13^<> select apnr, eintrag from hoererstatus order by 2^apnr, eintrag^<> select apnr, eintrag from hoererstatus where eintrag='alle';^ +44725^Hörerstatus^33^0^0^140^170^1^sql^255^0^13^<> select apnr, eintrag from hoererstatus order by 2^apnr, eintrag^<> select apnr, eintrag from hoererstatus where eintrag='alle';^ 44727^bis Fachsemester^35^350^-1^140^100^1^integer^30^0^13^^^^ 44729^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;^ 44730^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;^hidden^^ 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 36e2dd5..ff3f16e 100644 --- a/src-modules/module/viz/schluesseltabellen/macro_masken_bez_fuellen.sql +++ b/src-modules/module/viz/schluesseltabellen/macro_masken_bez_fuellen.sql @@ -39,7 +39,9 @@ {"makro":"44690", "tid":"44570", "sortnr":"10"}, {"makro":"44690", "tid":"44570", "sortnr":"20"}, {"makro":"44690", "tid":"44570", "sortnr":"30"}, -{"makro":"44690", "tid":"44720", "sortnr":"40"} +{"makro":"44690", "tid":"44720", "sortnr":"40"}, +{"makro":"44690", "tid":"44720", "sortnr":"50"}, +{"makro":"44690", "tid":"44720", "sortnr":"60"} @@ -195,8 +197,17 @@ {"makro":"44690", "sortnr":"40", "feldname":"Köpfe oder Fälle ?", "value":"1=1"}, {"makro":"44690", "sortnr":"40", "feldname":"Spaltenlayout", "value":"rpta_sos_lab_aggr_sem"}, {"makro":"44690", "sortnr":"40", "feldname":"Grafik", "value":"ABSOLV_SEM_LINE"}, -{"makro":"44690", "sortnr":"40", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"} +{"makro":"44690", "sortnr":"40", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"}, +{"makro":"44690", "sortnr":"50", "feldname":"Köpfe oder Fälle ?", "value":"1=1"}, +{"makro":"44690", "sortnr":"50", "feldname":"Spaltenlayout", "value":"rpta_sos_lab_aggr_in_rsz_sem"}, +{"makro":"44690", "sortnr":"50", "feldname":"Grafik", "value":"ABSOLV_RSZ_SEM_BAR"}, +{"makro":"44690", "sortnr":"50", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"}, + +{"makro":"44690", "sortnr":"60", "feldname":"Köpfe oder Fälle ?", "value":"1=1"}, +{"makro":"44690", "sortnr":"60", "feldname":"Spaltenlayout", "value":"rpta_sos_lab_aggr_abgrp_sem"}, +{"makro":"44690", "sortnr":"60", "feldname":"Grafik", "value":"ABSOLV_ABGRP_SEM_AREA"}, +{"makro":"44690", "sortnr":"60", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"} ] /> diff --git a/src-modules/module/viz/schluesseltabellen/rpta_column_layout_rpta_sos_lab_aggr_abgrp_zeitreihe_fuellen.sql b/src-modules/module/viz/schluesseltabellen/rpta_column_layout_rpta_sos_lab_aggr_abgrp_zeitreihe_fuellen.sql new file mode 100644 index 0000000..d6c2429 --- /dev/null +++ b/src-modules/module/viz/schluesseltabellen/rpta_column_layout_rpta_sos_lab_aggr_abgrp_zeitreihe_fuellen.sql @@ -0,0 +1,116 @@ +--freemarker template +<#include "RPTA-Makros"/> + + +select count(*) from systeminfo where tid=330; + + +<#assign rpta_column_layout = +{"uniquename":"rpta_sos_lab_aggr_abgrp_sem", +"caption":"Absolvierende nach Abschlussgruppe und Semester", +"rpta_resultset":"rpta_sos_lab_aggr", +"whereclause":"", +"description":"Absolvierende nach Abschlussgruppe und Semester", +"is_virtual":1 +} + /> + +<#assign rpta_columns = [ +{"uniquename":"sem_der_pruefung", +"caption":"Semester", +"srcfieldname":"sem_der_pruefung", +"targetfieldname":"sem_der_pruefung", +"column_type":"physicalColumn", +"col_function":"", +"is_visible":"0", +"format_code":"TEXT", +"visible_size":"5", +"is_aggregate":"0", +"description":"" +}, +{"uniquename":"semester_str", +"caption":"Semester Name", +"srcfieldname":"sem_der_pruefung", +"targetfieldname":"semester_str", +"column_type":"logicalColumn", +"col_function":"(case when substring(sem_der_pruefung::varchar from 5 for 1)=''2'' then ''WS '' || substring(sem_der_pruefung::varchar from 3 for 2) || ''/'' || lpad('''' || val(substring(sem_der_pruefung::varchar from 3 for 2))+1,2,''0'') +when substring(sem_der_pruefung::varchar from 5 for 1)=''1'' then ''SS '' || substring(sem_der_pruefung::varchar from 3 for 2) +else '''' end)", +"is_visible":"1", +"format_code":"", +"visible_size":"5", +"is_aggregate":"0", +"description":"" +}, + +{"uniquename":"absolv_ba", +"caption_der_spalte":"BA", +"caption_in_ergebnistabelle":"Bachelor", +"srcfieldname":"", +"targetfieldname":"absolv_ba", +"column_type":"logicalColumn", +"col_function":"(case when dim_studiengang_abschlussart=''A24'' and dim_studiengang_ist_lehramt =0 then summe + else 0 end)", +"is_visible":"1", +"visible_size":"10", +"is_aggregate":"1", +"description":"Absolv. Bachelor ohne Lehramt" +}, +{"uniquename":"absolv_ba_la", +"caption_der_spalte":"LA BA", +"caption_in_ergebnistabelle":"Bachelor Lehramt", +"srcfieldname":"", +"targetfieldname":"absolv_ba_la", +"column_type":"logicalColumn", +"col_function":"(case when dim_studiengang_abschlussart=''A24'' and dim_studiengang_ist_lehramt =1 then summe + else 0 end)", +"is_visible":"1", +"visible_size":"10", +"is_aggregate":"1", +"description":"Absolv. Bachelor Lehramt" +}, +{"uniquename":"absolv_ma", +"caption_der_spalte":"MA", +"caption_in_ergebnistabelle":"Master", +"srcfieldname":"", +"targetfieldname":"absolv_ma", +"column_type":"logicalColumn", +"col_function":"(case when dim_studiengang_abschlussart=''A37'' and dim_studiengang_ist_lehramt =0 then summe + else 0 end)", +"is_visible":"1", +"visible_size":"10", +"is_aggregate":"1", +"description":"Absolv. Master" +}, +{"uniquename":"absolv_ma_la", +"caption_der_spalte":"MA LA", +"caption_in_ergebnistabelle":"Master Lehramt", +"srcfieldname":"", +"targetfieldname":"absolv_ma_la", +"column_type":"logicalColumn", +"col_function":"(case when dim_studiengang_abschlussart=''A37'' and dim_studiengang_ist_lehramt =1 then summe + else 0 end)", +"is_visible":"1", +"visible_size":"10", +"is_aggregate":"1", +"description":"Absolv. Master Lehramt" +}, +{"uniquename":"absolv_prom", +"caption_der_spalte":"Promotion", +"caption_in_ergebnistabelle":"Promotion", +"srcfieldname":"", +"targetfieldname":"absolv_prom", +"column_type":"logicalColumn", +"col_function":"(case when dim_studiengang_abschlussart=''G_Prom'' then summe else 0 end)", +"is_visible":"1", +"visible_size":"10", +"is_aggregate":"1", +"description":"Absolv. Promotion" +} + +] + /> + +<#if rpta_installed==1> +<@rpta_column_layout_fuellen /> + diff --git a/src-modules/module/viz/schluesseltabellen/rpta_column_layout_rpta_sos_lab_aggr_in_rsz_zeitreihe_fuellen.sql b/src-modules/module/viz/schluesseltabellen/rpta_column_layout_rpta_sos_lab_aggr_in_rsz_zeitreihe_fuellen.sql new file mode 100644 index 0000000..7bbab07 --- /dev/null +++ b/src-modules/module/viz/schluesseltabellen/rpta_column_layout_rpta_sos_lab_aggr_in_rsz_zeitreihe_fuellen.sql @@ -0,0 +1,90 @@ +--freemarker template +<#include "RPTA-Makros"/> + + +select count(*) from systeminfo where tid=330; + + +<#assign rpta_column_layout = +{"uniquename":"rpta_sos_lab_aggr_in_rsz_sem", +"caption":"Absolvierende in oder über RSZ nach Semester", +"rpta_resultset":"rpta_sos_lab_aggr", +"whereclause":"", +"description":"Absolvierende in oder über RSZ nach Semester", +"is_virtual":1 +} + /> + +<#assign rpta_columns = [ +{"uniquename":"sem_der_pruefung", +"caption":"Semester", +"srcfieldname":"sem_der_pruefung", +"targetfieldname":"sem_der_pruefung", +"column_type":"physicalColumn", +"col_function":"", +"is_visible":"0", +"format_code":"TEXT", +"visible_size":"5", +"is_aggregate":"0", +"description":"" +}, +{"uniquename":"semester_str", +"caption":"Semester Name", +"srcfieldname":"sem_der_pruefung", +"targetfieldname":"semester_str", +"column_type":"logicalColumn", +"col_function":"(case when substring(sem_der_pruefung::varchar from 5 for 1)=''2'' then ''WS '' || substring(sem_der_pruefung::varchar from 3 for 2) || ''/'' || lpad('''' || val(substring(sem_der_pruefung::varchar from 3 for 2))+1,2,''0'') +when substring(sem_der_pruefung::varchar from 5 for 1)=''1'' then ''SS '' || substring(sem_der_pruefung::varchar from 3 for 2) +else '''' end)", +"is_visible":"1", +"format_code":"", +"visible_size":"5", +"is_aggregate":"0", +"description":"" +}, +{"uniquename":"absolv_in_rsz_summe", +"caption":"Absolv. in der RSZ", +"srcfieldname":"", +"targetfieldname":"absolv_in_rsz", +"column_type":"logicalColumn", +"col_function":"(case when fach_sem_zahl <= dim_studiengang_regel then summe + else 0 end)", +"is_visible":"1", +"format_code":"", +"visible_size":"5", +"is_aggregate":"1", +"description":"Absolv. unter RSZ" +}, +{"uniquename":"absolv_ueber_rsz_summe", +"caption":"Absolv. über der RSZ", +"srcfieldname":"", +"targetfieldname":"absolv_ueber_rsz", +"column_type":"logicalColumn", +"col_function":"(case when fach_sem_zahl > dim_studiengang_regel then summe + else 0 end)", +"is_visible":"1", +"format_code":"", +"visible_size":"5", +"is_aggregate":"1", +"description":"Absolv. über RSZ" +}, +{"uniquename":"absolv_unbek_rsz_summe", +"caption_der_spalte":"Absolv. unbek. RSZ", +"caption_in_ergebnistabelle":"Unbekannt", +"srcfieldname":"", +"targetfieldname":"absolv_unbek_rsz", +"column_type":"logicalColumn", +"col_function":"(case when fach_sem_zahl is null or dim_studiengang_regel is null then summe + else 0 end)", +"is_visible":"1", +"format_code":"", +"visible_size":"5", +"is_aggregate":"1", +"description":"Absolv. unbek RSZ" +} +] + /> + +<#if rpta_installed==1> +<@rpta_column_layout_fuellen /> + diff --git a/src-modules/module/viz/schluesseltabellen/viz_chart.unl b/src-modules/module/viz/schluesseltabellen/viz_chart.unl index b084c1c..09fd5ce 100644 --- a/src-modules/module/viz/schluesseltabellen/viz_chart.unl +++ b/src-modules/module/viz/schluesseltabellen/viz_chart.unl @@ -1193,3 +1193,232 @@ {"name":"dimension1","vizPropertyVariablename":"dimension1","propertyValue":"dim_studiengang_fb_str","propUnit":""},\ {"name":"measure1","vizPropertyVariablename":"measure1","propertyValue":"summe","propUnit":""}],\ "dataTransformation":[]}^ ^0^600^400^200^100^ +41^ABSOLV_RSZ_SEM_BAR^Absolvierende nach RSZ und 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_native","sourceCode":\ +{\ +title: {\ + text: 'Absolvierende nach Regelstudienzeit',\ + left: "center",\ + top: "top",\ + textStyle: {\ + fontSize: 20\ + }\ + },\ + grid: {\ + top: "16%",\ + left: "20%"\ + },\ + legend: {show:true,itemGap:5,itemHeight:6, top:'bottom',\ + data: [{\ + name: 'Absolv. in der Regelstudienzeit',\ + icon: 'roundRect'},\ + {\ + name: 'Absolv. über der Regelstudienzeit',\ + icon: 'roundRect'\ + }, {\ + name: 'Unbekannt',\ + icon: 'roundRect'\ + },\ +]\ + },\ + tooltip: {},\ + \ + xAxis: [\ + { type: 'category', axisLabel:{rotate:30}}\ + ],\ + yAxis: [{name:'Absolvierende', nameLocation:'middle', nameGap:40,id:0 }],\ + \ + series: [\ + { name:'Absolv. in der Regelstudienzeit',type: 'bar', encode:{x:'semester_str',y:'absolv_in_rsz'},stack:'summe', color:'#004a93',\ + label: {\ + show: true\ + }},\ + { name:'Absolv. über der Regelstudienzeit',type: 'bar',encode:{x:'semester_str',y:'absolv_ueber_rsz'},stack:'summe', color:'#afcde4',\ + label: {\ + show: true\ + }},\ + { name:'Unbekannt',type: 'bar',encode:{x:'semester_str',y:'absolv_unbek_rsz'},stack:'summe', color:'#cccccc',\ + label: {\ + show: true\ + }}\ + ]\ +}\ +}\ +]\ +}^ ^^25.08.2024^25.08.2024^44720^ ^3^{"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":"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"},\ +{"nr":2,"vizTypePropertyUniquename":"stroke_static","caption":"Strichfarbe","propertyValue":"#1a5fb4","propertyType":"string"},\ +{"nr":2,"vizTypePropertyUniquename":"fill_static","caption":"Flächenfarbe","propertyValue":"#000000","propertyType":"string"}]},\ +{"elemID":"3","vizTypeUniquename":"text","caption":"text","datasource":"0","elementTypeProperties":[{"nr":"3","vizTypePropertyUniquename":"x","caption":"X-Achse","propertyValue":"semester_str","propertyType":"string"},\ +{"nr":"3","vizTypePropertyUniquename":"y","caption":"Y-Achse","propertyValue":"summe","propertyType":"string"},\ +{"nr":"3","vizTypePropertyUniquename":"text","caption":"Beschriftung","propertyValue":"summe","propertyType":"string"},\ +{"name":"strokeWidth","vizPropertyVariablename":"strokeWidth","propertyValue":"1","propUnit":""},\ +{"nr":"3","vizTypePropertyUniquename":"stroke_static","caption":"Strichfarbe","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äger_innen nach Semester"},\ +{"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":"marginTop","vizPropertyVariablename":"marginTop","propertyValue":"70","propUnit":""},\ +{"name":"strokeWidth","vizPropertyVariablename":"strokeWidth","propertyValue":"1","propUnit":""},\ +{"name":"marginBottom","vizPropertyVariablename":"marginBottom","propertyValue":"80","propUnit":""},\ +{"name":"innerRadius","vizPropertyVariablename":"innerRadius","propertyValue":"0","propUnit":""},\ +{"name":"labelRadiusFactor","vizPropertyVariablename":"labelRadiusFactor","propertyValue":"80","propUnit":""},\ +{"name":"tickRotate_x","vizPropertyVariablename":"tickRotate","propertyValue":"-45","propUnit":""},\ +{"name":"cornerRadius","vizPropertyVariablename":"cornerRadius","propertyValue":"10","propUnit":"px"},\ +{"name":"labelOpacity","vizPropertyVariablename":"labelOpacity","propertyValue":"70","propUnit":""},\ +{"name":"dx","vizPropertyVariablename":"dx","propertyValue":"4","propUnit":"px"},\ +{"name":"dy","vizPropertyVariablename":"dy","propertyValue":"-20","propUnit":"px"},\ +{"name":"backgroundColor","vizPropertyVariablename":"backgroundColor","propertyValue":"#ffffff","propUnit":""},\ +{"name":"color","vizPropertyVariablename":"color","propertyValue":"#000000","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":""},\ +{"name":"fill_static","vizPropertyVariablename":"fill","propertyValue":"#000000","propUnit":""},\ +{"name":"label_y","vizPropertyVariablename":"label","propertyValue":"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":"scale_x","vizPropertyVariablename":"type","propertyValue":"band","propUnit":""},\ +{"name":"x","vizPropertyVariablename":"x","propertyValue":"semester_str","propUnit":""},\ +{"name":"y","vizPropertyVariablename":"y","propertyValue":"summe","propUnit":""},\ +{"name":"text","vizPropertyVariablename":"text","propertyValue":"summe","propUnit":""}],\ +"dataTransformation":[]}^ ^1^600^400^200^100^ +42^ABSOLV_ABGRP_SEM_AREA^Absolvierende nach Abschlussgruppe und 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_native","sourceCode":\ +{ \ +title: {\ + text: 'Absolvierende nach Abschluss',\ + left: "center",\ + top: "top",\ + textStyle: {\ + fontSize: 20\ + }\ + },\ + grid: {\ + top: "16%",\ + left: "20%"\ + },\ + legend: {show:true,itemGap:5,itemHeight:6, top:'bottom',\ + data: [{\ + name: 'BA',\ + icon: 'roundRect'},\ + {\ + name: 'LA BA',\ + icon: 'roundRect'\ + },\ + {\ + name: 'MA',\ + icon: 'roundRect'},\ + {\ + name: 'LA MA',\ + icon: 'roundRect'\ + },\ + {\ + name: 'Promotion',\ + icon: 'roundRect'\ + }\ +]\ + },\ + tooltip: {\ + trigger: 'axis',\ + axisPointer: {\ + type: 'cross',\ + label: {\ + backgroundColor: '#6a7985'\ + }\ + }\ + },\ + xAxis: [\ + { type: 'category', axisLabel:{rotate:30}}\ + ],\ + yAxis: [{name:'Absolvierende', nameLocation:'middle', nameGap:40,id:0 }],\ + series: [\ + { name:'BA',type: 'line', encode:{x:'semester_str',y:'absolv_ba'},stack:'summe', color:'#374ca',\ + areaStyle: {},\ + emphasis: {\ + focus: 'series'\ + }},\ + { name:'LA BA',type: 'line',encode:{x:'semester_str',y:'absolv_ba_la'},stack:'summe', color:'#5e70ba',\ + areaStyle: {},\ + emphasis: {\ + focus: 'series'\ + }},\ + { name:'MA',type: 'line', encode:{x:'semester_str',y:'absolv_ma'},stack:'summe', color:'#64a6d9',\ + areaStyle: {},\ + emphasis: {\ + focus: 'series'\ + }},\ + { name:'LA MA',type: 'line',encode:{x:'semester_str',y:'absolv_ma_la'},stack:'summe', color:'#8cb7e1',\ + areaStyle: {},\ + emphasis: {\ + focus: 'series'\ + }},\ + { name:'Promotion',type: 'line',encode:{x:'semester_str',y:'absolv_prom'},stack:'summe', color:'#7aa2ba',\ + areaStyle: {},\ + emphasis: {\ + focus: 'series'\ + }}\ + ]\ +}\ +}\ +]\ +}^ ^^25.08.2024^25.08.2024^44720^ ^3^{"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":"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"},\ +{"nr":2,"vizTypePropertyUniquename":"stroke_static","caption":"Strichfarbe","propertyValue":"#1a5fb4","propertyType":"string"},\ +{"nr":2,"vizTypePropertyUniquename":"fill_static","caption":"Flächenfarbe","propertyValue":"#000000","propertyType":"string"}]},\ +{"elemID":"3","vizTypeUniquename":"text","caption":"text","datasource":"0","elementTypeProperties":[{"nr":"3","vizTypePropertyUniquename":"x","caption":"X-Achse","propertyValue":"semester_str","propertyType":"string"},\ +{"nr":"3","vizTypePropertyUniquename":"y","caption":"Y-Achse","propertyValue":"summe","propertyType":"string"},\ +{"nr":"3","vizTypePropertyUniquename":"text","caption":"Beschriftung","propertyValue":"summe","propertyType":"string"},\ +{"name":"strokeWidth","vizPropertyVariablename":"strokeWidth","propertyValue":"1","propUnit":""},\ +{"nr":"3","vizTypePropertyUniquename":"stroke_static","caption":"Strichfarbe","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äger_innen nach Semester"},\ +{"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":"marginTop","vizPropertyVariablename":"marginTop","propertyValue":"70","propUnit":""},\ +{"name":"strokeWidth","vizPropertyVariablename":"strokeWidth","propertyValue":"1","propUnit":""},\ +{"name":"marginBottom","vizPropertyVariablename":"marginBottom","propertyValue":"80","propUnit":""},\ +{"name":"innerRadius","vizPropertyVariablename":"innerRadius","propertyValue":"0","propUnit":""},\ +{"name":"labelRadiusFactor","vizPropertyVariablename":"labelRadiusFactor","propertyValue":"80","propUnit":""},\ +{"name":"tickRotate_x","vizPropertyVariablename":"tickRotate","propertyValue":"-45","propUnit":""},\ +{"name":"cornerRadius","vizPropertyVariablename":"cornerRadius","propertyValue":"10","propUnit":"px"},\ +{"name":"labelOpacity","vizPropertyVariablename":"labelOpacity","propertyValue":"70","propUnit":""},\ +{"name":"dx","vizPropertyVariablename":"dx","propertyValue":"4","propUnit":"px"},\ +{"name":"dy","vizPropertyVariablename":"dy","propertyValue":"-20","propUnit":"px"},\ +{"name":"backgroundColor","vizPropertyVariablename":"backgroundColor","propertyValue":"#ffffff","propUnit":""},\ +{"name":"color","vizPropertyVariablename":"color","propertyValue":"#000000","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":""},\ +{"name":"fill_static","vizPropertyVariablename":"fill","propertyValue":"#000000","propUnit":""},\ +{"name":"label_y","vizPropertyVariablename":"label","propertyValue":"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":"scale_x","vizPropertyVariablename":"type","propertyValue":"band","propUnit":""},\ +{"name":"x","vizPropertyVariablename":"x","propertyValue":"semester_str","propUnit":""},\ +{"name":"y","vizPropertyVariablename":"y","propertyValue":"summe","propUnit":""},\ +{"name":"text","vizPropertyVariablename":"text","propertyValue":"summe","propUnit":""}],\ +"dataTransformation":[]}^ ^1^600^400^200^100^ diff --git a/src-modules/module/viz/schluesseltabellen/viz_type_echarts_fuellen.sql b/src-modules/module/viz/schluesseltabellen/viz_type_echarts_fuellen.sql index a05a565..5f3eb1d 100644 --- a/src-modules/module/viz/schluesseltabellen/viz_type_echarts_fuellen.sql +++ b/src-modules/module/viz/schluesseltabellen/viz_type_echarts_fuellen.sql @@ -28,9 +28,18 @@ {"uniquename":"echarts_pie", "caption":"Tortendiagramm", "orientation":"Z", "description":"Tortendiagramm oder Donut", +"explanation":""}, +{"uniquename":"echarts_bar_y_stacked", "caption":"Säulendiagramm gestapelt (vertikal)", +"orientation":"V", +"description":"Vertikales Balkendiagramm (gestapelt)", +"explanation":""}, +{"uniquename":"echarts_native", "caption":"Echarts (nativ)", +"orientation":"V", +"description":"Natives Diagramm", "explanation":""} + ] /> @@ -124,6 +133,21 @@ "range_from":"", "range_to":"", "prop_value_type":"string" +}, +{ "caption":"Quellcode", +"prop_uniquename":"sourcecode", +"explanation":"Quellcode bei nativen Echarts", +"prop_default":"", +"prop_unit":"", +"is_generic":"0", +"static_values":"", +"is_mandatory":"0", +"input_type_uniquename":"TEXT", +"property_group_uniquename":"SOURCECODE", +"sortnr":"608", +"range_from":"", +"range_to":"", +"prop_value_type":"object" } ] /> @@ -137,6 +161,18 @@ "viz_property_uniquename":"y", "is_mandatory":"1", "sortnr":"10"}, +{ "viz_type_uniquename":"echarts_bar_y_stacked", +"viz_property_uniquename":"x", +"is_mandatory":"1", +"sortnr":"1"}, +{ "viz_type_uniquename":"echarts_bar_y_stacked", +"viz_property_uniquename":"stroke", +"is_mandatory":"1", +"sortnr":"10"}, +{ "viz_type_uniquename":"echarts_bar_y_stacked", +"viz_property_uniquename":"y", +"is_mandatory":"1", +"sortnr":"20"}, { "viz_type_uniquename":"echarts_bar_x", "viz_property_uniquename":"x", "is_mandatory":"1", @@ -168,6 +204,10 @@ { "viz_type_uniquename":"echarts_pie", "viz_property_uniquename":"measure1", "is_mandatory":"1", +"sortnr":"10"}, +{ "viz_type_uniquename":"echarts_native", +"viz_property_uniquename":"sourcecode", +"is_mandatory":"1", "sortnr":"10"} diff --git a/superx/xml/js/viz/viz_viewer.js b/superx/xml/js/viz/viz_viewer.js index f5f1141..e70992d 100644 --- a/superx/xml/js/viz/viz_viewer.js +++ b/superx/xml/js/viz/viz_viewer.js @@ -1665,6 +1665,8 @@ return option; function getChartPropertyValue(propArray,propName) { var propertyValue=""; + if(propArray) + { for (var i=0;i { + for (var col in row) { + console.log(col +"-"+row[col]); + } + } + ); + } + + +function pivotTable(rsData,rsMetaData,srcColNrStart) +{ + var rsDataPivot=new Array(); + var nrSourceRows=rsData.length; + var nrSouceCols=rsMetaData.length; + var rsRow=new Array(); + var zs=""; + var targetRownr=0; + //first line will have headers: + var rownr=0; + zs+="Zeile|"; + rsRow[rownr]="Zeile"; + rownr++; + rsData.forEach((row) => { + var colnr=0; + for (var col in row) { + + if(colnr==srcColNrStart) + { + zs+=row[col]+"|"; + rsRow[rownr]=row[col]; + } + colnr++; + } + rownr++; + } + ); + zs +="\n"; + targetRownr++; + rsDataPivot.push(rsRow); + //now the data: + var metaDataColnr=0; + + rsMetaData.forEach((col) => { + if(metaDataColnr>srcColNrStart && col.colcaption.trim()!="") + { + //start a new row: + var rsRow=new Array(); + var colname=col.colname; + zs+=col.colcaption +"|"; + rsRow[0]=col.colcaption; + var targetColnr=1; + var rownr=0; + rsData.forEach((row) => { + var colnr=0; + for (var col in row) { + if(colnr==metaDataColnr) + { + zs+=row[col]+"|"; + rsRow[targetColnr]=row[col]; + targetColnr++; + } + colnr++; + }; + rownr++; + }); + zs+="\n"; + rsDataPivot.push(rsRow); + + + } + metaDataColnr++; + }); + + + +//alert(zs); +/* for(var row=0;row < nrSourceRows;row++) + { + + rsRow[row]=rsData[row][srcColNr]; + } + rsDataPivot.push(rsRow); + //Now line 2 upwards: + rsData.forEach((row) => { + for (var col in row) { + console.log(col +"-"+row[col]); + } + } + ); + } + + for(var col=srcColNr+1;col < nrSouceCols;col++) + { + var rsRow=new Array(); + var srcColCounter=0; + //first targetcolumn has name + rsRow[0]=rsMetaData[col]; + for(var row=0;row < nrSourceRows;row++) + { + rsRow[row+1]=rsData[row][col]; + + } + rsDataPivot.push(rsRow); + } + console.log(rsDataPivot); + +*/ +return rsDataPivot; +} diff --git a/superx/xml/viz_components.xsl b/superx/xml/viz_components.xsl index 20a4ee4..695759f 100644 --- a/superx/xml/viz_components.xsl +++ b/superx/xml/viz_components.xsl @@ -1145,6 +1145,7 @@ Platzhalter +
@@ -1210,14 +1211,14 @@ Platzhalter
-
- +
@@ -1341,7 +1342,7 @@ Platzhalter -
+
@@ -1381,7 +1382,14 @@ Platzhalter -
+
+
+ +
+ @@ -1773,68 +1781,104 @@ td.integer { + - -
- -
+ +
+

@@ -2168,5 +2212,24 @@ vertical-align:center; + + + +

+ + + + + + + + + ... + + + +  + +

 diff --git a/superx/xml/viz_html_chart_viewer_grid.xsl b/superx/xml/viz_html_chart_viewer_grid.xsl index 59d45e9..53a596f 100644 --- a/superx/xml/viz_html_chart_viewer_grid.xsl +++ b/superx/xml/viz_html_chart_viewer_grid.xsl @@ -96,7 +96,9 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util
- + + +