From 5942321522e24f1ac3e8f2d2b0e45b516b061567 Mon Sep 17 00:00:00 2001 From: Patrick Fairbank Date: Mon, 3 Sep 2018 15:40:40 -0700 Subject: [PATCH] Move alliance selection from 'setup' dropdown to 'run'. --- ...selection.html => alliance_selection.html} | 10 +-- templates/base.html | 2 +- ...nce_selection.go => alliance_selection.go} | 12 ++-- ...ion_test.go => alliance_selection_test.go} | 63 +++++++++---------- web/web.go | 12 ++-- 5 files changed, 49 insertions(+), 50 deletions(-) rename templates/{setup_alliance_selection.html => alliance_selection.html} (94%) rename web/{setup_alliance_selection.go => alliance_selection.go} (96%) rename web/{setup_alliance_selection_test.go => alliance_selection_test.go} (75%) diff --git a/templates/setup_alliance_selection.html b/templates/alliance_selection.html similarity index 94% rename from templates/setup_alliance_selection.html rename to templates/alliance_selection.html index aa0327e..a0f9498 100644 --- a/templates/setup_alliance_selection.html +++ b/templates/alliance_selection.html @@ -15,13 +15,13 @@ {{end}} {{if len .Alliances | eq 0}}
-
+ Alliance Selection
{{else}} -
+
Alliance Selection
@@ -118,7 +118,7 @@

Are you sure you want to reset the alliance selection process?

- + @@ -133,7 +133,7 @@

Confirm

-
+

Are you sure you want to finalize the alliance selection process?

@@ -168,7 +168,7 @@ existing alliance data.

