From 299a242e9c32f54941a00ea8da56034a3807f1f1 Mon Sep 17 00:00:00 2001 From: Patrick Fairbank Date: Sun, 15 Mar 2020 17:35:32 -0700 Subject: [PATCH] Rename LED/PLC testing page to Field Testing to be more generic. --- .../js/{setup_led_plc.js => setup_field_testing.js} | 4 ++-- templates/base.html | 2 +- .../{setup_led_plc.html => setup_field_testing.html} | 6 +++--- web/{setup_led_plc.go => setup_field_testing.go} | 12 ++++++------ ...p_led_plc_test.go => setup_field_testing_test.go} | 4 ++-- web/web.go | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) rename static/js/{setup_led_plc.js => setup_field_testing.js} (86%) rename templates/{setup_led_plc.html => setup_field_testing.html} (89%) rename web/{setup_led_plc.go => setup_field_testing.go} (69%) rename web/{setup_led_plc_test.go => setup_field_testing_test.go} (87%) diff --git a/static/js/setup_led_plc.js b/static/js/setup_field_testing.js similarity index 86% rename from static/js/setup_led_plc.js rename to static/js/setup_field_testing.js index fec3dee..62277e9 100644 --- a/static/js/setup_led_plc.js +++ b/static/js/setup_field_testing.js @@ -1,7 +1,7 @@ // Copyright 2018 Team 254. All Rights Reserved. // Author: pat@patfairbank.com (Patrick Fairbank) // -// Client-side logic for the field setup page. +// Client-side logic for the Field Testing page. var websocket; @@ -24,7 +24,7 @@ var handlePlcIoChange = function(data) { $(function() { // Set up the websocket back to the server. - websocket = new CheesyWebsocket("/setup/led_plc/websocket", { + websocket = new CheesyWebsocket("/setup/field_testing/websocket", { plcIoChange: function(event) { handlePlcIoChange(event.data); } }); }); diff --git a/templates/base.html b/templates/base.html index 257f542..77b9aa0 100644 --- a/templates/base.html +++ b/templates/base.html @@ -35,7 +35,7 @@
  • Lower Thirds
  • Sponsor Slides
  • Display Configuration
    • -
  • LED and PLC Testing
    • +
  • Field Testing
  • diff --git a/templates/setup_led_plc.html b/templates/setup_field_testing.html similarity index 89% rename from templates/setup_led_plc.html rename to templates/setup_field_testing.html index b87ca88..7321ebe 100644 --- a/templates/setup_led_plc.html +++ b/templates/setup_field_testing.html @@ -2,9 +2,9 @@ Copyright 2018 Team 254. All Rights Reserved. Author: pat@patfairbank.com (Patrick Fairbank) - UI for testing the LEDs and PLC connected to the field. + UI for testing the game sounds and the LEDs and PLC connected to the field. */}} -{{define "title"}}LED and PLC Testing{{end}} +{{define "title"}}Field Testing{{end}} {{define "body"}}
    @@ -56,5 +56,5 @@
    {{end}} {{define "script"}} - + {{end}} diff --git a/web/setup_led_plc.go b/web/setup_field_testing.go similarity index 69% rename from web/setup_led_plc.go rename to web/setup_field_testing.go index 4b156a6..af3e34d 100644 --- a/web/setup_led_plc.go +++ b/web/setup_field_testing.go @@ -1,7 +1,7 @@ // Copyright 2018 Team 254. All Rights Reserved. // Author: pat@patfairbank.com (Patrick Fairbank) // -// Web routes for testing the field LEDs and PLC. +// Web routes for testing the field sounds, LEDs, and PLC. package web @@ -11,13 +11,13 @@ import ( "net/http" ) -// Shows the LED/PLC test page. -func (web *Web) ledPlcGetHandler(w http.ResponseWriter, r *http.Request) { +// Shows the Field Testing page. +func (web *Web) fieldTestingGetHandler(w http.ResponseWriter, r *http.Request) { if !web.userIsAdmin(w, r) { return } - template, err := web.parseFiles("templates/setup_led_plc.html", "templates/base.html") + template, err := web.parseFiles("templates/setup_field_testing.html", "templates/base.html") if err != nil { handleWebErr(w, err) return @@ -36,8 +36,8 @@ func (web *Web) ledPlcGetHandler(w http.ResponseWriter, r *http.Request) { } } -// The websocket endpoint for sending realtime updates to the LED/PLC test page. -func (web *Web) ledPlcWebsocketHandler(w http.ResponseWriter, r *http.Request) { +// The websocket endpoint for sending realtime updates to the Field Testing page. +func (web *Web) fieldTestingWebsocketHandler(w http.ResponseWriter, r *http.Request) { if !web.userIsAdmin(w, r) { return } diff --git a/web/setup_led_plc_test.go b/web/setup_field_testing_test.go similarity index 87% rename from web/setup_led_plc_test.go rename to web/setup_field_testing_test.go index 6f903fa..b5553c0 100644 --- a/web/setup_led_plc_test.go +++ b/web/setup_field_testing_test.go @@ -10,12 +10,12 @@ import ( "testing" ) -func TestSetupLedPlcWebsocket(t *testing.T) { +func TestSetupFieldTestingWebsocket(t *testing.T) { web := setupTestWeb(t) server, wsUrl := web.startTestServer() defer server.Close() - conn, _, err := gorillawebsocket.DefaultDialer.Dial(wsUrl+"/setup/led_plc/websocket", nil) + conn, _, err := gorillawebsocket.DefaultDialer.Dial(wsUrl+"/setup/field_testing/websocket", nil) assert.Nil(t, err) defer conn.Close() ws := websocket.NewTestWebsocket(conn) diff --git a/web/web.go b/web/web.go index 566c542..b609ad8 100644 --- a/web/web.go +++ b/web/web.go @@ -159,8 +159,8 @@ func (web *Web) newHandler() http.Handler { router.HandleFunc("/setup/db/save", web.saveDbHandler).Methods("GET") router.HandleFunc("/setup/displays", web.displaysGetHandler).Methods("GET") router.HandleFunc("/setup/displays/websocket", web.displaysWebsocketHandler).Methods("GET") - router.HandleFunc("/setup/led_plc", web.ledPlcGetHandler).Methods("GET") - router.HandleFunc("/setup/led_plc/websocket", web.ledPlcWebsocketHandler).Methods("GET") + router.HandleFunc("/setup/field_testing", web.fieldTestingGetHandler).Methods("GET") + router.HandleFunc("/setup/field_testing/websocket", web.fieldTestingWebsocketHandler).Methods("GET") router.HandleFunc("/setup/lower_thirds", web.lowerThirdsGetHandler).Methods("GET") router.HandleFunc("/setup/lower_thirds/websocket", web.lowerThirdsWebsocketHandler).Methods("GET") router.HandleFunc("/setup/schedule", web.scheduleGetHandler).Methods("GET")