[Student][MBL-13026][R-6.6.0] Fix missing label for LTI assignments (#…

…221)
instructure · Aug 7, 2019 · 5462a8f · 5462a8f
1 parent 2bea932
commit 5462a8f
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/.../main/java/com/instructure/student/mobius/assignmentDetails/AssignmentDetailsPresenter.kt b/.../main/java/com/instructure/student/mobius/assignmentDetails/AssignmentDetailsPresenter.kt
@@ -93,8 +93,12 @@ object AssignmentDetailsPresenter : Presenter<AssignmentDetailsModel, Assignment
                 R.drawable.vd_submitted
             )
         } else {
-            if (assignment.submission?.missing == true ||
-                (assignment.dueAt != null && assignmentState == AssignmentUtils2.ASSIGNMENT_STATE_MISSING)) {
+            // Don't mark LTI assignments as missing when overdue as they usually won't have a real submission for it
+            val isMissingFromDueDate = assignment.turnInType != Assignment.TurnInType.EXTERNAL_TOOL
+                && assignment.dueAt != null
+                && assignmentState == AssignmentUtils2.ASSIGNMENT_STATE_MISSING
+
+            if (assignment.submission?.missing == true || isMissingFromDueDate) {
                 // Mark it missing if the teacher marked it missing or if it's past due
                 Triple(R.string.missingSubmissionLabel, R.color.submissionStatusColorMissing, R.drawable.vd_unsubmitted)
             } else {
@@ -165,8 +169,7 @@ object AssignmentDetailsPresenter : Presenter<AssignmentDetailsModel, Assignment
             .map { Assignment.submissionTypeToPrettyPrintString(it, context) }
             .joinToString(", ")
 
-        val isExternalToolSubmission = assignment.getSubmissionTypes()
-            .any { it == Assignment.SubmissionType.EXTERNAL_TOOL || it == Assignment.SubmissionType.BASIC_LTI_LAUNCH }
+        val isExternalToolSubmission = assignment.turnInType == Assignment.TurnInType.EXTERNAL_TOOL
 
         // File types
         visibilities.fileTypes = assignment.allowedExtensions.isNotEmpty() && assignment.getSubmissionTypes().contains(Assignment.SubmissionType.ONLINE_UPLOAD)

diff --git a/...st/java/com/instructure/student/test/assignment/details/AssignmentDetailsPresenterTest.kt b/...st/java/com/instructure/student/test/assignment/details/AssignmentDetailsPresenterTest.kt
@@ -234,6 +234,28 @@ class AssignmentDetailsPresenterTest : Assert() {
         assertEquals("Missing", state.submittedStateLabel)
     }
 
+    @Test
+    fun `Uses correct label text for submitted status when submission is past due for an LTI assignment`() {
+        val calendar = Calendar.getInstance().apply { set(2000, 0, 31, 23, 59, 0) }
+
+        val submission = baseSubmission.copy(attempt = 0, workflowState = "unsubmitted")
+        val assignment = baseAssignment.copy(submission = submission, dueAt = calendar.time.toApiString(), submissionTypesRaw = listOf("basic_lti_launch"))
+        val model = baseModel.copy(assignmentResult = DataResult.Success(assignment))
+        val state = AssignmentDetailsPresenter.present(model, context) as AssignmentDetailsViewState.Loaded
+        assertEquals("Not Submitted", state.submittedStateLabel)
+    }
+
+    @Test
+    fun `Uses correct label text for submitted status when submission is past due for an external assignment`() {
+        val calendar = Calendar.getInstance().apply { set(2000, 0, 31, 23, 59, 0) }
+
+        val submission = baseSubmission.copy(attempt = 0, workflowState = "unsubmitted")
+        val assignment = baseAssignment.copy(submission = submission, dueAt = calendar.time.toApiString(), submissionTypesRaw = listOf("external_tool"))
+        val model = baseModel.copy(assignmentResult = DataResult.Success(assignment))
+        val state = AssignmentDetailsPresenter.present(model, context) as AssignmentDetailsViewState.Loaded
+        assertEquals("Not Submitted", state.submittedStateLabel)
+    }
+
     @Test
     fun `Uses correct label text for submitted status when submission is null`() {
         val assignment = baseAssignment.copy(submission = null, dueAt = null)