diff --git a/frontend/src/components/Displays/MissionButtons/MissionControlButtons.tsx b/frontend/src/components/Displays/MissionButtons/MissionControlButtons.tsx
index e2d540bc..e24c6eb6 100644
--- a/frontend/src/components/Displays/MissionButtons/MissionControlButtons.tsx
+++ b/frontend/src/components/Displays/MissionButtons/MissionControlButtons.tsx
@@ -5,7 +5,7 @@ import styled from 'styled-components'
import { Typography } from '@equinor/eds-core-react'
import { useLanguageContext } from 'components/Contexts/LanguageContext'
import { useMissionControlContext } from 'components/Contexts/MissionControlContext'
-import { StopMissionDialog, MissionStatusRequest } from 'components/Pages/FrontPage/MissionOverview/StopDialogs'
+import { SkipMissionDialog, MissionStatusRequest } from 'components/Pages/FrontPage/MissionOverview/StopDialogs'
import { TaskType } from 'models/Task'
import { useState } from 'react'
@@ -80,7 +80,7 @@ const OngoingMissionButton = ({ missionName, robotId, missionTaskType }: Mission
const { TranslateText } = useLanguageContext()
const { updateRobotMissionState } = useMissionControlContext()
const [isDialogOpen, setIsDialogOpen] = useState(false)
- const toggleStopMissionDialog = () => {
+ const toggleSkipMissionDialog = () => {
setIsDialogOpen(!isDialogOpen)
}
@@ -96,16 +96,16 @@ const OngoingMissionButton = ({ missionName, robotId, missionTaskType }: Mission
{TranslateText('Pause')}
-
+
{TranslateText('Stop')}
-
@@ -116,7 +116,7 @@ const PausedMissionButton = ({ missionName, robotId, missionTaskType }: MissionP
const { TranslateText } = useLanguageContext()
const { updateRobotMissionState } = useMissionControlContext()
const [isDialogOpen, setIsDialogOpen] = useState(false)
- const toggleStopMissionDialog = () => {
+ const toggleSkipMissionDialog = () => {
setIsDialogOpen(!isDialogOpen)
}
@@ -132,16 +132,16 @@ const PausedMissionButton = ({ missionName, robotId, missionTaskType }: MissionP
{TranslateText('Start')}
-
+
{TranslateText('Stop')}
-
diff --git a/frontend/src/components/Pages/FrontPage/MissionOverview/StopDialogs.tsx b/frontend/src/components/Pages/FrontPage/MissionOverview/StopDialogs.tsx
index 3bbd72f2..9b657a96 100644
--- a/frontend/src/components/Pages/FrontPage/MissionOverview/StopDialogs.tsx
+++ b/frontend/src/components/Pages/FrontPage/MissionOverview/StopDialogs.tsx
@@ -56,10 +56,10 @@ const DialogContent = ({ missionTaskType }: { missionTaskType: TaskType | undefi
return (
- {TranslateText('Stop button pressed during localization warning text')}
+ {TranslateText('Skip button pressed during localization warning text')}
- {TranslateText('Stop button pressed confirmation text')}
+ {TranslateText('Skip button pressed confirmation text')}
)
@@ -67,19 +67,19 @@ const DialogContent = ({ missionTaskType }: { missionTaskType: TaskType | undefi
return (
- {TranslateText('Stop button pressed during return home warning text')}
+ {TranslateText('Skip button pressed during return home warning text')}
- {TranslateText('Stop button pressed confirmation text')}
+ {TranslateText('Skip button pressed confirmation text')}
)
case TaskType.Inspection:
return (
- {TranslateText('Stop button pressed warning text')}
+ {TranslateText('Skip button pressed warning text')}
- {TranslateText('Stop button pressed confirmation text')}
+ {TranslateText('Skip button pressed confirmation text')}
)
@@ -87,32 +87,32 @@ const DialogContent = ({ missionTaskType }: { missionTaskType: TaskType | undefi
return (
- {TranslateText('Stop button pressed with no tasktype warning text')}
+ {TranslateText('Skip button pressed with no tasktype warning text')}
- {TranslateText('Stop button pressed with no mission confirmation text')}
+ {TranslateText('Skip button pressed with no mission confirmation text')}
)
}
}
-export const StopMissionDialog = ({
+export const SkipMissionDialog = ({
missionName,
robotId,
missionTaskType,
- isStopMissionDialogOpen,
+ isSkipMissionDialogOpen,
toggleDialog,
-}: MissionProps & { isStopMissionDialogOpen: boolean; toggleDialog: () => void }): JSX.Element => {
+}: MissionProps & { isSkipMissionDialogOpen: boolean; toggleDialog: () => void }): JSX.Element => {
const { TranslateText } = useLanguageContext()
const { updateRobotMissionState } = useMissionControlContext()
return (
-
+
- {missionName ? TranslateText('Stop mission:') : TranslateText('No mission running')}{' '}
+ {missionName ? TranslateText('Skip mission:') : TranslateText('No mission running')}{' '}
{missionName}
@@ -130,7 +130,7 @@ export const StopMissionDialog = ({
color="danger"
onClick={() => updateRobotMissionState(MissionStatusRequest.Stop, robotId)}
>
- {TranslateText('Stop mission')}
+ {TranslateText('Skip mission')}
diff --git a/frontend/src/language/en.json b/frontend/src/language/en.json
index 3561a980..cb0b2cf0 100644
--- a/frontend/src/language/en.json
+++ b/frontend/src/language/en.json
@@ -80,10 +80,10 @@
"East": "East",
"South": "South",
"West": "West",
- "Stop button pressed warning text": "You are about to stop the entire mission. If there are no more missions in the queue, the robot will return to the start position.",
- "Stop button pressed confirmation text": "Are you sure you want to stop the mission?",
- "Stop mission": "Stop mission",
- "Stop mission:": "Stop mission: ",
+ "Skip button pressed warning text": "You are about to skip the entire mission. If there are no more missions in the queue, the robot will return to the start position.",
+ "Skip button pressed confirmation text": "Are you sure you want to skip the mission?",
+ "Skip mission": "Skip mission",
+ "Skip mission:": "Skip mission: ",
"Search for missions": "Search for missions",
"Search for a tag": "Search for a tag",
"Search for a robot name": "Search for a robot name",
@@ -218,9 +218,9 @@
"Dock": "Dock",
"Dock successful text": "The robots are docked and will not run missions. To continue the mission press the 'Dismiss from dock' button.",
"Connection Issues": "Connection Issues",
- "Stop button pressed during return home warning text": "You are about to stop a mission that will send the robot back to the start position. You must manually drive the robot to the start position to start a new mission.",
+ "Skip button pressed during return home warning text": "You are about to skip a mission that will send the robot back to the start position. You must manually drive the robot to the start position to start a new mission.",
"Failed Telemetry": "Failed Telemetry",
- "Stop button pressed during localization warning text": "You are about to stop a mission that localizes the robot. You will not be able to run an inspection mission until you have successfully localized the robot.",
+ "Skip button pressed during localization warning text": "You are about to skip a mission that localizes the robot. You will not be able to run an inspection mission until you have successfully localized the robot.",
"HighHigh": "HighHigh",
"High": "High",
"Ok": "Ok",
@@ -263,9 +263,9 @@
"Open mission": "Open mission",
"Open robot information": "Open robot information",
"Not available": "Not available",
- "Stop button pressed with no tasktype warning text": "A stop command was recieved with no ongoing tasks.",
+ "Skip button pressed with no tasktype warning text": "A skip command was recieved with no ongoing tasks.",
"No mission running": "No Flotilla mission is running",
- "Stop button pressed with no mission confirmation text": "Do you want to send the stop command to the robot regardless?",
+ "Skip button pressed with no mission confirmation text": "Do you want to send the command to stop current mission to the robot regardless?",
"Tag": "Tag",
"Timestamp": "Timestamp",
"Last completed inspection": "Last completed inspection",
diff --git a/frontend/src/language/no.json b/frontend/src/language/no.json
index 74469382..8c0628cd 100644
--- a/frontend/src/language/no.json
+++ b/frontend/src/language/no.json
@@ -80,10 +80,10 @@
"East": "Øst",
"South": "Sør",
"West": "Vest",
- "Stop button pressed warning text": "Du er i ferd med å stoppe hele oppdraget. Hvis det ikke er flere oppdrag i kø vil roboten bli sendt tilbake til startposisjonen sin.",
- "Stop button pressed confirmation text": "Er du sikker på at du vil stoppe oppdraget?",
- "Stop mission": "Stopp oppdraget",
- "Stop mission:": "Stopp oppdrag: ",
+ "Skip button pressed warning text": "Du er i ferd med å hoppe over hele oppdraget. Hvis det ikke er flere oppdrag i kø vil roboten bli sendt tilbake til startposisjonen sin.",
+ "Skip button pressed confirmation text": "Er du sikker på at du vil hoppe over oppdraget?",
+ "Skip mission": "Hopp over oppdraget",
+ "Skip mission:": "Hopp over oppdrag: ",
"Search for missions": "Søk etter oppdrag",
"Search for a tag": "Søk etter tag",
"Search for a robot name": "Søk etter robotnavn",
@@ -218,9 +218,9 @@
"Dock": "Ladestasjon",
"Dock successful text": "Robotene er i ladestasjonen og vil ikke kjøre oppdrag. For å fortsette oppdrag trykk på knappen 'Slipp robotene ut fra ladestasjon'.",
"Connection Issues": "Tilkoblings\u00adproblemer",
- "Stop button pressed during return home warning text": "Du er i ferd med å stoppe et oppdrag som sender roboten tilbake til startposisjonen. Du må kjøre roboten manuelt til startposisjonen for å starte et nytt oppdrag.",
+ "Skip button pressed during return home warning text": "Du er i ferd med å hoppe over et oppdrag som sender roboten tilbake til startposisjonen. Du må kjøre roboten manuelt til startposisjonen for å starte et nytt oppdrag.",
"Failed Telemetry": "Mislykket telemetri",
- "Stop button pressed during localization warning text": "Du er i ferd med å stoppe et oppdrag som lokaliserer roboten. Du vil ikke kunne kjøre et inspeksjonsoppdrag før du har lokalisert roboten.",
+ "Skip button pressed during localization warning text": "Du er i ferd med å hoppe over et oppdrag som lokaliserer roboten. Du vil ikke kunne kjøre et inspeksjonsoppdrag før du har lokalisert roboten.",
"HighHigh": "HøyHøy",
"High": "Høy",
"Ok": "Ok",
@@ -264,8 +264,8 @@
"Open robot information": "Åpne robotinformasjon",
"Not available": "Ikke tilgjengelig",
"No mission running": "Ingen pågående Flotilla oppdrag",
- "Stop button pressed with no tasktype warning text": "Et stopp signal ble mottat uten noen pågående oppdrag.",
- "Stop button pressed with no mission confirmation text": "Ønsker du å sende stopp signalet til roboten likevel?",
+ "Skip button pressed with no tasktype warning text": "Et signal om å hoppe over oppdraget ble mottat uten noen pågående oppdrag.",
+ "Skip button pressed with no mission confirmation text": "Ønsker du å sende signalet om å stoppe nåværende oppdrag til roboten likevel?",
"Tag": "Tag",
"Timestamp": "Tidspunkt",
"Last completed inspection": "Siste gjennomførte inspeksjon",