diff --git a/grades.go b/grades.go index 0540df9..33818e1 100644 --- a/grades.go +++ b/grades.go @@ -66,7 +66,7 @@ func declareAPIAuthGradesRoutes(router *gin.RouterGroup) { } func GetAllGrades() (scores map[int64]map[int64]*float64, err error) { - if rows, errr := DBQuery("SELECT id_user, id_survey, SUM(score)/COUNT(*) FROM student_scores GROUP BY id_user, id_survey"); err != nil { + if rows, errr := DBQuery("SELECT id_user, id_survey, SUM(score)/COUNT(*) FROM student_scores GROUP BY id_user, id_survey"); errr != nil { return nil, errr } else { defer rows.Close() @@ -97,7 +97,7 @@ func GetAllGrades() (scores map[int64]map[int64]*float64, err error) { } func (s Survey) GetGrades() (scores map[int64]*float64, err error) { - if rows, errr := DBQuery("SELECT id_question, SUM(score)/COUNT(*) FROM student_scores WHERE id_survey=? GROUP BY id_question", s.Id); err != nil { + if rows, errr := DBQuery("SELECT id_question, SUM(score)/COUNT(*) FROM student_scores WHERE id_survey=? GROUP BY id_question", s.Id); errr != nil { return nil, errr } else { defer rows.Close() @@ -122,7 +122,7 @@ func (s Survey) GetGrades() (scores map[int64]*float64, err error) { } func (s Survey) GetUserGrades(u *User) (scores map[int64]*float64, err error) { - if rows, errr := DBQuery("SELECT id_question, MAX(score) FROM student_scores WHERE id_survey=? AND id_user = ? GROUP BY id_question", s.Id, u.Id); err != nil { + if rows, errr := DBQuery("SELECT id_question, MAX(score) FROM student_scores WHERE id_survey=? AND id_user = ? GROUP BY id_question", s.Id, u.Id); errr != nil { return nil, errr } else { defer rows.Close() diff --git a/keys.go b/keys.go index 3b15b2a..48dfe5f 100644 --- a/keys.go +++ b/keys.go @@ -95,6 +95,12 @@ func declareAPIAuthKeysRoutes(router *gin.RouterGroup) { return } + k2 := key + if err := k2.ReadInfos(u); err != nil { + c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"errmsg": err.Error()}) + return + } + k, err := u.NewKey(key.Type, key.Content) if err != nil { log.Println("Unable to NewKey:", err) diff --git a/surveys.go b/surveys.go index d5091f5..48df3eb 100644 --- a/surveys.go +++ b/surveys.go @@ -302,7 +302,7 @@ func (s Survey) GetScore(u *User) (score *float64, err error) { } func (s Survey) GetScores() (scores map[int64]*float64, err error) { - if rows, errr := DBQuery("SELECT id_user, SUM(score)/COUNT(*) FROM student_scores WHERE id_survey=? GROUP BY id_user", s.Id); err != nil { + if rows, errr := DBQuery("SELECT id_user, SUM(score)/COUNT(*) FROM student_scores WHERE id_survey=? GROUP BY id_user", s.Id); errr != nil { return nil, errr } else { defer rows.Close() diff --git a/ui/src/components/UserKeys.svelte b/ui/src/components/UserKeys.svelte index 8f21f21..7f383cb 100644 --- a/ui/src/components/UserKeys.svelte +++ b/ui/src/components/UserKeys.svelte @@ -25,7 +25,7 @@ {:then keys} {#if keys && keys.length > 0} {#each keys as keyid} - {#await getKey(keyid)} + {#await getKey(keyid, student.id)} Veuillez patienter {:then key}