sadorowo/szkolnyplus
1
0
Fork 0
forked from github/szkolny
Code Pull Requests Activity

[APIv2/Librus] Fix new homework notifications (Synergia)

Browse Source
This commit is contained in:
Kacper Ziubryniewicz 2019-10-25 22:13:43 +02:00
parent 9aef3d56df
commit e38dc011bd
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/synergia/LibrusSynergiaHomework.kt
View File

@ -45,7 +45,7 @@ class LibrusSynergiaHomework(override val data: DataLibrus, val onSuccess: () ->
val subjectId = data.subjectList.singleOrNull { it.longName == subjectName }?.id val subjectId = data.subjectList.singleOrNull { it.longName == subjectName }?.id
?: -1 ?: -1
val teacherName = elements[1].text().trim() val teacherName = elements[1].text().trim()
val teacherId = data.teacherList.singleOrNull { teacherName == "${it.name} ${it.surname}" }?.id val teacherId = data.teacherList.singleOrNull { teacherName == it.fullName }?.id
?: -1 ?: -1
val topic = elements[2].text().trim() val topic = elements[2].text().trim()
val addedDate = Date.fromY_m_d(elements[4].text().trim()).inMillis val addedDate = Date.fromY_m_d(elements[4].text().trim()).inMillis
@ -62,7 +62,11 @@ class LibrusSynergiaHomework(override val data: DataLibrus, val onSuccess: () ->
val description = "Treść: (.*)".toRegex(RegexOption.DOT_MATCHES_ALL).find(moreInfo) val description = "Treść: (.*)".toRegex(RegexOption.DOT_MATCHES_ALL).find(moreInfo)
?.get(1)?.replace("<br.*/>".toRegex(), "\n")?.trim() ?.get(1)?.replace("<br.*/>".toRegex(), "\n")?.trim()
val notify = (profile?.empty ?: false) && Date.getToday() < eventDate val notified = when (profile?.empty) {
true -> true
false -> Date.getToday() < eventDate
else -> false
}
val eventObject = Event( val eventObject = Event(
profileId, profileId,
@ -83,8 +87,8 @@ class LibrusSynergiaHomework(override val data: DataLibrus, val onSuccess: () ->
profileId, profileId,
Metadata.TYPE_HOMEWORK, Metadata.TYPE_HOMEWORK,
id, id,
notify, notified,
notify, notified,
addedDate addedDate
)) ))
} }