commit e4402714bf33dfb12bf5ffd3a4c6062523734d6e
author Filip Kujawa <filip.j.kujawa@gmail.com> Wed Apr 19 09:45:10 2023 -0700
committer Filip Kujawa <filip.j.kujawa@gmail.com> Wed Apr 19 20:08:03 2023 -0700
tree 736999843346b0815e24d312ac5d69e643e38df5
parent b73e94c5c4a306d91df01fa471a7e5b55798c38c

Scouting: Remove submit balancing button

Combine the submit balancing and start teleop buttons to simply user
interface.

Signed-off-by: Filip Kujawa <filip.j.kujawa@gmail.com>
Change-Id: Ie37947e71d371083ab62a37089a68d2d50667254

scouting/www/entry/entry.component.ts

diff --git a/scouting/www/entry/entry.component.ts b/scouting/www/entry/entry.component.ts
index 50d0cd9..edb1cf8 100644
--- a/scouting/www/entry/entry.component.ts
+++ b/scouting/www/entry/entry.component.ts
@@ -207,6 +207,13 @@
       this.mobilityCompleted = true;
     }
 
+    if (action.type == 'autoBalanceAction') {
+      // Timestamp is a unique index in the database so
+      // adding one makes sure it dosen't overlap with the
+      // start teleop action that is added at the same time.
+      action.timestamp += 1;
+    }
+
     if (
       action.type == 'pickupObjectAction' ||
       action.type == 'placeObjectAction'

scouting/www/entry/entry.ng.html

diff --git a/scouting/www/entry/entry.ng.html b/scouting/www/entry/entry.ng.html
index 3bc21e5..2459221 100644
--- a/scouting/www/entry/entry.ng.html
+++ b/scouting/www/entry/entry.ng.html
@@ -162,18 +162,11 @@
           <input #attempted type="checkbox" />
           Attempted to dock and engage but failed
         </label>
-        <br />
-        <button
-          class="btn btn-info"
-          (click)="addAction({type: 'autoBalanceAction', docked: docked.checked, engaged: engaged.checked, balanceAttempt: attempted.checked});"
-        >
-          Submit Balancing
-        </button>
       </div>
       <button
         *ngIf="autoPhase"
         class="btn btn-dark"
-        (click)="autoPhase = false; addAction({type: 'endAutoPhase'});"
+        (click)="autoPhase = false; addAction({type: 'endAutoPhase'}); addAction({type: 'autoBalanceAction', docked: docked.checked, engaged: engaged.checked, balanceAttempt: attempted.checked});"
       >
         Start Teleop
       </button>
@@ -252,18 +245,11 @@
           <input #attempted type="checkbox" />
           Attempted to dock and engage but failed
         </label>
-        <br />
-        <button
-          class="btn btn-info"
-          (click)="addAction({type: 'autoBalanceAction', docked: docked.checked, engaged: engaged.checked, balanceAttempt: attempted.checked});"
-        >
-          Submit Balancing
-        </button>
       </div>
       <button
         *ngIf="autoPhase"
         class="btn btn-dark"
-        (click)="autoPhase = false; addAction({type: 'endAutoPhase'});"
+        (click)="autoPhase = false; addAction({type: 'endAutoPhase'}); addAction({type: 'autoBalanceAction', docked: docked.checked, engaged: engaged.checked, balanceAttempt: attempted.checked});"
       >
         Start Teleop
       </button>