Add Team School Name to team Edit (#193)

* Add Team School Name to team Edit * fix test --------- Co-authored-by: Corey Applegate <[email protected]>
Team254 · Aug 4, 2024 · 9b5c7e4 · 9b5c7e4
1 parent f0ff0df
commit 9b5c7e4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/templates/edit_team.html b/templates/edit_team.html
@@ -24,6 +24,12 @@
               <input type="text" class="form-control" name="nickname" value="{{.Team.Nickname}}">
             </div>
           </div>
+          <div class="row mb-3">
+            <label class="col-lg-3 control-label">School Name</label>
+            <div class="col-lg-9">
+              <input type="text" class="form-control" name="schoolName" value="{{.Team.SchoolName}}">
+            </div>
+          </div>
           <div class="row mb-3">
             <label class="col-lg-3 control-label">City</label>
             <div class="col-lg-9">

diff --git a/templates/teams.csv b/templates/teams.csv
@@ -1,3 +1,3 @@
-Number,Name,Nickname,City,StateProv,Country,RookieYear,RobotName,HasConnected
-{{range $team := .}}{{$team.Id}},"{{$team.Name}}","{{$team.Nickname}}","{{$team.City}}","{{$team.StateProv}}","{{$team.Country}}",{{$team.RookieYear}},"{{$team.RobotName}}",{{$team.HasConnected}}
+Number,Name,Nickname,SchoolName,City,StateProv,Country,RookieYear,RobotName,HasConnected
+{{range $team := .}}{{$team.Id}},"{{$team.Name}}","{{$team.Nickname}}","{{$team.SchoolName}}","{{$team.City}}","{{$team.StateProv}}","{{$team.Country}}",{{$team.RookieYear}},"{{$team.RobotName}}",{{$team.HasConnected}}
 {{end}}
diff --git a/web/reports_test.go b/web/reports_test.go
@@ -86,19 +86,19 @@ func TestSchedulePdfReport(t *testing.T) {
 func TestTeamsCsvReport(t *testing.T) {
 	web := setupTestWeb(t)
 
-	team1 := model.Team{Id: 254, Name: "NASA", Nickname: "The Cheesy Poofs", City: "San Jose", StateProv: "CA",
+	team1 := model.Team{Id: 254, Name: "NASA", Nickname: "The Cheesy Poofs", SchoolName: "Bellarmine College Preparatory", City: "San Jose", StateProv: "CA",
 		Country: "USA", RookieYear: 1999, RobotName: "Barrage"}
-	team2 := model.Team{Id: 1114, Name: "GM", Nickname: "Simbotics", City: "St. Catharines", StateProv: "ON",
+	team2 := model.Team{Id: 1114, Name: "GM", Nickname: "Simbotics", SchoolName: "Governor Simcoe Secondary School", City: "St. Catharines", StateProv: "ON",
 		Country: "Canada", RookieYear: 2003, RobotName: "Simbot Evolution"}
 	web.arena.Database.CreateTeam(&team1)
 	web.arena.Database.CreateTeam(&team2)
 
 	recorder := web.getHttpResponse("/reports/csv/teams")
 	assert.Equal(t, 200, recorder.Code)
 	assert.Equal(t, "text/plain", recorder.Header()["Content-Type"][0])
-	expectedBody := "Number,Name,Nickname,City,StateProv,Country,RookieYear,RobotName,HasConnected\n254,\"NASA\"," +
-		"\"The Cheesy Poofs\",\"San Jose\",\"CA\",\"USA\",1999,\"Barrage\",false\n1114,\"GM\",\"Simbotics\"," +
-		"\"St. Catharines\",\"ON\",\"Canada\",2003,\"Simbot Evolution\",false\n\n"
+	expectedBody := "Number,Name,Nickname,SchoolName,City,StateProv,Country,RookieYear,RobotName,HasConnected\n254,\"NASA\"," +
+		"\"The Cheesy Poofs\",\"Bellarmine College Preparatory\",\"San Jose\",\"CA\",\"USA\",1999,\"Barrage\",false\n1114,\"GM\",\"Simbotics\"," +
+		"\"Governor Simcoe Secondary School\",\"St. Catharines\",\"ON\",\"Canada\",2003,\"Simbot Evolution\",false\n\n"
 	assert.Equal(t, expectedBody, recorder.Body.String())
 }
 

diff --git a/web/setup_teams.go b/web/setup_teams.go
@@ -176,6 +176,7 @@ func (web *Web) teamEditPostHandler(w http.ResponseWriter, r *http.Request) {
 	team.Name = r.PostFormValue("name")
 	team.Nickname = r.PostFormValue("nickname")
 	team.City = r.PostFormValue("city")
+	team.SchoolName = r.PostFormValue("schoolName")
 	team.StateProv = r.PostFormValue("stateProv")
 	team.Country = r.PostFormValue("country")
 	team.RookieYear, _ = strconv.Atoi(r.PostFormValue("rookieYear"))