Rename "round" to "set number" for the scouting match list
The Blue Alliance refers to what we call "round" as "set number". To
simplify everything, we should adopt the terminology that The Blue
Alliance uses. This patch converts all uses of "round" to "set
number".
Signed-off-by: Philipp Schrader <philipp.schrader@gmail.com>
Change-Id: Icc1b11554168fbb343e1fdfa597399951b2cb44d
diff --git a/scouting/www/app.ng.html b/scouting/www/app.ng.html
index 7bf7e63..297fd39 100644
--- a/scouting/www/app.ng.html
+++ b/scouting/www/app.ng.html
@@ -75,7 +75,7 @@
(switchTabsEvent)="switchTabTo($event)"
[teamNumber]="selectedTeamInMatch.teamNumber"
[matchNumber]="selectedTeamInMatch.matchNumber"
- [round]="selectedTeamInMatch.round"
+ [setNumber]="selectedTeamInMatch.setNumber"
[compLevel]="selectedTeamInMatch.compLevel"
*ngSwitchCase="'Entry'"
></app-entry>
diff --git a/scouting/www/app.ts b/scouting/www/app.ts
index 5180218..4f95c90 100644
--- a/scouting/www/app.ts
+++ b/scouting/www/app.ts
@@ -14,7 +14,7 @@
type TeamInMatch = {
teamNumber: number;
matchNumber: number;
- round: number;
+ setNumber: number;
compLevel: string;
};
@@ -27,7 +27,7 @@
selectedTeamInMatch: TeamInMatch = {
teamNumber: 1,
matchNumber: 1,
- round: 1,
+ setNumber: 1,
compLevel: 'qm',
};
tab: Tab = 'MatchList';
diff --git a/scouting/www/entry/entry.component.ts b/scouting/www/entry/entry.component.ts
index 9637e8c..d6829c5 100644
--- a/scouting/www/entry/entry.component.ts
+++ b/scouting/www/entry/entry.component.ts
@@ -54,7 +54,7 @@
@Output() switchTabsEvent = new EventEmitter<string>();
@Input() matchNumber: number = 1;
@Input() teamNumber: number = 1;
- @Input() round: number = 1;
+ @Input() setNumber: number = 1;
@Input() compLevel: CompLevel = 'qm';
autoUpperShotsMade: number = 0;
autoLowerShotsMade: number = 0;
@@ -135,7 +135,7 @@
SubmitDataScouting.startSubmitDataScouting(builder);
SubmitDataScouting.addTeam(builder, this.teamNumber);
SubmitDataScouting.addMatch(builder, this.matchNumber);
- SubmitDataScouting.addRound(builder, this.round);
+ SubmitDataScouting.addSetNumber(builder, this.setNumber);
SubmitDataScouting.addCompLevel(builder, compLevel);
SubmitDataScouting.addMissedShotsAuto(builder, this.autoShotsMissed);
SubmitDataScouting.addUpperGoalAuto(builder, this.autoUpperShotsMade);
diff --git a/scouting/www/entry/entry.ng.html b/scouting/www/entry/entry.ng.html
index c7bf3d6..6dab39b 100644
--- a/scouting/www/entry/entry.ng.html
+++ b/scouting/www/entry/entry.ng.html
@@ -29,11 +29,17 @@
/>
</div>
<div class="row">
- <label for="round">Round</label>
- <input [(ngModel)]="round" type="number" id="round" min="1" max="10" />
+ <label for="set_number">Set Number</label>
+ <input
+ [(ngModel)]="setNumber"
+ type="number"
+ id="set_number"
+ min="1"
+ max="10"
+ />
</div>
<div class="row">
- <label for="comp_level">Round</label>
+ <label for="comp_level">Comp Level</label>
<select [(ngModel)]="compLevel" type="number" id="comp_level">
<option *ngFor="let level of COMP_LEVELS" [ngValue]="level">
{{COMP_LEVEL_LABELS[level]}}
@@ -360,7 +366,7 @@
<ul>
<li>Match number: {{matchNumber}}</li>
<li>Team number: {{teamNumber}}</li>
- <li>Round: {{round}}</li>
+ <li>SetNumber: {{setNumber}}</li>
<li>Comp Level: {{COMP_LEVEL_LABELS[compLevel]}}</li>
</ul>
diff --git a/scouting/www/match_list/match_list.component.ts b/scouting/www/match_list/match_list.component.ts
index 1dc1f49..ab54e3e 100644
--- a/scouting/www/match_list/match_list.component.ts
+++ b/scouting/www/match_list/match_list.component.ts
@@ -12,7 +12,7 @@
type TeamInMatch = {
teamNumber: number;
matchNumber: number;
- round: number;
+ setNumber: number;
compLevel: string;
};
@@ -62,9 +62,9 @@
}
displayMatchNumber(match: Match): string {
- // Only display the set number ("round") for eliminations matches.
- const round = match.compLevel() == 'qm' ? '' : `${match.round()}`;
- return `${this.matchType(match)} ${round} Match ${match.matchNumber()}`;
+ // Only display the set number for eliminations matches.
+ const setNumber = match.compLevel() == 'qm' ? '' : `${match.setNumber()}`;
+ return `${this.matchType(match)} ${setNumber} Match ${match.matchNumber()}`;
}
ngOnInit() {
diff --git a/scouting/www/match_list/match_list.ng.html b/scouting/www/match_list/match_list.ng.html
index b2e66f8..e890faf 100644
--- a/scouting/www/match_list/match_list.ng.html
+++ b/scouting/www/match_list/match_list.ng.html
@@ -13,7 +13,7 @@
(click)="setTeamInMatch({
teamNumber: team.teamNumber,
matchNumber: match.matchNumber(),
- round: match.round(),
+ setNumber: match.setNumber(),
compLevel: match.compLevel()
})"
class="match-item"
diff --git a/scouting/www/rpc/match_list_requestor.ts b/scouting/www/rpc/match_list_requestor.ts
index ddbb221..f97b1ca 100644
--- a/scouting/www/rpc/match_list_requestor.ts
+++ b/scouting/www/rpc/match_list_requestor.ts
@@ -56,15 +56,15 @@
if (aMatchNumber > bMatchNumber) {
return 1;
}
- // Lastly, sort by round. I.e. Semi Final 1 Match 1 happens first. Then
- // comes Semi Final 2 Match 1. Then comes Semi Final 1 Match 2. Then
+ // Lastly, sort by set number. I.e. Semi Final 1 Match 1 happens first.
+ // Then comes Semi Final 2 Match 1. Then comes Semi Final 1 Match 2. Then
// Semi Final 2 Match 2.
- const aRound = a.round();
- const bRound = b.round();
- if (aRound < bRound) {
+ const aSetNumber = a.setNumber();
+ const bSetNumber = b.setNumber();
+ if (aSetNumber < bSetNumber) {
return -1;
}
- if (aRound > bRound) {
+ if (aSetNumber > bSetNumber) {
return 1;
}
return 0;