fixed some instances where if no temp unit was set for the user yet the unit defaulted to °F to cerrectly default to °C now
This commit is contained in:
parent
b3a50db873
commit
9a5e25908f
2 changed files with 15 additions and 15 deletions
|
|
@ -249,9 +249,9 @@ export default function BinCard(props: Props) {
|
||||||
noWrap
|
noWrap
|
||||||
style={{ fontSize: "0.85rem", fontWeight: 650, color: tempColour }}>
|
style={{ fontSize: "0.85rem", fontWeight: 650, color: tempColour }}>
|
||||||
{display +
|
{display +
|
||||||
(user.settings.temperatureUnit === pond.TemperatureUnit.TEMPERATURE_UNIT_CELSIUS
|
(user.settings.temperatureUnit === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT
|
||||||
? "°C"
|
? "°F"
|
||||||
: "°F")}
|
: "°C")}
|
||||||
</Typography>
|
</Typography>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -249,9 +249,9 @@ export default function GateSVG(props: Props) {
|
||||||
<g key={"finalTemp"} id={"finalTemp"} data-name={"finalTemp"}>
|
<g key={"finalTemp"} id={"finalTemp"} data-name={"finalTemp"}>
|
||||||
<text fontSize={7} className={classes.fontBase} x={100} y={85}>
|
<text fontSize={7} className={classes.fontBase} x={100} y={85}>
|
||||||
{convertFinalTemp(finalTemp).toFixed(2)}°
|
{convertFinalTemp(finalTemp).toFixed(2)}°
|
||||||
{user.settings.temperatureUnit === pond.TemperatureUnit.TEMPERATURE_UNIT_CELSIUS
|
{user.settings.temperatureUnit === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT
|
||||||
? "C"
|
? "°F"
|
||||||
: "F"}
|
: "°C"}
|
||||||
</text>
|
</text>
|
||||||
</g>
|
</g>
|
||||||
);
|
);
|
||||||
|
|
@ -260,9 +260,9 @@ export default function GateSVG(props: Props) {
|
||||||
<g key={"ambientTemp"} id={"ambientTemp"} data-name={"ambientTemp"}>
|
<g key={"ambientTemp"} id={"ambientTemp"} data-name={"ambientTemp"}>
|
||||||
<text fontSize={7} className={classes.fontBase} x={30} y={114}>
|
<text fontSize={7} className={classes.fontBase} x={30} y={114}>
|
||||||
Ambient: {ambientTemp}°
|
Ambient: {ambientTemp}°
|
||||||
{user.settings.temperatureUnit === pond.TemperatureUnit.TEMPERATURE_UNIT_CELSIUS
|
{user.settings.temperatureUnit === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT
|
||||||
? "C"
|
? "°F"
|
||||||
: "F"}
|
: "°C"}
|
||||||
</text>
|
</text>
|
||||||
</g>
|
</g>
|
||||||
);
|
);
|
||||||
|
|
@ -271,13 +271,13 @@ export default function GateSVG(props: Props) {
|
||||||
<g key={"tempChain"} id={"tempChain"} data-name={"tempChain"}>
|
<g key={"tempChain"} id={"tempChain"} data-name={"tempChain"}>
|
||||||
<text fontSize={7} className={classes.fontBase} x={30} y={149}>
|
<text fontSize={7} className={classes.fontBase} x={30} y={149}>
|
||||||
T1: {innerTemps.t1}°
|
T1: {innerTemps.t1}°
|
||||||
{user.settings.temperatureUnit === pond.TemperatureUnit.TEMPERATURE_UNIT_CELSIUS
|
{user.settings.temperatureUnit === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT
|
||||||
? "C"
|
? "°F"
|
||||||
: "F"}
|
: "°C"}
|
||||||
, T2: {innerTemps.t2}°
|
, T2: {innerTemps.t2}°
|
||||||
{user.settings.temperatureUnit === pond.TemperatureUnit.TEMPERATURE_UNIT_CELSIUS
|
{user.settings.temperatureUnit === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT
|
||||||
? "C"
|
? "°F"
|
||||||
: "F"}
|
: "°C"}
|
||||||
</text>
|
</text>
|
||||||
</g>
|
</g>
|
||||||
);
|
);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue