CEC-1711-fix-digital-twin-ver2 (#258)

* first commit

* fix build error
This commit is contained in:
das31
2023-01-13 16:30:20 -05:00
committed by GitHub
parent 5137e001ca
commit 7d14144b81
2 changed files with 17 additions and 13 deletions

View File

@@ -14,7 +14,7 @@ const mapOpenCloseState = (value) =>
const DigitalTwin = (props) => { const DigitalTwin = (props) => {
const classes = useStyles(); const classes = useStyles();
const { battery, doors, location, trex_version, ip, updated, windows, sunroof, dbc, door_locks } = props; const { battery, doors, location, trex_version, ip, updated, windows,misc_windows ,sunroof, dbc, door_locks } = props;
return ( return (
<div> <div>
@@ -47,7 +47,21 @@ const DigitalTwin = (props) => {
if (value[1] === 0) { if (value[1] === 0) {
return keyValueTemplate(value[0], "closed"); return keyValueTemplate(value[0], "closed");
} else { } else {
return keyValueTemplate(value[0], `${value[1]}% open`); const percentOpen = Math.min(value[1], 100);
return keyValueTemplate(value[0], `${percentOpen}% open`);
}
})}
</div>
)}
{misc_windows != null && (
<div className={classes.popupSection}>
<h3>Misc Windows</h3>
{Object.entries(misc_windows).map((value) => {
if (value[1] === 0) {
return keyValueTemplate(value[0], "closed");
} else {
const percentOpen = Math.min(value[1], 100);
return keyValueTemplate(value[0], `${percentOpen}% open`);
} }
})} })}
</div> </div>
@@ -55,7 +69,6 @@ const DigitalTwin = (props) => {
{sunroof != null && ( {sunroof != null && (
<div className={classes.popupSection}> <div className={classes.popupSection}>
<h3>Sunroof</h3> <h3>Sunroof</h3>
{/* {Object.entries(sunroof).map(mapOpenCloseState)} */}
{Object.entries(sunroof).map((value) => { {Object.entries(sunroof).map((value) => {
if (value[1] === 0) { if (value[1] === 0) {
return keyValueTemplate(value[0], "closed"); return keyValueTemplate(value[0], "closed");

View File

@@ -185,16 +185,7 @@ const Component = () => {
{carState ? ( {carState ? (
<VehiclePopUp <VehiclePopUp
key={carState.vin} key={carState.vin}
vin={carState.vin} {...carState}
online={carState.online}
onlineHMI={carState.online_hmi}
battery={carState.battery}
doors={carState.doors}
location={carState.location}
windows={carState.windows}
trex_version={carState.trex_version}
ip={carState.ip}
updated={carState.updated}
className={classes.popup} className={classes.popup}
onClose={handleClose} onClose={handleClose}
/> />