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

Sent keys type in my.json

Browse Source
This commit is contained in:
nemunaire 2016-01-20 10:14:56 +01:00
parent 59ae11e68d
commit a1d60ee78f
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
admin/api_team.go
View File

@ -20,13 +20,14 @@ type myTeamFile struct {
Path string `json:"path"` Path string `json:"path"`
Name string `json:"name"` Name string `json:"name"`
Checksum []byte `json:"checksum"` Checksum []byte `json:"checksum"`
Size int64 `json:"size"` Size int64 `json:"size"`
} }
type myTeamExercice struct { type myTeamExercice struct {
Statement string `json:"statement"` Statement string `json:"statement"`
Hint string `json:"hint"` Hint string `json:"hint"`
Gain int64 `json:"gain"` Gain int64 `json:"gain"`
Files []myTeamFile `json:"files"` Files []myTeamFile `json:"files"`
Keys []string `json:"keys"`
Solved bool `json:"solved"` Solved bool `json:"solved"`
SolvedTime time.Time `json:"solved_time"` SolvedTime time.Time `json:"solved_time"`
SolvedNumber int64 `json:"solved_number"` SolvedNumber int64 `json:"solved_number"`
@ -50,6 +51,18 @@ func myJSONTeam(t fic.Team) (interface{}, error) {
exercice.Statement = e.Statement exercice.Statement = e.Statement
exercice.Hint = e.Hint exercice.Hint = e.Hint
exercice.Solved, exercice.SolvedTime, exercice.SolvedNumber = t.HasSolved(e) exercice.Solved, exercice.SolvedTime, exercice.SolvedNumber = t.HasSolved(e)
exercice.Keys = []string{}
if keys, err := e.GetKeys(); err != nil {
return nil, err
} else {
for _, k := range keys {
exercice.Keys = append(exercice.Keys, k.Type)
}
}
exercice.Files = []myTeamFile{} exercice.Files = []myTeamFile{}
if files, err := e.GetFiles(); err != nil { if files, err := e.GetFiles(); err != nil {