fix: changes according QA review feedback

Author: PavloNetrebchuk

app/schemas/org.openedx.app.room.AppDatabase/3.json

@@ -23,7 +23,7 @@ import org.openedx.discovery.data.converter.DiscoveryConverter
 import org.openedx.discovery.data.model.room.CourseEntity
 import org.openedx.discovery.data.storage.DiscoveryDao
 
-const val DATABASE_VERSION = 2
+const val DATABASE_VERSION = 3
 const val DATABASE_NAME = "OpenEdX_db"
 
 @Database(
@@ -41,7 +41,8 @@ const val DATABASE_NAME = "OpenEdX_db"
         CourseProgressEntity::class,
     ],
     autoMigrations = [
-        AutoMigration(1, DATABASE_VERSION)
+        AutoMigration(1, 2),
+        AutoMigration(2, DATABASE_VERSION),
     ],
     version = DATABASE_VERSION
 )

app/src/main/java/org/openedx/app/room/AppDatabase.kt

@@ -14,19 +14,19 @@ data class AssignmentProgress(
     @SerializedName("num_points_possible")
     val numPointsPossible: Float?,
     @SerializedName("short_label")
-    val label: String?
+    val shortLabel: String?
 ) {
     fun mapToDomain(displayName: String) = AssignmentProgress(
         assignmentType = assignmentType ?: "",
         numPointsEarned = numPointsEarned ?: 0f,
         numPointsPossible = numPointsPossible ?: 0f,
-        label = label ?: displayName.take(DEFAULT_LABEL_LENGTH)
+        shortLabel = shortLabel ?: displayName.take(DEFAULT_LABEL_LENGTH)
     )
 
     fun mapToRoomEntity() = AssignmentProgressDb(
         assignmentType = assignmentType,
         numPointsEarned = numPointsEarned,
         numPointsPossible = numPointsPossible,
-        label = label
+        shortLabel = shortLabel
     )
 }

core/src/main/java/org/openedx/core/data/model/AssignmentProgress.kt

@@ -230,13 +230,13 @@ data class AssignmentProgressDb(
     val numPointsEarned: Float?,
     @ColumnInfo("num_points_possible")
     val numPointsPossible: Float?,
-    val label: String?
+    val shortLabel: String?
 ) {
     fun mapToDomain() = DomainAssignmentProgress(
         assignmentType = assignmentType ?: "",
         numPointsEarned = numPointsEarned ?: 0f,
         numPointsPossible = numPointsPossible ?: 0f,
-        label = label ?: ""
+        shortLabel = shortLabel ?: ""
     )
 }
 

core/src/main/java/org/openedx/core/data/model/room/BlockDb.kt

