token-validator: prefer displaying progress by challenge ID

token-validator/students.go

@@ -4,6 +4,7 @@ import (
 	"crypto/hmac"
 	"crypto/sha512"
 	"encoding/json"
+	"fmt"
 	"strings"
 	"time"
 
@@ -16,10 +17,14 @@ func init() {
 			if stds, err := getStudents(); err != nil {
 				return nil, err
 			} else {
-				ret := map[string][]UnlockedChallenge{}
+				ret := map[string]map[string]UnlockedChallenge{}
 				for _, std := range stds {
-					if ret[std.Login], err = std.getStates(); err != nil {
-						return nil, err
+					if sts, err := std.getStates(); err == nil {
+						ret[std.Login] = map[string]UnlockedChallenge{}
+
+						for _, s := range sts {
+							ret[std.Login][fmt.Sprintf("%d", s.Challenge)] = s
+						}
 					}
 				}
 				return ret, nil