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

[APIv2/Librus] Add getting normal lessons

Browse Source
This commit is contained in:
Kacper Ziubryniewicz 2019-11-10 16:47:32 +01:00
parent 0bcd190714
commit 5fa7409317
2 changed files with 64 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/LibrusData.kt
View File

@ -76,8 +76,10 @@ class LibrusData(val data: DataLibrus, val onSuccess: () -> Unit) {
LibrusApiClassrooms(data, onSuccess) LibrusApiClassrooms(data, onSuccess)
} }
// TODO push config // TODO push config
// TODO timetable ENDPOINT_LIBRUS_API_TIMETABLES -> {
data.startProgress(R.string.edziennik_progress_endpoint_timetable)
LibrusApiTimetables(data, onSuccess)
}
ENDPOINT_LIBRUS_API_NORMAL_GRADES -> { ENDPOINT_LIBRUS_API_NORMAL_GRADES -> {
data.startProgress(R.string.edziennik_progress_endpoint_grades) data.startProgress(R.string.edziennik_progress_endpoint_grades)
LibrusApiGrades(data, onSuccess) LibrusApiGrades(data, onSuccess)

60
app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiTimetables.kt Normal file
View File

@ -0,0 +1,60 @@
/*
* Copyright (c) Kacper Ziubryniewicz 2019-11-10
*/
package pl.szczodrzynski.edziennik.api.v2.librus.data.api
import pl.szczodrzynski.edziennik.*
import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_TIMETABLES
import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
import pl.szczodrzynski.edziennik.data.db.modules.timetable.Lesson
import pl.szczodrzynski.edziennik.utils.models.Date
import pl.szczodrzynski.edziennik.utils.models.Time
class LibrusApiTimetables(override val data: DataLibrus,
val onSuccess: () -> Unit) : LibrusApi(data) {
companion object {
const val TAG = "LibrusApiTimetables"
}
init {
apiGet(TAG, "Timetables") { json ->
json.getJsonObject("Timetable")?.also { timetables ->
timetables.keySet().forEach { dateStr ->
val date = Date.fromY_m_d(dateStr)
timetables.getJsonArray(dateStr)?.asJsonObjectList()?.forEach { lesson ->
val lessonNumber = lesson.getInt("LessonNo")
val startTime = lesson.getString("HourFrom")?.let { Time.fromH_m(it) }
val endTime = lesson.getString("HourTo")?.let { Time.fromH_m(it) }
val teacherId = lesson.getJsonObject("Teacher")?.getLong("Id")
val subjectId = lesson.getJsonObject("Subject")?.getLong("Id")
val classId = lesson.getJsonObject("Class")?.getLong("Id")
val virtualClassId = lesson.getJsonObject("VirtualClass")?.getLong("Id")
val teamId = virtualClassId ?: classId
val classroomId = lesson.getJsonObject("Classroom")?.getLong("Id")
val classroom = data.classrooms.singleOrNull { it.id == classroomId }?.name
val lessonObject = Lesson(profileId).apply {
this.date = date
this.lessonNumber = lessonNumber
this.startTime = startTime
this.endTime = endTime
this.teacherId = teacherId
this.subjectId = subjectId
this.teamId = teamId
this.classroom = classroom
}
// TODO add to the database
}
}
}
data.setSyncNext(ENDPOINT_LIBRUS_API_TIMETABLES, SYNC_ALWAYS)
onSuccess()
}
}
}