Skip to content

Commit b520469

Browse files
Techno11Techno11
committed
hotfixes
1 parent 332211a commit b520469

8 files changed

Lines changed: 38 additions & 28 deletions

File tree

‎ems-core/src/components/game-specifics/frc22/FRC22BlueScorecard.tsx‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class FRC22BlueScorecard extends React.Component<IProps> {
5454
const details = this.getDetails();
5555
const disabled = this.props.matchState === MatchState.MATCH_IN_PROGRESS || match === null || typeof match.matchDetails === "undefined";
5656
return (
57-
<Card fluid={true} className="scorecard blue-bg">
57+
<Card className="scorecard blue-bg">
5858
<Card.Content className="center-items card-header"><Card.Header>Blue Alliance Scorecard</Card.Header></Card.Content>
5959
<Card.Content>
6060
<FRC20TeamStatus alliance={"Blue"} />
@@ -63,13 +63,13 @@ class FRC22BlueScorecard extends React.Component<IProps> {
6363
<Form>
6464
<Grid className="details">
6565
<Grid.Row columns="equal" textAlign="center">
66-
<Grid.Column><Form.Checkbox disabled={disabled} fluid={true} label="Auto Robot 1 Taxied" checked={this.boolCheck(details.blueAutoTaxiRobot1)} onChange={this.modifyRobotOneTaxi}/></Grid.Column>
67-
<Grid.Column><Form.Checkbox disabled={disabled} fluid={true} label="Auto Robot 2 Taxied" checked={this.boolCheck(details.blueAutoTaxiRobot2)} onChange={this.modifyRobotTwoTaxi}/></Grid.Column>
68-
<Grid.Column><Form.Checkbox disabled={disabled} fluid={true} label="Auto Robot 3 Taxied" checked={this.boolCheck(details.blueAutoTaxiRobot3)} onChange={this.modifyRobotThreeTaxi}/></Grid.Column>
66+
<Grid.Column><Form.Checkbox disabled={disabled} label="Auto Robot 1 Taxied" checked={this.boolCheck(details.blueAutoTaxiRobot1)} onChange={this.modifyRobotOneTaxi}/></Grid.Column>
67+
<Grid.Column><Form.Checkbox disabled={disabled} label="Auto Robot 2 Taxied" checked={this.boolCheck(details.blueAutoTaxiRobot2)} onChange={this.modifyRobotTwoTaxi}/></Grid.Column>
68+
<Grid.Column><Form.Checkbox disabled={disabled} label="Auto Robot 3 Taxied" checked={this.boolCheck(details.blueAutoTaxiRobot3)} onChange={this.modifyRobotThreeTaxi}/></Grid.Column>
6969
</Grid.Row>
7070
<Grid.Row columns="equal" textAlign="center">
71-
<Grid.Column className="align-bottom"><Form.Input disabled={disabled} fluid={true} label="Auto Low Cargo" value={details.blueAutoCargoLow} onChange={this.modifyAutoLowCargo}/></Grid.Column>
72-
<Grid.Column className="align-bottom"><Form.Input disabled={disabled} fluid={true} label="Auto High Cargo" value={details.blueAutoCargoHigh} onChange={this.modifyAutoHighCargo}/></Grid.Column>
71+
<Grid.Column className="align-bottom"><Form.Input disabled={disabled} label="Auto Low Cargo" value={details.blueAutoCargoLow} onChange={this.modifyAutoLowCargo}/></Grid.Column>
72+
<Grid.Column className="align-bottom"><Form.Input disabled={disabled} label="Auto High Cargo" value={details.blueAutoCargoHigh} onChange={this.modifyAutoHighCargo}/></Grid.Column>
7373
</Grid.Row>
7474
</Grid>
7575
</Form>
@@ -78,8 +78,8 @@ class FRC22BlueScorecard extends React.Component<IProps> {
7878
<Form>
7979
<Grid className="details">
8080
<Grid.Row columns="equal" textAlign="center">
81-
<Grid.Column className="align-bottom"><Form.Input disabled={disabled} fluid={true} label="Tele Low Cargo" value={details.blueTeleCargoLow} onChange={this.modifyTeleLowCargo}/></Grid.Column>
82-
<Grid.Column className="align-bottom"><Form.Input disabled={disabled} fluid={true} label="Tele High Cargo" value={details.blueTeleCargoHigh} onChange={this.modifyTeleHighCargo}/></Grid.Column>
81+
<Grid.Column className="align-bottom"><Form.Input disabled={disabled} label="Tele Low Cargo" value={details.blueTeleCargoLow} onChange={this.modifyTeleLowCargo}/></Grid.Column>
82+
<Grid.Column className="align-bottom"><Form.Input disabled={disabled} label="Tele High Cargo" value={details.blueTeleCargoHigh} onChange={this.modifyTeleHighCargo}/></Grid.Column>
8383
</Grid.Row>
8484
</Grid>
8585
</Form>
@@ -88,8 +88,8 @@ class FRC22BlueScorecard extends React.Component<IProps> {
8888
<Form>
8989
<Grid className="details">
9090
<Grid.Row columns="equal" textAlign="center">
91-
<Grid.Column><Form.Checkbox disabled={disabled} fluid={true} label="Hangar Bonus?" checked={this.boolCheck(details.blueHangarBonus)} onChange={this.modifyHangarBonus}/></Grid.Column>
92-
<Grid.Column><Form.Checkbox disabled={disabled} fluid={true} label="Cargo Bonus?" checked={this.boolCheck(details.blueCargoBonus)} onChange={this.modifyCargoBonus}/></Grid.Column>
91+
<Grid.Column><Form.Checkbox disabled={disabled} label="Hangar Bonus?" checked={this.boolCheck(details.blueHangarBonus)} onChange={this.modifyHangarBonus}/></Grid.Column>
92+
<Grid.Column><Form.Checkbox disabled={disabled} label="Cargo Bonus?" checked={this.boolCheck(details.blueCargoBonus)} onChange={this.modifyCargoBonus}/></Grid.Column>
9393
</Grid.Row>
9494
</Grid>
9595
</Form>
@@ -98,9 +98,9 @@ class FRC22BlueScorecard extends React.Component<IProps> {
9898
<Form>
9999
<Grid className="details">
100100
<Grid.Row columns="equal" textAlign="center">
101-
<Grid.Column><Form.Dropdown disabled={disabled} fluid={true} label="Robot 1 Endgame" value={details.blueHangerRobot1} options={DropdownData.RapidReactEndItems} onChange={this.modifyRobotOneEndgame}/></Grid.Column>
102-
<Grid.Column><Form.Dropdown disabled={disabled} fluid={true} label="Robot 2 Endgame" value={details.blueHangerRobot2} options={DropdownData.RapidReactEndItems} onChange={this.modifyRobotTwoEndgame}/></Grid.Column>
103-
<Grid.Column><Form.Dropdown disabled={disabled} fluid={true} label="Robot 3 Endgame" value={details.blueHangerRobot3} options={DropdownData.RapidReactEndItems} onChange={this.modifyRobotThreeEndgame}/></Grid.Column>
101+
<Grid.Column><Form.Dropdown disabled={disabled} label="Robot 1 Endgame" value={details.blueHangerRobot1} options={DropdownData.RapidReactEndItems} onChange={this.modifyRobotOneEndgame}/></Grid.Column>
102+
<Grid.Column><Form.Dropdown disabled={disabled} label="Robot 2 Endgame" value={details.blueHangerRobot2} options={DropdownData.RapidReactEndItems} onChange={this.modifyRobotTwoEndgame}/></Grid.Column>
103+
<Grid.Column><Form.Dropdown disabled={disabled} label="Robot 3 Endgame" value={details.blueHangerRobot3} options={DropdownData.RapidReactEndItems} onChange={this.modifyRobotThreeEndgame}/></Grid.Column>
104104
</Grid.Row>
105105
</Grid>
106106
</Form>
@@ -109,8 +109,8 @@ class FRC22BlueScorecard extends React.Component<IProps> {
109109
<Form>
110110
<Grid className="details">
111111
<Grid.Row columns="equal" textAlign="center">
112-
<Grid.Column><Form.Input disabled={disabled} fluid={true} label="Fouls (4pt)" value={match.blueMinPen} onChange={this.modifyMinorPenalties}/></Grid.Column>
113-
<Grid.Column><Form.Input disabled={disabled} fluid={true} label="Tech Fouls (8pt)" value={match.blueMajPen} onChange={this.modifyMajorPenalties}/></Grid.Column>
112+
<Grid.Column><Form.Input disabled={disabled} label="Fouls (4pt)" value={match.blueMinPen} onChange={this.modifyMinorPenalties}/></Grid.Column>
113+
<Grid.Column><Form.Input disabled={disabled} label="Tech Fouls (8pt)" value={match.blueMajPen} onChange={this.modifyMajorPenalties}/></Grid.Column>
114114
</Grid.Row>
115115
<Grid.Row>
116116
<Grid.Column>Score: {match.blueScore}</Grid.Column>

‎ems-core/src/components/game-specifics/frc22/FRC22RedScorecard.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ class RoverRuckusRedScorecard extends React.Component<IProps> {
6464
<Form>
6565
<Grid className="details">
6666
<Grid.Row columns="equal" textAlign="center">
67-
<Grid.Column><Form.Checkbox disabled={disabled} fluid={true} label="Auto Robot 1 Taxied" checked={this.boolCheck(details.redAutoTaxiRobot1)} onChange={this.modifyRobotOneTaxi}/></Grid.Column>
68-
<Grid.Column><Form.Checkbox disabled={disabled} fluid={true} label="Auto Robot 2 Taxied" checked={this.boolCheck(details.redAutoTaxiRobot2)} onChange={this.modifyRobotTwoTaxi}/></Grid.Column>
69-
<Grid.Column><Form.Checkbox disabled={disabled} fluid={true} label="Auto Robot 3 Taxied" checked={this.boolCheck(details.redAutoTaxiRobot3)} onChange={this.modifyRobotThreeTaxi}/></Grid.Column>
67+
<Grid.Column><Form.Checkbox disabled={disabled} label="Auto Robot 1 Taxied" checked={this.boolCheck(details.redAutoTaxiRobot1)} onChange={this.modifyRobotOneTaxi}/></Grid.Column>
68+
<Grid.Column><Form.Checkbox disabled={disabled} label="Auto Robot 2 Taxied" checked={this.boolCheck(details.redAutoTaxiRobot2)} onChange={this.modifyRobotTwoTaxi}/></Grid.Column>
69+
<Grid.Column><Form.Checkbox disabled={disabled} label="Auto Robot 3 Taxied" checked={this.boolCheck(details.redAutoTaxiRobot3)} onChange={this.modifyRobotThreeTaxi}/></Grid.Column>
7070
</Grid.Row>
7171
<Grid.Row columns="equal" textAlign="center">
7272
<Grid.Column className="align-bottom"><Form.Input disabled={disabled} fluid={true} label="Auto Low Cargo" value={details.redAutoCargoLow} onChange={this.modifyAutoLowCargo}/></Grid.Column>
@@ -89,8 +89,8 @@ class RoverRuckusRedScorecard extends React.Component<IProps> {
8989
<Form>
9090
<Grid className="details">
9191
<Grid.Row columns="equal" textAlign="center">
92-
<Grid.Column><Form.Checkbox disabled={disabled} fluid={true} label="Hangar Bonus?" checked={this.boolCheck(details.redHangarBonus)} onChange={this.modifyHangarBonus}/></Grid.Column>
93-
<Grid.Column><Form.Checkbox disabled={disabled} fluid={true} label="Cargo Bonus?" checked={this.boolCheck(details.redCargoBonus)} onChange={this.modifyCargoBonus}/></Grid.Column>
92+
<Grid.Column><Form.Checkbox disabled={disabled} label="Hangar Bonus?" checked={this.boolCheck(details.redHangarBonus)} onChange={this.modifyHangarBonus}/></Grid.Column>
93+
<Grid.Column><Form.Checkbox disabled={disabled} label="Cargo Bonus?" checked={this.boolCheck(details.redCargoBonus)} onChange={this.modifyCargoBonus}/></Grid.Column>
9494
</Grid.Row>
9595
</Grid>
9696
</Form>

‎ems-core/src/views/match-play/containers/MatchPlay.tsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ class MatchPlay extends React.Component<IProps, IState> {
119119
});
120120

121121
const availableMatches = this.getMatchesByTournamentLevel(selectedLevel).map(match => {
122+
console.log(selectedLevel);
123+
console.log("here?");
122124
return {
123125
text: match.matchName,
124126
value: match.matchKey
@@ -396,6 +398,7 @@ class MatchPlay extends React.Component<IProps, IState> {
396398
}
397399

398400
private getMatchesByTournamentLevel(tournamentLevel: TournamentType): Match[] {
401+
console.log("double here: " + tournamentLevel);
399402
switch (tournamentLevel) {
400403
case "Test":
401404
return this.props.testMatches;

‎ref-tablet/src/App.css‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@
150150

151151
.state-switcher-container {
152152
width: 100%;
153+
height: 120px;
153154
display: flex;
154155
flex-direction: column;
155156
justify-content: space-around;
@@ -159,7 +160,7 @@
159160

160161
.state-switcher-team-container {
161162
width: 25%;
162-
height: 100%;
163+
height: 40px;
163164
display: flex;
164165
justify-content: center;
165166
align-items: center;
@@ -169,6 +170,10 @@
169170
margin-bottom: 10px;
170171
}
171172

173+
.ui.buttons {
174+
height: 100%;
175+
}
176+
172177
.state-switcher-state-container {
173178
width: 75%;
174179
height: 50%;
@@ -320,7 +325,7 @@
320325

321326
.robot-number-right {
322327
width: 100%;
323-
height: 100%;
328+
height: 80px;
324329
display: flex;
325330
justify-content: center;
326331
align-items: center;
@@ -329,6 +334,8 @@
329334

330335
.robot-number-item {
331336
width: 10vw !important;
337+
height: 100%;
338+
332339
text-align: center;
333340
margin: 5px 0 5px 0;
334341
}

‎ref-tablet/src/components/RobotButtonGroup.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class RobotButtonGroup extends React.Component<IProps> {
2929
let labelView;
3030

3131
if (typeof participant !== "undefined") {
32-
labelView = (<span>{participant.team ? participant.team.teamNameShort : participant.teamKey}</span>);
32+
labelView = (<span>{participant.teamKey} - {participant.team ? participant.team.teamNameShort : participant.teamKey}</span>);
3333
} else if (typeof label !== "undefined") {
3434
labelView = (<span>{label}</span>);
3535
}

‎ref-tablet/src/components/RobotCardStatus.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class RobotCardStatus extends React.Component<IProps> {
1818
return (
1919
<div className="robot-card-container">
2020
<div className="robot-card-team">
21-
{participant.team.teamNameShort}
21+
{`${participant.teamKey} - ${participant.team.teamNameShort}`}
2222
</div>
2323
<div className="robot-card-cards">
2424
<div className={"robot-card-none " + (selected === 0 ? "selected" : "")} onClick={this.updateSelected.bind(this, 0)}>None</div>

‎ref-tablet/src/views/frc_22/BlueAllianceView.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,14 +239,14 @@ class BlueAllianceView extends React.Component<IProps, IState> {
239239
return (
240240
<div>
241241
<Row>
242-
<Col sm={6}>
242+
<Col lg={6} md={12}>
243243
<Row>
244244
<Col sm={12}>
245245
{robotAutoLineViews}
246246
</Col>
247247
</Row>
248248
</Col>
249-
<Col sm={6}>
249+
<Col lg={6} md={12}>
250250
<Row>
251251
<Col sm={12}>
252252
<RobotButtonGroup value={details.blueHangarBonus ? 1 : 0} label={"Hangar Bonus"} states={["None", "Achieved"]} onChange={this.updateHangarBonus}/>

‎ref-tablet/src/views/frc_22/RedAllianceView.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,14 +239,14 @@ class RedAllianceView extends React.Component<IProps, IState> {
239239
return (
240240
<div>
241241
<Row>
242-
<Col sm={6}>
242+
<Col lg={6} md={12}>
243243
<Row>
244244
<Col sm={12}>
245245
{robotAutoLineViews}
246246
</Col>
247247
</Row>
248248
</Col>
249-
<Col sm={6}>
249+
<Col lg={6} md={12}>
250250
<Row>
251251
<Col sm={12}>
252252
<RobotButtonGroup value={details.redHangarBonus ? 1 : 0} label={"Hangar Bonus"} states={["None", "Achieved"]} onChange={this.updateHangarBonus}/>

0 commit comments

Comments
 (0)