From 116228bc12b5aa9b1351fb5b34992ee9355a1fd5 Mon Sep 17 00:00:00 2001
From: Patrick Fairbank <pat@patfairbank.com>
Date: Sat, 23 Sep 2017 22:15:52 -0700
Subject: [PATCH] Fix alliance station display bugs.

---
 static/css/alliance_station_display.css | 23 ++++++++++++-----------
 static/js/alliance_station_display.js   |  6 +++---
 templates/alliance_station_display.html |  2 +-
 web/alliance_station_display.go         |  3 ++-
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/static/css/alliance_station_display.css b/static/css/alliance_station_display.css
index 342e5d0..31619c9 100644
--- a/static/css/alliance_station_display.css
+++ b/static/css/alliance_station_display.css
@@ -34,7 +34,7 @@ body[data-mode=match] .mode#match {
   display: block;
 }
 body[data-mode=fieldReset] .mode#fieldReset {
-  display: block;
+  display: table;
 }
 
 /* Logo Mode */
@@ -66,16 +66,15 @@ body[data-mode=fieldReset] .mode#fieldReset {
 /* Field Reset Mode */
 #fieldReset {
   position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  height: 65%;
-  line-height: 300px;
-  margin: auto auto;
+  width: 100%;
+  height: 100%;
+}
+#fieldReset div {
+  display: table-cell;
+  vertical-align: middle;
   text-align: center;
-  color: #fff;
-  font-size: 300px;
+  font-size: 350px;
+  line-height: 350px;
 }
 
 /* Match Mode */
@@ -170,4 +169,6 @@ body[data-position=right] #inMatch #blueScore {
 [data-alliance-bg=B], [data-status=B] {
   background-color: #00c;
 }
-
+#teamRank {
+  background-color: transparent;
+}
\ No newline at end of file
diff --git a/static/js/alliance_station_display.js b/static/js/alliance_station_display.js
index 70f8184..995eaf6 100644
--- a/static/js/alliance_station_display.js
+++ b/static/js/alliance_station_display.js
@@ -47,7 +47,7 @@ var handleSetMatch = function(data) {
       $("#teamNameText").attr("data-alliance-bg", allianceStation[0]).text(team.Nickname);
 
       var ranking = data.Rankings[team.Id];
-      if (ranking) {
+      if (ranking && data.MatchType == "qualification") {
         var rankingText = ranking.Rank;
         $("#teamRank").attr("data-alliance-bg", allianceStation[0]).text(rankingText);
       } else {
@@ -69,8 +69,8 @@ var handleStatus = function(data) {
   var blink = false;
   if (stationStatus && stationStatus.Bypass) {
     $("#match").attr("data-status", "bypass");
-  } else if (stationStatus && stationStatus.DsConn) {
-    if (!stationStatus.DsConn.DsLinked) {
+  } else if (stationStatus) {
+    if (!stationStatus.DsConn || !stationStatus.DsConn.DsLinked) {
       $("#match").attr("data-status", allianceStation[0]);
     } else if (!stationStatus.DsConn.RobotLinked) {
       blink = true;
diff --git a/templates/alliance_station_display.html b/templates/alliance_station_display.html
index 41cdbef..f8a3dcb 100644
--- a/templates/alliance_station_display.html
+++ b/templates/alliance_station_display.html
@@ -32,7 +32,7 @@
     <div id="logo" class="mode">
       <img id="logoImg" src="/static/img/alliance-station-logo.gif" alt="logo" />
     </div>
-    <div id="fieldReset" class="mode">FIELD<br />RESET</div>
+    <div id="fieldReset" class="mode"><div>FIELD<br />RESET</div></div>
     <script>
       // A unique id to differentiate this station's display from its peers.
       var displayId = "{{.DisplayId}}";
diff --git a/web/alliance_station_display.go b/web/alliance_station_display.go
index a3d56e7..ef3dea2 100644
--- a/web/alliance_station_display.go
+++ b/web/alliance_station_display.go
@@ -154,10 +154,11 @@ func (web *Web) allianceStationDisplayWebsocketHandler(w http.ResponseWriter, r
 					AllianceStation string
 					Teams           map[string]*model.Team
 					Rankings        map[string]*game.Ranking
+					MatchType       string
 				}{station, map[string]*model.Team{"R1": web.arena.AllianceStations["R1"].Team,
 					"R2": web.arena.AllianceStations["R2"].Team, "R3": web.arena.AllianceStations["R3"].Team,
 					"B1": web.arena.AllianceStations["B1"].Team, "B2": web.arena.AllianceStations["B2"].Team,
-					"B3": web.arena.AllianceStations["B3"].Team}, rankings}
+					"B3": web.arena.AllianceStations["B3"].Team}, rankings, web.arena.CurrentMatch.Type}
 			case _, ok := <-robotStatusListener:
 				if !ok {
 					return