Skip to content

Commit 512d623

Browse files
committed
Move Halt button above continue buttons
1 parent d911019 commit 512d623

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

frontend/src/components/control/HaltButton.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const sendCommand = () => {
1313
}
1414
1515
const disable = computed(() => {
16-
return store.matchState.command?.type === Command_Type.HALT
16+
return store.matchState.command?.type === Command_Type.HALT || store.matchState.command?.type === Command_Type.TIMEOUT
1717
})
1818
1919
</script>

frontend/src/views/MatchView.vue

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import SwitchColorButton from "@/components/start/SwitchColorButton.vue";
1212
import {useMatchStateStore} from "@/store/matchState";
1313
import {Referee_Stage} from "@/proto/ssl_gc_referee_message";
1414
import SwitchSidesButton from "@/components/start/SwitchSidesButton.vue";
15+
import HaltButton from "@/components/control/HaltButton.vue";
1516
1617
const store = useMatchStateStore()
1718
const gcStore = useGcStateStore()
@@ -106,6 +107,9 @@ onUnmounted(() => {
106107
{{ hint.message }}
107108
</div>
108109
</template>
110+
<div class="column">
111+
<HaltButton class="col"/>
112+
</div>
109113
<ContinueActionButtonList/>
110114
</div>
111115
<div class="col q-gutter-md q-mr-md" style="min-width: 300px">

internal/app/engine/process_continue_next_action.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -182,15 +182,6 @@ func (e *Engine) nextActions() (actions []*ContinueAction, hints []*ContinueHint
182182
actions = append(actions, continueFromHalt)
183183
}
184184

185-
if *e.currentState.Command.Type != state.Command_HALT &&
186-
*e.currentState.Command.Type != state.Command_TIMEOUT {
187-
actions = append(actions, createContinueAction(
188-
ContinueAction_HALT,
189-
state.Team_UNKNOWN,
190-
ContinueAction_READY_MANUAL,
191-
))
192-
}
193-
194185
return
195186
}
196187

0 commit comments

Comments
 (0)