From 90271706ee0c7c9f6d43856f1a26b0ede0d30b52 Mon Sep 17 00:00:00 2001
From: Jon Ziebell <ziebelje@gmail.com>
Date: Fri, 23 Jun 2023 06:32:05 -0400
Subject: [PATCH] Fixed #397 - CSV downloaded data unusable due to data
 misalignment: some rows missing TVOC and CO2 cells shifting rightward cells
 to the left

---
 api/runtime.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/api/runtime.php b/api/runtime.php
index 9a215cd..4f033b3 100644
--- a/api/runtime.php
+++ b/api/runtime.php
@@ -1148,14 +1148,12 @@ class runtime extends cora\api {
               isset($runtime_sensors_by_timestamp[$current_timestamp][$sensor['sensor_id']]) === true
             )
             {
-              if($runtime_sensors_by_timestamp[$current_timestamp][$sensor['sensor_id']]['air_quality'] !== null) {
-                $csv_row[] = $runtime_sensors_by_timestamp[$current_timestamp][$sensor['sensor_id']]['air_quality'];
-              }
-              if($runtime_sensors_by_timestamp[$current_timestamp][$sensor['sensor_id']]['voc_concentration'] !== null) {
-                $csv_row[] = $runtime_sensors_by_timestamp[$current_timestamp][$sensor['sensor_id']]['voc_concentration'];
-              }
-              if($runtime_sensors_by_timestamp[$current_timestamp][$sensor['sensor_id']]['co2_concentration'] !== null) {
-                $csv_row[] = $runtime_sensors_by_timestamp[$current_timestamp][$sensor['sensor_id']]['co2_concentration'];
+              foreach($sensor['capability'] as $capability) {
+                if($capability['type'] === 'airQuality') {
+                  $csv_row[] = $runtime_sensors_by_timestamp[$current_timestamp][$sensor['sensor_id']]['air_quality'];
+                  $csv_row[] = $runtime_sensors_by_timestamp[$current_timestamp][$sensor['sensor_id']]['voc_concentration'];
+                  $csv_row[] = $runtime_sensors_by_timestamp[$current_timestamp][$sensor['sensor_id']]['co2_concentration'];
+                }
               }
 
               $csv_row[] = $runtime_sensors_by_timestamp[$current_timestamp][$sensor['sensor_id']]['temperature'];