Display message in place of graph is there is no data to display.
This commit is contained in:
parent
b5f996b53d
commit
378c27e062
|
@ -695,11 +695,24 @@ function farm_sensor_listener_data_graphs_form($form, &$form_state, $asset) {
|
||||||
$graphs = array();
|
$graphs = array();
|
||||||
foreach ($filters['values'] as $name) {
|
foreach ($filters['values'] as $name) {
|
||||||
$id = drupal_html_id('sensor-data-' . $name);
|
$id = drupal_html_id('sensor-data-' . $name);
|
||||||
|
|
||||||
|
// Load data.
|
||||||
|
$data = farm_sensor_listener_data($asset->id, $name, strtotime($filters['start_date']), strtotime($filters['end_date']), NULL, NULL);
|
||||||
|
|
||||||
|
// Don't render a graph if there is no data to display.
|
||||||
|
if (empty($data)) {
|
||||||
|
$markup[] = '<div class="farm-sensor-graph alert alert-warning"><p>' . t('No data for "@value" in this date range.', array('@value' => $name)) . '</p></div>';
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Build graph markup.
|
||||||
$markup[] = '<div id="' . $id . '" class="farm-sensor-graph"></div>';
|
$markup[] = '<div id="' . $id . '" class="farm-sensor-graph"></div>';
|
||||||
|
|
||||||
|
// Build graph settings.
|
||||||
$graph = array(
|
$graph = array(
|
||||||
'name' => $name,
|
'name' => $name,
|
||||||
'id' => $id,
|
'id' => $id,
|
||||||
'data' => farm_sensor_listener_data($asset->id, $name, strtotime($filters['start_date']), strtotime($filters['end_date']), NULL, NULL),
|
'data' => $data,
|
||||||
);
|
);
|
||||||
$graphs[] = $graph;
|
$graphs[] = $graph;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue