Merge changes Ic380ac41,If586b548
* changes:
Rezero/reconfigure practice bot wrist
Fix blue-side & substation auto-align
diff --git a/scouting/www/entry/entry.ng.html b/scouting/www/entry/entry.ng.html
index 49967b9..9822c92 100644
--- a/scouting/www/entry/entry.ng.html
+++ b/scouting/www/entry/entry.ng.html
@@ -248,19 +248,19 @@
>
Revive
</button>
+ <button
+ class="btn btn-info"
+ (click)="changeSectionTo('Review and Submit'); addAction({type: 'endMatchAction', docked: dockedValue, engaged: engagedValue});"
+ >
+ End Match
+ </button>
</div>
</div>
<div *ngSwitchCase="'Review and Submit'" id="Review" class="container-fluid">
<div class="d-grid gap-5">
<button class="btn btn-secondary" (click)="undoLastAction()">UNDO</button>
- <button
- *ngIf="!autoPhase"
- class="btn btn-warning"
- (click)="submitActions();"
- >
- Submit
- </button>
+ <button class="btn btn-warning" (click)="submitActions();">Submit</button>
</div>
</div>