File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -3,6 +3,7 @@ import { ExperimentResult } from "@/dto/ExperimentResult";
33import { Button , EdsProvider , Typography } from "@equinor/eds-core-react" ;
44import { EdsDataGrid , Row } from "@equinor/eds-data-grid-react" ;
55import { buildLabResultsTableData } from "@/functions/Tables" ;
6+ import { useSettings } from "@/contexts/SettingsContext" ;
67
78interface 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 < {
Original file line number Diff line number Diff line change 11import { 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 ] ) => [
You can’t perform that action at this time.
0 commit comments