DustyP 9 months ago
parent ceb608424f
commit 14cffece3b

@ -48,8 +48,8 @@ type Heat struct {
ID int64 `json:"id"` ID int64 `json:"id"`
GroupID int64 `json:"group_id"` GroupID int64 `json:"group_id"`
HeatNum int `json:"heat_num"` HeatNum int `json:"heat_num"`
Lane1ID int64 `json:"lane1_id"` Lane1ID *int64 `json:"lane1_id"`
Lane2ID int64 `json:"lane2_id"` Lane2ID *int64 `json:"lane2_id"`
Lane3ID int64 `json:"lane3_id"` Lane3ID *int64 `json:"lane3_id"`
Lane4ID int64 `json:"lane4_id"` Lane4ID *int64 `json:"lane4_id"`
} }

@ -814,10 +814,10 @@ func (s *Server) handleHeatsContent() http.HandlerFunc {
for i, h := range derbyHeats { for i, h := range derbyHeats {
heats[i] = models.Heat{ heats[i] = models.Heat{
HeatNum: i + 1, HeatNum: i + 1,
Lane1ID: *h.Lane1ID, Lane1ID: h.Lane1ID,
Lane2ID: *h.Lane2ID, Lane2ID: h.Lane2ID,
Lane3ID: *h.Lane3ID, Lane3ID: h.Lane3ID,
Lane4ID: *h.Lane4ID, Lane4ID: h.Lane4ID,
} }
} }
} }

@ -69,10 +69,10 @@ templ HeatsContent(heats []models.Heat, racers []models.Racer) {
for i, heat := range heats { for i, heat := range heats {
<tr> <tr>
<td>{ strconv.Itoa(i + 1) }</td> <td>{ strconv.Itoa(i + 1) }</td>
<td>{ getRacerName(racers, heat.Lane1ID) }</td> <td>{ getRacerName(racers, *heat.Lane1ID) }</td>
<td>{ getRacerName(racers, heat.Lane2ID) }</td> <td>{ getRacerName(racers, *heat.Lane2ID) }</td>
<td>{ getRacerName(racers, heat.Lane3ID) }</td> <td>{ getRacerName(racers, *heat.Lane3ID) }</td>
<td>{ getRacerName(racers, heat.Lane4ID) }</td> <td>{ getRacerName(racers, *heat.Lane4ID) }</td>
</tr> </tr>
} }
</tbody> </tbody>

@ -167,9 +167,9 @@ func HeatsContent(heats []models.Heat, racers []models.Racer) templ.Component {
return templ_7745c5c3_Err return templ_7745c5c3_Err
} }
var templ_7745c5c3_Var7 string var templ_7745c5c3_Var7 string
templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(getRacerName(racers, heat.Lane1ID)) templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(getRacerName(racers, *heat.Lane1ID))
if templ_7745c5c3_Err != nil { if templ_7745c5c3_Err != nil {
return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/heats.templ`, Line: 72, Col: 47} return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/heats.templ`, Line: 72, Col: 48}
} }
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7)) _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
if templ_7745c5c3_Err != nil { if templ_7745c5c3_Err != nil {
@ -180,9 +180,9 @@ func HeatsContent(heats []models.Heat, racers []models.Racer) templ.Component {
return templ_7745c5c3_Err return templ_7745c5c3_Err
} }
var templ_7745c5c3_Var8 string var templ_7745c5c3_Var8 string
templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(getRacerName(racers, heat.Lane2ID)) templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(getRacerName(racers, *heat.Lane2ID))
if templ_7745c5c3_Err != nil { if templ_7745c5c3_Err != nil {
return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/heats.templ`, Line: 73, Col: 47} return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/heats.templ`, Line: 73, Col: 48}
} }
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8)) _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
if templ_7745c5c3_Err != nil { if templ_7745c5c3_Err != nil {
@ -193,9 +193,9 @@ func HeatsContent(heats []models.Heat, racers []models.Racer) templ.Component {
return templ_7745c5c3_Err return templ_7745c5c3_Err
} }
var templ_7745c5c3_Var9 string var templ_7745c5c3_Var9 string
templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(getRacerName(racers, heat.Lane3ID)) templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(getRacerName(racers, *heat.Lane3ID))
if templ_7745c5c3_Err != nil { if templ_7745c5c3_Err != nil {
return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/heats.templ`, Line: 74, Col: 47} return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/heats.templ`, Line: 74, Col: 48}
} }
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9)) _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
if templ_7745c5c3_Err != nil { if templ_7745c5c3_Err != nil {
@ -206,9 +206,9 @@ func HeatsContent(heats []models.Heat, racers []models.Racer) templ.Component {
return templ_7745c5c3_Err return templ_7745c5c3_Err
} }
var templ_7745c5c3_Var10 string var templ_7745c5c3_Var10 string
templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(getRacerName(racers, heat.Lane4ID)) templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(getRacerName(racers, *heat.Lane4ID))
if templ_7745c5c3_Err != nil { if templ_7745c5c3_Err != nil {
return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/heats.templ`, Line: 75, Col: 47} return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/heats.templ`, Line: 75, Col: 48}
} }
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10)) _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
if templ_7745c5c3_Err != nil { if templ_7745c5c3_Err != nil {

Loading…
Cancel
Save