Skip to content

fix sorting for grading #1155

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
RichDom2185 merged 3 commits into from
Aug 20, 2024
Merged

fix sorting for grading #1155

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f79ecc
fix sorting for grading
thortol Aug 19, 2024
ec73e5d
sorted by submission.id as well for the edge case that inserted_at is…
thortol Aug 19, 2024
f84156e
fixed formatting issues
thortol Aug 19, 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
40 changes: 21 additions & 19 deletions lib/cadet/assessments/assessments.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1943,12 +1943,12 @@ defmodule Cadet.Assessments do
left_join: asst in subquery(question_answers_query),
on: asst.assessment_id == s.assessment_id,
as: :asst,
left_join: user in User,
on: user.id == s.student_id,
as: :user,
left_join: cr in CourseRegistration,
on: user.id == cr.user_id,
on: s.student_id == cr.id,
as: :cr,
left_join: user in User,
on: user.id == cr.user_id,
as: :user,
left_join: group in Group,
on: cr.group_id == group.id,
as: :group,
Expand Down Expand Up @@ -1982,7 +1982,9 @@ defmodule Cadet.Assessments do
query =
sort_submission(query, Map.get(params, "sortBy", ""), Map.get(params, "sortDirection", ""))

query = from([s, ans, asst, user, cr, group] in query, order_by: [desc: s.inserted_at])
query =
from([s, ans, asst, cr, user, group] in query, order_by: [desc: s.inserted_at, asc: s.id])

submissions = Repo.all(query)

count_query =
Expand Down Expand Up @@ -2027,30 +2029,30 @@ defmodule Cadet.Assessments do
defp sort_submission_asc(query, sort_by) do
cond do
sort_by == "assessmentName" ->
from([s, ans, asst, user, cr, group, config] in query,
from([s, ans, asst, cr, user, group, config] in query,
order_by: fragment("upper(?)", asst.title)
)

sort_by == "assessmentType" ->
from([s, ans, asst, user, cr, group, config] in query, order_by: asst.config_id)
from([s, ans, asst, cr, user, group, config] in query, order_by: asst.config_id)

sort_by == "studentName" ->
from([s, ans, asst, user, cr, group, config] in query,
from([s, ans, asst, cr, user, group, config] in query,
order_by: fragment("upper(?)", user.name)
)

sort_by == "studentUsername" ->
from([s, ans, asst, user, cr, group, config] in query,
from([s, ans, asst, cr, user, group, config] in query,
order_by: fragment("upper(?)", user.username)
)

sort_by == "groupName" ->
from([s, ans, asst, user, cr, group, config] in query,
from([s, ans, asst, cr, user, group, config] in query,
order_by: fragment("upper(?)", group.name)
)

sort_by == "progressStatus" ->
from([s, ans, asst, user, cr, group, config] in query,
from([s, ans, asst, cr, user, group, config] in query,
order_by: [
asc: config.is_manually_graded,
asc: s.status,
Expand All @@ -2060,7 +2062,7 @@ defmodule Cadet.Assessments do
)

sort_by == "xp" ->
from([s, ans, asst, user, cr, group, config] in query,
from([s, ans, asst, cr, user, group, config] in query,
order_by: ans.xp + ans.xp_adjustment
)

Expand All @@ -2072,30 +2074,30 @@ defmodule Cadet.Assessments do
defp sort_submission_desc(query, sort_by) do
cond do
sort_by == "assessmentName" ->
from([s, ans, asst, user, cr, group, config] in query,
from([s, ans, asst, cr, user, group, config] in query,
order_by: [desc: fragment("upper(?)", asst.title)]
)

sort_by == "assessmentType" ->
from([s, ans, asst, user, cr, group, config] in query, order_by: [desc: asst.config_id])
from([s, ans, asst, cr, user, group, config] in query, order_by: [desc: asst.config_id])

sort_by == "studentName" ->
from([s, ans, asst, user, cr, group, config] in query,
from([s, ans, asst, cr, user, group, config] in query,
order_by: [desc: fragment("upper(?)", user.name)]
)

sort_by == "studentUsername" ->
from([s, ans, asst, user, cr, group, config] in query,
from([s, ans, asst, cr, user, group, config] in query,
order_by: [desc: fragment("upper(?)", user.username)]
)

sort_by == "groupName" ->
from([s, ans, asst, user, cr, group, config] in query,
from([s, ans, asst, cr, user, group, config] in query,
order_by: [desc: fragment("upper(?)", group.name)]
)

sort_by == "progressStatus" ->
from([s, ans, asst, user, cr, group, config] in query,
from([s, ans, asst, cr, user, group, config] in query,
order_by: [
desc: config.is_manually_graded,
desc: s.status,
Expand All @@ -2105,7 +2107,7 @@ defmodule Cadet.Assessments do
)

sort_by == "xp" ->
from([s, ans, asst, user, cr, group, config] in query,
from([s, ans, asst, cr, user, group, config] in query,
order_by: [desc: ans.xp + ans.xp_adjustment]
)

Expand Down