NCGEARS/cheesy-arena-lite
1
0
Fork 0
mirror of https://github.com/Team254/cheesy-arena-lite.git synced 2026-03-09 21:56:50 -04:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Refactor game-specific models into separate package.

Browse Source
This commit is contained in:
Patrick Fairbank
2017-08-05 20:48:17 -07:00
parent 0a783b3701
commit 299c601e8f
41 changed files with 805 additions and 726 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
static/js/match_review.js
View File

@@ -33,11 +33,11 @@ var renderResults = function(alliance) {
// Set the values of the form fields from the JSON results data.
$("input[name=" + alliance + "AutoMobility]").val(result.score.AutoMobility);
$("input[name=" + alliance + "AutoGears]").val(result.score.AutoGears);
$("input[name=" + alliance + "AutoRotors]").val(result.score.AutoRotors);
$("input[name=" + alliance + "AutoFuelLow]").val(result.score.AutoFuelLow);
$("input[name=" + alliance + "AutoFuelHigh]").val(result.score.AutoFuelHigh);
$("input[name=" + alliance + "Gears]").val(result.score.Gears);
$("input[name=" + alliance + "Rotors]").val(result.score.Rotors);
$("input[name=" + alliance + "FuelLow]").val(result.score.FuelLow);
$("input[name=" + alliance + "FuelHigh]").val(result.score.FuelHigh);
$("input[name=" + alliance + "Takeoffs]").val(result.score.Takeoffs);
@@ -45,7 +45,7 @@ var renderResults = function(alliance) {
if (result.score.Fouls != null) {
$.each(result.score.Fouls, function(k, v) {
$("input[name=" + alliance + "Foul" + k + "Team][value=" + v.TeamId + "]").prop("checked", true);
$("input[name=" + alliance + "Foul" + k + "Rule]").val(v.Rule);
$("input[name=" + alliance + "Foul" + k + "RuleNumber]").val(v.RuleNumber);
$("input[name=" + alliance + "Foul" + k + "IsTechnical]").prop("checked", v.IsTechnical);
$("input[name=" + alliance + "Foul" + k + "Time]").val(v.TimeInMatchSec);
});
@@ -67,10 +67,10 @@ var updateResults = function(alliance) {
});
result.score.AutoMobility = parseInt(formData[alliance + "AutoMobility"]);
result.score.AutoGears = parseInt(formData[alliance + "AutoGears"]);
result.score.AutoRotors = parseInt(formData[alliance + "AutoRotors"]);
result.score.AutoFuelLow = parseInt(formData[alliance + "AutoFuelLow"]);
result.score.AutoFuelHigh = parseInt(formData[alliance + "AutoFuelHigh"]);
result.score.Gears = parseInt(formData[alliance + "Gears"]);
result.score.Rotors = parseInt(formData[alliance + "Rotors"]);
result.score.FuelLow = parseInt(formData[alliance + "FuelLow"]);
result.score.FuelHigh = parseInt(formData[alliance + "FuelHigh"]);
result.score.Takeoffs = parseInt(formData[alliance + "Takeoffs"]);
@@ -78,7 +78,7 @@ var updateResults = function(alliance) {
result.score.Fouls = [];
for (var i = 0; formData[alliance + "Foul" + i + "Time"]; i++) {
var prefix = alliance + "Foul" + i;
var foul = {TeamId: parseInt(formData[prefix + "Team"]), Rule: formData[prefix + "Rule"],
var foul = {TeamId: parseInt(formData[prefix + "Team"]), RuleNumber: formData[prefix + "RuleNumber"],
IsTechnical: formData[prefix + "IsTechnical"] == "on",
TimeInMatchSec: parseFloat(formData[prefix + "Time"])};
result.score.Fouls.push(foul);

13
static/js/scoring_display.js
View File

@@ -11,13 +11,6 @@ var handleScore = function(data) {
// Update autonomous period values.
var score = data.Score.CurrentScore;
$("#autoMobility").text(score.AutoMobility);
$("#autoGears").text(score.AutoGears);
$("#autoRotors").text(data.ScoreSummary.Rotors);
// Update teleoperated period values.
$("#teleopAutoGears").text(score.AutoGears);
$("#totalGears").text(score.AutoGears + score.Gears);
$("#totalRotors").text(data.ScoreSummary.Rotors);
// Update component visibility.
if (!data.AutoCommitted) {
@@ -49,12 +42,6 @@ var handleKeyPress = function(event) {
case "M":
websocket.send("undoMobility");
break;
case "g":
websocket.send("gear");
break;
case "G":
websocket.send("undoGear");
break;
case "\r":
websocket.send("commit");
break;