Fixed a bug where on the Syllabus Summary page the quizzes icons was not shown correctly. (All classic quizzes had locked icon, and all new quizzes had the default assignment icon). (#3301)

refs: MBL-18749
affects: Student, Teacher, Parent
release note: Fix a bug where Syllabus Summary pages does not show correct icons for classic (locked) and new quizzes (default assignment icon).

Author: kdeakinstructure

apps/student/src/main/java/com/instructure/student/mobius/syllabus/SyllabusPresenter.kt

@@ -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
     }

apps/teacher/src/main/java/com/instructure/teacher/features/syllabus/SyllabusPresenter.kt

@@ -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
         }

libs/pandautils/src/main/java/com/instructure/pandautils/utils/ScheduleItemExtensions.kt

@@ -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
         }