FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 09:16:53 +00:00
Code Issues Releases Wiki Activity

93_DBLog: V2.22.8, avoid multiple entries of Device:Reading-combinations in drop-down-list when creating SVG

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@15156 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2017-10-01 07:34:16 +00:00
parent 1472aad86a
commit 8a41283dac
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fhem/CHANGED
View File

@ -1,5 +1,8 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- change: 93_DBLog: V2.22.8, avoid multiple entries of
Device:Reading-combinations in Dopdown-list when
creating SVG
- bugfix: 10_MQTT_BRIDGE: fix comandref $device - bugfix: 10_MQTT_BRIDGE: fix comandref $device
- feature: 74_AMADDevice: add media support for YouTubeKids - feature: 74_AMADDevice: add media support for YouTubeKids
- bugfix: 74_AMADautomagicFlowset_4.0.9.xml: fix restore volume bug - bugfix: 74_AMADautomagicFlowset_4.0.9.xml: fix restore volume bug

5
fhem/FHEM/93_DbLog.pm
View File

@ -16,6 +16,7 @@
############################################################################################################################################ ############################################################################################################################################
# Versions History done by DS_Starter & DeeSPe: # Versions History done by DS_Starter & DeeSPe:
# #
# 2.22.8 29.09.2017 avoid multiple entries in Dopdown-list when creating SVG by group Device:Reading in DbLog_sampleDataFn
# 2.22.7 24.09.2017 minor fixes in configcheck # 2.22.7 24.09.2017 minor fixes in configcheck
# 2.22.6 22.09.2017 commandref revised # 2.22.6 22.09.2017 commandref revised
# 2.22.5 05.09.2017 fix Internal MODE isn't set correctly after DEF is edited, nextsynch is not renewed if reopen is # 2.22.5 05.09.2017 fix Internal MODE isn't set correctly after DEF is edited, nextsynch is not renewed if reopen is
@ -151,7 +152,7 @@ use Blocking;
use Time::HiRes qw(gettimeofday tv_interval); use Time::HiRes qw(gettimeofday tv_interval);
use Encode qw(encode_utf8); use Encode qw(encode_utf8);
my $DbLogVersion = "2.22.7"; my $DbLogVersion = "2.22.8";
my %columns = ("DEVICE" => 64, my %columns = ("DEVICE" => 64,
"TYPE" => 64, "TYPE" => 64,
@ -4304,7 +4305,7 @@ DbLog_sampleDataFn($$$$$)
if($currentPresent =~ m/Current/ && $prescurr) { if($currentPresent =~ m/Current/ && $prescurr) {
# Table Current present, use it for sample data # Table Current present, use it for sample data
my $query = "select device,reading,value from current where device <> '' order by device,reading"; my $query = "select device,reading from current where device <> '' group by device,reading";
my $sth = $dbhf->prepare( $query ); my $sth = $dbhf->prepare( $query );
$sth->execute(); $sth->execute();
while (my @line = $sth->fetchrow_array()) { while (my @line = $sth->fetchrow_array()) {