File tree Expand file tree Collapse file tree 4 files changed +8
-1
lines changed
FrontPage/MissionOverview Expand file tree Collapse file tree 4 files changed +8
-1
lines changed Original file line number Diff line number Diff line change @@ -2,6 +2,7 @@ import { tokens } from '@equinor/eds-tokens'
2
2
import { Icon , Typography } from '@equinor/eds-core-react'
3
3
import styled from 'styled-components'
4
4
import { Icons } from 'utils/icons'
5
+ import { BatteryStatus } from 'models/Battery'
5
6
6
7
const BatteryAlignment = styled . div `
7
8
display: flex;
@@ -12,13 +13,15 @@ const StyledTypography = styled(Typography)<{ $fontSize?: 24 | 16 | 18 | 32 | 40
12
13
`
13
14
interface BatteryStatusDisplayProps {
14
15
batteryLevel ?: number
16
+ batteryState ?: BatteryStatus
15
17
itemSize ?: 24 | 16 | 18 | 32 | 40 | 48 | undefined
16
18
batteryWarningLimit ?: number
17
19
textAlignedBottom ?: boolean
18
20
}
19
21
20
22
export const BatteryStatusDisplay = ( {
21
23
batteryLevel,
24
+ batteryState,
22
25
itemSize,
23
26
batteryWarningLimit,
24
27
textAlignedBottom,
@@ -27,6 +30,8 @@ export const BatteryStatusDisplay = ({
27
30
28
31
const getBatteryIcon = ( batteryLevel ?: number ) => {
29
32
switch ( true ) {
33
+ case batteryState === BatteryStatus . Charging :
34
+ return Icons . BatteryCharging
30
35
case batteryLevel === null || batteryLevel === undefined :
31
36
return Icons . BatteryUnknown
32
37
case ! batteryWarningLimit || batteryLevel ! > batteryWarningLimit :
Original file line number Diff line number Diff line change @@ -145,6 +145,7 @@ export const RobotCard = ({ robot }: { robot: Robot }) => {
145
145
< AttributeTitleTypography > { TranslateText ( 'Battery' ) } </ AttributeTitleTypography >
146
146
< BatteryStatusDisplay
147
147
batteryLevel = { robot . batteryLevel }
148
+ batteryState = { robot . batteryState }
148
149
batteryWarningLimit = { robot . model . batteryWarningThreshold }
149
150
/>
150
151
</ VerticalContent >
Original file line number Diff line number Diff line change @@ -137,6 +137,7 @@ export const RobotPage = () => {
137
137
< BatteryStatusDisplay
138
138
itemSize = { 32 }
139
139
batteryLevel = { selectedRobot . batteryLevel }
140
+ batteryState = { selectedRobot . batteryState }
140
141
batteryWarningLimit = { selectedRobot . model . batteryWarningThreshold }
141
142
/>
142
143
{ selectedRobot . pressureLevel !== null &&
Original file line number Diff line number Diff line change @@ -28,7 +28,7 @@ export interface Robot {
28
28
serialNumber ?: string
29
29
currentInstallation : Installation
30
30
batteryLevel ?: number
31
- batteryStatus ?: BatteryStatus
31
+ batteryState ?: BatteryStatus
32
32
pressureLevel ?: number
33
33
pose ?: Pose
34
34
status : RobotStatus
You can’t perform that action at this time.
0 commit comments