OpenEcoLab-LasAlpujarras
/
farmOS
mirror of https://github.com/farmOS/farmOS.git
3
0
Fork 0
Code Wiki

Add start and end timestamp parameters.

This commit is contained in:
Michael Stenta 2018-11-06 10:51:39 -05:00
parent b10267e6f7
commit 591d07b09b
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
modules/farm/farm_sensor/farm_sensor_listener/farm_sensor_listener.module
View File

@ -149,6 +149,18 @@ function farm_sensor_listener_page_callback($public_key) {
$name = $params['name'];
}
// If the 'start' parameter is set, limit results to timestamps after it.
$start = NULL;
if (!empty($params['start'])) {
$start = $params['start'];
}
// If the 'end' parameter is set, limit to results before it.
$end = NULL;
if (!empty($params['end'])) {
$end = $params['end'];
}
// If the 'limit' parameter is set, limit the number of results.
$limit = 1;
if (!empty($params['limit'])) {
@ -162,7 +174,7 @@ function farm_sensor_listener_page_callback($public_key) {
}
// Get the data from the sensor.
$data = farm_sensor_listener_data($sensor->id, $name, $limit, $offset);
$data = farm_sensor_listener_data($sensor->id, $name, $start, $end, $limit, $offset);
// Return the latest readings as JSON.
drupal_json_output($data);
@ -371,6 +383,10 @@ function farm_sensor_listener_process_notifications($sensor, $data_name, $value)
* The sensor asset ID.
* @param $name
* The sensor value name.
* @param $start
* Filter data to timestamps greater than or equal to this start timestamp.
* @param $end
* Filter data to timestamps less than or equal to this end timestamp.
* @param $limit
* The number of results to return.
* @param $offset
@ -379,7 +395,7 @@ function farm_sensor_listener_process_notifications($sensor, $data_name, $value)
* @return array
* Returns an array of data.
*/
function farm_sensor_listener_data($id, $name = '', $limit = 1, $offset = 0) {
function farm_sensor_listener_data($id, $name = '', $start = NULL, $end = NULL, $limit = 1, $offset = 0) {
// Query the database for data from this sensor.
$query = db_select('farm_sensor_data', 'fsd');
@ -391,6 +407,16 @@ function farm_sensor_listener_data($id, $name = '', $limit = 1, $offset = 0) {
$query->condition('fsd.name', $name);
}
// If a start timestamp is specified, filter to data after it (inclusive).
if (!is_null($start) && is_numeric($start)) {
$query->condition('fsd.timestamp', $start, '>=');
}
// If an end timestamp is specified, filter to data before it (inclusive).
if (!is_null($end) && is_numeric($end)) {
$query->condition('fsd.timestamp', $end, '<=');
}
// Order by timestamp descending.
$query->orderBy('fsd.timestamp', 'DESC');