Switch Quadrants and Balls selection in the scouting app
It's simpler for the scouts to first select the starting position of
the robot and then scroll down to keep track of which balls are picked
up and scored.
Signed-off-by: Philipp Schrader <philipp.schrader@gmail.com>
Change-Id: I917fd5aa27579647720f281a73cd6428bced2274
diff --git a/scouting/www/entry/entry.ng.html b/scouting/www/entry/entry.ng.html
index dd40cdf..a39db40 100644
--- a/scouting/www/entry/entry.ng.html
+++ b/scouting/www/entry/entry.ng.html
@@ -21,17 +21,6 @@
<div *ngSwitchCase="'Auto'" id="auto" class="container-fluid">
<div class="row">
- <img src="/pictures/field/balls.jpeg" alt="Image">
- <form>
- <!--Choice for each ball location-->
- <input [(ngModel)]=ball1 type="checkbox" name="1ball" value="1" id="ball-1"><label for="ball-1">Ball 1</label>
- <input [(ngModel)]=ball2 type="checkbox" name="2ball" value="2" id="ball-2"><label for="ball-2">Ball 2</label><br>
- <input [(ngModel)]=ball3 type="checkbox" name="3ball" value="3" id="ball-3"><label for="ball-3">Ball 3</label>
- <input [(ngModel)]=ball4 type="checkbox" name="4ball" value="4" id="ball-4"><label for="ball-4">Ball 4</label><br>
- <input [(ngModel)]=ball5 type="checkbox" name="5ball" value="5" id="ball-5"><label for="ball-5">Ball 5</label>
- </form>
- </div>
- <div class="row">
<img src="/pictures/field/quadrants.jpeg" alt="Quadrants Image">
<form>
<input type="radio" [(ngModel)]="quadrant" name="quadrant" id="quadrant1" [value]="1">
@@ -44,6 +33,17 @@
<label for="quadrant4">Quadrant 4</label>
</form>
</div>
+ <div class="row">
+ <img src="/pictures/field/balls.jpeg" alt="Image">
+ <form>
+ <!--Choice for each ball location-->
+ <input [(ngModel)]=ball1 type="checkbox" name="1ball" value="1" id="ball-1"><label for="ball-1">Ball 1</label>
+ <input [(ngModel)]=ball2 type="checkbox" name="2ball" value="2" id="ball-2"><label for="ball-2">Ball 2</label><br>
+ <input [(ngModel)]=ball3 type="checkbox" name="3ball" value="3" id="ball-3"><label for="ball-3">Ball 3</label>
+ <input [(ngModel)]=ball4 type="checkbox" name="4ball" value="4" id="ball-4"><label for="ball-4">Ball 4</label><br>
+ <input [(ngModel)]=ball5 type="checkbox" name="5ball" value="5" id="ball-5"><label for="ball-5">Ball 5</label>
+ </form>
+ </div>
<div class="row justify-content-center">
<frc971-counter-button class="col-4" [(value)]="autoUpperShotsMade">Upper</frc971-counter-button>
<frc971-counter-button class="col-4" [(value)]="autoLowerShotsMade">Lower</frc971-counter-button>
@@ -157,12 +157,12 @@
<h4>Auto</h4>
<ul>
+ <li>Quadrant: {{quadrant}}</li>
<li>Collected Ball 1: {{ball1}}</li>
<li>Collected Ball 2: {{ball2}}</li>
<li>Collected Ball 3: {{ball3}}</li>
<li>Collected Ball 4: {{ball4}}</li>
<li>Collected Ball 5: {{ball5}}</li>
- <li>Quadrant: {{quadrant}}</li>
<li>Upper Shots Made: {{autoUpperShotsMade}}</li>
<li>Lower Shots Made: {{autoLowerShotsMade}}</li>
<li>Missed Shots: {{autoShotsMissed}}</li>