fic/server
2
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

my.json now contains team members, instead of teams.json

Browse Source
This commit is contained in:
nemunaire 2016-01-24 11:42:26 +01:00
parent 890d3e2fdf
commit e207e90c2e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/api_team.go
View File

@ -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,
}
}
}

5
libfic/team_my.go
View File

@ -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{}