File tree Expand file tree Collapse file tree 4 files changed +38
-5
lines changed Expand file tree Collapse file tree 4 files changed +38
-5
lines changed Original file line number Diff line number Diff line change @@ -300,9 +300,9 @@ func (e *Engine) LogModify(m EventModifyValue) {
300
300
Timestamp : e .TimeProvider ().UnixNano (),
301
301
StageTime : e .State .StageTimeElapsed ,
302
302
Type : RefereeEventModify ,
303
- Name : "modify" ,
303
+ Name : m . Type () ,
304
304
Team : team ,
305
- Description : m .String (),
305
+ Description : m .Value (),
306
306
}
307
307
e .RefereeEvents = append (e .RefereeEvents , refereeEvent )
308
308
}
Original file line number Diff line number Diff line change @@ -3,6 +3,8 @@ package controller
3
3
import (
4
4
"encoding/json"
5
5
"fmt"
6
+ "log"
7
+ "reflect"
6
8
"time"
7
9
)
8
10
@@ -122,6 +124,31 @@ func (m EventModifyValue) String() string {
122
124
return string (b )
123
125
}
124
126
127
+ func (m EventModifyValue ) Type () string {
128
+ v := reflect .ValueOf (m )
129
+ for i := 0 ; i < v .NumField (); i ++ {
130
+ fieldName := v .Type ().Field (i ).Name
131
+ log .Print (fieldName , " " , v .Field (i ))
132
+ if fieldName != "ForTeam" && ! v .Field (i ).IsNil () {
133
+ return fieldName
134
+ }
135
+ }
136
+ return "unknown"
137
+ }
138
+
139
+ func (m EventModifyValue ) Value () string {
140
+ v := reflect .ValueOf (m )
141
+ for i := 0 ; i < v .NumField (); i ++ {
142
+ fieldName := v .Type ().Field (i ).Name
143
+ log .Print (fieldName , " " , v .Field (i ))
144
+ if fieldName != "ForTeam" && ! v .Field (i ).IsNil () {
145
+ b , _ := json .Marshal (v .Field (i ).Interface ())
146
+ return string (b )
147
+ }
148
+ }
149
+ return "unknown"
150
+ }
151
+
125
152
// EventTrigger is an event that can be applied
126
153
type EventTrigger struct {
127
154
Type TriggerType `json:"triggerType"`
Original file line number Diff line number Diff line change 100
100
#app-header {
101
101
display : flex ;
102
102
flex-direction : row ;
103
- flex-wrap : wrap-reverse ;
103
+ flex-wrap : wrap ;
104
104
justify-content : space-between ;
105
105
align-items : baseline ;
106
106
align-content : flex-start ;
135
135
flex-grow : 1 ;
136
136
}
137
137
138
+ @media only screen and (max-width : 1600px ) {
139
+ .main-middle-container {
140
+ order : 10 ;
141
+ }
142
+ }
143
+
138
144
@-moz-document url-prefix() {
139
145
/* CSS-Hack for limiting following style to Firefox only */
140
146
.main-middle-container {
Original file line number Diff line number Diff line change 1
1
<template >
2
- <span class =" control-general" >
2
+ <div class =" control-general" >
3
3
<span v-b-tooltip.hover
4
4
:title =" 'Immediately stop all robots (' + Object.keys(keymapHalt)[0] + ')'" >
5
5
<b-button v-hotkey =" keymapHalt"
59
59
Manual
60
60
</label >
61
61
</div >
62
- </span >
62
+ </div >
63
63
</template >
64
64
65
65
<script >
You can’t perform that action at this time.
0 commit comments