Cutlery/beestat
1
0
Fork 0
mirror of https://github.com/beestat/app.git synced 2025-06-03 13:46:54 -04:00
Code Actions Packages Releases Activity

Fixed #278 - Improve column names for CSV export

Browse Source
This commit is contained in:
Jon Ziebell 2020-06-09 21:27:32 -04:00
parent ac2ae13690
commit 117bfe5d30
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
api/runtime.php
View File

@ -921,6 +921,16 @@ class runtime extends cora\api {
$headers[array_search('event_runtime_thermostat_text_id', $headers)] = 'event'; $headers[array_search('event_runtime_thermostat_text_id', $headers)] = 'event';
$headers[array_search('climate_runtime_thermostat_text_id', $headers)] = 'climate'; $headers[array_search('climate_runtime_thermostat_text_id', $headers)] = 'climate';
// Make the column names friendlier.
foreach($headers as $i => $header) {
$headers[$i] = ucwords(str_replace('_', ' ', $headers[$i]));
}
foreach($sensors as $sensor) {
$headers[] = $sensor['name'] . ' - Temperature';
$headers[] = $sensor['name'] . ' - Occupancy';
}
$bytes += fputcsv($output, $headers); $bytes += fputcsv($output, $headers);
$needs_header = false; $needs_header = false;
} }
@ -972,10 +982,23 @@ class runtime extends cora\api {
[$local_datetime], [$local_datetime],
$runtime_thermostats_by_timestamp[$current_timestamp] $runtime_thermostats_by_timestamp[$current_timestamp]
); );
foreach($sensors as $sensor) {
if(
isset($runtime_sensors_by_timestamp[$current_timestamp]) === true &&
isset($runtime_sensors_by_timestamp[$current_timestamp][$sensor['sensor_id']]) === true
)
{
$csv_row[] = $runtime_sensors_by_timestamp[$current_timestamp][$sensor['sensor_id']]['temperature'];
$csv_row[] = $runtime_sensors_by_timestamp[$current_timestamp][$sensor['sensor_id']]['occupancy'];
}
}
} else { } else {
$csv_row = [$local_datetime]; $csv_row = [$local_datetime];
} }
$bytes += fputcsv($output, $csv_row); $bytes += fputcsv($output, $csv_row);
$current_timestamp += 300; $current_timestamp += 300;
} }