sadorowo/wulkanowy-mod
1
0
Fork 0
forked from github/wulkanowy-mirror
Code Issues Pull Requests Actions Releases 5 Activity

Fix grade summary final grade string (#324)

Browse Source
This commit is contained in:
Mikołaj Pich 2019-04-20 22:19:06 +02:00 committed by Rafał Borcz
parent 2bf7755157
commit 017c200115
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
View File

@ -36,6 +36,7 @@ class GradeSummaryPresenter @Inject constructor(
.flatMap { semesterRepository.getSemesters(it).map { semesters -> it to semesters } } .flatMap { semesterRepository.getSemesters(it).map { semesters -> it to semesters } }
.flatMap { (student, semesters) -> .flatMap { (student, semesters) ->
gradeSummaryRepository.getGradesSummary(semesters.first { it.semesterId == semesterId }, forceRefresh) gradeSummaryRepository.getGradesSummary(semesters.first { it.semesterId == semesterId }, forceRefresh)
.map { it.sortedBy { subject -> subject.subject } }
.flatMap { gradesSummary -> .flatMap { gradesSummary ->
averageProvider.getGradeAverage(student, semesters, semesterId, forceRefresh) averageProvider.getGradeAverage(student, semesters, semesterId, forceRefresh)
.map { averages -> createGradeSummaryItemsAndHeader(gradesSummary, averages) } .map { averages -> createGradeSummaryItemsAndHeader(gradesSummary, averages) }

5
app/src/main/res/layout/item_grade_summary.xml
View File

@ -3,7 +3,8 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical"
tools:context=".ui.modules.grade.summary.GradeSummaryItem">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -79,7 +80,7 @@
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:layout_weight="1" android:layout_weight="1"
android:text="@string/grade_summary_final_average" android:text="@string/grade_summary_final_grade"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView