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

Add total attendance summary (#672)

Browse Source
This commit is contained in:
Dominik Korsa 2020-02-02 16:40:00 +01:00 committed by GitHub
parent 731afbb00c
commit c3a6842027
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt
View File

@ -36,6 +36,8 @@ class AttendanceSummaryFragment : BaseFragment(), AttendanceSummaryView, MainVie
fun newInstance() = AttendanceSummaryFragment()
}
override val totalString get() = getString(R.string.attendance_summary_total)
override val titleStringId get() = R.string.attendance_title
override val isViewEmpty get() = attendanceSummaryAdapter.isEmpty

16
app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt
View File

@ -144,8 +144,22 @@ class AttendanceSummaryPresenter @Inject constructor(
)
}
private fun createAttendanceSummaryTotalItem(attendanceSummary: List<AttendanceSummary>): AttendanceSummaryItem {
return AttendanceSummaryItem(
month = view?.totalString.orEmpty(),
percentage = formatPercentage(attendanceSummary.calculatePercentage()),
present = attendanceSummary.sumBy { it.presence }.toString(),
absence = attendanceSummary.sumBy { it.absence }.toString(),
excusedAbsence = attendanceSummary.sumBy { it.absenceExcused }.toString(),
schoolAbsence = attendanceSummary.sumBy { it.absenceForSchoolReasons }.toString(),
exemption = attendanceSummary.sumBy { it.exemption }.toString(),
lateness = attendanceSummary.sumBy { it.lateness }.toString(),
excusedLateness = attendanceSummary.sumBy { it.latenessExcused }.toString()
)
}
private fun createAttendanceSummaryItems(attendanceSummary: List<AttendanceSummary>): List<AttendanceSummaryItem> {
return attendanceSummary.sortedByDescending { it.id }.map {
return listOf(createAttendanceSummaryTotalItem(attendanceSummary)) + attendanceSummary.sortedByDescending { it.id }.map {
AttendanceSummaryItem(
month = it.month.getFormattedName(),
percentage = formatPercentage(it.calculatePercentage()),

2
app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryView.kt
View File

@ -4,6 +4,8 @@ import io.github.wulkanowy.ui.base.BaseView
interface AttendanceSummaryView : BaseView {
val totalString: String
val isViewEmpty: Boolean
fun initView()

1
app/src/main/res/values-pl/strings.xml
View File

@ -151,6 +151,7 @@
<!--Attendance summary-->
<string name="attendance_summary_final">Frekwencja</string>
<string name="attendance_summary_total">Razem</string>
<!--Exam-->

1
app/src/main/res/values-ru/strings.xml
View File

@ -146,6 +146,7 @@
<!--Attendance summary-->
<string name="attendance_summary_final">Посещаемость</string>
<string name="attendance_summary_total">вместе</string>
<!--Exam-->

1
app/src/main/res/values/strings.xml
View File

@ -145,6 +145,7 @@
<!--Attendance summary-->
<string name="attendance_summary_final">Attendance</string>
<string name="attendance_summary_total">Total</string>
<!--Exam-->