[MBL-19125][Student][Teacher] Assignment list discussion checkpoints (#3250)

refs: MBL-19125
affects: Student, Teacher
release note: Showing discussion checkpoints on Assignment list.

Author: kristofnemere

apps/student/src/main/java/com/instructure/student/features/assignments/list/StudentAssignmentListBehavior.kt

@@ -21,6 +21,7 @@ import com.instructure.canvasapi2.CustomGradeStatusesQuery
 import com.instructure.canvasapi2.models.Assignment
 import com.instructure.canvasapi2.models.Course
 import com.instructure.canvasapi2.models.GradingPeriod
+import com.instructure.pandautils.compose.composables.DiscussionCheckpointUiState
 import com.instructure.pandautils.features.assignments.list.AssignmentGroupItemState
 import com.instructure.pandautils.features.assignments.list.AssignmentListBehavior
 import com.instructure.pandautils.features.assignments.list.AssignmentListFragment
@@ -38,12 +39,15 @@ class StudentAssignmentListBehavior : AssignmentListBehavior {
     override fun getAssignmentGroupItemState(
         course: Course,
         assignment: Assignment,
-        customStatuses: List<CustomGradeStatusesQuery.Node>
+        customStatuses: List<CustomGradeStatusesQuery.Node>,
+        checkpoints: List<DiscussionCheckpointUiState>
     ): AssignmentGroupItemState {
         return AssignmentGroupItemState(
             course,
             assignment,
             customStatuses,
+            checkpoints,
+            showClosedState = true,
             showDueDate = true,
             showSubmissionState = true,
             showGrade = true

apps/student/src/main/java/com/instructure/student/holders/GradeViewHolder.kt

@@ -79,7 +79,7 @@ class GradeViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
                 points.setGone()
             } else {
                 points.setVisible()
-                val (grade, contentDescription) = assignment.getGrade(submission, context, restrictQuantitativeData, gradingScheme)
+                val (grade, contentDescription) = assignment.getGrade(submission, context.resources, restrictQuantitativeData, gradingScheme)
                 points.text = grade
                 points.contentDescription = contentDescription
             }

apps/student/src/main/java/com/instructure/student/util/BinderUtils.kt

@@ -48,7 +48,7 @@ object BinderUtils {
         restrictQuantitativeData: Boolean,
         gradingScheme: List<GradingSchemeRow>
     ) {
-        val (grade, contentDescription) = assignment.getGrade(submission, context, restrictQuantitativeData, gradingScheme)
+        val (grade, contentDescription) = assignment.getGrade(submission, context.resources, restrictQuantitativeData, gradingScheme)
         if (!submission.excused && grade.isValid()) {
             textView.text = grade
             textView.contentDescription = contentDescription

apps/teacher/src/main/java/com/instructure/teacher/features/assignment/list/TeacherAssignmentListBehavior.kt

@@ -21,6 +21,7 @@ import com.instructure.canvasapi2.CustomGradeStatusesQuery
 import com.instructure.canvasapi2.models.Assignment
 import com.instructure.canvasapi2.models.Course
 import com.instructure.canvasapi2.models.GradingPeriod
+import com.instructure.pandautils.compose.composables.DiscussionCheckpointUiState
 import com.instructure.pandautils.features.assignments.list.AssignmentGroupItemState
 import com.instructure.pandautils.features.assignments.list.AssignmentListBehavior
 import com.instructure.pandautils.features.assignments.list.AssignmentListFragment
@@ -36,12 +37,14 @@ class TeacherAssignmentListBehavior : AssignmentListBehavior {
     override fun getAssignmentGroupItemState(
         course: Course,
         assignment: Assignment,
-        customStatuses: List<CustomGradeStatusesQuery.Node>
+        customStatuses: List<CustomGradeStatusesQuery.Node>,
+        checkpoints: List<DiscussionCheckpointUiState>
     ): AssignmentGroupItemState {
         return AssignmentGroupItemState(
             course,
             assignment,
             customStatuses,
+            checkpoints,
             showPublishStateIcon = true,
             showClosedState = true,
             showDueDate = true,

libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/apis/AssignmentAPI.kt

@@ -92,7 +92,7 @@ object AssignmentAPI {
         @GET("courses/{courseId}/assignment_groups?include[]=assignments&include[]=discussion_topic&include[]=submission&override_assignment_dates=true&include[]=all_dates&include[]=overrides")
         fun getFirstPageAssignmentGroupListWithAssignments(@Path("courseId") courseId: Long): Call<List<AssignmentGroup>>
 
-        @GET("courses/{courseId}/assignment_groups?include[]=assignments&include[]=discussion_topic&include[]=submission&include[]=rubric_assessment&override_assignment_dates=true&include[]=all_dates&include[]=overrides&include[]=submission_history&include[]=submission_comments&include[]=score_statistics")
+        @GET("courses/{courseId}/assignment_groups?include[]=assignments&include[]=discussion_topic&include[]=submission&include[]=rubric_assessment&override_assignment_dates=true&include[]=all_dates&include[]=overrides&include[]=submission_history&include[]=submission_comments&include[]=score_statistics&include[]=checkpoints&include[]=discussion_topic&include[]=sub_assignment_submissions")
         suspend fun getFirstPageAssignmentGroupListWithAssignments(@Path("courseId") courseId: Long, @Tag restParams: RestParams): DataResult<List<AssignmentGroup>>
 
         @GET

libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/Assignment.kt

@@ -118,7 +118,9 @@ data class Assignment(
         val isHiddenInGradeBook: Boolean = false,
         @SerializedName("sub_assignment_tag")
         val subAssignmentTag: String? = null,
-        val checkpoints: List<Checkpoint> = emptyList()
+        val checkpoints: List<Checkpoint> = emptyList(),
+        @SerializedName("has_overrides")
+        val hasOverrides: Boolean = false
 ) : CanvasModel<Assignment>() {
     override val comparisonDate get() = dueDate
     override val comparisonString get() = dueAt

libs/pandares/src/main/res/values/strings.xml

@@ -2152,4 +2152,5 @@
     <string name="reply_to_topic">Reply to topic</string>
     <string name="additional_replies">Additional replies (%d)</string>
     <string name="a11y_discussion_checkpoints">Discussion Checkpoints</string>
+    <string name="multipleDueDates">Multiple Due Dates</string>
 </resources>

libs/pandautils/src/androidTest/java/com/instructure/pandautils/compose/features/assignments/list/AssignmentListScreenTest.kt

@@ -27,9 +27,13 @@ import androidx.compose.ui.test.hasTestTag
 import androidx.compose.ui.test.hasText
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.onNodeWithText
 import com.instructure.canvasapi2.models.Assignment
 import com.instructure.canvasapi2.models.AssignmentGroup
+import com.instructure.canvasapi2.models.Checkpoint
 import com.instructure.canvasapi2.models.Course
+import com.instructure.canvasapi2.models.Submission
+import com.instructure.pandautils.compose.composables.DiscussionCheckpointUiState
 import com.instructure.pandautils.features.assignments.list.AssignmentGroupItemState
 import com.instructure.pandautils.features.assignments.list.AssignmentListMenuOverFlowItem
 import com.instructure.pandautils.features.assignments.list.AssignmentListScreenOption
@@ -41,10 +45,13 @@ import com.instructure.pandautils.features.assignments.list.filter.AssignmentLis
 import com.instructure.pandautils.features.assignments.list.filter.AssignmentListFilterOptions
 import com.instructure.pandautils.features.assignments.list.filter.AssignmentListFilterType
 import com.instructure.pandautils.features.assignments.list.filter.AssignmentListSelectedFilters
+import com.instructure.pandautils.features.grades.SubmissionStateLabel
+import com.instructure.pandautils.utils.DisplayGrade
 import com.instructure.pandautils.utils.ScreenState
 import com.jakewharton.threetenabp.AndroidThreeTen
 import org.junit.Rule
 import org.junit.Test
+import java.util.Date
 
 class AssignmentListScreenTest {
     @get:Rule
@@ -282,4 +289,101 @@ class AssignmentListScreenTest {
             .assertIsDisplayed()
             .assertHasClickAction()
     }
-}
+
+    @Test
+    fun assertDiscussionCheckpointsContent() {
+        composeTestRule.setContent {
+            AndroidThreeTen.init(LocalContext.current)
+            val assignmentGroups = listOf(
+                AssignmentGroup(
+                    id = 1,
+                    name = "Group 1",
+                    assignments = listOf(
+                        Assignment(
+                            name = "Assignment 1",
+                            checkpoints = listOf(
+                                Checkpoint(),
+                                Checkpoint()
+                            ),
+                            submission = Submission(
+                                grade = "7/15",
+                                postedAt = Date()
+                            )
+                        )
+                    )
+                )
+            )
+            val state = AssignmentListUiState(
+                state = ScreenState.Content,
+                subtitle = "Course",
+                allAssignments = assignmentGroups.flatMap { it.assignments },
+                assignmentGroups = assignmentGroups,
+                listState = mapOf(
+                    assignmentGroups[0].name.orEmpty() to assignmentGroups[0].assignments.map {
+                        AssignmentGroupItemState(
+                            course = Course(), assignment = it, customStatuses = emptyList(), checkpoints = listOf(
+                                DiscussionCheckpointUiState(
+                                    name = "Checkpoint 1",
+                                    dueDate = "Due date 1",
+                                    submissionStateLabel = SubmissionStateLabel.Graded,
+                                    displayGrade = DisplayGrade("7/10", ""),
+                                    pointsPossible = 10
+                                ),
+                                DiscussionCheckpointUiState(
+                                    name = "Checkpoint 2",
+                                    dueDate = "Due date 2",
+                                    submissionStateLabel = SubmissionStateLabel.Missing,
+                                    displayGrade = DisplayGrade("-/5", ""),
+                                    pointsPossible = 5
+                                )
+                            ),
+                            checkpointsExpanded = true,
+                            showDueDate = true,
+                            showGrade = true,
+                            showSubmissionState = true
+                        )
+                    }
+                ),
+                screenOption = AssignmentListScreenOption.List
+            )
+            AssignmentListScreen(
+                title = "Grade Preferences",
+                state = state,
+                contextColor = Color.Red,
+                screenActionHandler = {},
+                listActionHandler = {}
+            )
+        }
+
+        composeTestRule.onNodeWithText("Group 1")
+            .assertIsDisplayed()
+        composeTestRule.onNodeWithText("Assignment 1")
+            .assertIsDisplayed()
+        composeTestRule.onNode(hasTestTag("assignmentDueDate") and hasText("Due date 1"), true)
+            .assertIsDisplayed()
+        composeTestRule.onNode(hasTestTag("assignmentDueDate") and hasText("Due date 2"), true)
+            .assertIsDisplayed()
+        composeTestRule.onNode(hasTestTag("submissionStateLabel") and hasText("Graded"), true)
+            .assertIsDisplayed()
+        composeTestRule.onNodeWithText("7/15")
+            .assertIsDisplayed()
+
+        composeTestRule.onNodeWithText("Checkpoint 1")
+            .assertIsDisplayed()
+        composeTestRule.onNode(hasTestTag("checkpointDueDate") and hasText("Due date 1"), true)
+            .assertIsDisplayed()
+        composeTestRule.onNode(hasTestTag("checkpointSubmissionStateLabel") and hasText("Graded"), true)
+            .assertIsDisplayed()
+        composeTestRule.onNodeWithText("7/10")
+            .assertIsDisplayed()
+
+        composeTestRule.onNodeWithText("Checkpoint 2")
+            .assertIsDisplayed()
+        composeTestRule.onNode(hasTestTag("checkpointDueDate") and hasText("Due date 2"), true)
+            .assertIsDisplayed()
+        composeTestRule.onNode(hasTestTag("checkpointSubmissionStateLabel") and hasText("Missing"), true)
+            .assertIsDisplayed()
+        composeTestRule.onNodeWithText("-/5")
+            .assertIsDisplayed()
+    }
+}

libs/pandautils/src/androidTest/java/com/instructure/pandautils/compose/features/grades/GradesScreenTest.kt

@@ -30,9 +30,9 @@ import androidx.compose.ui.test.onNodeWithText
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.instructure.composeTest.hasDrawable
 import com.instructure.pandares.R
+import com.instructure.pandautils.compose.composables.DiscussionCheckpointUiState
 import com.instructure.pandautils.features.grades.AssignmentGroupUiState
 import com.instructure.pandautils.features.grades.AssignmentUiState
-import com.instructure.pandautils.features.grades.DiscussionCheckpointUiState
 import com.instructure.pandautils.features.grades.GradesScreen
 import com.instructure.pandautils.features.grades.GradesUiState
 import com.instructure.pandautils.features.grades.SubmissionStateLabel
@@ -211,13 +211,15 @@ class GradesScreenTest {
                                             name = "Checkpoint 1",
                                             dueDate = "Due date 1",
                                             submissionStateLabel = SubmissionStateLabel.Graded,
-                                            displayGrade = DisplayGrade("7/10", "")
+                                            displayGrade = DisplayGrade("7/10", ""),
+                                            pointsPossible = 10
                                         ),
                                         DiscussionCheckpointUiState(
                                             name = "Checkpoint 2",
                                             dueDate = "Due date 2",
                                             submissionStateLabel = SubmissionStateLabel.Missing,
-                                            displayGrade = DisplayGrade("-/5", "")
+                                            displayGrade = DisplayGrade("-/5", ""),
+                                            pointsPossible = 5
                                         )
                                     ),
                                     checkpointsExpanded = true

libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/ChekcpointItem.kt

@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2025 - present Instructure, Inc.
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+
+package com.instructure.pandautils.compose.composables
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.pluralStringResource
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.instructure.pandautils.R
+import com.instructure.pandautils.features.grades.SubmissionStateLabel
+import com.instructure.pandautils.utils.DisplayGrade
+
+
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+fun CheckpointItem(
+    discussionCheckpointUiState: DiscussionCheckpointUiState,
+    contextColor: Color,
+    showGrade: Boolean = true
+) {
+    Column(
+        modifier = Modifier
+            .padding(top = 8.dp)
+            .semantics(true) {}
+    ) {
+        Text(
+            text = discussionCheckpointUiState.name,
+            color = colorResource(id = R.color.textDarkest),
+            fontSize = 16.sp
+        )
+        FlowRow {
+            Text(
+                text = discussionCheckpointUiState.dueDate,
+                color = colorResource(id = R.color.textDark),
+                fontSize = 14.sp,
+                modifier = Modifier.testTag("checkpointDueDate")
+            )
+            if (discussionCheckpointUiState.submissionStateLabel != SubmissionStateLabel.None) {
+                Spacer(modifier = Modifier.width(4.dp))
+                Box(
+                    Modifier
+                        .height(16.dp)
+                        .width(1.dp)
+                        .clip(RoundedCornerShape(1.dp))
+                        .background(colorResource(id = R.color.borderMedium))
+                        .align(Alignment.CenterVertically)
+                )
+                Spacer(modifier = Modifier.width(4.dp))
+                SubmissionState(discussionCheckpointUiState.submissionStateLabel, "checkpointSubmissionStateLabel")
+            }
+        }
+        if (showGrade) {
+            val gradeText = discussionCheckpointUiState.displayGrade.text
+            if (gradeText.isNotEmpty()) {
+                Text(
+                    text = gradeText,
+                    color = contextColor,
+                    fontSize = 16.sp,
+                    modifier = Modifier
+                        .semantics {
+                            contentDescription = discussionCheckpointUiState.displayGrade.contentDescription
+                        }
+                        .testTag("checkpointGradeText")
+                )
+            }
+        } else {
+            Text(
+                pluralStringResource(
+                    R.plurals.assignmentListMaxpoints,
+                    discussionCheckpointUiState.pointsPossible,
+                    discussionCheckpointUiState.pointsPossible
+                ),
+                color = contextColor,
+                fontSize = 16.sp,
+                fontWeight = FontWeight.SemiBold,
+            )
+        }
+    }
+}
+
+data class DiscussionCheckpointUiState(
+    val name: String,
+    val dueDate: String,
+    val submissionStateLabel: SubmissionStateLabel,
+    val displayGrade: DisplayGrade,
+    val pointsPossible: Int
+)
+
+@Preview(showBackground = true)
+@Composable
+private fun CheckpointItemPreview() {
+    CheckpointItem(
+        discussionCheckpointUiState = DiscussionCheckpointUiState(
+            name = "Checkpoint 1",
+            dueDate = "Due Sep 30",
+            submissionStateLabel = SubmissionStateLabel.Submitted,
+            displayGrade = DisplayGrade(
+                text = "95/100",
+                contentDescription = "Grade 95 out of 100"
+            ),
+            pointsPossible = 100
+        ),
+        contextColor = Color.Blue
+    )
+}