Merge pull request #15154 from Runa-Dacino/tguifixpass

Fixes PDA records missing linebreaks & fixes communicator weather app gibberish
This commit is contained in:
Heroman3003
2023-07-18 15:12:14 +10:00
committed by GitHub
5 changed files with 11 additions and 7 deletions
@@ -20,7 +20,7 @@
// Values were extracted from the template itself
results = list(
list("entry" = "Pressure", "units" = "kPa", "val" = "[round(pressure,0.1)]", "bad_high" = 120, "poor_high" = 110, "poor_low" = 95, "bad_low" = 80),
list("entry" = "Temperature", "units" = "°C", "val" = "[round(environment.temperature-T0C,0.1)]", "bad_high" = 35, "poor_high" = 25, "poor_low" = 15, "bad_low" = 5),
list("entry" = "Temperature", "units" = "\u00B0" + "C", "val" = "[round(environment.temperature-T0C,0.1)]", "bad_high" = 35, "poor_high" = 25, "poor_low" = 15, "bad_low" = 5),
list("entry" = "Oxygen", "units" = "kPa", "val" = "[round(o2_level*100,0.1)]", "bad_high" = 140, "poor_high" = 135, "poor_low" = 19, "bad_low" = 17),
list("entry" = "Nitrogen", "units" = "kPa", "val" = "[round(n2_level*100,0.1)]", "bad_high" = 105, "poor_high" = 85, "poor_low" = 50, "bad_low" = 40),
list("entry" = "Carbon Dioxide", "units" = "kPa", "val" = "[round(co2_level*100,0.1)]", "bad_high" = 10, "poor_high" = 5, "poor_low" = 0, "bad_low" = 0),
@@ -1158,6 +1158,8 @@ const WeatherTab = (props, context) => {
const { aircontents, weather } = data;
let deg = '\u00B0';
return (
<Section title="Weather">
<Section title="Current Conditions">
@@ -1195,8 +1197,8 @@ const WeatherTab = (props, context) => {
{toTitleCase(wr.Weather)}
</LabeledList.Item>
<LabeledList.Item label="Temperature">
Current: {wr.Temperature.toFixed()}&deg;C | High:{' '}
{wr.High.toFixed()}&deg;C | Low: {wr.Low.toFixed()}&deg;C
Current: {wr.Temperature.toFixed()} {deg}C | High:{' '}
{wr.High.toFixed()} {deg}C | Low: {wr.Low.toFixed()} {deg}C
</LabeledList.Item>
<LabeledList.Item label="Wind Direction">
{wr.WindDir}
@@ -64,7 +64,7 @@ export const pda_medical = (props, context) => {
{medical.cdi_d}
</LabeledList.Item>
<LabeledList.Item label="Important Notes" preserveWhitespace>
{medical.notes}
<Box preserveWhitespace>{medical.notes}</Box>
</LabeledList.Item>
</LabeledList>
)) || <Box color="bad">Medical record lost!</Box>}
@@ -51,8 +51,10 @@ export const pda_security = (props, context) => {
<LabeledList.Item label="Details">
{security.ma_crim_d}
</LabeledList.Item>
<LabeledList.Item label="Important Notes:" preserveWhitespace>
{security.notes || 'No data found.'}
<LabeledList.Item label="Important Notes:">
<Box preserveWhitespace>
{security.notes || 'No data found.'}
</Box>
</LabeledList.Item>
</LabeledList>
)) || <Box color="bad">Security record lost!</Box>}
File diff suppressed because one or more lines are too long