github/szkolny
1
0
Fork 1
mirror of https://github.com/szkolny-eu/szkolny-android.git synced 2024-09-20 05:49:09 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

[API/Podlasie] Move event description to homework body.

Browse Source
This commit is contained in:
Kacper Ziubryniewicz 2020-05-13 22:56:22 +02:00
parent 1fb5aaed5d
commit f09f069b2c
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/data/api/PodlasieApiEvents.kt
View File

@ -23,9 +23,8 @@ class PodlasieApiEvents(val data: DataPodlasie, val rows: List<JsonObject>) {
val time = event.getString("DateFrom")?.let { Time.fromY_m_d_H_m_s(it) } val time = event.getString("DateFrom")?.let { Time.fromY_m_d_H_m_s(it) }
?: return@forEach ?: return@forEach
val name = event.getString("Name") ?: "" val name = event.getString("Name")?.replace("&#34;", "\"") ?: ""
val description = event.getString("Description") ?: "" val description = event.getString("Description")?.replace("&#34;", "\"") ?: ""
val topic = "$name\n\n$description".replace("&#34;", "\"")
val type = when (event.getString("Category")?.toLowerCase(Locale.getDefault())) { val type = when (event.getString("Category")?.toLowerCase(Locale.getDefault())) {
"klasówka" -> Event.TYPE_EXAM "klasówka" -> Event.TYPE_EXAM
@ -49,14 +48,16 @@ class PodlasieApiEvents(val data: DataPodlasie, val rows: List<JsonObject>) {
id = id, id = id,
date = date, date = date,
time = time, time = time,
topic = topic, topic = name,
color = null, color = null,
type = type, type = type,
teacherId = teacher.id, teacherId = teacher.id,
subjectId = lesson?.subjectId ?: -1, subjectId = lesson?.subjectId ?: -1,
teamId = data.teamClass?.id ?: -1, teamId = data.teamClass?.id ?: -1,
addedDate = addedDate addedDate = addedDate
) ).apply {
homeworkBody = description
}
data.eventList.add(eventObject) data.eventList.add(eventObject)
data.metadataList.add( data.metadataList.add(