Mirrorlandia_minetest/contentdb
1
0
Fork 0
mirror of https://github.com/minetest/contentdb.git synced 2024-12-23 06:22:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Stats: Fix annotation being added when outside graph range

Browse Source
This commit is contained in:
rubenwardy 2023-06-14 22:41:02 +01:00
parent 7f3b24a650
commit 516361345e
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/public/static/package_charts.js
View File

@ -102,6 +102,11 @@ async function load_data() {
return list.map((value, i) => ({ x: dates[i], y: value })); return list.map((value, i) => ({ x: dates[i], y: value }));
} }
const annotations = {};
if (new Date(json.start) < new Date("2022-11-05")) {
annotations.annotationNov5 = annotationNov5;
}
if (json.package_downloads) { if (json.package_downloads) {
const packageRecentDownloads = Object.fromEntries(Object.entries(json.package_downloads) const packageRecentDownloads = Object.fromEntries(Object.entries(json.package_downloads)
.map(([label, values]) => [label, sum(values.slice(-30))])); .map(([label, values]) => [label, sum(values.slice(-30))]));
@ -114,7 +119,7 @@ async function load_data() {
.sort((a, b) => packageRecentDownloads[a[0]] - packageRecentDownloads[b[0]]) .sort((a, b) => packageRecentDownloads[a[0]] - packageRecentDownloads[b[0]])
.map(([label, values]) => ({ label, data: getData(values) })), .map(([label, values]) => ({ label, data: getData(values) })),
}; };
setup_chart(ctx, data); setup_chart(ctx, data, annotations);
} }
{ {
@ -125,7 +130,7 @@ async function load_data() {
{ label: "Minetest", data: getData(json.platform_minetest) }, { label: "Minetest", data: getData(json.platform_minetest) },
], ],
}; };
setup_chart(ctx, data); setup_chart(ctx, data, annotations);
} }
{ {
@ -138,7 +143,7 @@ async function load_data() {
{ label: "New Install", data: getData(json.reason_new) }, { label: "New Install", data: getData(json.reason_new) },
], ],
}; };
setup_chart(ctx, data); setup_chart(ctx, data, annotations);
} }
{ {
@ -182,7 +187,7 @@ async function load_data() {
} }
function setup_chart(ctx, data) { function setup_chart(ctx, data, annotations) {
data.datasets = data.datasets.map((set, i) => { data.datasets = data.datasets.map((set, i) => {
const colorIdx = (data.datasets.length - i - 1) % chartColors.length; const colorIdx = (data.datasets.length - i - 1) % chartColors.length;
return { return {
@ -212,9 +217,7 @@ function setup_chart(ctx, data) {
}, },
annotation: { annotation: {
annotations: { annotations,
annotationNov5,
},
}, },
}, },
interaction: { interaction: {

2
app/templates/macros/stats.html
View File

@ -2,7 +2,7 @@
<script src="/static/libs/chart.min.js"></script> <script src="/static/libs/chart.min.js"></script>
<script src="/static/libs/chartjs-adapter-date-fns.bundle.min.js"></script> <script src="/static/libs/chartjs-adapter-date-fns.bundle.min.js"></script>
<script src="/static/libs/chartjs-plugin-annotation.min.js"></script> <script src="/static/libs/chartjs-plugin-annotation.min.js"></script>
<script src="/static/package_charts.js?v=9"></script> <script src="/static/package_charts.js?v=10"></script>
{% endmacro %} {% endmacro %}