Skip to content
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

Jump to bottom

fix: Auto publish for non-autograded assessments #1157

Merged
merged 3 commits into from
Aug 22, 2024
Merged

fix: Auto publish for non-autograded assessments #1157

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e74c6f
fix: Auto publish for non-autograded assessments
GabrielCWT Aug 22, 2024
1f44bed
Merge branch 'master' into fix/auto-publish
GabrielCWT Aug 22, 2024
821708b
chore: Formatting
GabrielCWT Aug 22, 2024
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/assessments/assessments.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -916,7 +916,7 @@
raw_answer,
force_submit
) do
with {:ok, team} <- find_team(question.assessment.id, cr_id),

Check warning on line 919 in lib/cadet/assessments/assessments.ex

View workflow job for this annotation

GitHub Actions / Run CI 

variable "team" is unused (if the variable is not meant to be used, prefix it with an underscore)
{:ok, submission} <- find_or_create_submission(cr, question.assessment),
{:status, true} <- {:status, force_submit or submission.status != :submitted},
{:ok, _answer} <- insert_or_update_answer(submission, question, raw_answer, cr_id) do
Expand Down Expand Up @@ -2409,16 +2409,23 @@
submission =
Submission
|> join(:inner, [s], a in assoc(s, :assessment))
|> preload([_, a], assessment: a)
|> preload([_, a], assessment: {a, :config})
|> Repo.get(submission_id)

is_grading_auto_published = submission.assessment.config.is_grading_auto_published

with {:answer_found?, true} <- {:answer_found?, is_map(answer)},
{:status, true} <-
{:status, answer.submission.status == :submitted or is_own_submission},
{:valid, changeset = %Ecto.Changeset{valid?: true}} <-
{:valid, Answer.grading_changeset(answer, attrs)},
{:ok, _} <- Repo.update(changeset) do
update_xp_bonus(submission)

if is_grading_auto_published and is_fully_graded?(submission_id) do
publish_grading(submission_id)
end

{:ok, nil}
else
{:answer_found?, false} ->
Expand Down Expand Up @@ -2683,7 +2690,7 @@

def has_last_modified_answer?(
question = %Question{},
cr = %CourseRegistration{id: cr_id},

Check warning on line 2693 in lib/cadet/assessments/assessments.ex

View workflow job for this annotation

GitHub Actions / Run CI 

variable "cr_id" is unused (if the variable is not meant to be used, prefix it with an underscore)
last_modified_at,
force_submit
) do
Expand Down
Loading