@@ -10,7 +10,7 @@ data class AssignmentProgress(
     val assignmentType: String,
     val numPointsEarned: Float,
     val numPointsPossible: Float,
-    val label: String
+    val shortLabel: String
 ) : Parcelable {
 
     @IgnoredOnParcel
@@ -19,4 +19,9 @@ data class AssignmentProgress(
     override fun toString(): String {
         return "${numPointsEarned.toInt()}/${numPointsPossible.toInt()}"
     }
+
+    @IgnoredOnParcel
+    val label = shortLabel
+        .replace(" ", "")
+        .replaceFirst(Regex("^(\\D+)(0*)(\\d+)$"), "$1$3")
 }

core/src/main/java/org/openedx/core/domain/model/AssignmentProgress.kt

@@ -64,12 +64,16 @@ class CourseAssignmentViewModel(
         if (assignments.isEmpty()) {
             _uiState.value = CourseAssignmentUIState.Empty
         } else {
-            val grouped = assignments
-                .filter { assignments ->
-                    courseProgress.gradingPolicy?.assignmentPolicies?.map { it.type }
-                        ?.contains(assignments.assignmentProgress?.assignmentType) == true
+            val assignmentTypeOrder =
+                courseProgress.gradingPolicy?.assignmentPolicies?.map { it.type } ?: emptyList()
+            val filteredAssignments = assignments
+                .filter { assignment ->
+                    assignmentTypeOrder.contains(assignment.assignmentProgress?.assignmentType)
                 }
+                .filter { it.graded }
+            val grouped = filteredAssignments
                 .groupBy { it.assignmentProgress?.assignmentType ?: "" }
+                .toSortedMap(compareBy { assignmentTypeOrder.indexOf(it) })
             val completed = assignments.count { it.isCompleted() }
             val total = assignments.size
             val progress = Progress(completed, total)

course/src/main/java/org/openedx/course/presentation/assignments/CourseAssignmentViewModel.kt

@@ -79,7 +79,6 @@ private const val ASSIGNMENT_BUTTON_CARD_BACKGROUND_ALPHA = 0.5f
 private const val COMPLETED_ASSIGNMENTS_COUNT = 1
 private const val COMPLETED_ASSIGNMENTS_COUNT_TABLET = 2
 private const val TOTAL_ASSIGNMENTS_COUNT = 3
-private const val SHORT_LABEL_PREFIX_SIZE = 3
 
 @Composable
 fun CourseContentAssignmentScreen(
@@ -139,15 +138,18 @@ private fun CourseContentAssignmentScreen(
         is CourseAssignmentUIState.CourseData -> {
             val gradingPolicy = uiState.courseProgress.gradingPolicy
             val defaultGradeColor = MaterialTheme.appColors.primary
-            Box(modifier = screenWidth) {
+            Box(
+                modifier = Modifier.fillMaxSize(),
+                contentAlignment = Alignment.TopCenter
+            ) {
                 val progress = uiState.progress
                 val description = stringResource(
                     id = R.string.course_completed,
                     progress.completed,
                     progress.total
                 )
                 LazyColumn(
-                    modifier = Modifier.fillMaxSize(),
+                    modifier = screenWidth,
                     contentPadding = PaddingValues(bottom = 16.dp)
                 ) {
                     item {
@@ -308,9 +310,6 @@ private fun AssignmentGroupSection(
 
 @Composable
 private fun AssignmentButton(assignment: Block, isSelected: Boolean, onClick: () -> Unit) {
-    val label = assignment.assignmentProgress?.label?.split(" ").let {
-        it?.first()?.take(SHORT_LABEL_PREFIX_SIZE) + it?.last()
-    }
     val isDuePast = assignment.due != null && assignment.due!! < Date()
     val cardBorderColor = when {
         isSelected -> MaterialTheme.appColors.primary
@@ -368,7 +367,7 @@ private fun AssignmentButton(assignment: Block, isSelected: Boolean, onClick: ()
                 ) {
                     Text(
                         modifier = Modifier.align(Alignment.Center),
-                        text = label,
+                        text = assignment.assignmentProgress?.label ?: "",
                         color = MaterialTheme.appColors.textDark,
                         style = MaterialTheme.appTypography.bodyMedium,
                         maxLines = 1,
@@ -412,11 +411,14 @@ private fun AssignmentDetails(
     onAssignmentClick: (Block) -> Unit,
 ) {
     val dueDate =
-        assignment.due?.let { TimeUtils.formatToDueInString(LocalContext.current, it) } ?: ""
+        assignment.due?.let {
+            TimeUtils.formatToDueInString(LocalContext.current, it)
+        } ?: ""
+    val isDuePast = assignment.due != null && assignment.due!! < Date()
     val progress = assignment.completion.toFloat()
     val color = when {
         assignment.isCompleted() -> MaterialTheme.appColors.successGreen
-        assignment.due != null && assignment.due!! > Date() -> MaterialTheme.appColors.warning
+        isDuePast -> MaterialTheme.appColors.warning
         else -> MaterialTheme.appColors.cardViewBorder
     }
     val label = assignment.assignmentProgress?.label
@@ -428,13 +430,17 @@ private fun AssignmentDetails(
             )
         }
 
-        assignment.due != null && assignment.due!! > Date() -> {
+        isDuePast -> {
             "$label " + stringResource(
                 R.string.course_past_due,
                 assignment.assignmentProgress?.toString() ?: ""
             )
         }
 
+        assignment.due == null -> {
+            "$label - ${assignment.assignmentProgress}"
+        }
+
         else -> {
             "$label $dueDate"
         }
@@ -637,7 +643,7 @@ private val mockAssignmentProgress = AssignmentProgress(
     assignmentType = "Home",
     numPointsEarned = 1f,
     numPointsPossible = 3f,
-    label = "HM1"
+    shortLabel = "HM1"
 )
 
 private val mockChapterBlock = Block(

course/src/main/java/org/openedx/course/presentation/assignments/CourseContentAssignmentScreen.kt

@@ -306,7 +306,7 @@ fun CourseDashboard(
                             ) {
                                 IconText(
                                     text = stringResource(R.string.course_review_grading_policy),
-                                    painter = painterResource(id = coreR.drawable.core_ic_assignment),
+                                    painter = painterResource(id = coreR.drawable.core_ic_mountains),
                                     color = MaterialTheme.appColors.primary,
                                     textStyle = MaterialTheme.appTypography.labelLarge
                                 )

course/src/main/java/org/openedx/course/presentation/container/CourseContainerFragment.kt

@@ -483,7 +483,7 @@ private val mockAssignmentProgress = AssignmentProgress(
     assignmentType = "Home",
     numPointsEarned = 1f,
     numPointsPossible = 3f,
-    label = "HM1"
+    shortLabel = "HM1"
 )
 private val mockChapterBlock = Block(
     id = "id",

course/src/main/java/org/openedx/course/presentation/outline/CourseContentAllScreen.kt

@@ -308,7 +308,7 @@ private val mockAssignmentProgress = AssignmentProgress(
     assignmentType = "Home",
     numPointsEarned = 1f,
     numPointsPossible = 3f,
-    label = "HM1"
+    shortLabel = "HM1"
 )
 
 private val mockChapterBlock = Block(