github/szkolny
1
0
Fork 1
mirror of https://github.com/szkolny-eu/szkolny-android.git synced 2025-01-19 05:16:56 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

[API/Edudziennik] Fix getting attendances.

Browse Source
This commit is contained in:
Kacper Ziubryniewicz 2020-01-15 23:19:33 +01:00
parent 9ed1be3594
commit 5c4d6ed140
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/EdudziennikWeb.kt
View File

@ -29,7 +29,7 @@ open class EdudziennikWeb(open val data: DataEdudziennik) {
val url = "https://dziennikel.appspot.com/" + when (endpoint.endsWith('/') || endpoint.contains('?') || endpoint.isEmpty()) { val url = "https://dziennikel.appspot.com/" + when (endpoint.endsWith('/') || endpoint.contains('?') || endpoint.isEmpty()) {
true -> endpoint true -> endpoint
else -> "$endpoint/" else -> "$endpoint/"
} + (semester?.let { "?semester=$it" } ?: "") } + (semester?.let { "?semester=" + if(it == -1) "all" else it } ?: "")
d(tag, "Request: Edudziennik/Web - $url") d(tag, "Request: Edudziennik/Web - $url")

2
app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebAttendance.kt
View File

@ -26,7 +26,7 @@ class EdudziennikWebAttendance(override val data: DataEdudziennik,
} }
init { data.profile?.also { profile -> init { data.profile?.also { profile ->
webGet(TAG, data.studentEndpoint + "Presence") { text -> webGet(TAG, data.studentEndpoint + "Presence", semester = -1) { text ->
val attendanceTypes = EDUDZIENNIK_ATTENDANCE_TYPES.find(text)?.get(1)?.split(',')?.map { val attendanceTypes = EDUDZIENNIK_ATTENDANCE_TYPES.find(text)?.get(1)?.split(',')?.map {
val type = EDUDZIENNIK_ATTENDANCE_TYPE.find(it.trim()) val type = EDUDZIENNIK_ATTENDANCE_TYPE.find(it.trim())