diff --git a/web/server.go b/web/server.go index 05fe15c..cb831b2 100644 --- a/web/server.go +++ b/web/server.go @@ -425,7 +425,7 @@ func (s *Server) broadcastRaceEvent(event derby.Event) { switch event.Type { case derby.EventRaceStart: s.logger.Info("Broadcasting race start event") - s.sendRaceEventToAllClients("event: race-status\ndata:
Race Running
\n\n") + s.sendRaceEventToAllClients("event: race-status\ndata:
Race Running
\n\n") heatGroup, _ := s.db.GetCurrentRacingGroup() heatResult.GroupID = heatGroup.ID heatResult.HeatNumber, _ = s.db.GetCurrentHeatNumber(heatGroup.ID) @@ -455,7 +455,7 @@ func (s *Server) broadcastRaceEvent(event derby.Event) { case derby.EventRaceComplete: s.logger.Info("Broadcasting race complete event") - s.sendRaceEventToAllClients("event: race-status\ndata:
Race Complete
\n\n") + s.sendRaceEventToAllClients("event: race-status\ndata:
Race Complete
\n\n") s.db.SaveHeatResult(heatResult) } } @@ -1689,6 +1689,8 @@ func (s *Server) handleNextHeat() http.HandlerFunc { Event: *heatData, }) + s.sendRaceEventToAllClients("event: race-status\ndata:
Idle
\n\n") + w.WriteHeader(http.StatusOK) json.NewEncoder(w).Encode(map[string]string{"status": "success"}) } @@ -1734,6 +1736,8 @@ func (s *Server) handlePreviousHeat() http.HandlerFunc { Event: *heatData, }) + s.sendRaceEventToAllClients("event: race-status\ndata:
Idle
\n\n") + w.WriteHeader(http.StatusOK) json.NewEncoder(w).Encode(map[string]string{"status": "success"}) } @@ -1773,6 +1777,8 @@ func (s *Server) handleRerunHeat() http.HandlerFunc { Event: *heatData, }) + s.sendRaceEventToAllClients("event: race-status\ndata:
Idle
\n\n") + w.WriteHeader(http.StatusOK) json.NewEncoder(w).Encode(map[string]string{"status": "success"}) } @@ -1813,6 +1819,8 @@ func (s *Server) handleSetRacingGroup() http.HandlerFunc { Event: heatResults, }) + s.sendRaceEventToAllClients("event: race-status\ndata:
Idle
\n\n") + w.WriteHeader(http.StatusOK) json.NewEncoder(w).Encode(map[string]string{"status": "success"}) } diff --git a/web/templates/race_manage.templ b/web/templates/race_manage.templ index 630ff1e..06b64ba 100644 --- a/web/templates/race_manage.templ +++ b/web/templates/race_manage.templ @@ -42,14 +42,14 @@ templ RaceManage(heatData *models.HeatData, nextHeat *models.HeatData, groups []
Timer Control
-
- Ready +
+
Ready
- -
Timer Control
Ready
Gate Status: Unknown
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, ">Next Heat
Timer Control
Ready
Gate Status: Unknown
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/web/templates/race_public.templ b/web/templates/race_public.templ index cf3a048..803545a 100644 --- a/web/templates/race_public.templ +++ b/web/templates/race_public.templ @@ -20,9 +20,8 @@ templ RacePublic(heatData *models.HeatData, nextHeat *models.HeatData, onDeckHea
-
-
0.000
-
Ready
+
+
Ready
diff --git a/web/templates/race_public_templ.go b/web/templates/race_public_templ.go index e984a1c..e5ac41e 100644 --- a/web/templates/race_public_templ.go +++ b/web/templates/race_public_templ.go @@ -87,7 +87,7 @@ func RacePublic(heatData *models.HeatData, nextHeat *models.HeatData, onDeckHeat if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "
0.000
Ready
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "
Ready
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -226,7 +226,7 @@ func raceLaneCard(laneData models.LaneData) templ.Component { var templ_7745c5c3_Var8 string templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(laneData.Lane)) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_public.templ`, Line: 97, Col: 67} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_public.templ`, Line: 96, Col: 67} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8)) if templ_7745c5c3_Err != nil { @@ -239,7 +239,7 @@ func raceLaneCard(laneData models.LaneData) templ.Component { var templ_7745c5c3_Var9 string templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(laneData.Name) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_public.templ`, Line: 100, Col: 54} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_public.templ`, Line: 99, Col: 54} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9)) if templ_7745c5c3_Err != nil { @@ -252,7 +252,7 @@ func raceLaneCard(laneData models.LaneData) templ.Component { var templ_7745c5c3_Var10 string templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(laneData.CarNum) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_public.templ`, Line: 102, Col: 61} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_public.templ`, Line: 101, Col: 61} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10)) if templ_7745c5c3_Err != nil { @@ -265,7 +265,7 @@ func raceLaneCard(laneData models.LaneData) templ.Component { var templ_7745c5c3_Var11 string templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%.1f oz", laneData.CarWeight)) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_public.templ`, Line: 103, Col: 89} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_public.templ`, Line: 102, Col: 89} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11)) if templ_7745c5c3_Err != nil { @@ -278,7 +278,7 @@ func raceLaneCard(laneData models.LaneData) templ.Component { var templ_7745c5c3_Var12 string templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("lane-%d-time", laneData.Lane)) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_public.templ`, Line: 110, Col: 146} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_public.templ`, Line: 109, Col: 146} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12)) if templ_7745c5c3_Err != nil { @@ -291,7 +291,7 @@ func raceLaneCard(laneData models.LaneData) templ.Component { var templ_7745c5c3_Var13 string templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%.3f", laneData.Time)) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_public.templ`, Line: 111, Col: 72} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_public.templ`, Line: 110, Col: 72} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13)) if templ_7745c5c3_Err != nil { @@ -304,7 +304,7 @@ func raceLaneCard(laneData models.LaneData) templ.Component { var templ_7745c5c3_Var14 string templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("lane-%d-position", laneData.Lane)) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_public.templ`, Line: 118, Col: 150} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_public.templ`, Line: 117, Col: 150} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14)) if templ_7745c5c3_Err != nil { @@ -317,7 +317,7 @@ func raceLaneCard(laneData models.LaneData) templ.Component { var templ_7745c5c3_Var15 string templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(laneData.Place)) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_public.templ`, Line: 119, Col: 66} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_public.templ`, Line: 118, Col: 66} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15)) if templ_7745c5c3_Err != nil { @@ -360,7 +360,7 @@ func raceNextHeatPreview(heatData *models.HeatData) templ.Component { var templ_7745c5c3_Var17 string templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(heatData.HeatNumber)) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_public.templ`, Line: 132, Col: 61} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_public.templ`, Line: 131, Col: 61} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17)) if templ_7745c5c3_Err != nil { @@ -431,7 +431,7 @@ func raceNextHeatRow(laneData models.LaneData) templ.Component { var templ_7745c5c3_Var19 string templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(laneData.Lane)) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_public.templ`, Line: 163, Col: 41} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_public.templ`, Line: 162, Col: 41} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19)) if templ_7745c5c3_Err != nil { @@ -444,7 +444,7 @@ func raceNextHeatRow(laneData models.LaneData) templ.Component { var templ_7745c5c3_Var20 string templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(laneData.Name) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_public.templ`, Line: 164, Col: 27} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_public.templ`, Line: 163, Col: 27} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var20)) if templ_7745c5c3_Err != nil { @@ -457,7 +457,7 @@ func raceNextHeatRow(laneData models.LaneData) templ.Component { var templ_7745c5c3_Var21 string templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.JoinStringErrs(laneData.CarNum) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_public.templ`, Line: 165, Col: 29} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_public.templ`, Line: 164, Col: 29} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var21)) if templ_7745c5c3_Err != nil {