Skip to content

[MBL-19627][Teacher] Fix quiz filtering to include New Quizzes #3461

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
tamaskozmer merged 1 commit into from
Jan 6, 2026
Merged

[MBL-19627][Teacher] Fix quiz filtering to include New Quizzes #3461

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
2 changes: 1 addition & 1 deletion ...main/java/com/instructure/pandautils/features/assignments/list/AssignmentListViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ class AssignmentListViewModel @Inject constructor(
Assignment.SubmissionType.DISCUSSION_TOPIC.apiString in it.submissionTypesRaw
}.toSet()
val quizzesGroup = (filteredAssignments - discussionsGroup).filter {
Assignment.SubmissionType.ONLINE_QUIZ.apiString in it.submissionTypesRaw
it.isQuiz()
}.toSet()
val assignmentGroup = filteredAssignments - discussionsGroup - quizzesGroup

Expand Down
32 changes: 26 additions & 6 deletions .../java/com/instructure/pandautils/features/assignments/list/AssignmentListViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import com.instructure.canvasapi2.models.AssignmentGroup
import com.instructure.canvasapi2.models.Checkpoint
import com.instructure.canvasapi2.models.Course
import com.instructure.canvasapi2.models.DiscussionTopicHeader
import com.instructure.canvasapi2.models.ExternalToolAttributes
import com.instructure.canvasapi2.models.GradingPeriod
import com.instructure.canvasapi2.models.SubAssignmentSubmission
import com.instructure.canvasapi2.models.Submission
Expand Down Expand Up @@ -482,21 +483,38 @@ class AssignmentListViewModelTest {
submissionTypesRaw = listOf(Assignment.SubmissionType.ONLINE_QUIZ.apiString),
dueAt = (Calendar.getInstance().apply { add(Calendar.DATE, -2)}.time).toApiString()
)
val assignment4 = Assignment(
id = 4,
name = "Assignment 4 (New Quizzes)",
assignmentGroupId = 4,
submissionTypesRaw = listOf(Assignment.SubmissionType.EXTERNAL_TOOL.apiString),
externalToolAttributes = ExternalToolAttributes(url = "https://example.com/quiz-lti"),
dueAt = (Calendar.getInstance().apply { add(Calendar.DATE, 1)}.time).toApiString()
)
val assignmentGroups = listOf(
AssignmentGroup(
id = 1,
name = "Group 1",
assignments = listOf(assignment1)
assignments = listOf(assignment1),
position = 1
),
AssignmentGroup(
id = 2,
name = "Group 2",
assignments = listOf(assignment2)
assignments = listOf(assignment2),
position = 2
),
AssignmentGroup(
id = 3,
name = "Group 3",
assignments = listOf(assignment3)
assignments = listOf(assignment3),
position = 3
),
AssignmentGroup(
id = 4,
name = "Group 4",
assignments = listOf(assignment4),
position = 4
),
)
val dueDateGroups = listOf(
Expand All @@ -508,7 +526,7 @@ class AssignmentListViewModelTest {
AssignmentGroup(
id = 1,
name = "Upcoming Assignments",
assignments = listOf(assignment2)
assignments = listOf(assignment4, assignment2)
),
AssignmentGroup(
id = 2,
Expand All @@ -530,22 +548,24 @@ class AssignmentListViewModelTest {
AssignmentGroup(
id = 2,
name = "Quizzes",
assignments = listOf(assignment3)
assignments = listOf(assignment3, assignment4)
),
)

val groupItem1 = AssignmentGroupItemState(course, assignment1, emptyList())
val groupItem2 = AssignmentGroupItemState(course, assignment2, emptyList())
val groupItem3 = AssignmentGroupItemState(course, assignment3, emptyList())
val groupItem4 = AssignmentGroupItemState(course, assignment4, emptyList())
every { behavior.getAssignmentGroupItemState(course, assignment1, emptyList(), emptyList()) } returns groupItem1
every { behavior.getAssignmentGroupItemState(course, assignment2, emptyList(), emptyList()) } returns groupItem2
every { behavior.getAssignmentGroupItemState(course, assignment3, emptyList(), emptyList()) } returns groupItem3
every { behavior.getAssignmentGroupItemState(course, assignment4, emptyList(), emptyList()) } returns groupItem4
coEvery { repository.getAssignments(any(), any()) } returns assignmentGroups
val viewModel = getViewModel()

var newFilter = AssignmentListSelectedFilters(selectedGroupByOption = AssignmentGroupByOption.AssignmentGroup)
viewModel.handleAction(AssignmentListScreenEvent.UpdateFilterState(newFilter))
assertEquals(assignmentGroups.reversed().map { it.assignments }, viewModel.uiState.value.listState.values.map { it.map { it.assignment } } )
assertEquals(assignmentGroups.map { it.assignments }, viewModel.uiState.value.listState.values.map { group -> group.map { it.assignment } } )

newFilter = newFilter.copy(selectedGroupByOption = AssignmentGroupByOption.DueDate)
viewModel.handleAction(AssignmentListScreenEvent.UpdateFilterState(newFilter))
Expand Down
Loading