github/wulkanowy-mirror
1
0
Fork 1
mirror of https://github.com/wulkanowy/wulkanowy.git synced 2025-01-31 20:02:45 +01:00
Code

Fix grade sorting by date (#1717)

Browse Source
This commit is contained in:
Rafał Borcz 2021-12-11 11:54:07 +01:00 committed by GitHub
parent 1bcc4d199e
commit d89e4ccfdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
View File

@ -230,10 +230,14 @@ class GradeDetailsPresenter @Inject constructor(
gradesWithAverages.filter { it.grades.isNotEmpty() } gradesWithAverages.filter { it.grades.isNotEmpty() }
} else gradesWithAverages } else gradesWithAverages
} }
.let { .let { gradeSubjects ->
when (preferencesRepository.gradeSortingMode) { when (preferencesRepository.gradeSortingMode) {
DATE -> it.sortedByDescending { gradeDetailsWithAverage -> gradeDetailsWithAverage.grades.firstOrNull()?.date } DATE -> gradeSubjects.sortedByDescending { gradeDetailsWithAverage ->
ALPHABETIC -> it.sortedBy { gradeDetailsWithAverage -> gradeDetailsWithAverage.subject.lowercase() } gradeDetailsWithAverage.grades.maxByOrNull { it.date }?.date
}
ALPHABETIC -> gradeSubjects.sortedBy { gradeDetailsWithAverage ->
gradeDetailsWithAverage.subject.lowercase()
}
} }
} }
.map { (subject, average, points, _, grades) -> .map { (subject, average, points, _, grades) ->