From 098b640d87d068a01be6bba85f0be6316aef3523 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Wed, 1 Mar 2023 11:52:21 +0100 Subject: [PATCH] dashboard optimizations --- .../german/chronikseiten/schuelerzahlen.md | 54 ++++++------------- static/data/schuelerzahlen.json | 4 +- 2 files changed, 18 insertions(+), 40 deletions(-) diff --git a/content/german/chronikseiten/schuelerzahlen.md b/content/german/chronikseiten/schuelerzahlen.md index 4a3fcf3..de73c29 100644 --- a/content/german/chronikseiten/schuelerzahlen.md +++ b/content/german/chronikseiten/schuelerzahlen.md @@ -157,6 +157,13 @@ aliases: // Use axis to trigger tooltip type: 'shadow' // 'shadow' as default; can also be 'line' or 'shadow' }, + formatter: function (params, ticket, callback) { + var output = ""; + params.forEach(function(param) { + output = output + "" + param.seriesName + ": " + param.value + (param.seriesName == "Anteil Mädchen" ? "%" : "") + "
"; + }); + return output; + } }, xAxis: { data: data['schuelerzahlen'].map(function (item) { @@ -191,41 +198,6 @@ aliases: type: "inside" } ], - /*visualMap: { - top: 50, - right: 10, - precision: 1, - pieces: [ - { - gt: 0.9, - lte: 1.0, - color: "#005da9", - }, - { - gt: 1.0, - lte: 1.5, - color: "#0b9834" - }, - { - gt: 1.5, - lte: 2.0, - color: "#93CE07" - }, - { - gt: 2.0, - lte: 2.5, - color: "#FBDB0F" - }, - /*{ - gt: 2.0, - lte: 2.5, - color: "#FC7D02" - }, - ], - outOfRange: { - color: "#999" - } - },*/ series: [{ name: "Jungen", type: "bar", @@ -250,7 +222,7 @@ aliases: yAxis: 500 } ] - } + }, }, { name: "Mädchen", @@ -285,6 +257,12 @@ aliases: data: data['schuelerzahlen'].map(function (item) { return item['all']; }), + lineStyle: { + normal: { + width: 0, + } + }, + symbolSize: 0, markLine: { silent: true, lineStyle: { @@ -300,13 +278,13 @@ aliases: { yAxis: 500 } - ] + ], } }, { name: "Anteil Mädchen", type: "line", - color: "#dc9870", + color: "#4b4b4b", yAxisIndex: 1, data: data['schuelerzahlen'].map(function (item) { return (item['girls']/item['all']*100).toFixed(2);; diff --git a/static/data/schuelerzahlen.json b/static/data/schuelerzahlen.json index 8718282..94ded78 100644 --- a/static/data/schuelerzahlen.json +++ b/static/data/schuelerzahlen.json @@ -161,8 +161,8 @@ }, { "year":2020, - "all": 0, - "girls": 0 + "all": 535, + "girls": 150 }, { "year": 2021,