Skip to content

Add solution field to GradingController.show #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 25, 2018
Merged

Add solution field to GradingController.show #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion lib/cadet_web/controllers/grading_controller.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,8 @@ defmodule CadetWeb.GradingController do
GradingInfo:
swagger_schema do
description(
"A list of questions with submitted answers and previous grading info if available"
"A list of questions with submitted answers, solution and previous grading info " <>
"if available"
)

type(:array)
Expand All @@ -171,6 +172,12 @@ defmodule CadetWeb.GradingController do
question(Schema.ref(:Question))
grade(Schema.ref(:Grade))

solution(
:string,
"the marking scheme and model solution to this question. Only available for programming questions",
required: true
)

maxGrade(
:integer,
"the max grade that can be given to this question",
Expand Down
1 change: 1 addition & 0 deletions lib/cadet_web/views/grading_view.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ defmodule CadetWeb.GradingView do
&1.answer["code"] || &1.answer["choice_id"]
),
maxGrade: & &1.question.max_grade,
solution: &(&1.question.question["solution"] || ""),
grade: &transform_map_for_view(&1, [:grade, :adjustment, :comment])
})
end
Expand Down
2 changes: 2 additions & 0 deletions test/cadet_web/controllers/grading_controller_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ defmodule CadetWeb.GradingControllerTest do
"content" => &1.question.question.content,
"answer" => &1.answer.code
},
"solution" => &1.question.question.solution,
"maxGrade" => &1.question.max_grade,
"grade" => %{
"grade" => &1.grade,
Expand Down Expand Up @@ -176,6 +177,7 @@ defmodule CadetWeb.GradingControllerTest do
}
end
},
"solution" => "",
"maxGrade" => &1.question.max_grade,
"grade" => %{
"grade" => &1.grade,
Expand Down