From d91b530bef9fa3f53dcd25d8932e8279e1a3956f Mon Sep 17 00:00:00 2001
From: Patrick Fairbank <pat@patfairbank.com>
Date: Sun, 3 Sep 2017 22:23:48 -0700
Subject: [PATCH] Fix some UI bugs.

---
 static/js/alliance_station_display.js | 4 ++--
 static/js/audience_display.js         | 3 ++-
 templates/audience_display.html       | 4 ++--
 templates/referee_display.html        | 8 ++++----
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/static/js/alliance_station_display.js b/static/js/alliance_station_display.js
index d4c6d79..93a3fa9 100644
--- a/static/js/alliance_station_display.js
+++ b/static/js/alliance_station_display.js
@@ -106,8 +106,8 @@ var handleMatchTime = function(data) {
 
 // Handles a websocket message to update the match score.
 var handleRealtimeScore = function(data) {
-  $("#redScore").text(data.RedScoreFields.Score);
-  $("#blueScore").text(data.BlueScoreFields.Score);
+  $("#redScore").text(data.RedScore);
+  $("#blueScore").text(data.BlueScore);
 };
 
 $(function() {
diff --git a/static/js/audience_display.js b/static/js/audience_display.js
index ac9bd1d..abccd7a 100644
--- a/static/js/audience_display.js
+++ b/static/js/audience_display.js
@@ -106,10 +106,11 @@ var handlePlaySound = function(sound) {
 // Handles a websocket message to update the alliance selection screen.
 var handleAllianceSelection = function(alliances) {
   if (alliances) {
+    var numColumns = alliances[0].length + 1;
     $.each(alliances, function(k, v) {
       v.Index = k + 1;
     });
-    $("#allianceSelection").html(allianceSelectionTemplate(alliances));
+    $("#allianceSelection").html(allianceSelectionTemplate({alliances: alliances, numColumns: numColumns}));
   }
 };
 
diff --git a/templates/audience_display.html b/templates/audience_display.html
index 93d71da..3779b9b 100644
--- a/templates/audience_display.html
+++ b/templates/audience_display.html
@@ -140,11 +140,11 @@
     <script id="allianceSelectionTemplate" type="text/x-handlebars-template">
       <table id="allianceSelectionTable">
         <tr>
-          <td colspan="4">
+          <td colspan="{{"{{numColumns}}"}}">
             <img src="/static/img/alliance-selection-logo.png" alt="logo" />
           </td>
         </tr>
-        {{"{{#each this}}"}}
+        {{"{{#each alliances}}"}}
           <tr>
             <td class="alliance-cell">{{"{{Index}}"}}</td>
             {{"{{#each this}}"}}
diff --git a/templates/referee_display.html b/templates/referee_display.html
index 81c1653..e5f5317 100644
--- a/templates/referee_display.html
+++ b/templates/referee_display.html
@@ -60,8 +60,8 @@
           <div class="row">
             {{range $rule := .Rules}}
               <a class="btn btn-sm {{if $rule.IsTechnical}}btn-danger{{else}}btn-warning{{end}} btn-referee btn-rule"
-                  data-rule="{{$rule.Rule}}" data-is-technical="{{$rule.IsTechnical}}" onclick="setFoulRule(this);">
-                {{$rule.Rule}}{{if $rule.IsTechnical}}<sup>T</sup>{{end}}
+                  data-rule="{{$rule.RuleNumber}}" data-is-technical="{{$rule.IsTechnical}}" onclick="setFoulRule(this);">
+                {{$rule.RuleNumber}}{{if $rule.IsTechnical}}<sup>T</sup>{{end}}
               </a>
             {{end}}
           </div>
@@ -99,8 +99,8 @@
 {{define "foul"}}
   <tr class="row-{{.color}}">
     <td>{{.foul.TeamId}}</td>
-    <td>{{.foul.Rule}}{{if .foul.IsTechnical}}<sup>T</sup>{{end}}</td>
-    <td><a class="btn btn-sm btn-danger" onclick="deleteFoul('{{.color}}', {{.foul.TeamId}}, '{{.foul.Rule}}',
+    <td>{{.foul.RuleNumber}}{{if .foul.IsTechnical}}<sup>T</sup>{{end}}</td>
+    <td><a class="btn btn-sm btn-danger" onclick="deleteFoul('{{.color}}', {{.foul.TeamId}}, '{{.foul.RuleNumber}}',
           {{.foul.IsTechnical}}, {{.foul.TimeInMatchSec}});">Delete</a></td>
   </tr>
 {{end}}