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: Fix limit function for grading table fetch function #1190

Merged
merged 2 commits into from
Sep 23, 2024
Merged

Fix: Fix limit function for grading table fetch function #1190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0601d61
fix: Fix limit functionality not working
GabrielCWT Sep 22, 2024
4d66230
feat: Implement test for pagination
GabrielCWT Sep 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
2 changes: 1 addition & 1 deletion lib/cadet/assessments/assessments.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,7 +940,7 @@
raw_answer,
force_submit
) do
with {:ok, team} <- find_team(question.assessment.id, cr_id),

Check warning on line 943 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 @@ -1985,7 +1985,7 @@
where: s.assessment_id in subquery(build_assessment_config_filter(params)),
where: ^build_submission_filter(params),
where: ^build_course_registration_filter(params, grader),
limit: ^params[:limit],
limit: ^params[:page_size],
offset: ^params[:offset],
select: %{
id: s.id,
Expand Down Expand Up @@ -2679,7 +2679,7 @@

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

Check warning on line 2682 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
23 changes: 23 additions & 0 deletions test/cadet/assessments/assessments_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2210,6 +2210,29 @@
Map.put(seed, :total_submissions, total_submissions)
end

test "limit submissions", %{
course_regs: %{avenger1_cr: avenger}
} do
{_, res} =
Assessments.submissions_by_grader_for_index(avenger, %{
:page_size => 1
})

assert length(res[:data][:submissions]) == 1
end

test "limit submisssions 2", %{
course_regs: %{avenger1_cr: avenger},
assessments: assessments

Check warning on line 2226 in test/cadet/assessments/assessments_test.exs

View workflow job for this annotation

GitHub Actions / Run CI 

variable "assessments" is unused (if the variable is not meant to be used, prefix it with an underscore)
} do
{_, res} =
Assessments.submissions_by_grader_for_index(avenger, %{
:page_size => 2
})

assert length(res[:data][:submissions]) == 2
end

test "filter by assessment title", %{
course_regs: %{avenger1_cr: avenger},
assessments: assessments,
Expand Down
Loading