diff --git a/typescript/frontend-marios2/src/content/dashboards/BatteryView/BatteryView.tsx b/typescript/frontend-marios2/src/content/dashboards/BatteryView/BatteryView.tsx index 1ad54388b..56378d8d5 100644 --- a/typescript/frontend-marios2/src/content/dashboards/BatteryView/BatteryView.tsx +++ b/typescript/frontend-marios2/src/content/dashboards/BatteryView/BatteryView.tsx @@ -375,6 +375,112 @@ function BatteryView(props: BatteryViewProps) { )} + + {props.productNum === 1 && ( + <> + + {Number(battery.Warnings.value) === 0 ? ( + 'None' + ) : Number(battery.Warnings.value) === 1 ? ( + + New Warning + + ) : ( + + Multiple Warnings + + )} + + + {Number(battery.Alarms.value) === 0 ? ( + 'None' + ) : Number(battery.Alarms.value) === 1 ? ( + + New Alarm + + ) : ( + + Multiple Alarms + + )} + + + )} ))} diff --git a/typescript/frontend-marios2/src/content/dashboards/BatteryView/DetailedBatteryView.tsx b/typescript/frontend-marios2/src/content/dashboards/BatteryView/DetailedBatteryView.tsx index b5752eafa..d03f82778 100644 --- a/typescript/frontend-marios2/src/content/dashboards/BatteryView/DetailedBatteryView.tsx +++ b/typescript/frontend-marios2/src/content/dashboards/BatteryView/DetailedBatteryView.tsx @@ -335,7 +335,7 @@ function DetailedBatteryView(props: DetailedBatteryViewProps) { ...batteryStringStyle, backgroundColor: props.batteryData.String1Active.value == 'True' || - props.batteryData.String4Active.value == 0 + Number(props.batteryData.String1Active.value) == 0 ? '#32CD32' : '#FF033E' }} @@ -345,7 +345,7 @@ function DetailedBatteryView(props: DetailedBatteryViewProps) { ...batteryStringStyle, backgroundColor: props.batteryData.String2Active.value == 'True' || - props.batteryData.String4Active.value == 0 + Number(props.batteryData.String2Active.value) == 0 ? '#32CD32' : '#FF033E' }} @@ -355,7 +355,7 @@ function DetailedBatteryView(props: DetailedBatteryViewProps) { ...batteryStringStyle, backgroundColor: props.batteryData.String3Active.value == 'True' || - props.batteryData.String4Active.value == 0 + Number(props.batteryData.String3Active.value) == 0 ? '#32CD32' : '#FF033E' }} @@ -365,7 +365,7 @@ function DetailedBatteryView(props: DetailedBatteryViewProps) { ...batteryStringStyle, backgroundColor: props.batteryData.String4Active.value == 'True' || - props.batteryData.String4Active.value == 0 + Number(props.batteryData.String4Active.value) == 0 ? '#32CD32' : '#FF033E' }} @@ -375,7 +375,7 @@ function DetailedBatteryView(props: DetailedBatteryViewProps) { ...batteryStringStyle, backgroundColor: props.batteryData.String5Active.value == 'True' || - props.batteryData.String4Active.value == 0 + Number(props.batteryData.String5Active.value) == 0 ? '#32CD32' : '#FF033E' }} @@ -639,6 +639,7 @@ function DetailedBatteryView(props: DetailedBatteryViewProps) { {/*----------------------------------------------------------------------------------------------------------------------------------*/} + {props.productNum === 0 && ( <> diff --git a/typescript/frontend-marios2/src/content/dashboards/Information/InformationSalidomo.tsx b/typescript/frontend-marios2/src/content/dashboards/Information/InformationSalidomo.tsx index 4c85105a5..b10e749d9 100644 --- a/typescript/frontend-marios2/src/content/dashboards/Information/InformationSalidomo.tsx +++ b/typescript/frontend-marios2/src/content/dashboards/Information/InformationSalidomo.tsx @@ -275,6 +275,19 @@ function InformationSalidomo(props: InformationSalidomoProps) { /> + {/*
*/} + {/* */} + {/* }*/} + {/* name="vrmLink"*/} + {/* value={formValues.vrmLink}*/} + {/* onChange={handleChange}*/} + {/* variant="outlined"*/} + {/* fullWidth*/} + {/* />*/} + {/*
*/} +