diff --git a/src-modules/module/viz/conf/includes.txt b/src-modules/module/viz/conf/includes.txt index 80a428f..f08a0fa 100644 --- a/src-modules/module/viz/conf/includes.txt +++ b/src-modules/module/viz/conf/includes.txt @@ -1,4 +1,7 @@ doku/viz_modul/viz.html +images/information_white_liberation.svg +images/viz_sidebarbuttonInfo.svg +images/viz_sidebarbuttonMaske.svg images/icons/into_excel_normal.svg images/icons/into_pdf.svg images/icons/into_word.svg diff --git a/src-modules/module/viz/conf/viz.xml b/src-modules/module/viz/conf/viz.xml index 3864adc..172b87f 100644 --- a/src-modules/module/viz/conf/viz.xml +++ b/src-modules/module/viz/conf/viz.xml @@ -689,13 +689,17 @@ parent="Visualisierungen">Abfragen zur Administration von Visualisierungen - - - + + + + + + + @@ -772,6 +776,7 @@ parent="Visualisierungen">Abfragen zur Administration von Visualisierungen + @@ -785,14 +790,17 @@ parent="Visualisierungen">Abfragen zur Administration von Visualisierungen - - - - + + + + + + + diff --git a/src-modules/module/viz/masken/44630_maskeninfo.unl b/src-modules/module/viz/masken/44630_maskeninfo.unl index f6090d4..51fd643 100644 --- a/src-modules/module/viz/masken/44630_maskeninfo.unl +++ b/src-modules/module/viz/masken/44630_maskeninfo.unl @@ -85,10 +85,10 @@ hidden_booklet_stylesheet --,\ --optional_filter_value\ )\ select 1,\ -trim(name) || ' im Überblick' ,\ +'${VIZ_HS_KUERZEL} im Überblick' ,\ 44660,\ 'viz_report_44660_xmlsource.jrxml'\ -from hochschulinfo;\ +from xdummy;\ \ <#assign ord=1 />\ <#foreach kennzahl in kennzahlen>\ diff --git a/src-modules/module/viz/masken/44690_felderinfo.unl b/src-modules/module/viz/masken/44690_felderinfo.unl index e517be0..b1eba33 100644 --- a/src-modules/module/viz/masken/44690_felderinfo.unl +++ b/src-modules/module/viz/masken/44690_felderinfo.unl @@ -37,5 +37,5 @@ order by tid DESC;^Eintrag^<> select tid,eintrag from semester where today( 44709^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^ 44710^##line##^30^0^0^100^100^1^char^5000^0^8^^^1^ 44711^Abschluss^8^0^0^100^200^3^char^1500^0^12^<> select tid,name,sortnr from sichten where art='SOS-Abschluss-Sicht' order by 3,2;^ ^ ^ -44712^Kachelhöhe^310^0^0^100^15^1^integer^5000^0^0^^^300^ +44712^Kachelhöhe^310^0^0^100^15^1^integer^5000^0^0^^^400^ 44713^##line##^40^0^0^100^100^1^char^5000^0^8^^^1^ diff --git a/src-modules/module/viz/masken/44690_maskeninfo.unl b/src-modules/module/viz/masken/44690_maskeninfo.unl index e548b6a..13fc271 100644 --- a/src-modules/module/viz/masken/44690_maskeninfo.unl +++ b/src-modules/module/viz/masken/44690_maskeninfo.unl @@ -1 +1 @@ -44690^Studierende, Absolvierende und Personal Dashboard^ ^ ^Altersgruppe^Anzahl^Studierende, Absolvierende und Personal (Zeitreihe und nach Organisationseinheit)^ ^^3^700^360^0^1^ ^ +44690^Studierende und Absolvierende Dashboard^ ^ ^Altersgruppe^Anzahl^Studierende, Absolvierende und Personal (Zeitreihe und nach Organisationseinheit)^ ^^3^700^360^0^1^ ^ 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 ff3f16e..a11afa1 100644 --- a/src-modules/module/viz/schluesseltabellen/macro_masken_bez_fuellen.sql +++ b/src-modules/module/viz/schluesseltabellen/macro_masken_bez_fuellen.sql @@ -119,42 +119,36 @@ {"makro":"44190", "sortnr":"10", "feldname":"Grafik", "value":"STUD_GESCHL_W_DONUT"}, {"makro":"44190", "sortnr":"10", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"}, {"makro":"44190", "sortnr":"10", "feldname":"Nur Endsemester", "value":"1"}, -{"makro":"44190", "sortnr":"10", "feldname":"Stichtag", "value":"1"}, {"makro":"44190", "sortnr":"20", "feldname":"Köpfe oder Fälle ?", "value":"studiengang_nr = 1 and fach_nr = 1"}, {"makro":"44190", "sortnr":"20", "feldname":"Spaltenlayout", "value":"sos_stud_fak_dashboard"}, {"makro":"44190", "sortnr":"20", "feldname":"Grafik", "value":"STUDANF_FAK_BAR"}, {"makro":"44190", "sortnr":"20", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"}, {"makro":"44190", "sortnr":"20", "feldname":"Nur Endsemester", "value":"1"}, -{"makro":"44190", "sortnr":"20", "feldname":"Stichtag", "value":"1"}, {"makro":"44190", "sortnr":"30", "feldname":"Köpfe oder Fälle ?", "value":"1=1"}, {"makro":"44190", "sortnr":"30", "feldname":"Spaltenlayout", "value":"sos_stud_abgrp_dashboard"}, {"makro":"44190", "sortnr":"30", "feldname":"Grafik", "value":"STUDANF_ABGRP_BAR_Y_ECHART"}, {"makro":"44190", "sortnr":"30", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"}, {"makro":"44190", "sortnr":"30", "feldname":"Nur Endsemester", "value":"1"}, -{"makro":"44190", "sortnr":"30", "feldname":"Stichtag", "value":"1"}, {"makro":"44190", "sortnr":"40", "feldname":"Köpfe oder Fälle ?", "value":"1=1"}, {"makro":"44190", "sortnr":"40", "feldname":"Spaltenlayout", "value":"sos_stud_la_dashboard"}, {"makro":"44190", "sortnr":"40", "feldname":"Grafik", "value":"STUD_LEHRAMT_DONUT"}, {"makro":"44190", "sortnr":"40", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"}, {"makro":"44190", "sortnr":"40", "feldname":"Nur Endsemester", "value":"1"}, -{"makro":"44190", "sortnr":"40", "feldname":"Stichtag", "value":"1"}, {"makro":"44190", "sortnr":"50", "feldname":"Köpfe oder Fälle ?", "value":"studiengang_nr = 1 and fach_nr = 1"}, {"makro":"44190", "sortnr":"50", "feldname":"Spaltenlayout", "value":"sos_stud_bildungstyp_dashboard"}, {"makro":"44190", "sortnr":"50", "feldname":"Grafik", "value":"STUD_BILDUNGSTYP_DONUT"}, {"makro":"44190", "sortnr":"50", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"}, {"makro":"44190", "sortnr":"50", "feldname":"Nur Endsemester", "value":"1"}, -{"makro":"44190", "sortnr":"50", "feldname":"Stichtag", "value":"1"}, {"makro":"44190", "sortnr":"60", "feldname":"Köpfe oder Fälle ?", "value":"studiengang_nr = 1 and fach_nr = 1"}, {"makro":"44190", "sortnr":"60", "feldname":"Spaltenlayout", "value":"sos_stud_hzb_bland_dashboard"}, {"makro":"44190", "sortnr":"60", "feldname":"Grafik", "value":"STUDANF_HZB_LAND_BAR"}, {"makro":"44190", "sortnr":"60", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"}, {"makro":"44190", "sortnr":"60", "feldname":"Nur Endsemester", "value":"1"}, -{"makro":"44190", "sortnr":"60", "feldname":"Stichtag", "value":"1"}, {"makro":"44660", "sortnr":"10", "feldname":"Köpfe oder Fälle ?", "value":"studiengang_nr = 1 and fach_nr = 1"}, {"makro":"44660", "sortnr":"10", "feldname":"Spaltenlayout", "value":"sos_stud_sem_dashboard"}, diff --git a/src-modules/module/viz/schluesseltabellen/sx_repository.unl b/src-modules/module/viz/schluesseltabellen/sx_repository.unl index 7782bca..1a31212 100644 --- a/src-modules/module/viz/schluesseltabellen/sx_repository.unl +++ b/src-modules/module/viz/schluesseltabellen/sx_repository.unl @@ -54,3 +54,4 @@ order by G.sortnr,G.uniquename,P.sortnr,P.caption\ \ \ ^Chart-Eigenschaften^Hier werden Chart-Eigenschaften gefiltert^^VIZ_PROPERTIES^^^320^1^0^0^^1^01.01.1900^31.12.3000^ +2^VIZ_HS_KUERZEL^Uni X^Institutions-Kürzel^Hier wird ein Kürzel für die Hochschule eingetragen^^VIZ_PROPERTIES^^^320^1^0^0^^1^01.01.1900^31.12.3000^ diff --git a/src-modules/module/viz/schluesseltabellen/sx_repository_fuellen.sql b/src-modules/module/viz/schluesseltabellen/sx_repository_fuellen.sql index c9dfe06..34ea876 100644 --- a/src-modules/module/viz/schluesseltabellen/sx_repository_fuellen.sql +++ b/src-modules/module/viz/schluesseltabellen/sx_repository_fuellen.sql @@ -54,3 +54,7 @@ select sp_update_sequence('sx_repository'); drop table tmp_repository; +--Default Kürzel: +update sx_repository set content=(select min(name) from hochschulinfo) +where id='VIZ_HS_KUERZEL' +and content='Uni X'; diff --git a/src-modules/module/viz/schluesseltabellen/viz_chart.unl b/src-modules/module/viz/schluesseltabellen/viz_chart.unl index 09fd5ce..32a0455 100644 --- a/src-modules/module/viz/schluesseltabellen/viz_chart.unl +++ b/src-modules/module/viz/schluesseltabellen/viz_chart.unl @@ -203,100 +203,6 @@ {"name":"dimension1","vizPropertyVariablename":"dimension1","propertyValue":"dim_studiengang_fb","propUnit":""},\ {"name":"measure1","vizPropertyVariablename":"measure1","propertyValue":"summe","propUnit":""}],\ "dataTransformation":[]}^ ^^25.08.2024^25.08.2024^44280^ ^1^ ^ ^0^600^400^200^100^ -40^ABSOLV_SEM_LINE^Absolvierende nach Semester^ ^{"version":"0.2b","id":1,"name":"","renderer":"echarts","dataSources":[{"value":"0","nr":1,"name":"Tab. 1","isDefault":true}],\ -"targetDiv":"","chartElements":[{"elemID":"1","vizTypeUniquename":"echarts_line_y","caption":"line","datasource":"0","elementTypeProperties":[{"nr":"1","vizTypePropertyUniquename":"x","caption":"X-Achse","propertyValue":"semester_str","propertyType":"string"},\ -{"nr":"1","vizTypePropertyUniquename":"y","caption":"Y-Achse","propertyValue":"summe","propertyType":"string"},\ -{"nr":"1","vizTypePropertyUniquename":"stroke_static","caption":"Strichfarbe","propertyValue":"#004c93","propertyType":"string"},\ -{"nr":"1","vizTypePropertyUniquename":"fill_static","caption":"Flächenfarbe","propertyValue":"#ffffff","propertyType":"string"}]},\ -{"elemID":2,"vizTypeUniquename":"dot","caption":"dot","datasource":"0","elementTypeProperties":[{"nr":2,"vizTypePropertyUniquename":"x","caption":"X-Achse","propertyValue":"semester_str","propertyType":"string"},\ -{"nr":2,"vizTypePropertyUniquename":"y","caption":"Y-Achse","propertyValue":"summe","propertyType":"string"},\ -{"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"},\ -{"nr":"3","vizTypePropertyUniquename":"stroke_static","caption":"Strichfarbe","propertyValue":"#000000","propertyType":"string"},\ -{"nr":"3","vizTypePropertyUniquename":"fill_static","caption":"Flächenfarbe","propertyValue":"#000000","propertyType":"string"},\ -{"nr":"3","vizTypePropertyUniquename":"dx","caption":"Offset (horizontal)","propertyValue":"4","propertyType":"integer"},\ -{"nr":"3","vizTypePropertyUniquename":"dy","caption":"Offset (vertikal)","propertyValue":"-20","propertyType":"integer"}]}],\ -"chartPropertiesUsed":[{"name":"caption","vizPropertyVariablename":"caption","propertyValue":"Absolvierende nach Semester"},\ -{"name":"subtitle","vizPropertyVariablename":"caption","propertyValue":""},\ -{"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":"marginBottom","vizPropertyVariablename":"marginBottom","propertyValue":"90","propUnit":""},\ -{"name":"tickRotate_x","vizPropertyVariablename":"tickRotate","propertyValue":"-45","propUnit":""},\ -{"name":"innerRadius","vizPropertyVariablename":"innerRadius","propertyValue":"0","propUnit":""},\ -{"name":"labelRadiusFactor","vizPropertyVariablename":"labelRadiusFactor","propertyValue":"80","propUnit":""},\ -{"name":"cornerRadius","vizPropertyVariablename":"cornerRadius","propertyValue":"10","propUnit":"px"},\ -{"name":"labelOpacity","vizPropertyVariablename":"labelOpacity","propertyValue":"100","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":"scheme","vizPropertyVariablename":"scheme","propertyValue":"unique","propUnit":""},\ -{"name":"fontFamily","vizPropertyVariablename":"fontFamily","propertyValue":"sans-serif","propUnit":""},\ -{"name":"fontSize","vizPropertyVariablename":"fontSize","propertyValue":"14","propUnit":"px"},\ -{"name":"stroke_static","vizPropertyVariablename":"stroke_static","propertyValue":"#000000","propUnit":""},\ -{"name":"fill_static","vizPropertyVariablename":"fill","propertyValue":"#000000","propUnit":""},\ -{"name":"label_y","vizPropertyVariablename":"label","propertyValue":"Absolvierende","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":[]}^ ^^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^ 37^STUDANF_KOHORTEN_BAR_Y_ECHART^Studierende nach Kohorten Balken vertikal (Echart)^ ^{"version":"0.2b","id":1,"name":"","renderer":"echarts","dataSources":[{"value":"0","nr":1,"name":"Tab. 1","isDefault":true}],\ "targetDiv":"",\ "chartElements":[{"elemID":1,"vizTypeUniquename":"echarts_native","sourceCode":\ @@ -1193,13 +1099,13 @@ {"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",\ +41^ABSOLV_RSZ_SEM_BAR^Absolvent*innen 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',\ + text: 'Absolvent*innen nach Regelstudienzeit',\ left: "center",\ top: "top",\ textStyle: {\ @@ -1217,32 +1123,35 @@ title: {\ {\ name: 'Absolv. über der Regelstudienzeit',\ icon: 'roundRect'\ - }, {\ - name: 'Unbekannt',\ - icon: 'roundRect'\ - },\ + }\ ]\ },\ - tooltip: {},\ + tooltip: {\ + valueFormatter: (value) => value.toLocaleString()\ + },\ \ xAxis: [\ { type: 'category', axisLabel:{rotate:30}}\ ],\ - yAxis: [{name:'Absolvierende', nameLocation:'middle', nameGap:40,id:0 }],\ + yAxis: [{name:'', 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\ - }},\ + show: true,\ + formatter: function (params) {\ + return params.value[params.dimensionNames[params.encode.y[0]]].toLocaleString()\ + }\ + } \ + },\ { 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\ - }}\ + label: {\ + show: true,\ + formatter: function (params) {\ + return params.value[params.dimensionNames[params.encode.y[0]]].toLocaleString()\ + }\ + } \ + }\ ]\ }\ }\ @@ -1294,13 +1203,107 @@ title: {\ {"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",\ +40^ABSOLV_SEM_LINE^Absolvent*innen nach Semester^ ^{"version":"0.2b","id":1,"name":"","renderer":"echarts","dataSources":[{"value":"0","nr":1,"name":"Tab. 1","isDefault":true}],\ +"targetDiv":"","chartElements":[{"elemID":"1","vizTypeUniquename":"echarts_line_y","caption":"line","datasource":"0","elementTypeProperties":[{"nr":"1","vizTypePropertyUniquename":"x","caption":"X-Achse","propertyValue":"semester_str","propertyType":"string"},\ +{"nr":"1","vizTypePropertyUniquename":"y","caption":"Y-Achse","propertyValue":"summe","propertyType":"string"},\ +{"nr":"1","vizTypePropertyUniquename":"stroke_static","caption":"Strichfarbe","propertyValue":"#004c93","propertyType":"string"},\ +{"nr":"1","vizTypePropertyUniquename":"fill_static","caption":"Flächenfarbe","propertyValue":"#ffffff","propertyType":"string"}]},\ +{"elemID":2,"vizTypeUniquename":"dot","caption":"dot","datasource":"0","elementTypeProperties":[{"nr":2,"vizTypePropertyUniquename":"x","caption":"X-Achse","propertyValue":"semester_str","propertyType":"string"},\ +{"nr":2,"vizTypePropertyUniquename":"y","caption":"Y-Achse","propertyValue":"summe","propertyType":"string"},\ +{"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"},\ +{"nr":"3","vizTypePropertyUniquename":"stroke_static","caption":"Strichfarbe","propertyValue":"#000000","propertyType":"string"},\ +{"nr":"3","vizTypePropertyUniquename":"fill_static","caption":"Flächenfarbe","propertyValue":"#000000","propertyType":"string"},\ +{"nr":"3","vizTypePropertyUniquename":"dx","caption":"Offset (horizontal)","propertyValue":"4","propertyType":"integer"},\ +{"nr":"3","vizTypePropertyUniquename":"dy","caption":"Offset (vertikal)","propertyValue":"-20","propertyType":"integer"}]}],\ +"chartPropertiesUsed":[{"name":"caption","vizPropertyVariablename":"caption","propertyValue":"Absolvent*innen nach Semester"},\ +{"name":"subtitle","vizPropertyVariablename":"caption","propertyValue":""},\ +{"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":"marginBottom","vizPropertyVariablename":"marginBottom","propertyValue":"90","propUnit":""},\ +{"name":"tickRotate_x","vizPropertyVariablename":"tickRotate","propertyValue":"-45","propUnit":""},\ +{"name":"innerRadius","vizPropertyVariablename":"innerRadius","propertyValue":"0","propUnit":""},\ +{"name":"labelRadiusFactor","vizPropertyVariablename":"labelRadiusFactor","propertyValue":"80","propUnit":""},\ +{"name":"cornerRadius","vizPropertyVariablename":"cornerRadius","propertyValue":"10","propUnit":"px"},\ +{"name":"labelOpacity","vizPropertyVariablename":"labelOpacity","propertyValue":"100","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":"scheme","vizPropertyVariablename":"scheme","propertyValue":"unique","propUnit":""},\ +{"name":"fontFamily","vizPropertyVariablename":"fontFamily","propertyValue":"sans-serif","propUnit":""},\ +{"name":"fontSize","vizPropertyVariablename":"fontSize","propertyValue":"14","propUnit":"px"},\ +{"name":"stroke_static","vizPropertyVariablename":"stroke_static","propertyValue":"#000000","propUnit":""},\ +{"name":"fill_static","vizPropertyVariablename":"fill","propertyValue":"#000000","propUnit":""},\ +{"name":"label_y","vizPropertyVariablename":"label","propertyValue":"Absolvierende","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":[]}^ ^^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^Absolvent*innen 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',\ + text: 'Absolvent*innen nach Abschluss',\ left: "center",\ top: "top",\ textStyle: {\ @@ -1338,19 +1341,21 @@ title: {\ type: 'cross',\ label: {\ backgroundColor: '#6a7985'\ - }\ - }\ + } },\ + valueFormatter: (value) => value.toLocaleString()\ + \ },\ xAxis: [\ { type: 'category', axisLabel:{rotate:30}}\ ],\ - yAxis: [{name:'Absolvierende', nameLocation:'middle', nameGap:40,id:0 }],\ + yAxis: [{name:'', nameLocation:'middle', nameGap:40,id:0, axisLabel:{show:false} }],\ 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: {\ diff --git a/superx/images/information_white_liberation.svg b/superx/images/information_white_liberation.svg new file mode 100644 index 0000000..ed8838d --- /dev/null +++ b/superx/images/information_white_liberation.svg @@ -0,0 +1,83 @@ + + + + + + image/svg+xml + + + + + + + + + + + i + diff --git a/superx/images/viz_sidebarbuttonInfo.svg b/superx/images/viz_sidebarbuttonInfo.svg new file mode 100644 index 0000000..1a7b812 --- /dev/null +++ b/superx/images/viz_sidebarbuttonInfo.svg @@ -0,0 +1,97 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + Info + + + + diff --git a/superx/images/viz_sidebarbuttonMaske.svg b/superx/images/viz_sidebarbuttonMaske.svg new file mode 100644 index 0000000..3cacf92 --- /dev/null +++ b/superx/images/viz_sidebarbuttonMaske.svg @@ -0,0 +1,98 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + Filter + + + + diff --git a/superx/xml/js/viz/viz_viewer.js b/superx/xml/js/viz/viz_viewer.js index 1be3b6a..850fd32 100644 --- a/superx/xml/js/viz/viz_viewer.js +++ b/superx/xml/js/viz/viz_viewer.js @@ -1509,11 +1509,11 @@ if(orientation=="x") trigger: "axis", axisPointer: { type: "shadow" - },/* - formatter: function (value, index) { - return numberFormatter(value,"value"); - }*/ - valueFormatter: (value) => numberFormatter(value,"value") + }, + /*valueFormatter: (value) => numberFormatter(value,"value")*/ + /*valueFormatter: (value) => '$' + value.toFixed(2)*/ + /*valueFormatter: (value) => value.toString().replace(",",".")*/ + valueFormatter: (value) => value.toLocaleString() }, xAxis: { type:xAxisType, //horizontal oder vertikal @@ -1524,9 +1524,10 @@ if(orientation=="x") fontSize: 12, width:"100px", rotate: 30, - formatter: function (value, index) { + /*formatter: function (value, index) { return numberFormatter(value,xAxisType); - } + }*/ + valueFormatter: (value) => value.toLocaleString() } }, yAxis: { @@ -1537,9 +1538,9 @@ if(orientation=="x") margin: 5, fontSize: 12, width:"50px", - formatter: function (value, index) { - return numberFormatter(value,yAxisType); - } + distance:20, + position:"bottom", + formatter: (value) => value.toLocaleString() } }, @@ -1563,8 +1564,20 @@ if(orientation=="x") /*distance:10,*/ /* offset:[30, 40]*/ /*labelLayout:{}*/ - distance:20, - position:"bottom" + distance:30, + position:"bottom", + /*formatter:(value) => "-"+value.value.summe.toString().replace(",",".")*/ + /*valueFormatter: (value) => value.toString().replace(",",".")*/ + /*valueFormatter: (value) => "z"+value.toLocaleString()*/ + /*formatter: (value) => "y"+value.toLocaleString()*/ + /*formatter: "{b} : `{@summe}` ({c[3]}%)"*/ + formatter: function (params) { + /*myValue= + return "z"+myValue; *///params.value[params.encode.y[0]].toString().toLocaleString(); + //return "z"+params.value[params.encode.y[0]]; + return params.value[params.dimensionNames[params.encode.y[0]]].toLocaleString() + } + }, labelLayout(params) { return getLabelLayout(chartTypes[1],params,orientation) diff --git a/superx/xml/viz_components.xsl b/superx/xml/viz_components.xsl index 8e937f5..2e80065 100644 --- a/superx/xml/viz_components.xsl +++ b/superx/xml/viz_components.xsl @@ -1221,7 +1221,7 @@ Platzhalter
- @@ -1351,7 +1351,7 @@ Platzhalter
+
- + @@ -1406,7 +1407,7 @@ Platzhalter
- @@ -1414,7 +1415,7 @@ Platzhalter
- +
@@ -1828,7 +1829,7 @@ td.integer { position: fixed; top: 50%; z-index: 700; - left: calc(100vw - 445px - 40px);/* Viewport-Breite minus Sidebar-Breite minus Abstand */ + left: calc(100vw - 545px - 40px);/* Viewport-Breite minus Sidebar-Breite minus Abstand */ transform: none; /* keine vertikale Zentrierung */ } @@ -1840,7 +1841,7 @@ td.integer { padding-right: 0.7em; right: 0em; bottom: 0; - width: 445px; /*Breite nach Bedarf */ + width: 545px; /*Breite nach Bedarf */ background: white; box-shadow: -2px 0 5px rgba(0,0,0,0.1); overflow-y: auto; @@ -1856,7 +1857,7 @@ td.integer { .vizLabel-container { display: flex; background: inherit; - min-width: 10.5rem; + min-width: 13.5rem; } .label.is-small { width: 100%; } /*einheitliche Labelbreite*/