Skip to content

Commit

Permalink
Merge branch 'main' into update_urls
Browse files Browse the repository at this point in the history
  • Loading branch information
johnjasa authored Jan 29, 2024
2 parents 7e64bec + 1642ab8 commit 129384a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
6 changes: 6 additions & 0 deletions aviary/visualization/assets/aviary_vars/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ function createTabulator(tableData)
width: 300,
tooltip: (e, cell, onRendered) => displayValueInToolTip(e, cell, onRendered),
},
{
title: "Units",
field: "units",
width: 200,
tooltip: (e, cell, onRendered) => displayValueInToolTip(e, cell, onRendered),
},
]
});

Expand Down
3 changes: 3 additions & 0 deletions aviary/visualization/dashboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ def create_aviary_variables_table_data_nested(script_name, recorder_file):
"abs_name": group_name,
"prom_name": outputs[var_info]["prom_name"],
"value": str(outputs[var_info]["val"]),
"units": str(outputs[var_info]["units"]),
}
)
else:
Expand All @@ -197,13 +198,15 @@ def create_aviary_variables_table_data_nested(script_name, recorder_file):
"abs_name": children_name,
"prom_name": outputs[children_name]["prom_name"],
"value": str(outputs[children_name]["val"]),
"units": str(outputs[children_name]["units"]),
}
)
table_data_nested.append( # not a real var, just a group of vars so no values
{
"abs_name": group_name,
"prom_name": "",
"value": "",
"units": "",
"_children": children_list,
}
)
Expand Down

0 comments on commit 129384a

Please sign in to comment.