From 42ba224603b6068f5c72e0c74dfe0d4343b83034 Mon Sep 17 00:00:00 2001
From: Noe <noe@devnullmail.com>
Date: Mon, 3 Jun 2024 13:16:09 +0200
Subject: [PATCH] Fixed bugs in warnings and alarms representation (front end)

---
 .../dashboards/BatteryView/BatteryView.tsx    | 106 ++++++++++++++++++
 .../BatteryView/DetailedBatteryView.tsx       |  11 +-
 .../Information/InformationSalidomo.tsx       |  13 +++
 3 files changed, 125 insertions(+), 5 deletions(-)

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) {
                         </TableCell>
                       </>
                     )}
+
+                    {props.productNum === 1 && (
+                      <>
+                        <TableCell
+                          style={{
+                            width: '20%',
+                            textAlign: 'center',
+                            padding: '8px',
+                            fontWeight:
+                              Number(battery.Warnings.value) !== 0
+                                ? 'bold'
+                                : 'inherit',
+                            backgroundColor:
+                              Number(battery.Warnings.value) === 0
+                                ? 'inherit'
+                                : '#ff9900',
+                            color:
+                              Number(battery.Warnings.value) != 0
+                                ? 'black'
+                                : 'inherit'
+                          }}
+                        >
+                          {Number(battery.Warnings.value) === 0 ? (
+                            'None'
+                          ) : Number(battery.Warnings.value) === 1 ? (
+                            <Link
+                              style={{ color: 'black' }}
+                              to={
+                                currentLocation.pathname.substring(
+                                  0,
+                                  currentLocation.pathname.lastIndexOf('/') + 1
+                                ) +
+                                routes.log +
+                                '?open=warning'
+                              }
+                            >
+                              New Warning
+                            </Link>
+                          ) : (
+                            <Link
+                              style={{ color: 'black' }}
+                              to={
+                                currentLocation.pathname.substring(
+                                  0,
+                                  currentLocation.pathname.lastIndexOf('/') + 1
+                                ) +
+                                routes.log +
+                                '?open=warning'
+                              }
+                            >
+                              Multiple Warnings
+                            </Link>
+                          )}
+                        </TableCell>
+                        <TableCell
+                          sx={{
+                            width: '20%',
+                            textAlign: 'center',
+                            fontWeight:
+                              Number(battery.Alarms.value) !== 0
+                                ? 'bold'
+                                : 'inherit',
+                            backgroundColor:
+                              Number(battery.Alarms.value) === 0
+                                ? 'inherit'
+                                : '#FF033E',
+                            color:
+                              Number(battery.Alarms.value) != 0
+                                ? 'black'
+                                : 'inherit'
+                          }}
+                        >
+                          {Number(battery.Alarms.value) === 0 ? (
+                            'None'
+                          ) : Number(battery.Alarms.value) === 1 ? (
+                            <Link
+                              style={{ color: 'black' }}
+                              to={
+                                currentLocation.pathname.substring(
+                                  0,
+                                  currentLocation.pathname.lastIndexOf('/') + 1
+                                ) +
+                                routes.log +
+                                '?open=error'
+                              }
+                            >
+                              New Alarm
+                            </Link>
+                          ) : (
+                            <Link
+                              style={{ color: 'black' }}
+                              to={
+                                currentLocation.pathname.substring(
+                                  0,
+                                  currentLocation.pathname.lastIndexOf('/') + 1
+                                ) +
+                                routes.log +
+                                '?open=error'
+                              }
+                            >
+                              Multiple Alarms
+                            </Link>
+                          )}
+                        </TableCell>
+                      </>
+                    )}
                   </TableRow>
                 ))}
               </TableBody>
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) {
         </Card>
       </Grid>
       {/*----------------------------------------------------------------------------------------------------------------------------------*/}
+
       {props.productNum === 0 && (
         <>
           <Grid item md={3} xs={3}>
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) {
                   />
                 </div>
 
+                {/*<div>*/}
+                {/*  <TextField*/}
+                {/*    label={*/}
+                {/*      <FormattedMessage id="vrmLink" defaultMessage="vrmLink" />*/}
+                {/*    }*/}
+                {/*    name="vrmLink"*/}
+                {/*    value={formValues.vrmLink}*/}
+                {/*    onChange={handleChange}*/}
+                {/*    variant="outlined"*/}
+                {/*    fullWidth*/}
+                {/*  />*/}
+                {/*</div>*/}
+
                 <div>
                   <TextField
                     label="S3 Bucket Name"