diff --git a/src-modules/module/viz/schluesseltabellen/fm_templates.unl b/src-modules/module/viz/schluesseltabellen/fm_templates.unl index 5d60619..0e46099 100644 --- a/src-modules/module/viz/schluesseltabellen/fm_templates.unl +++ b/src-modules/module/viz/schluesseltabellen/fm_templates.unl @@ -389,9 +389,6 @@ where T.tid is null;\ delete from viz_dashboard_tab\ where dashboard_id in (select T.tid\ from tmp_dashboard T);\ -delete from viz_dashboard_element\ -where dashboard_id in (select T.tid\ -from tmp_dashboard T);\ \ \ <#foreach tab in viz_dashboard_tabs>\ @@ -419,36 +416,6 @@ insert into viz_dashboard_tab(dashboard_id,\ from tmp_dashboard T;\ \ \ -<#foreach elem in viz_dashboard_elements>\ -insert into viz_dashboard_element(dashboard_id,\ - datasource_type,\ - datasource,\ - chart_id,\ - onclick_event,\ - sortnr,\ - caption,\ - open_modal_card_detail,\ - link_maskennummer,\ - link_chart_uniquename,\ - link_tablestylesheet, \ - active)\ - select\ - T.tid as dashboard_id,\ - ${elem.datasource_type},\ - '${elem.datasource}',\ - V.tid as chart_id,\ - '${elem.onclick_event}',\ - ${elem.sortnr},\ - '${elem.caption}',\ - ${open_modal_card_detail},\ - V.maskeninfo_id as link_maskennummer,\ - V.uniquename as link_chart_uniquename,\ - '${link_tablestylesheet}',\ - ${elem.active}\ - from tmp_dashboard T, viz_chart V\ - where V.uniquename='${elem.chart_uniquename}';\ - \ -\ \ \ <#macro create_temp_tables_dashboard>\ @@ -479,27 +446,11 @@ booklet_stylesheet VARCHAR(255) \ ) \ ;\ \ -create temp table tmp_dashboard_element(\ -dashboard_id INTEGER not null, \ -datasource_type INTEGER default 1 , \ -datasource VARCHAR(255) , \ -chart_id INTEGER , \ -onclick_event VARCHAR(255) , \ -sortnr SMALLINT default 0 , \ -caption VARCHAR(255) , \ -open_modal_card_detail SMALLINT default 1 , \ -link_maskennummer INTEGER , \ -link_chart_uniquename VARCHAR(255) , \ -link_tablestylesheet VARCHAR(255) , \ -active SMALLINT default 1 not null\ -) \ -;\ \ \ \ <#macro drop_temp_tables_dashboard>\ drop table if exists tmp_dashboard;\ drop table if exists tmp_dashboard_tab;\ -drop table if exists tmp_dashboard_element;\ \ ^Makros zum Umgang mit Visualisierungen^ ^1^ diff --git a/src-modules/module/viz/schluesseltabellen/sx_captions_fuellen.sql b/src-modules/module/viz/schluesseltabellen/sx_captions_fuellen.sql index c98952d..642e0f2 100644 --- a/src-modules/module/viz/schluesseltabellen/sx_captions_fuellen.sql +++ b/src-modules/module/viz/schluesseltabellen/sx_captions_fuellen.sql @@ -32,6 +32,7 @@ select setval('sx_captions_tid_seq',(select max(tid) from sx_captions)); ] /> --Ab hier braucht man nichts ändern: +drop table if exists tmp_sx_captions; CREATE TEMP TABLE tmp_sx_captions ( id char(200), diff --git a/src-modules/module/viz/schluesseltabellen/viz_chart.unl b/src-modules/module/viz/schluesseltabellen/viz_chart.unl index 24de090..a2db627 100644 --- a/src-modules/module/viz/schluesseltabellen/viz_chart.unl +++ b/src-modules/module/viz/schluesseltabellen/viz_chart.unl @@ -517,64 +517,6 @@ ABSOLV_SEM_LINE^Absolvent*innen nach Semester^ ^{"version":"0.2b","id":1,"name": {"name":"text","vizPropertyVariablename":"text","propertyValue":"summe","propUnit":""}],\ "dataTransformation":[]}^ ^1^600^400^200^100^0^^^^^^^^^ 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^ ^1^{"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":[]}^ ^1^600^400^200^100^0^^^^^^^^^ -hms_torte_stud_fak^Studierende nach Fakultät (Torte - HMS)^ ^{"version":"0.2b","id":1,"name":"","renderer":"echarts","dataSources":[{"value":"0","nr":1,"name":"Tab. 1","isDefault":true}],\ -"targetDiv":"","chartElements":[{"elemID":"1","vizTypeUniquename":"echarts_pie","caption":"echarts_pie","datasource":"0","elementTypeProperties":[{"nr":"1","vizTypePropertyUniquename":"dimension1","caption":"Dimension 1","propertyValue":"dim_studiengang_fb","propertyType":"string"},\ -{"nr":"1","vizTypePropertyUniquename":"measure1","caption":"Maß 1","propertyValue":"summe","propertyType":"string"},\ -{"nr":"1","vizTypePropertyUniquename":"innerRadius","caption":"Innerer Radius","propertyValue":"25","propertyType":"string"},\ -{"nr":"1","vizTypePropertyUniquename":"outerRadius","caption":"Äußerer Radius in %","propertyValue":"50","propertyType":"INTEGER"},\ -{"nr":"1","vizTypePropertyUniquename":"cornerRadiusRounded","caption":"Abgerundete Ecken","propertyValue":"false","propertyType":"STRING"}]}],\ -"chartPropertiesUsed":[{"name":"caption","vizPropertyVariablename":"caption","propertyValue":"Studierende nach Fakultät (Torte - HMS)"},\ -{"name":"innerRadius","vizPropertyVariablename":"innerRadius","propertyValue":"40","propUnit":""},\ -{"name":"innerRadius","vizPropertyVariablename":"innerRadius","propertyValue":"40","propUnit":""},\ -{"name":"dimension1","vizPropertyVariablename":"dimension1","propertyValue":"dim_studiengang_fb","propUnit":""},\ -{"name":"dimension1","vizPropertyVariablename":"dimension1","propertyValue":"dim_studiengang_fb","propUnit":""},\ -{"name":"dimension1","vizPropertyVariablename":"dimension1","propertyValue":"dim_studiengang_fb","propUnit":""},\ -{"name":"measure1","vizPropertyVariablename":"measure1","propertyValue":"summe","propUnit":""},\ -{"name":"measure1","vizPropertyVariablename":"measure1","propertyValue":"summe","propUnit":""},\ -{"name":"measure1","vizPropertyVariablename":"measure1","propertyValue":"summe","propUnit":""},\ -{"name":"title.left","vizPropertyVariablename":"title.left","propertyValue":"left","propUnit":""},\ -{"name":"title.top","vizPropertyVariablename":"title.top","propertyValue":"top","propUnit":""},\ -{"name":"legendShow","vizPropertyVariablename":"legendShow","propertyValue":"true","propUnit":""},\ -{"name":"legend.top","vizPropertyVariablename":"legend.top","propertyValue":"bottom","propUnit":""},\ -{"name":"legend.left","vizPropertyVariablename":"legend.left","propertyValue":"left","propUnit":""},\ -{"name":"legend.scroll","vizPropertyVariablename":"legend.scroll","propertyValue":"false","propUnit":""},\ -{"name":"margin.left","vizPropertyVariablename":"margin.left","propertyValue":"20","propUnit":"%"},\ -{"name":"margin.right","vizPropertyVariablename":"margin.right","propertyValue":"0","propUnit":"%"},\ -{"name":"margin.top","vizPropertyVariablename":"margin.top","propertyValue":"16","propUnit":"%"},\ -{"name":"margin.bottom","vizPropertyVariablename":"margin.bottom","propertyValue":"20","propUnit":"%"},\ -{"name":"valueLabelShow","vizPropertyVariablename":"valueLabelShow","propertyValue":"true","propUnit":""},\ -{"name":"distance_valueLabel","vizPropertyVariablename":"distance_valueLabel","propertyValue":"10","propUnit":""},\ -{"name":"position_valueLabel","vizPropertyVariablename":"position_valueLabel","propertyValue":"inside","propUnit":""},\ -{"name":"schemeArray","vizPropertyVariablename":"schemeArray","propertyValue":"hms_torte_fb","propUnit":""},\ -{"name":"outerRadius","vizPropertyVariablename":"outerRadius","propertyValue":"50","propUnit":"%"},\ -{"name":"cornerRadiusRounded","vizPropertyVariablename":"cornerRadiusRounded","propertyValue":"false","propUnit":""}],\ -"dataTransformation":[]}^ ^^25.08.2024^25.08.2024^44570^ ^3^{"version":"0.2b","id":1,"name":"","renderer":"d3js","dataSources":[{"value":"1","nr":2,"name":"Tab. 2","isDefault":true}],\ -"targetDiv":"","chartElements":[{"elemID":"1","vizTypeUniquename":"pie","caption":"pie","datasource":"1","elementTypeProperties":[{"nr":"1","vizTypePropertyUniquename":"dimension1","caption":"Dimension 1","propertyValue":"geschlecht_str","propertyType":"string"},\ -{"nr":"1","vizTypePropertyUniquename":"measure1","caption":"Maß 1","propertyValue":"anteil","propertyType":"string"},\ -{"nr":"1","vizTypePropertyUniquename":"width","caption":"Grafik-Breite","propertyValue":"250","propertyType":"integer"},\ -{"nr":"1","vizTypePropertyUniquename":"height","caption":"Grafik-Höhe","propertyValue":"150","propertyType":"integer"},\ -{"nr":"1","vizTypePropertyUniquename":"backgroundColor","caption":"Hintergrundfarbe","propertyValue":"#ffffff","propertyType":"string"},\ -{"nr":"1","vizTypePropertyUniquename":"scheme","caption":"Farbschema","propertyValue":"greens","propertyType":"string"},\ -{"nr":"1","vizTypePropertyUniquename":"innerRadius","caption":"Innerer Radius","propertyValue":"0","propertyType":"string"},\ -{"nr":"1","vizTypePropertyUniquename":"cornerRadius","caption":"Kanten-Radius","propertyValue":"0","propertyType":"string"},\ -{"nr":"1","vizTypePropertyUniquename":"labelRadiusFactor","caption":"Beschriftung Radius","propertyValue":"20","propertyType":"string"},\ -{"nr":"1","vizTypePropertyUniquename":"labelOpacity","caption":"Label-Deckungsgrad","propertyValue":"70","propertyType":"string"}]}],\ -"chartPropertiesUsed":[{"name":"caption","vizPropertyVariablename":"caption","propertyValue":"Studierende nach Geschlecht"},\ -{"name":"height","vizPropertyVariablename":"height","propertyValue":"350","propUnit":""},\ -{"name":"width","vizPropertyVariablename":"width","propertyValue":"350","propUnit":""},\ -{"name":"marginLeft","vizPropertyVariablename":"marginLeft","propertyValue":"20","propUnit":""},\ -{"name":"innerRadius","vizPropertyVariablename":"innerRadius","propertyValue":"0","propUnit":""},\ -{"name":"labelRadiusFactor","vizPropertyVariablename":"labelRadiusFactor","propertyValue":"30","propUnit":""},\ -{"name":"cornerRadius","vizPropertyVariablename":"cornerRadius","propertyValue":"0","propUnit":"px"},\ -{"name":"labelOpacity","vizPropertyVariablename":"labelOpacity","propertyValue":"100","propUnit":""},\ -{"name":"backgroundColor","vizPropertyVariablename":"backgroundColor","propertyValue":"#ffffff","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":""},\ -{"name":"scheme","vizPropertyVariablename":"scheme","propertyValue":"greens","propUnit":""},\ -{"name":"dimension1","vizPropertyVariablename":"dimension1","propertyValue":"geschlecht_str","propUnit":""},\ -{"name":"measure1","vizPropertyVariablename":"measure1","propertyValue":"anteil","propUnit":""}],\ -"dataTransformation":[]}^ ^1^600^400^200^100^0^ ^ ^ ^ ^ ^ ^ ^^ simplePivotTable_44570^Studierende nach Semester (tabellarisch)^ ^{"version":"0.2b","id":1,"name":"","renderer":"viz","dataSources":[{"value":"0","nr":1,"name":"Tab. 1","isDefault":true}],\ "targetDiv":"","chartElements":[{"elemID":1,"vizTypeUniquename":"simplePivotTable","caption":"simplePivotTable","datasource":"0","elementTypeProperties":[{"nr":1,"vizTypePropertyUniquename":"coldim1","caption":"Spaltendimension 1","propertyValue":"semester_str","propertyType":"string"},\ {"nr":1,"vizTypePropertyUniquename":"measure1","caption":"Maß 1","propertyValue":"summe","propertyType":"string"}]}],\ diff --git a/src-modules/module/viz/schluesseltabellen/viz_colorscheme_fuellen.sql b/src-modules/module/viz/schluesseltabellen/viz_colorscheme_fuellen.sql index cd563b4..5e1b1a8 100644 --- a/src-modules/module/viz/schluesseltabellen/viz_colorscheme_fuellen.sql +++ b/src-modules/module/viz/schluesseltabellen/viz_colorscheme_fuellen.sql @@ -143,6 +143,7 @@ /> select sp_update_sequence('viz_colorscheme'); +drop table if exists tmp_viz_colorscheme; create temp table tmp_viz_colorscheme( tid integer, diff --git a/src-modules/module/viz/schluesseltabellen/viz_dashboard_STUDABSOLV_fuellen.sql b/src-modules/module/viz/schluesseltabellen/viz_dashboard_STUDABSOLV_fuellen.sql index 92319b0..70f1999 100644 --- a/src-modules/module/viz/schluesseltabellen/viz_dashboard_STUDABSOLV_fuellen.sql +++ b/src-modules/module/viz/schluesseltabellen/viz_dashboard_STUDABSOLV_fuellen.sql @@ -64,62 +64,6 @@ and fach_sem_zahl=1", } ] /> -<#assign viz_dashboard_elements = [ -{ -"datasource_type":1, -"datasource":"2", -"sortnr":10, -"chart_uniquename":"STUD_SEM_LINE", -"caption":"Studierende gesamt", -"onclick_event":"", -"active":"1" -}, -{ -"datasource_type":1, -"datasource":"3", -"sortnr":20, -"chart_uniquename":"STUD_SEM_LINE", -"caption":"Studierende 1. Hochschulsemester", -"onclick_event":"", -"active":"1" -}, -{ -"datasource_type":1, -"datasource":"4", -"sortnr":30, -"chart_uniquename":"STUD_SEM_LINE", -"caption":"Studierende 1. Fachsemester", -"onclick_event":"", -"active":"1" -}, -{ -"datasource_type":1, -"datasource":"5", -"sortnr":40, -"chart_uniquename":"ABSOLV_SEM_LINE", -"caption":"Absolvent*innen (Zeitreihe)", -"onclick_event":"", -"active":"1" -}, -{ -"datasource_type":1, -"datasource":"6", -"sortnr":50, -"chart_uniquename":"ABSOLV_RSZ_SEM_BAR", -"caption":"Absolvent*innen in der Regelstudienzeit (Zeitreihe)", -"onclick_event":"", -"active":"1" -}, -{ -"datasource_type":1, -"datasource":"7", -"sortnr":60, -"chart_uniquename":"ABSOLV_ABGRP_SEM_AREA", -"caption":"Absolvent*innen nach Abschlussgruppe (Zeitreihe)", -"onclick_event":"", -"active":"1" -} -] /> <@create_temp_tables_dashboard /> diff --git a/src-modules/module/viz/schluesseltabellen/viz_properties_echarts_fuellen.sql b/src-modules/module/viz/schluesseltabellen/viz_properties_echarts_fuellen.sql index 2c88b2e..7098f07 100644 --- a/src-modules/module/viz/schluesseltabellen/viz_properties_echarts_fuellen.sql +++ b/src-modules/module/viz/schluesseltabellen/viz_properties_echarts_fuellen.sql @@ -138,6 +138,22 @@ "prop_value_type":"STRING", "parent_property_uniquename":"titleNode" }, +{ "caption":"Titel-Schriftfarbe", +"prop_uniquename":"title_fontcolor", +"explanation":"Text", +"prop_default":"#000000", +"prop_unit":"", +"is_generic":"1", +"static_values":"", +"is_mandatory":"0", +"input_type_uniquename":"TEXT", +"property_group_uniquename":"", +"sortnr":"10", +"range_from":"", +"range_to":"", +"prop_value_type":"STRING", +"parent_property_uniquename":"titleNode" +}, { "caption":"Titel-Ausrichtung (horiz.)", "prop_uniquename":"title.left", "explanation":"", @@ -256,6 +272,23 @@ "parent_property_uniquename":"legendNode", "variableName":"legend.scroll" }, +{ "caption":"Legende Schriftfarbe", +"prop_uniquename":"legend_fontcolor", +"explanation":"", +"prop_default":"#000000", +"prop_unit":"", +"is_generic":"1", +"static_values":"", +"is_mandatory":"0", +"input_type_uniquename":"TEXT", +"property_group_uniquename":"", +"sortnr":"10", +"range_from":"", +"range_to":"", +"prop_value_type":"STRING", +"parent_property_uniquename":"legendNode", +"variableName":"legend_fontcolor" +}, { "caption":"Ränder", "prop_uniquename":"marginNode", "explanation":"", @@ -401,6 +434,22 @@ "parent_property_uniquename":"xAxisNode", "variableName":"xAxisLabelNode" }, +{ "caption":"X: Schriftgröße", +"prop_uniquename":"fontsize_x", +"explanation":"X-Achse Schriftgröße", +"prop_default":"1em", +"prop_unit":"", +"is_generic":"0", +"static_values":"", +"is_mandatory":"0", +"input_type_uniquename":"TEXT", +"sortnr":"35", +"range_from":"", +"range_to":"", +"prop_value_type":"STRING", +"parent_property_uniquename":"xAxisLabelNode", +"variableName":"fontsize_x" +}, { "caption":"X: Schriftneigung", "prop_uniquename":"tickRotate_x", "explanation":"X-Achse-Beschriftung Schriftneigung", @@ -417,6 +466,22 @@ "parent_property_uniquename":"xAxisLabelNode", "variableName":"tickRotate_x" }, +{ "caption":"X: Schriftfarbe", +"prop_uniquename":"fontcolor_x", +"explanation":"X-Achse Schriftfarbe", +"prop_default":"#000000", +"prop_unit":"", +"is_generic":"0", +"static_values":"", +"is_mandatory":"0", +"input_type_uniquename":"TEXT", +"sortnr":"45", +"range_from":"", +"range_to":"", +"prop_value_type":"STRING", +"parent_property_uniquename":"xAxisLabelNode", +"variableName":"fontcolor_x" +}, { "caption":"X: Beschriftung Breite", "prop_uniquename":"width_x", "explanation":"X-Achse Breite Beschriftung", @@ -497,6 +562,22 @@ "parent_property_uniquename":"yAxisNode", "variableName":"yAxisLabelNode" }, +{ "caption":"Y: Schriftgröße", +"prop_uniquename":"fontsize_y", +"explanation":"Y-Achse Schriftgröße", +"prop_default":"1em", +"prop_unit":"", +"is_generic":"0", +"static_values":"", +"is_mandatory":"0", +"input_type_uniquename":"TEXT", +"sortnr":"125", +"range_from":"", +"range_to":"", +"prop_value_type":"STRING", +"parent_property_uniquename":"yAxisLabelNode", +"variableName":"fontsize_y" +}, { "caption":"Y: Schriftneigung", "prop_uniquename":"tickRotate_y", "explanation":"Y-Achse-Beschriftung Schriftneigung", @@ -513,6 +594,22 @@ "parent_property_uniquename":"yAxisLabelNode", "variableName":"tickRotate_y" }, +{ "caption":"Y: Schriftfarbe", +"prop_uniquename":"fontcolor_y", +"explanation":"Y-Achse Schriftfarbe", +"prop_default":"#000000", +"prop_unit":"", +"is_generic":"0", +"static_values":"", +"is_mandatory":"0", +"input_type_uniquename":"TEXT", +"sortnr":"135", +"range_from":"", +"range_to":"", +"prop_value_type":"STRING", +"parent_property_uniquename":"yAxisLabelNode", +"variableName":"fontcolor_y" +}, { "caption":"Y: Abstand Beschriftung", "prop_uniquename":"padding_y", "explanation":"Y-Achse Abstand Beschriftung zur Achsenlinie", @@ -611,6 +708,40 @@ "parent_property_uniquename":"valueLabelNode", "variableName":"valueLabelShow" }, +{ "caption":"Schriftgröße", +"prop_uniquename":"valueLabelFontsize", +"explanation":"", +"prop_default":"1em", +"prop_unit":"", +"is_generic":"1", +"static_values":"", +"is_mandatory":"0", +"input_type_uniquename":"TEXT", +"property_group_uniquename":"", +"sortnr":"413", +"range_from":"", +"range_to":"", +"prop_value_type":"STRING", +"parent_property_uniquename":"valueLabelNode", +"variableName":"valueLabelFontsize" +}, +{ "caption":"Farbe", +"prop_uniquename":"valueLabelColor", +"explanation":"", +"prop_default":"#000000", +"prop_unit":"", +"is_generic":"1", +"static_values":"", +"is_mandatory":"0", +"input_type_uniquename":"TEXT", +"property_group_uniquename":"", +"sortnr":"415", +"range_from":"", +"range_to":"", +"prop_value_type":"STRING", +"parent_property_uniquename":"valueLabelNode", +"variableName":"valueLabelColor" +}, { "caption":"Wertelabel: Distanz Beschriftung", "prop_uniquename":"distance_valueLabel", "explanation":"Wertelabel Abstand Beschriftung zum Item. Wird nur ausgewertet wenn Ausrichtung Wertelabel (vertikal)=top gesetzt wird.", diff --git a/src-modules/module/viz/schluesseltabellen/viz_properties_echarts_line_bar_fuellen.sql b/src-modules/module/viz/schluesseltabellen/viz_properties_echarts_line_bar_fuellen.sql index 86d8ec1..de2aa43 100644 --- a/src-modules/module/viz/schluesseltabellen/viz_properties_echarts_line_bar_fuellen.sql +++ b/src-modules/module/viz/schluesseltabellen/viz_properties_echarts_line_bar_fuellen.sql @@ -45,12 +45,16 @@ {"viz_property_uniquename":"tickRotate_x"}, {"viz_property_uniquename":"width_x"}, {"viz_property_uniquename":"padding_x"}, +{"viz_property_uniquename":"fontsize_x"}, +{"viz_property_uniquename":"fontcolor_x"}, {"viz_property_uniquename":"yAxisNode"}, {"viz_property_uniquename":"yAxisName"}, {"viz_property_uniquename":"yAxisLabelNode"}, {"viz_property_uniquename":"tickRotate_y"}, {"viz_property_uniquename":"width_y"}, {"viz_property_uniquename":"padding_y"}, +{"viz_property_uniquename":"fontsize_y"}, +{"viz_property_uniquename":"fontcolor_y"}, {"viz_property_uniquename":"singleColor"}, {"viz_property_uniquename":"barStacked"}, {"viz_property_uniquename":"seriesColorBy"} diff --git a/superx/xml/js/viz/viz_viewer.js b/superx/xml/js/viz/viz_viewer.js index 14f6a69..d62cd7b 100644 --- a/superx/xml/js/viz/viz_viewer.js +++ b/superx/xml/js/viz/viz_viewer.js @@ -171,7 +171,7 @@ function fillEchartsDataSet(myRs,myRsMetaData,currentChartModel,seriesDistinctCo var measure1Fldname=getChartElementPropertyValueFromModel(currentChartModel,"1","measure1"); var dimension1Fldname=getChartElementPropertyValueFromModel(currentChartModel,"1","dimension1"); var seriesFldname=getChartElementPropertyValueFromModel(currentChartModel,"1","stroke"); - dataset0={source:fillEchartsDataSetNameValue(rs[0],rsColumnMetaData[0],dimension1Fldname,measure1Fldname,seriesFldname,seriesDistinctColumnValues)}; + dataset0={source:fillEchartsDataSetNameValue(myRs,myRsMetaData,dimension1Fldname,measure1Fldname,seriesFldname,seriesDistinctColumnValues)}; dataset.push(dataset0); //dataset=fillEchartsDataSetNameValue(myRs,myRsMetaData,dimension1Fldname,measure1Fldname,seriesFldname,seriesDistinctColumnValues); if(seriesFldname && seriesDistinctColumnValues && seriesDistinctColumnValues.length>0) @@ -1921,7 +1921,10 @@ var seriesArray=getEchartSeriesArray(currentChartModel,chartType,orientation,myD show: (getChartPropertyValue(currentChartModel.chartPropertiesUsed,"legendShow")=="false")?false:true, //true type: (getChartPropertyValue(currentChartModel.chartPropertiesUsed,"legend.scroll")=="false")?"plain":"scroll", top:getChartPropertyValue(currentChartModel.chartPropertiesUsed,"legend.top"), - left:getChartPropertyValue(currentChartModel.chartPropertiesUsed,"legend.left") + left:getChartPropertyValue(currentChartModel.chartPropertiesUsed,"legend.left"), + textStyle: { + color: getChartPropertyValue(currentChartModel.chartPropertiesUsed,"legend_fontcolor") + } }, title: { text: titleText, @@ -1929,10 +1932,12 @@ var seriesArray=getEchartSeriesArray(currentChartModel,chartType,orientation,myD left: getChartPropertyValue(currentChartModel.chartPropertiesUsed,"title.left"), //"center", top: getChartPropertyValue(currentChartModel.chartPropertiesUsed,"title.top"), //"top", textStyle: { - fontSize: 20 + fontSize: 20, + color: getChartPropertyValue(currentChartModel.chartPropertiesUsed,"title_fontcolor") }, subtextStyle: { - fontSize: 15 + fontSize: 15, + color: getChartPropertyValue(currentChartModel.chartPropertiesUsed,"title_fontcolor") } }, grid: { @@ -1960,13 +1965,14 @@ var seriesArray=getEchartSeriesArray(currentChartModel,chartType,orientation,myD axisLabel: { inside: false, margin: getChartPropertyValue(currentChartModel.chartPropertiesUsed,"padding_x"), - fontSize: "1.5em", + fontSize: getChartPropertyValue(currentChartModel.chartPropertiesUsed,"fontsize_x"), width:getChartPropertyValue(currentChartModel.chartPropertiesUsed,"width_x"), rotate: getChartPropertyValue(currentChartModel.chartPropertiesUsed,"tickRotate_x"), /*formatter: function (value, index) { return numberFormatter(value,xAxisType); }*/ - valueFormatter: (value) => value.toLocaleString() + valueFormatter: (value) => value.toLocaleString(), + color: getChartPropertyValue(currentChartModel.chartPropertiesUsed,"fontcolor_x") } }, yAxis: { @@ -1976,13 +1982,13 @@ var seriesArray=getEchartSeriesArray(currentChartModel,chartType,orientation,myD axisLabel: { inside: false, margin: getChartPropertyValue(currentChartModel.chartPropertiesUsed,"padding_y"), - fontSize: "2em", + fontSize: getChartPropertyValue(currentChartModel.chartPropertiesUsed,"fontsize_y"), width:getChartPropertyValue(currentChartModel.chartPropertiesUsed,"width_y"), rotate: getChartPropertyValue(currentChartModel.chartPropertiesUsed,"tickRotate_y"), distance:getChartPropertyValue(currentChartModel.chartPropertiesUsed,"distance_y"), position:getChartPropertyValue(currentChartModel.chartPropertiesUsed,"position_y"), - formatter: (value) => value.toLocaleString() - + formatter: (value) => value.toLocaleString(), + color: getChartPropertyValue(currentChartModel.chartPropertiesUsed,"fontcolor_y") } }, series: seriesArray, @@ -2134,7 +2140,8 @@ function createBarLineSeriesObj(currentChartModel,chartType,orientation,measureC label: { show: (getChartPropertyValue(currentChartModel.chartPropertiesUsed,"valueLabelShow")=="false")?false:true, //true fontWeight:'bolder', - fontSize: "2em", + fontSize: getChartPropertyValue(currentChartModel.chartPropertiesUsed,"valueLabelFontsize"), + color: getChartPropertyValue(currentChartModel.chartPropertiesUsed,"valueLabelColor"), distance:30, //offset:[30, 40], // position:"bottom", @@ -2384,10 +2391,12 @@ else left: getChartPropertyValue(currentChartModel.chartPropertiesUsed,"title.left"), //"center", top: getChartPropertyValue(currentChartModel.chartPropertiesUsed,"title.top"), //"top", textStyle: { - fontSize: 20 + fontSize: 20, + color: getChartPropertyValue(currentChartModel.chartPropertiesUsed,"title_fontcolor") }, subtextStyle: { - fontSize: 15 + fontSize: 15, + color: getChartPropertyValue(currentChartModel.chartPropertiesUsed,"title_fontcolor") } } } @@ -2458,9 +2467,16 @@ function getEchartsSeriesPie(dsIndex,dsIndexMax,currentChartModel,myPalette) /*formatter: function (params) { return params.value.toLocaleString() }*/ - formatter: '{c}' + formatter: '{c}', + color: getChartPropertyValue(currentChartModel.chartPropertiesUsed,"valueLabelColor") - } /*, + } , + labelLine: { + length: 50, + length2: 50 + } + + /*, labelLayout(params) { return getLabelLayout(chartTypes[1],params,orientation) }*/, @@ -2474,7 +2490,8 @@ function getEchartsSeriesPie(dsIndex,dsIndexMax,currentChartModel,myPalette) borderColor: '#fff', borderWidth: 2 }, - datasetIndex: dsIndex + datasetIndex: dsIndex, + top: "20%" } return serieObj; }