mirror of
https://github.com/szkolny-eu/szkolny-android.git
synced 2024-11-24 19:04:38 -06:00
[Vulcan/Hebe] Fix getting classroom name.
This commit is contained in:
parent
a9eda087e0
commit
8fc57cd3f5
@ -119,7 +119,7 @@ class VulcanHebeTimetable(
|
|||||||
val startTime = lessonRange?.startTime
|
val startTime = lessonRange?.startTime
|
||||||
val endTime = lessonRange?.endTime
|
val endTime = lessonRange?.endTime
|
||||||
val teacherId = getTeacherId(json, "TeacherPrimary")
|
val teacherId = getTeacherId(json, "TeacherPrimary")
|
||||||
val classroom = json.getString("Room")
|
val classroom = json.getJsonObject("Room").getString("Code")
|
||||||
val subjectId = getSubjectId(json, "Subject")
|
val subjectId = getSubjectId(json, "Subject")
|
||||||
|
|
||||||
val teamId = getTeamId(json, "Distribution")
|
val teamId = getTeamId(json, "Distribution")
|
||||||
@ -168,7 +168,7 @@ class VulcanHebeTimetable(
|
|||||||
val changeStartTime = changeLessonRange?.startTime
|
val changeStartTime = changeLessonRange?.startTime
|
||||||
val changeEndTime = changeLessonRange?.endTime
|
val changeEndTime = changeLessonRange?.endTime
|
||||||
val changeTeacherId = getTeacherId(changeJson, "TeacherPrimary") ?: teacherId
|
val changeTeacherId = getTeacherId(changeJson, "TeacherPrimary") ?: teacherId
|
||||||
val changeClassroom = changeJson.getString("Room") ?: classroom
|
val changeClassroom = changeJson.getJsonObject("Room").getString("Code") ?: classroom
|
||||||
val changeSubjectId = getSubjectId(changeJson, "Subject") ?: subjectId
|
val changeSubjectId = getSubjectId(changeJson, "Subject") ?: subjectId
|
||||||
|
|
||||||
val changeTeamId = getTeamId(json, "Distribution")
|
val changeTeamId = getTeamId(json, "Distribution")
|
||||||
|
Loading…
Reference in New Issue
Block a user