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

Optimize field monitor display for mobile and distant viewing.

Browse Source
This commit is contained in:
Patrick Fairbank
2018-09-23 18:39:24 -07:00
parent ca99653de7
commit 8e726abc4e
13 changed files with 203 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
web/fta_display.go → web/field_monitor_display.go
View File

@@ -1,7 +1,7 @@
// Copyright 2014 Team 254. All Rights Reserved.
// Copyright 2018 Team 254. All Rights Reserved.
// Author: pat@patfairbank.com (Patrick Fairbank)
//
// Web handlers for the FTA diagnostic display.
// Web handlers for the field monitor display showing robot connection status.
package web
@@ -11,17 +11,17 @@ import (
"net/http"
)
// Renders the FTA diagnostic display.
func (web *Web) ftaDisplayHandler(w http.ResponseWriter, r *http.Request) {
// Renders the field monitor display.
func (web *Web) fieldMonitorDisplayHandler(w http.ResponseWriter, r *http.Request) {
if !web.userIsReader(w, r) {
return
}
if !web.enforceDisplayConfiguration(w, r, nil) {
if !web.enforceDisplayConfiguration(w, r, map[string]string{"reversed": "false"}) {
return
}
template, err := web.parseFiles("templates/fta_display.html", "templates/base.html")
template, err := web.parseFiles("templates/field_monitor_display.html")
if err != nil {
handleWebErr(w, err)
return
@@ -29,15 +29,15 @@ func (web *Web) ftaDisplayHandler(w http.ResponseWriter, r *http.Request) {
data := struct {
*model.EventSettings
}{web.arena.EventSettings}
err = template.ExecuteTemplate(w, "base_no_navbar", data)
err = template.ExecuteTemplate(w, "field_monitor_display.html", data)
if err != nil {
handleWebErr(w, err)
return
}
}
// The websocket endpoint for the FTA display client to receive status updates.
func (web *Web) ftaDisplayWebsocketHandler(w http.ResponseWriter, r *http.Request) {
// The websocket endpoint for the field monitor display client to receive status updates.
func (web *Web) fieldMonitorDisplayWebsocketHandler(w http.ResponseWriter, r *http.Request) {
if !web.userIsReader(w, r) {
return
}

34
web/field_monitor_display_test.go Normal file
View File

@@ -0,0 +1,34 @@
// Copyright 2018 Team 254. All Rights Reserved.
// Author: pat@patfairbank.com (Patrick Fairbank)
package web
import (
"github.com/Team254/cheesy-arena/websocket"
gorillawebsocket "github.com/gorilla/websocket"
"github.com/stretchr/testify/assert"
"testing"
)
func TestFieldMonitorDisplay(t *testing.T) {
web := setupTestWeb(t)
recorder := web.getHttpResponse("/displays/field_monitor?displayId=1&reversed=false")
assert.Equal(t, 200, recorder.Code)
assert.Contains(t, recorder.Body.String(), "Field Monitor - Untitled Event - Cheesy Arena")
}
func TestFieldMonitorDisplayWebsocket(t *testing.T) {
web := setupTestWeb(t)
server, wsUrl := web.startTestServer()
defer server.Close()
conn, _, err := gorillawebsocket.DefaultDialer.Dial(wsUrl+"/displays/field_monitor/websocket?displayId=1", nil)
assert.Nil(t, err)
defer conn.Close()
ws := websocket.NewTestWebsocket(conn)
// Should get a few status updates right after connection.
readWebsocketType(t, ws, "arenaStatus")
readWebsocketType(t, ws, "displayConfiguration")
}

17
web/fta_display_test.go
View File

@@ -1,17 +0,0 @@
// Copyright 2014 Team 254. All Rights Reserved.
// Author: pat@patfairbank.com (Patrick Fairbank)
package web
import (
"github.com/stretchr/testify/assert"
"testing"
)
func TestFtaDisplay(t *testing.T) {
web := setupTestWeb(t)
recorder := web.getHttpResponse("/displays/fta?displayId=1")
assert.Equal(t, 200, recorder.Code)
assert.Contains(t, recorder.Body.String(), "Field Monitor - Untitled Event - Cheesy Arena")
}

4
web/web.go
View File

@@ -142,8 +142,8 @@ func (web *Web) newHandler() http.Handler {
router.HandleFunc("/displays/announcer/websocket", web.announcerDisplayWebsocketHandler).Methods("GET")
router.HandleFunc("/displays/audience", web.audienceDisplayHandler).Methods("GET")
router.HandleFunc("/displays/audience/websocket", web.audienceDisplayWebsocketHandler).Methods("GET")
router.HandleFunc("/displays/fta", web.ftaDisplayHandler).Methods("GET")
router.HandleFunc("/displays/fta/websocket", web.ftaDisplayWebsocketHandler).Methods("GET")
router.HandleFunc("/displays/field_monitor", web.fieldMonitorDisplayHandler).Methods("GET")
router.HandleFunc("/displays/field_monitor/websocket", web.fieldMonitorDisplayWebsocketHandler).Methods("GET")
router.HandleFunc("/displays/pit", web.pitDisplayHandler).Methods("GET")
router.HandleFunc("/displays/pit/websocket", web.pitDisplayWebsocketHandler).Methods("GET")
router.HandleFunc("/displays/queueing", web.queueingDisplayHandler).Methods("GET")