Merge pull request #2447 from instructure/release/teacher-1.30.2-67

Release Teacher 1.30.1 (67)
instructure · May 14, 2024 · b09bbb5 · b09bbb5
2 parents 4a9f97d + 072b2b5
commit b09bbb5
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 15 deletions.
diff --git a/apps/teacher/build.gradle b/apps/teacher/build.gradle
@@ -39,8 +39,8 @@ android {
     defaultConfig {
         minSdkVersion Versions.MIN_SDK
         targetSdkVersion Versions.TARGET_SDK
-        versionCode = 66
-        versionName = '1.30.1'
+        versionCode = 67
+        versionName = '1.30.2'
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
         testInstrumentationRunner 'com.instructure.teacher.ui.espresso.TeacherHiltTestRunner'

diff --git a/apps/teacher/src/main/java/com/instructure/teacher/activities/SpeedGraderActivity.kt b/apps/teacher/src/main/java/com/instructure/teacher/activities/SpeedGraderActivity.kt
@@ -98,6 +98,7 @@ class SpeedGraderActivity : BasePresenterActivity<SpeedGraderPresenter, SpeedGra
     private val submissionId: Long by lazy { intent.extras!!.getLong(RouterParams.SUBMISSION_ID) }
     private val discussionTopicHeader: DiscussionTopicHeader? by lazy { intent.extras!!.getParcelable(Const.DISCUSSION_HEADER) }
     private val anonymousGrading: Boolean? by lazy { intent.extras?.getBoolean(Const.ANONYMOUS_GRADING) }
+    private val filteredSubmissionIds: LongArray by lazy { intent.extras?.getLongArray(FILTERED_SUBMISSION_IDS) ?: longArrayOf() }
     private val filter: SubmissionListFilter by lazy {
         intent.extras!!.getSerializable(
             FILTER
@@ -140,6 +141,7 @@ class SpeedGraderActivity : BasePresenterActivity<SpeedGraderPresenter, SpeedGra
         submissionId,
         discussionTopicHeader,
         repository,
+        filteredSubmissionIds,
         filter,
         filterValue
     )
@@ -381,14 +383,16 @@ class SpeedGraderActivity : BasePresenterActivity<SpeedGraderPresenter, SpeedGra
 
         const val FILTER = "filter"
         const val FILTER_VALUE = "filter_value"
+        const val FILTERED_SUBMISSION_IDS = "filtered_submission_ids"
 
         fun makeBundle(
             courseId: Long,
             assignmentId: Long,
             selectedIdx: Int,
             anonymousGrading: Boolean? = null,
-            filter: SubmissionListFilter,
-            filterValue: Double
+            filteredSubmissionIds: LongArray = longArrayOf(),
+            filter: SubmissionListFilter? = null,
+            filterValue: Double = 0.0
         ): Bundle {
             return Bundle().apply {
                 putLong(Const.COURSE_ID, courseId)
@@ -397,6 +401,7 @@ class SpeedGraderActivity : BasePresenterActivity<SpeedGraderPresenter, SpeedGra
                 putBoolean(Const.ANONYMOUS_GRADING, anonymousGrading ?: false)
                 putSerializable(FILTER, filter)
                 putDouble(FILTER_VALUE, filterValue)
+                putLongArray(FILTERED_SUBMISSION_IDS, filteredSubmissionIds)
             }
         }
 

diff --git a/apps/teacher/src/main/java/com/instructure/teacher/adapters/StudentContextFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/adapters/StudentContextFragment.kt
@@ -282,9 +282,11 @@ class StudentContextFragment : PresenterFragment<StudentContextPresenter, Studen
 
                 val studentSubmission = GradeableStudentSubmission(StudentAssignee(user), null)
                 val bundle = SpeedGraderActivity.makeBundle(
-                    course.id.toLongOrNull() ?: 0,
-                    submission.assignment?.id?.toLongOrNull() ?: 0,
-                    listOf(studentSubmission), 0)
+                    courseId = course.id.toLongOrNull() ?: 0,
+                    assignmentId = submission.assignment?.id?.toLongOrNull() ?: 0,
+                    anonymousGrading = false,
+                    filteredSubmissionIds = longArrayOf(studentSubmission.id),
+                    selectedIdx = 0)
                 RouteMatcher.route(requireActivity(), Route(bundle, RouteContext.SPEED_GRADER))
             }
             binding.submissionListContainer.addView(view)

diff --git a/apps/teacher/src/main/java/com/instructure/teacher/factory/SpeedGraderPresenterFactory.kt b/apps/teacher/src/main/java/com/instructure/teacher/factory/SpeedGraderPresenterFactory.kt
@@ -29,8 +29,9 @@ class SpeedGraderPresenterFactory(
         private val submissionId: Long, // Id used when we are coming from a push notification
         private val discussionEntries:  DiscussionTopicHeader?,
         private val repository: AssignmentSubmissionRepository,
+        private val filteredSubmissionIds: LongArray,
         private val filter: SubmissionListFilter,
         private val filterValue: Double
 ) : PresenterFactory<SpeedGraderView, SpeedGraderPresenter> {
-    override fun create() = SpeedGraderPresenter(courseId, assignmentId, submissionId, discussionEntries, repository, filter, filterValue)
+    override fun create() = SpeedGraderPresenter(courseId, assignmentId, submissionId, discussionEntries, repository, filteredSubmissionIds, filter, filterValue)
 }
diff --git a/...om/instructure/teacher/features/assignment/submission/AssignmentSubmissionListFragment.kt b/...om/instructure/teacher/features/assignment/submission/AssignmentSubmissionListFragment.kt
@@ -151,12 +151,12 @@ class AssignmentSubmissionListFragment : BaseSyncFragment<
                 val filteredSubmissions = (0 until presenter.data.size()).map { presenter.data[it] }
                 val selectedIdx = filteredSubmissions.indexOf(gradeableStudentSubmission)
                 val bundle = SpeedGraderActivity.makeBundle(
-                    course.id,
-                    assignment.id,
-                    selectedIdx,
-                    assignment.anonymousGrading,
-                    presenter.getFilter(),
-                    presenter.getFilterPoints()
+                    courseId = course.id,
+                    assignmentId = assignment.id,
+                    selectedIdx = selectedIdx,
+                    anonymousGrading = assignment.anonymousGrading,
+                    filter = presenter.getFilter(),
+                    filterValue = presenter.getFilterPoints()
                 )
                 RouteMatcher.route(requireActivity(), Route(bundle, RouteContext.SPEED_GRADER))
             }

diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/ToDoFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/ToDoFragment.kt
@@ -152,8 +152,9 @@ class ToDoFragment : BaseSyncFragment<ToDo, ToDoPresenter, ToDoView, ToDoViewHol
             showToast(R.string.toDoNoSubmissions)
             return
         }
+        val submissionIds = submissions.map { it.id }.toLongArray()
         val anonymousGrading = assignment.anonymousGrading || assignment.anonymousSubmissions
-        val bundle = SpeedGraderActivity.makeBundle(course.id, assignment.id, submissions, 0, anonymousGrading)
+        val bundle = SpeedGraderActivity.makeBundle(courseId = course.id, assignmentId = assignment.id, filteredSubmissionIds = submissionIds, anonymousGrading = anonymousGrading, selectedIdx = 0)
         RouteMatcher.route(requireActivity(), Route(bundle, RouteContext.SPEED_GRADER))
     }
 

diff --git a/apps/teacher/src/main/java/com/instructure/teacher/presenters/SpeedGraderPresenter.kt b/apps/teacher/src/main/java/com/instructure/teacher/presenters/SpeedGraderPresenter.kt
@@ -56,6 +56,7 @@ class SpeedGraderPresenter(
     private var submissionId: Long,
     private var discussion: DiscussionTopicHeader?,
     private val repository: AssignmentSubmissionRepository,
+    private val filteredSubmissionIds: LongArray,
     private val filter: SubmissionListFilter,
     private val filterValue: Double
 ) : Presenter<SpeedGraderView> {
@@ -148,6 +149,10 @@ class SpeedGraderPresenter(
                 submissions = listOf(GradeableStudentSubmission(StudentAssignee(user), submission))
             }
 
+            if (filteredSubmissionIds.isNotEmpty()) {
+                submissions = submissions.filter { it.id in filteredSubmissionIds }
+            }
+
             mView?.onDataSet(assignment, submissions)
         } catch {
             mView?.onErrorSettingData()