mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

statistics: attribut singularReadings now multiline

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@15455 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
tupol
2017-11-19 12:30:39 +00:00
parent 5a9c37b7f4
commit 019e7f4bdc
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fhem/FHEM/98_statistics.pm
View File

@@ -139,7 +139,7 @@ sub statistics_Initialize($)
."periodChangePreset "
."specialDeltaPeriodHours "
."specialDeltaPeriods "
."singularReadings "
."singularReadings:textField-long "
."tendencyReadings "
.$readingFnAttributes;
}
@@ -578,6 +578,7 @@ sub statistics_doStatisticMinMaxSingle ($$$$$$)
# Store single readings
my $singularReadings = AttrVal($name, "singularReadings", "");
$singularReadings=~s/\n|\r//g;
if ($singularReadings ne "") {
# statistics_storeSingularReadings $hashName,$singularReadings,$dev,$statReadingName,$readingName,$statType,$period,$statValue,$lastValue,$saveLast
my $statValue = sprintf "%.".$decPlaces."f", $stat[1];
@@ -653,6 +654,7 @@ sub statistics_doStatisticTendency ($$$)
# Store single readings
my $singularReadings = AttrVal($name, "singularReadings", "");
$singularReadings=~s/\n|\r//g;
if ($singularReadings ne "") {
# statistics_storeSingularReadings $hashName,$singularReadings,$dev,$statReadingName,$readingName,$statType,$period,$statValue,$lastValue,$saveLast
statistics_storeSingularReadings ($name,$singularReadings,$dev,$statReadingName,$readingName,"Tendency","1h",$stat[1],0,0);
@@ -793,6 +795,7 @@ sub statistics_doStatisticDelta ($$$$)
# Store single readings
my $singularReadings = AttrVal($name, "singularReadings", "");
$singularReadings=~s/\n|\r//g;
if ($singularReadings ne "") {
# statistics_storeSingularReadings $hashName,$singularReadings,$dev,$statReadingName,$readingName,$statType,$period,$statValue,$lastValue,$saveLast
my $statValue = sprintf "%.".$decPlaces."f", $stat[1];
@@ -1025,6 +1028,7 @@ sub statistics_doStatisticDurationSingle ($$$$$$)
# Store single readings
my $singularReadings = AttrVal($name, "singularReadings", "");
$singularReadings=~s/\n|\r//g;
if ($singularReadings ne "") {
# Do this for each state of the current or last period
while (my ($statKey, $statValue) = each(%stat) ) {