- + diff --git a/templates/base.html b/templates/base.html index ae8889f..e199f9c 100644 --- a/templates/base.html +++ b/templates/base.html @@ -40,7 +40,6 @@
  • Settings
  • Team List
  • Match Scheduling
    • -
  • Alliance Selection
  • Lower Thirds
  • Sponsor Slides
  • Display Configuration
    • @@ -53,6 +52,7 @@
  • Match Play
  • Match Review
  • Match Logs
    • +
  • Alliance Selection
  • diff --git a/web/setup_alliance_selection.go b/web/alliance_selection.go similarity index 96% rename from web/setup_alliance_selection.go rename to web/alliance_selection.go index d14bae6..bbe50b8 100644 --- a/web/setup_alliance_selection.go +++ b/web/alliance_selection.go @@ -85,7 +85,7 @@ func (web *Web) allianceSelectionPostHandler(w http.ResponseWriter, r *http.Requ cachedRankedTeams = newRankedTeams web.arena.AllianceSelectionNotifier.NotifyWithMessage(cachedAlliances) - http.Redirect(w, r, "/setup/alliance_selection", 303) + http.Redirect(w, r, "/alliance_selection", 303) } // Sets up the empty alliances and populates the ranked team list. @@ -128,7 +128,7 @@ func (web *Web) allianceSelectionStartHandler(w http.ResponseWriter, r *http.Req } web.arena.AllianceSelectionNotifier.NotifyWithMessage(cachedAlliances) - http.Redirect(w, r, "/setup/alliance_selection", 303) + http.Redirect(w, r, "/alliance_selection", 303) } // Resets the alliance selection process back to the starting point. @@ -145,7 +145,7 @@ func (web *Web) allianceSelectionResetHandler(w http.ResponseWriter, r *http.Req cachedAlliances = [][]model.AllianceTeam{} cachedRankedTeams = []*RankedTeam{} web.arena.AllianceSelectionNotifier.NotifyWithMessage(cachedAlliances) - http.Redirect(w, r, "/setup/alliance_selection", 303) + http.Redirect(w, r, "/alliance_selection", 303) } // Saves the selected alliances to the database and generates the first round of elimination matches. @@ -222,7 +222,7 @@ func (web *Web) allianceSelectionFinalizeHandler(w http.ResponseWriter, r *http. } } - http.Redirect(w, r, "/setup/alliance_selection", 303) + http.Redirect(w, r, "/alliance_selection", 303) } // Publishes the alliances to the web. @@ -236,7 +236,7 @@ func (web *Web) allianceSelectionPublishHandler(w http.ResponseWriter, r *http.R http.Error(w, "Failed to publish alliances: "+err.Error(), 500) return } - http.Redirect(w, r, "/setup/teams", 303) + http.Redirect(w, r, "/alliance_selection", 303) } func (web *Web) renderAllianceSelection(w http.ResponseWriter, r *http.Request, errorMessage string) { @@ -250,7 +250,7 @@ func (web *Web) renderAllianceSelection(w http.ResponseWriter, r *http.Request, } } - template, err := web.parseFiles("templates/setup_alliance_selection.html", "templates/base.html") + template, err := web.parseFiles("templates/alliance_selection.html", "templates/base.html") if err != nil { handleWebErr(w, err) return diff --git a/web/setup_alliance_selection_test.go b/web/alliance_selection_test.go similarity index 75% rename from web/setup_alliance_selection_test.go rename to web/alliance_selection_test.go index 0d44956..d4370da 100644 --- a/web/setup_alliance_selection_test.go +++ b/web/alliance_selection_test.go @@ -22,62 +22,61 @@ func TestSetupAllianceSelection(t *testing.T) { } // Check that there are no alliance placeholders to start. - recorder := web.getHttpResponse("/setup/alliance_selection") + recorder := web.getHttpResponse("/alliance_selection") assert.Equal(t, 200, recorder.Code) assert.NotContains(t, recorder.Body.String(), "Captain") assert.NotContains(t, recorder.Body.String(), ">110<") // Start the alliance selection. - recorder = web.postHttpResponse("/setup/alliance_selection/start", "") + recorder = web.postHttpResponse("/alliance_selection/start", "") assert.Equal(t, 303, recorder.Code) if assert.Equal(t, 15, len(cachedAlliances)) { assert.Equal(t, 4, len(cachedAlliances[0])) } - recorder = web.getHttpResponse("/setup/alliance_selection") + recorder = web.getHttpResponse("/alliance_selection") assert.Contains(t, recorder.Body.String(), "Captain") assert.Contains(t, recorder.Body.String(), ">110<") // Reset the alliance selection. - recorder = web.postHttpResponse("/setup/alliance_selection/reset", "") + recorder = web.postHttpResponse("/alliance_selection/reset", "") assert.Equal(t, 303, recorder.Code) assert.NotContains(t, recorder.Body.String(), "Captain") assert.NotContains(t, recorder.Body.String(), ">110<") web.arena.EventSettings.NumElimAlliances = 3 web.arena.EventSettings.SelectionRound3Order = "" - recorder = web.postHttpResponse("/setup/alliance_selection/start", "") + recorder = web.postHttpResponse("/alliance_selection/start", "") assert.Equal(t, 303, recorder.Code) if assert.Equal(t, 3, len(cachedAlliances)) { assert.Equal(t, 3, len(cachedAlliances[0])) } // Update one team at a time. - recorder = web.postHttpResponse("/setup/alliance_selection", "selection0_0=110") + recorder = web.postHttpResponse("/alliance_selection", "selection0_0=110") assert.Equal(t, 303, recorder.Code) assert.Equal(t, 110, cachedAlliances[0][0].TeamId) - recorder = web.getHttpResponse("/setup/alliance_selection") + recorder = web.getHttpResponse("/alliance_selection") assert.Contains(t, recorder.Body.String(), "\"110\"") assert.NotContains(t, recorder.Body.String(), ">110<") // Update multiple teams at a time. - recorder = web.postHttpResponse("/setup/alliance_selection", "selection0_0=101&selection0_1=102&selection1_0=103") + recorder = web.postHttpResponse("/alliance_selection", "selection0_0=101&selection0_1=102&selection1_0=103") assert.Equal(t, 303, recorder.Code) assert.Equal(t, 101, cachedAlliances[0][0].TeamId) assert.Equal(t, 102, cachedAlliances[0][1].TeamId) assert.Equal(t, 103, cachedAlliances[1][0].TeamId) - recorder = web.getHttpResponse("/setup/alliance_selection") + recorder = web.getHttpResponse("/alliance_selection") assert.Contains(t, recorder.Body.String(), ">110<") // Update remainder of teams. - recorder = web.postHttpResponse("/setup/alliance_selection", "selection0_0=101&selection0_1=102&"+ - "selection0_2=103&selection1_0=104&selection1_1=105&selection1_2=106&selection2_0=107&selection2_1=108&"+ - "selection2_2=109") + recorder = web.postHttpResponse("/alliance_selection", "selection0_0=101&selection0_1=102&selection0_2=103&"+ + "selection1_0=104&selection1_1=105&selection1_2=106&selection2_0=107&selection2_1=108&selection2_2=109") assert.Equal(t, 303, recorder.Code) - recorder = web.getHttpResponse("/setup/alliance_selection") + recorder = web.getHttpResponse("/alliance_selection") assert.Contains(t, recorder.Body.String(), ">110<") // Finalize alliance selection. web.arena.Database.CreateTeam(&model.Team{Id: 254, YellowCard: true}) - recorder = web.postHttpResponse("/setup/alliance_selection/finalize", "startTime=2014-01-01 01:00:00 PM") + recorder = web.postHttpResponse("/alliance_selection/finalize", "startTime=2014-01-01 01:00:00 PM") assert.Equal(t, 303, recorder.Code) alliances, err := web.arena.Database.GetAllAlliances() assert.Nil(t, err) @@ -104,55 +103,55 @@ func TestSetupAllianceSelectionErrors(t *testing.T) { } // Start an alliance selection that is already underway. - recorder := web.postHttpResponse("/setup/alliance_selection/start", "") + recorder := web.postHttpResponse("/alliance_selection/start", "") assert.Equal(t, 303, recorder.Code) - recorder = web.postHttpResponse("/setup/alliance_selection/start", "") + recorder = web.postHttpResponse("/alliance_selection/start", "") assert.Equal(t, 200, recorder.Code) assert.Contains(t, recorder.Body.String(), "already in progress") // Select invalid teams. - recorder = web.postHttpResponse("/setup/alliance_selection", "selection0_0=asdf") + recorder = web.postHttpResponse("/alliance_selection", "selection0_0=asdf") assert.Equal(t, 200, recorder.Code) assert.Contains(t, recorder.Body.String(), "Invalid team number") - recorder = web.postHttpResponse("/setup/alliance_selection", "selection0_0=100") + recorder = web.postHttpResponse("/alliance_selection", "selection0_0=100") assert.Equal(t, 200, recorder.Code) assert.Contains(t, recorder.Body.String(), "not present at this event") - recorder = web.postHttpResponse("/setup/alliance_selection", "selection0_0=101&selection1_1=101") + recorder = web.postHttpResponse("/alliance_selection", "selection0_0=101&selection1_1=101") assert.Equal(t, 200, recorder.Code) assert.Contains(t, recorder.Body.String(), "already part of an alliance") // Finalize early and without required parameters. - recorder = web.postHttpResponse("/setup/alliance_selection/finalize", + recorder = web.postHttpResponse("/alliance_selection/finalize", "startTime=2014-01-01 01:00:00 PM&matchSpacingSec=360") assert.Equal(t, 200, recorder.Code) assert.Contains(t, recorder.Body.String(), "until all spots have been filled") - recorder = web.postHttpResponse("/setup/alliance_selection", "selection0_0=101&selection0_1=102&"+ - "selection0_2=103&selection1_0=104&selection1_1=105&selection1_2=106") + recorder = web.postHttpResponse("/alliance_selection", "selection0_0=101&selection0_1=102&selection0_2=103&"+ + "selection1_0=104&selection1_1=105&selection1_2=106") assert.Equal(t, 303, recorder.Code) - recorder = web.postHttpResponse("/setup/alliance_selection/finalize", "startTime=asdf") + recorder = web.postHttpResponse("/alliance_selection/finalize", "startTime=asdf") assert.Equal(t, 200, recorder.Code) assert.Contains(t, recorder.Body.String(), "valid start time") // Finalize for real and check that TBA publishing is triggered. web.arena.TbaClient.BaseUrl = "fakeurl" web.arena.EventSettings.TbaPublishingEnabled = true - recorder = web.postHttpResponse("/setup/alliance_selection/finalize", "startTime=2014-01-01 01:00:00 PM") + recorder = web.postHttpResponse("/alliance_selection/finalize", "startTime=2014-01-01 01:00:00 PM") assert.Equal(t, 200, recorder.Code) assert.Contains(t, recorder.Body.String(), "Failed to publish alliances") // Do other things after finalization. - recorder = web.postHttpResponse("/setup/alliance_selection/finalize", "startTime=2014-01-01 01:00:00 PM") + recorder = web.postHttpResponse("/alliance_selection/finalize", "startTime=2014-01-01 01:00:00 PM") assert.Equal(t, 200, recorder.Code) assert.Contains(t, recorder.Body.String(), "already been finalized") - recorder = web.postHttpResponse("/setup/alliance_selection/reset", "") + recorder = web.postHttpResponse("/alliance_selection/reset", "") assert.Equal(t, 200, recorder.Code) assert.Contains(t, recorder.Body.String(), "already been finalized") - recorder = web.postHttpResponse("/setup/alliance_selection", "selection0_0=asdf") + recorder = web.postHttpResponse("/alliance_selection", "selection0_0=asdf") assert.Equal(t, 200, recorder.Code) assert.Contains(t, recorder.Body.String(), "already been finalized") cachedAlliances = [][]model.AllianceTeam{} cachedRankedTeams = []*RankedTeam{} - recorder = web.postHttpResponse("/setup/alliance_selection/start", "") + recorder = web.postHttpResponse("/alliance_selection/start", "") assert.Equal(t, 200, recorder.Code) assert.Contains(t, recorder.Body.String(), "already been finalized") } @@ -167,7 +166,7 @@ func TestSetupAllianceSelectionAutofocus(t *testing.T) { // Straight draft. web.arena.EventSettings.SelectionRound2Order = "F" web.arena.EventSettings.SelectionRound3Order = "F" - recorder := web.postHttpResponse("/setup/alliance_selection/start", "") + recorder := web.postHttpResponse("/alliance_selection/start", "") assert.Equal(t, 303, recorder.Code) i, j := web.determineNextCell() assert.Equal(t, 0, i) @@ -208,9 +207,9 @@ func TestSetupAllianceSelectionAutofocus(t *testing.T) { // Double-serpentine draft. web.arena.EventSettings.SelectionRound2Order = "L" web.arena.EventSettings.SelectionRound3Order = "L" - recorder = web.postHttpResponse("/setup/alliance_selection/reset", "") + recorder = web.postHttpResponse("/alliance_selection/reset", "") assert.Equal(t, 303, recorder.Code) - recorder = web.postHttpResponse("/setup/alliance_selection/start", "") + recorder = web.postHttpResponse("/alliance_selection/start", "") assert.Equal(t, 303, recorder.Code) i, j = web.determineNextCell() assert.Equal(t, 0, i) @@ -255,7 +254,7 @@ func TestSetupAllianceSelectionPublish(t *testing.T) { web.arena.TbaClient.BaseUrl = "fakeurl" web.arena.EventSettings.TbaPublishingEnabled = true - recorder := web.postHttpResponse("/setup/alliance_selection/publish", "") + recorder := web.postHttpResponse("/alliance_selection/publish", "") assert.Equal(t, 500, recorder.Code) assert.Contains(t, recorder.Body.String(), "Failed to publish alliances") } diff --git a/web/web.go b/web/web.go index c729f6b..32a2534 100644 --- a/web/web.go +++ b/web/web.go @@ -125,6 +125,12 @@ func (web *Web) checkReaderPassword(user, password string) bool { // Sets up the mapping between URLs and handlers. func (web *Web) newHandler() http.Handler { router := mux.NewRouter() + router.HandleFunc("/alliance_selection", web.allianceSelectionGetHandler).Methods("GET") + router.HandleFunc("/alliance_selection", web.allianceSelectionPostHandler).Methods("POST") + router.HandleFunc("/alliance_selection/start", web.allianceSelectionStartHandler).Methods("POST") + router.HandleFunc("/alliance_selection/reset", web.allianceSelectionResetHandler).Methods("POST") + router.HandleFunc("/alliance_selection/finalize", web.allianceSelectionFinalizeHandler).Methods("POST") + router.HandleFunc("/alliance_selection/publish", web.allianceSelectionPublishHandler).Methods("POST") router.HandleFunc("/setup/settings", web.settingsGetHandler).Methods("GET") router.HandleFunc("/setup/settings", web.settingsPostHandler).Methods("POST") router.HandleFunc("/setup/db/save", web.saveDbHandler).Methods("GET") @@ -142,12 +148,6 @@ func (web *Web) newHandler() http.Handler { router.HandleFunc("/setup/schedule/generate", web.scheduleGeneratePostHandler).Methods("POST") router.HandleFunc("/setup/schedule/republish", web.scheduleRepublishPostHandler).Methods("POST") router.HandleFunc("/setup/schedule/save", web.scheduleSavePostHandler).Methods("POST") - router.HandleFunc("/setup/alliance_selection", web.allianceSelectionGetHandler).Methods("GET") - router.HandleFunc("/setup/alliance_selection", web.allianceSelectionPostHandler).Methods("POST") - router.HandleFunc("/setup/alliance_selection/start", web.allianceSelectionStartHandler).Methods("POST") - router.HandleFunc("/setup/alliance_selection/reset", web.allianceSelectionResetHandler).Methods("POST") - router.HandleFunc("/setup/alliance_selection/finalize", web.allianceSelectionFinalizeHandler).Methods("POST") - router.HandleFunc("/setup/alliance_selection/publish", web.allianceSelectionPublishHandler).Methods("POST") router.HandleFunc("/setup/displays", web.displaysGetHandler).Methods("GET") router.HandleFunc("/setup/displays", web.displaysPostHandler).Methods("POST") router.HandleFunc("/setup/displays/reload", web.displaysReloadHandler).Methods("GET")