starcalc
/
flm01
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[drupal] plot sensors based on chart field in {logger_meters}

This commit is contained in:
Bart Van Der Meerssche 2011-03-18 10:21:14 +00:00
parent 9d9befbee0
commit e2e9fee434
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/drupal/modules/logger/logger.module
View File

@ -319,10 +319,18 @@ function _logger_dashboard($type, $function, $interval) {
WHERE uid = %d AND type = '%s' AND function = '%s' WHERE uid = %d AND type = '%s' AND function = '%s'
ORDER BY created", $user->uid, $type, $function)); ORDER BY created", $user->uid, $type, $function));
$result_me = db_query("SELECT meter, function if (in_array('pro', array_values($user->roles)))
FROM {logger_meters} $result_me = db_query("SELECT meter, function
WHERE uid = %d AND type = '%s' FROM {logger_meters}
ORDER BY function", $user->uid, $type); WHERE uid = %d AND type = '%s' and chart = %d
ORDER BY function", $user->uid, $type, 1);
else
$result_me = db_query("SELECT meter, function
FROM {logger_meters}
WHERE uid = %d AND type = '%s'
ORDER BY function", $user->uid, $type);
$meter_me = db_fetch_object($result_me); $meter_me = db_fetch_object($result_me);
$result_sub = db_query("SELECT u.name, lm.meter, lu.private $result_sub = db_query("SELECT u.name, lm.meter, lu.private