Merge branch 'master' into feat-calculate-all-user-xp

source-academy · Sep 3, 2023 · 7f82b5a · 7f82b5a
2 parents cbf3e08 + dfcbdb4
commit 7f82b5a
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 14 deletions.
diff --git a/lib/cadet/assessments/assessments.ex b/lib/cadet/assessments/assessments.ex
@@ -1224,6 +1224,7 @@ defmodule Cadet.Assessments do
                  (select
                    a.id,
                    a.title,
+                   a.number as "assessmentNumber",
                    bool_or(ac.is_manually_graded) as "isManuallyGraded",
                    max(ac.type) as "type",
                    sum(q.max_xp) as "maxXp",
@@ -1242,6 +1243,7 @@ defmodule Cadet.Assessments do
                  (select
                    cr.id,
                    u.name as "name",
+                   u.username as "username",
                    g.name as "groupName",
                    g.leader_id as "groupLeaderId"
                  from course_registrations cr

diff --git a/lib/cadet_web/admin_controllers/admin_grading_controller.ex b/lib/cadet_web/admin_controllers/admin_grading_controller.ex
@@ -310,6 +310,7 @@ defmodule CadetWeb.AdminGradingController do
           properties do
             id(:integer, "student id", required: true)
             name(:string, "student name", required: true)
+            username(:string, "student username", required: true)
             groupName(:string, "name of student's group")
             groupLeaderId(:integer, "user id of group leader")
           end

diff --git a/lib/cadet_web/admin_views/admin_grading_view.ex b/lib/cadet_web/admin_views/admin_grading_view.ex
@@ -10,7 +10,11 @@ defmodule CadetWeb.AdminGradingView do
   def render("grading_info.json", %{answer: answer}) do
     transform_map_for_view(answer, %{
       student:
-        &transform_map_for_view(&1.submission.student, %{name: fn st -> st.user.name end, id: :id}),
+        &transform_map_for_view(&1.submission.student, %{
+          name: fn st -> st.user.name end,
+          id: :id,
+          username: fn st -> st.user.username end
+        }),
       question: &build_grading_question/1,
       solution: &(&1.question.question["solution"] || ""),
       grade: &build_grade/1