Skip to content

Commit fb94e09

Browse files
committed
Use battery charging symbol when robot is charging
1 parent 19dbea3 commit fb94e09

File tree

4 files changed

+8
-1
lines changed

4 files changed

+8
-1
lines changed

frontend/src/components/Displays/RobotDisplays/BatteryStatusDisplay.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { tokens } from '@equinor/eds-tokens'
22
import { Icon, Typography } from '@equinor/eds-core-react'
33
import styled from 'styled-components'
44
import { Icons } from 'utils/icons'
5+
import { BatteryStatus } from 'models/Battery'
56

67
const BatteryAlignment = styled.div`
78
display: flex;
@@ -12,13 +13,15 @@ const StyledTypography = styled(Typography)<{ $fontSize?: 24 | 16 | 18 | 32 | 40
1213
`
1314
interface BatteryStatusDisplayProps {
1415
batteryLevel?: number
16+
batteryState?: BatteryStatus
1517
itemSize?: 24 | 16 | 18 | 32 | 40 | 48 | undefined
1618
batteryWarningLimit?: number
1719
textAlignedBottom?: boolean
1820
}
1921

2022
export const BatteryStatusDisplay = ({
2123
batteryLevel,
24+
batteryState,
2225
itemSize,
2326
batteryWarningLimit,
2427
textAlignedBottom,
@@ -27,6 +30,8 @@ export const BatteryStatusDisplay = ({
2730

2831
const getBatteryIcon = (batteryLevel?: number) => {
2932
switch (true) {
33+
case batteryState === BatteryStatus.Charging:
34+
return Icons.BatteryCharging
3035
case batteryLevel === null || batteryLevel === undefined:
3136
return Icons.BatteryUnknown
3237
case !batteryWarningLimit || batteryLevel! > batteryWarningLimit:

frontend/src/components/Pages/FrontPage/MissionOverview/RobotCard.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ export const RobotCard = ({ robot }: { robot: Robot }) => {
145145
<AttributeTitleTypography>{TranslateText('Battery')}</AttributeTitleTypography>
146146
<BatteryStatusDisplay
147147
batteryLevel={robot.batteryLevel}
148+
batteryState={robot.batteryState}
148149
batteryWarningLimit={robot.model.batteryWarningThreshold}
149150
/>
150151
</VerticalContent>

frontend/src/components/Pages/RobotPage/RobotPage.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ export const RobotPage = () => {
137137
<BatteryStatusDisplay
138138
itemSize={32}
139139
batteryLevel={selectedRobot.batteryLevel}
140+
batteryState={selectedRobot.batteryState}
140141
batteryWarningLimit={selectedRobot.model.batteryWarningThreshold}
141142
/>
142143
{selectedRobot.pressureLevel !== null &&

frontend/src/models/Robot.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export interface Robot {
2828
serialNumber?: string
2929
currentInstallation: Installation
3030
batteryLevel?: number
31-
batteryStatus?: BatteryStatus
31+
batteryState?: BatteryStatus
3232
pressureLevel?: number
3333
pose?: Pose
3434
status: RobotStatus

0 commit comments

Comments
 (0)