my.json now contains team members, instead of teams.json
This commit is contained in:
parent
890d3e2fdf
commit
e207e90c2e
@ -34,7 +34,6 @@ type exportedTeam struct {
|
||||
Color string `json:"color"`
|
||||
Rank int `json:"rank"`
|
||||
Points int64 `json:"score"`
|
||||
Members []fic.Member `json:"members"`
|
||||
}
|
||||
|
||||
func exportTeams() (interface{}, error) {
|
||||
@ -47,15 +46,12 @@ func exportTeams() (interface{}, error) {
|
||||
for _, team := range teams {
|
||||
if points, err := team.GetPoints(); err != nil {
|
||||
return nil, err
|
||||
} else if members, err := team.GetMembers(); err != nil {
|
||||
return nil, err
|
||||
} else {
|
||||
ret[fmt.Sprintf("%d", team.Id)] = exportedTeam{
|
||||
team.Name,
|
||||
fmt.Sprintf("#%x", team.Color),
|
||||
rank[team.Id],
|
||||
points,
|
||||
members,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -26,6 +26,7 @@ type myTeamExercice struct {
|
||||
type myTeam struct {
|
||||
Id int64 `json:"team_id"`
|
||||
Points int64 `json:"score"`
|
||||
Members []Member `json:"members"`
|
||||
Exercices map[string]myTeamExercice `json:"exercices"`
|
||||
}
|
||||
|
||||
@ -36,6 +37,10 @@ func MyJSONTeam(t *Team, started bool) (interface{}, error) {
|
||||
} else {
|
||||
ret.Id = t.Id
|
||||
ret.Points, _ = t.GetPoints()
|
||||
if members, err := t.GetMembers(); err == nil {
|
||||
ret.Members = members
|
||||
}
|
||||
|
||||
}
|
||||
ret.Exercices = map[string]myTeamExercice{}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user