FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-13 17:26:34 +00:00
Code Issues Releases Wiki Activity

statistics2: minor improvements, resize pie charts

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@15561 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
markusbloch 2017-12-06 20:23:59 +00:00
parent 47fde815e9
commit ed24ec27b9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,10 +63,10 @@ function drawGooglePieChart(data, el, subst, sort, threshold) {
var options = { is3D: true, var options = { is3D: true,
chartArea : { height:'80%',width:'95%' }, chartArea : { height:'80%',width:'95%' },
tooltip: { trigger: 'selection' }, tooltip: { trigger: 'selection' },
width: 450, width: 600,
legend: {position: 'right',labeledValueText: 'both'}, legend: {position: 'right',labeledValueText: 'both'},
pieSliceText: 'none', pieSliceText: 'none',
height: 350, height: 450,
sliceVisibilityThreshold: threshold sliceVisibilityThreshold: threshold
}; };
@ -284,7 +284,6 @@ function createModulTable(modules,models,table)
function convertHtmlEntities(str) function convertHtmlEntities(str)
{ {
return $("<div />").text(str).html(); return $("<div />").text(str).html();
return str.replace(/[\u00A0-\u9999<>\&]/gim, function(i) { return '&#'+i.charCodeAt(0)+';'; });
} }
function generateModelsOverview(moduleName, modelData) function generateModelsOverview(moduleName, modelData)

1
fhem/contrib/statistics/2017/statistics.html
View File

@ -5,6 +5,7 @@
<head> <head>
<title>FHEM statistics</title> <title>FHEM statistics</title>
<meta name="keywords" content="fhem homeautomation statistics" /> <meta name="keywords" content="fhem homeautomation statistics" />
<meta charset="UTF-8" />
<link rel="stylesheet" type="text/css" href="css/statistics.css" /> <link rel="stylesheet" type="text/css" href="css/statistics.css" />
<link rel="stylesheet" type="text/css" href="css/jquery-ui.min.css" /> <link rel="stylesheet" type="text/css" href="css/jquery-ui.min.css" />
<link rel="stylesheet" type="text/css" href="css/jquery.dataTables.min.css" /> <link rel="stylesheet" type="text/css" href="css/jquery.dataTables.min.css" />