Skip to content

Commit 1787ee4

Browse files
committed
Show lab results in correct unit
1 parent 750bd36 commit 1787ee4

2 files changed

Lines changed: 12 additions & 4 deletions

File tree

frontend/src/components/LabResultsTable.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { ExperimentResult } from "@/dto/ExperimentResult";
33
import { Button, EdsProvider, Typography } from "@equinor/eds-core-react";
44
import { EdsDataGrid, Row } from "@equinor/eds-data-grid-react";
55
import { buildLabResultsTableData } from "@/functions/Tables";
6+
import { useSettings } from "@/contexts/SettingsContext";
67

78
interface LabResultsTableProps {
89
labResults: ExperimentResult[];
@@ -15,7 +16,8 @@ const LabResultsTable: React.FC<LabResultsTableProps> = ({
1516
selectedExperiments,
1617
setSelectedExperiments,
1718
}) => {
18-
const { columns, rows } = buildLabResultsTableData(labResults);
19+
const { temperature } = useSettings();
20+
const { columns, rows } = buildLabResultsTableData(labResults, temperature);
1921

2022
const handleRowClick = (
2123
row: Row<{

frontend/src/functions/Tables.tsx

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { ExperimentResult } from "@/dto/ExperimentResult";
2+
import { Unit } from "@/contexts/SettingsContext";
23

3-
export function buildLabResultsTableData(labResults: ExperimentResult[]) {
4+
export function buildLabResultsTableData(labResults: ExperimentResult[], temperatureUnit?: Unit) {
45
const initialPrefix = "in-";
56
const finalPrefix = "out-";
67

@@ -27,7 +28,7 @@ export function buildLabResultsTableData(labResults: ExperimentResult[]) {
2728
size: 65,
2829
},
2930
{
30-
header: "Temperature (°C)",
31+
header: `Temperature (${temperatureUnit?.unit ?? "°C"})`,
3132
id: "temperature",
3233
accessorKey: "temperature",
3334
size: 475,
@@ -65,7 +66,12 @@ export function buildLabResultsTableData(labResults: ExperimentResult[]) {
6566
id: entry.name,
6667
name: entry.name,
6768
time: String(entry.time),
68-
temperature: entry.temperature,
69+
temperature:
70+
entry.temperature === null
71+
? null
72+
: temperatureUnit?.unit === "°C"
73+
? entry.temperature
74+
: entry.temperature - 273,
6975
pressure: entry.pressure,
7076
...Object.fromEntries(
7177
Object.entries(entry.initialConcentrations).map(([key, value]) => [

0 commit comments

Comments
 (0)