Skip to content

[MBL-19286][All] - Fixed wrong quiz icons on Summary Syllabus page #3301

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
kdeakinstructure merged 1 commit into from
Oct 14, 2025
Merged

[MBL-19286][All] - Fixed wrong quiz icons on Summary Syllabus page #3301

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: 2 additions & 0 deletions apps/student/src/main/java/com/instructure/student/mobius/syllabus/SyllabusPresenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ object SyllabusPresenter : Presenter<SyllabusModel, SyllabusViewState> {

private fun getAssignmentIcon(assignment: Assignment) = when {
assignment.getSubmissionTypes().contains(Assignment.SubmissionType.ONLINE_QUIZ) -> com.instructure.student.R.drawable.ic_quiz
assignment.getSubmissionTypes().contains(Assignment.SubmissionType.EXTERNAL_TOOL) &&
assignment.externalToolAttributes?.url?.contains("quiz-lti") == true -> com.instructure.student.R.drawable.ic_quiz
assignment.getSubmissionTypes().contains(Assignment.SubmissionType.DISCUSSION_TOPIC) -> com.instructure.student.R.drawable.ic_discussion
else -> com.instructure.student.R.drawable.ic_assignment
}
Expand Down
2 changes: 2 additions & 0 deletions apps/teacher/src/main/java/com/instructure/teacher/features/syllabus/SyllabusPresenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ class SyllabusPresenter : Presenter<SyllabusModel, SyllabusViewState> {
private fun getAssignmentIcon(assignment: Assignment): Int {
return when {
assignment.getSubmissionTypes().contains(Assignment.SubmissionType.ONLINE_QUIZ) -> R.drawable.ic_quiz
assignment.getSubmissionTypes().contains(Assignment.SubmissionType.EXTERNAL_TOOL) &&
assignment.externalToolAttributes?.url?.contains("quiz-lti") == true -> R.drawable.ic_quiz
assignment.getSubmissionTypes().contains(Assignment.SubmissionType.DISCUSSION_TOPIC) -> R.drawable.ic_discussion
else -> R.drawable.ic_assignment
}
Expand Down
16 changes: 14 additions & 2 deletions libs/pandautils/src/main/java/com/instructure/pandautils/utils/ScheduleItemExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,33 @@ import java.util.Date

val ScheduleItem.iconRes: Int
get() {
val isClassicQuiz = this.assignment?.getSubmissionTypes()?.contains(SubmissionType.ONLINE_QUIZ).orDefault()
val isNewQuiz = this.assignment?.getSubmissionTypes()?.contains(SubmissionType.EXTERNAL_TOOL).orDefault() &&
this.assignment?.externalToolAttributes?.url?.contains("quiz-lti").orDefault()

return when {
this.type == "event" -> R.drawable.ic_calendar
isClassicQuiz && this.assignment?.isLocked.orDefault() -> R.drawable.ic_lock // For classic quizzes, use isLocked instead of lockedForUser (classic quizzes always return lockedForUser=true from API)
isClassicQuiz -> R.drawable.ic_quiz
this.assignment?.lockedForUser.orDefault() -> R.drawable.ic_lock
this.assignment?.getSubmissionTypes()?.contains(SubmissionType.ONLINE_QUIZ).orDefault() -> R.drawable.ic_quiz
isNewQuiz -> R.drawable.ic_quiz
this.assignment?.getSubmissionTypes()?.contains(SubmissionType.DISCUSSION_TOPIC).orDefault() -> R.drawable.ic_discussion
else -> R.drawable.ic_assignment
}
}

val ScheduleItem.contentDescriptionRes: Int
get() {
val isClassicQuiz = this.assignment?.getSubmissionTypes()?.contains(SubmissionType.ONLINE_QUIZ).orDefault()
val isNewQuiz = this.assignment?.getSubmissionTypes()?.contains(SubmissionType.EXTERNAL_TOOL).orDefault() &&
this.assignment?.externalToolAttributes?.url?.contains("quiz-lti").orDefault()

return when {
this.type == "event" -> R.string.a11y_summaryEventContentDescription
isClassicQuiz && this.assignment?.isLocked.orDefault() -> R.string.a11y_summaryLockedContentDescription // For classic quizzes, use isLocked instead of lockedForUser (classic quizzes always return lockedForUser=true from API)
isClassicQuiz -> R.string.a11y_summaryQuizContentDescription
this.assignment?.lockedForUser.orDefault() -> R.string.a11y_summaryLockedContentDescription
this.assignment?.getSubmissionTypes()?.contains(SubmissionType.ONLINE_QUIZ).orDefault() -> R.string.a11y_summaryQuizContentDescription
isNewQuiz -> R.string.a11y_summaryQuizContentDescription
this.assignment?.getSubmissionTypes()?.contains(SubmissionType.DISCUSSION_TOPIC).orDefault() -> R.string.a11y_summaryDiscussionContentDescription
else -> R.string.a11y_summaryAssignmentContentDescription
}
Expand Down
Loading