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

[APIv2/Librus] Show starting points only when greater than 0.

Browse Source
This commit is contained in:
Kacper Ziubryniewicz 2019-12-22 22:22:46 +01:00
parent fe40ab0ab4
commit 8f8eb64364
1 changed files with 48 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiBehaviourGrades.kt
View File

@ -26,6 +26,7 @@ class LibrusApiBehaviourGrades(override val data: DataLibrus,
init { data.profile?.let { profile -> init { data.profile?.let { profile ->
apiGet(TAG, "BehaviourGrades/Points") { json -> apiGet(TAG, "BehaviourGrades/Points") { json ->
if (data.startPointsSemester1 > 0) {
val semester1StartGradeObject = Grade( val semester1StartGradeObject = Grade(
profileId, profileId,
-101, -101,
@ -49,7 +50,9 @@ class LibrusApiBehaviourGrades(override val data: DataLibrus,
true, true,
profile.getSemesterStart(1).inMillis profile.getSemesterStart(1).inMillis
)) ))
}
if (data.startPointsSemester2 > 0) {
val semester2StartGradeObject = Grade( val semester2StartGradeObject = Grade(
profileId, profileId,
-102, -102,
@ -73,6 +76,7 @@ class LibrusApiBehaviourGrades(override val data: DataLibrus,
true, true,
profile.getSemesterStart(2).inMillis profile.getSemesterStart(2).inMillis
)) ))
}
json.getJsonArray("Grades")?.asJsonObjectList()?.forEach { grade -> json.getJsonArray("Grades")?.asJsonObjectList()?.forEach { grade ->
val id = grade.getLong("Id") ?: return@forEach val id = grade.getLong("Id") ?: return@forEach