Merge pull request #11717 from PersianXerxes/oopsPHManBad

Chem Dispensers and Heaters now show pH again
This commit is contained in:
Putnam3145
2020-04-02 16:55:45 -07:00
committed by GitHub
4 changed files with 17 additions and 5 deletions
@@ -150,7 +150,7 @@ export const ChemDispenser = props => {
<AnimatedNumber
initial={0}
value={data.beakerCurrentVolume} />
/{data.beakerMaxVolume} units
/{data.beakerMaxVolume} units, {data.beakerCurrentpH} pH
</Fragment>
)
|| 'No beaker'}
@@ -11,6 +11,7 @@ export const ChemHeater = props => {
isActive,
isBeakerLoaded,
currentTemp,
currentpH,
beakerCurrentVolume,
beakerMaxVolume,
beakerContents = [],
@@ -40,7 +41,7 @@ export const ChemHeater = props => {
target: value,
})} />
</LabeledList.Item>
<LabeledList.Item label="Reading">
<LabeledList.Item label="Temperature">
<Box
width="60px"
textAlign="right">
@@ -51,6 +52,17 @@ export const ChemHeater = props => {
) || '—'}
</Box>
</LabeledList.Item>
<LabeledList.Item label="pH">
<Box
width="60px"
textAlign="right">
{isBeakerLoaded && (
<AnimatedNumber
value={currentpH}
format={value => toFixed(value) + ' pH'} />
) || '-'}
</Box>
</LabeledList.Item>
</LabeledList>
</Section>
<Section
@@ -15,7 +15,7 @@ export const BeakerContents = props => {
)}
{beakerContents.map(chemical => (
<Box key={chemical.name} color="label">
{chemical.volume} units of {chemical.name}
{chemical.volume} units of {chemical.name}, Purity: {chemical.purity}
</Box>
))}
</Box>
File diff suppressed because one or more lines are too long