From 5c4d6ed140ae37b90cbf69343254c5de35beae17 Mon Sep 17 00:00:00 2001 From: Kacper Ziubryniewicz Date: Wed, 15 Jan 2020 23:19:33 +0100 Subject: [PATCH] [API/Edudziennik] Fix getting attendances. --- .../data/api/edziennik/edudziennik/data/EdudziennikWeb.kt | 2 +- .../edziennik/edudziennik/data/web/EdudziennikWebAttendance.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/EdudziennikWeb.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/EdudziennikWeb.kt index 949bd49f..58bf4b44 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/EdudziennikWeb.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/EdudziennikWeb.kt @@ -29,7 +29,7 @@ open class EdudziennikWeb(open val data: DataEdudziennik) { val url = "https://dziennikel.appspot.com/" + when (endpoint.endsWith('/') || endpoint.contains('?') || endpoint.isEmpty()) { true -> endpoint else -> "$endpoint/" - } + (semester?.let { "?semester=$it" } ?: "") + } + (semester?.let { "?semester=" + if(it == -1) "all" else it } ?: "") d(tag, "Request: Edudziennik/Web - $url") diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebAttendance.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebAttendance.kt index a1c4e45f..ec695f26 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebAttendance.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebAttendance.kt @@ -26,7 +26,7 @@ class EdudziennikWebAttendance(override val data: DataEdudziennik, } 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 type = EDUDZIENNIK_ATTENDANCE_TYPE.find(it.trim())