|
|
|
@ -474,10 +474,7 @@ def horizon_daily(): |
|
|
|
|
|
|
|
|
|
# Get the right sensors for the family |
|
|
|
|
table_name, col_names = get_table_cols(hus, fam, typ) |
|
|
|
|
sql_col_names = ','.join(f'"{x}"' for x in col_names) |
|
|
|
|
|
|
|
|
|
out = {} |
|
|
|
|
out['sensor_names'] = col_names[2:] |
|
|
|
|
sql_col_names = ','.join(f'"{x}"' for x in col_names) |
|
|
|
|
|
|
|
|
|
query = f'SELECT {sql_col_names} FROM "{table_name}"' |
|
|
|
|
query += f'WHERE "{date_col}"=? ' |
|
|
|
@ -485,14 +482,20 @@ def horizon_daily(): |
|
|
|
|
|
|
|
|
|
cur = conn.execute(query, [day]) |
|
|
|
|
res_all = cur.fetchall() |
|
|
|
|
|
|
|
|
|
for i, sensor_name in enumerate(out['sensor_names']): |
|
|
|
|
sensor_data_sorted = sorted(res_all) |
|
|
|
|
if i == 0: |
|
|
|
|
out['days'] = [x[0] for x in sensor_data_sorted] |
|
|
|
|
out['times'] = [x[1] for x in sensor_data_sorted] |
|
|
|
|
out[sensor_name] = [x[2] for x in sensor_data_sorted] |
|
|
|
|
|
|
|
|
|
out = {} |
|
|
|
|
out['sensor_names'] = col_names[2:] |
|
|
|
|
out['days'] = [] |
|
|
|
|
out['times'] = [] |
|
|
|
|
for s in out['sensor_names']: |
|
|
|
|
out[s] = [] |
|
|
|
|
|
|
|
|
|
for row in res_all: |
|
|
|
|
out['days'].append(row[0]) |
|
|
|
|
out['times'].append(row[1]) |
|
|
|
|
for i, s in enumerate(out['sensor_names']): |
|
|
|
|
out[s].append(row[i+2]) |
|
|
|
|
|
|
|
|
|
return out |
|
|
|
|
|
|
|
|
|
|
|
|
|
|