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

minors

Browse Source 
git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@2930 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
johannnes
2013-03-16 17:27:24 +00:00
parent 8c8996da4b
commit 205e2825ac
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
www/frontend/FHEM/93_DbLog.pm
View File

@@ -776,7 +776,7 @@ sub prepareSql(@_) {
my ($sql, $jsonstring, $countsql);
if($userquery eq "getreadings") {
$sql = "SELECT distinct(reading) FROM current WHERE device = '".$device."'";
$sql = "SELECT distinct(reading) FROM history WHERE device = '".$device."'";
} elsif($userquery eq "getdevices") {
$sql = "SELECT distinct(device) FROM history";
} elsif($userquery eq "timerange") {
@@ -808,7 +808,7 @@ sub chartQuery($@) {
my ($sql, $countsql) = prepareSql(@_);
if ($sql eq "error") {
return jsonError("Could not setup SQL String");
return jsonError("Could not setup SQL String. Maybe the Database is busy, please try again!");
}
my ($hash, @a) = @_;
my $dbhf= $hash->{DBHF};

2
www/frontend/controls_frontend.txt
View File

@@ -37,7 +37,7 @@ DIR www/frontend/lib/ext-4.1.1a/images/gray/grid
DIR www/frontend/lib/ext-4.1.1a/images/gray/util
DIR www/frontend/lib/ext-4.1.1a/images/gray/panel-header
DIR www/frontend/lib/ext-4.1.1a/images/gray/tip
UPD 2013-03-07_12:12:22 49744 FHEM/93_DbLog.pm
UPD 2013-03-16_05:44:48 49791 FHEM/93_DbLog.pm
UPD 2013-03-08_07:13:10 563 www/frontend/index.html
UPD 2013-03-06_11:11:22 236 www/frontend/README.txt
UPD 2013-03-08_01:44:54 613 www/frontend/app/userconfig.js