Skip to content

Commit 61f669b

Browse files
committed
MatchData on Station Field Monitor
1 parent 6cf808b commit 61f669b

File tree

3 files changed

+50
-3
lines changed

3 files changed

+50
-3
lines changed

static/css/field_monitor_display.css

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,25 @@ body {
2727
.position-row[data-ds="true"][data-preMatch="false"] {
2828
display: none;
2929
}
30+
#matchData[data-ds="true"][data-preMatch="true"]{
31+
display: none;
32+
}
33+
#matchData{
34+
position: absolute;
35+
top: 2%;
36+
width: 100%;
37+
height: 170px;
38+
display: flex;
39+
flex-direction: column;
40+
align-items: center;
41+
font-size: 4vw;
42+
}
43+
#matchStatusRow{
44+
display: flex;
45+
}
46+
#matchStatusRow[data-ds="true"][data-preMatch="false"] {
47+
display: none;
48+
}
3049
#matchStatusRow {
3150
height: 6%;
3251
display: flex;
@@ -36,9 +55,6 @@ body {
3655
font-size: 1.5vw;
3756
text-transform: uppercase;
3857
}
39-
#matchStatusRow[data-ds="true"][data-preMatch="false"] {
40-
display: none;
41-
}
4258
#eventStatusRow {
4359
height: 7%;
4460
display: flex;

static/js/field_monitor_display.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ var handleMatchTime = function(data) {
148148
translateMatchTime(data, function(matchState, matchStateText, countdownSec) {
149149
$("#matchState").text(matchStateText);
150150
$("#matchTime").text(countdownSec);
151+
$("#matchTimeAllianceStation").text(countdownSec);
151152
if (matchStateText === "PRE-MATCH" | matchStateText === "POST-MATCH") {
152153
$(".ds-dependent").attr("data-preMatch", "true");
153154
} else {
@@ -162,10 +163,22 @@ var handleRealtimeScore = function(data,reversed) {
162163
if (reversed === "true") {
163164
$("#rightScore").text(data.Red.ScoreSummary.Score);
164165
$("#leftScore").text(data.Blue.ScoreSummary.Score);
166+
167+
$("#rightScoreAllianceDisplay").text(data.Blue.ScoreSummary.Score);
168+
$("#leftScoreAllianceDisplay").text(data.Red.ScoreSummary.Score);
169+
$(`#noteNumerator`).text(data.Blue.ScoreSummary.NumNotes);
170+
$(`#noteDenominator`).text(data.Blue.ScoreSummary.NumNotesGoal);
171+
$(`#amplifiedTimeRemaining`).text(data.Blue.AmplifiedTimeRemainingSec);
172+
165173
} else {
166174
$("#rightScore").text(data.Blue.ScoreSummary.Score);
167175
$("#leftScore").text(data.Red.ScoreSummary.Score);
168176

177+
$("#rightScoreAllianceDisplay").text(data.Red.ScoreSummary.Score);
178+
$("#leftScoreAllianceDisplay").text(data.Blue.ScoreSummary.Score);
179+
$(`#noteNumerator`).text(data.Red.ScoreSummary.NumNotes);
180+
$(`#noteDenominator`).text(data.Red.ScoreSummary.NumNotesGoal);
181+
$(`#amplifiedTimeRemaining`).text(data.Red.AmplifiedTimeRemainingSec);
169182
}
170183
};
171184

templates/field_monitor_display.html

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,24 @@
3232
<div id="earlyLateMessage" class="text-center ds-dependent" style="width: 38%;"></div>
3333
<div id="rightScore" class="right-score ds-dependent text-center fta-dependent reversible-right " style="width: 8%;"></div>
3434
</div>
35+
<div id="matchData" class="ds-dependent">
36+
<div>Match Time</div>
37+
<div id="matchTimeAllianceStation"></div>
38+
Melody
39+
<div id="melody">
40+
<span id="noteNumerator"></span>
41+
<span class="note-splitter">/</span>
42+
<span id="noteDenominator"></span>
43+
</div>
44+
<div>Amplified Time</div>
45+
<div id="amplifiedTimeRemaining"></div>
46+
Score
47+
<div id="Score">
48+
<span id="rightScoreAllianceDisplay" class="left-score ds-dependent text-center reversible-right"></span>
49+
<span class="note-splitter">/</span>
50+
<span id="leftScoreAllianceDisplay" class="right-score ds-dependent text-center reversible-right"></span>
51+
</div>
52+
</div>
3553
</body>
3654
<script src="/static/js/lib/jquery.min.js"></script>
3755
<script src="/static/js/lib/jquery.json-2.4.min.js"></script>

0 commit comments

Comments
 (0)