From d792772f9b20b5e77018642e55120209c1933595 Mon Sep 17 00:00:00 2001 From: Patrick Fairbank Date: Tue, 10 Jun 2014 22:15:51 -0700 Subject: [PATCH] Removed unneeded first round ordering setting. --- .../20140524160241_CreateEventSettings.sql | 1 - event_settings.go | 2 -- event_settings_test.go | 3 +-- setup_settings.go | 1 - templates/settings.html | 19 ------------------- 5 files changed, 1 insertion(+), 25 deletions(-) diff --git a/db/migrations/20140524160241_CreateEventSettings.sql b/db/migrations/20140524160241_CreateEventSettings.sql index e8d2688..7c809ac 100644 --- a/db/migrations/20140524160241_CreateEventSettings.sql +++ b/db/migrations/20140524160241_CreateEventSettings.sql @@ -5,7 +5,6 @@ CREATE TABLE event_settings ( code VARCHAR(16), displaybackgroundcolor VARCHAR(16), numelimalliances int, - selectionround1order VARCHAR(1), selectionround2order VARCHAR(1), selectionround3order VARCHAR(1) ); diff --git a/event_settings.go b/event_settings.go index 5e5b220..c5b17fe 100644 --- a/event_settings.go +++ b/event_settings.go @@ -11,7 +11,6 @@ type EventSettings struct { Code string DisplayBackgroundColor string NumElimAlliances int - SelectionRound1Order string SelectionRound2Order string SelectionRound3Order string } @@ -27,7 +26,6 @@ func (database *Database) GetEventSettings() (*EventSettings, error) { eventSettings.Code = "UE" eventSettings.DisplayBackgroundColor = "#00ff00" eventSettings.NumElimAlliances = 8 - eventSettings.SelectionRound1Order = "F" eventSettings.SelectionRound2Order = "L" eventSettings.SelectionRound3Order = "" err = database.eventSettingsMap.Insert(eventSettings) diff --git a/event_settings_test.go b/event_settings_test.go index 1ed610a..c401ff6 100644 --- a/event_settings_test.go +++ b/event_settings_test.go @@ -17,13 +17,12 @@ func TestEventSettingsReadWrite(t *testing.T) { eventSettings, err := db.GetEventSettings() assert.Nil(t, err) - assert.Equal(t, EventSettings{0, "Untitled Event", "UE", "#00ff00", 8, "F", "L", ""}, *eventSettings) + assert.Equal(t, EventSettings{0, "Untitled Event", "UE", "#00ff00", 8, "L", ""}, *eventSettings) eventSettings.Name = "Chezy Champs" eventSettings.Code = "cc" eventSettings.DisplayBackgroundColor = "#ff00ff" eventSettings.NumElimAlliances = 6 - eventSettings.SelectionRound1Order = "F" eventSettings.SelectionRound2Order = "F" eventSettings.SelectionRound3Order = "L" err = db.SaveEventSettings(eventSettings) diff --git a/setup_settings.go b/setup_settings.go index d4e6e37..c1c55b5 100644 --- a/setup_settings.go +++ b/setup_settings.go @@ -39,7 +39,6 @@ func SettingsPostHandler(w http.ResponseWriter, r *http.Request) { return } eventSettings.NumElimAlliances = numAlliances - eventSettings.SelectionRound1Order = r.PostFormValue("selectionRound1Order") eventSettings.SelectionRound2Order = r.PostFormValue("selectionRound2Order") eventSettings.SelectionRound3Order = r.PostFormValue("selectionRound3Order") err := db.SaveEventSettings(eventSettings) diff --git a/templates/settings.html b/templates/settings.html index fb0fc4c..de7b44b 100644 --- a/templates/settings.html +++ b/templates/settings.html @@ -40,25 +40,6 @@ -
- -
-
- -
-
- -
-
-