FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 12:49:34 +00:00
Code Issues Releases Wiki Activity

statistics2: custom slice threshold for each pie chart, show today submissions in the summary

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14772 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
markusbloch 2017-07-23 16:26:38 +00:00
parent 34f85eb74a
commit eec88e4cf3
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fhem/contrib/statistics/2017/js/statistics.js
View File

@ -30,7 +30,7 @@ function rand(length) {
return text;
}
function drawGooglePieChart(data, el, subst, sort="byKey") {
function drawGooglePieChart(data, el, subst, sort="byKey", threshold) {
var id = rand(5);
@ -66,7 +66,7 @@ function drawGooglePieChart(data, el, subst, sort="byKey") {
legend: {position: 'right',labeledValueText: 'both'},
pieSliceText: 'none',
height: 350,
sliceVisibilityThreshold: 0.004
sliceVisibilityThreshold: threshold
};
var container = document.getElementById(id);
@ -315,9 +315,10 @@ function onSuccess(data, textStatus, jqXHR) {
div.append("last submission: " + data.updated + " UTC<br>");
div.append("created in: " + data.generated.toFixed(3) + " seconds<br>");
div.append("number of submissions (last 12 months): " + data.nodes12 + "<br>");
div.append("number of submissions today: " + data.nodesToday + "<br>");
div.append("number of submissions (last 12 months, used for statistics): " + data.nodes12 + "<br>");
div.append("total number of submissions (since : " + data.started + "): "+data.nodesTotal+"<br><br>");
div.append("You can help us to increase the quality of FHEM statistics data. Please check <a href='https://fhem.de/commandref.html#fheminfo' target='_new'>fheminfo</a> command for details.");
div.append("You can help us increase the quality of FHEM statistics data. Please check <a href='https://fhem.de/commandref.html#fheminfo' target='_new'>fheminfo</a> command for details.");
$("div.tabs").tabs();
@ -329,8 +330,8 @@ function onSuccess(data, textStatus, jqXHR) {
drawGoogleWorldMap(data.data.geo.countrycode,$("div#maptab-world"));
// draw google pie charts
drawGooglePieChart(data.data.system.os, $("div#versiontab-os"), {"linux":"Linux","MSWin32":"Windows","darwin":"macOS"}, "byValue");
drawGooglePieChart(data.data.system.perl, $("div#versiontab-perl"));
drawGooglePieChart(data.data.system.os, $("div#versiontab-os"), {"linux":"Linux","MSWin32":"Windows","darwin":"macOS","cygwin":"Cygwin","freebsd":"FreeBSD"}, "byValue",0 );
drawGooglePieChart(data.data.system.perl, $("div#versiontab-perl"),false,undefined,0);
drawGooglePieChart(data.data.system.age, $("div#versiontab-update"), {"0":"≤ 1 day", "7": "1 day - 1 week", "30": "1 week - 1 month", "180": "1 month - 6 months", "365": "6 months - 1 year", "999": "> 1 year"}, false);