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

[API/Edudziennik] Fix getting grades and add support for point grades.

Browse Source
This commit is contained in:
Kacper Ziubryniewicz 2019-12-25 22:46:29 +01:00
parent 39ff47e866
commit eee83ebb94
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebGrades.kt
View File

@ -40,17 +40,26 @@ class EdudziennikWebGrades(override val data: DataEdudziennik,
val subjectName = subjectElement.child(0).text().trim() val subjectName = subjectElement.child(0).text().trim()
val subject = data.getSubject(subjectId, subjectName) val subject = data.getSubject(subjectId, subjectName)
val grades = subjectElement.select(".grade") val gradeType = when {
subjectElement.select("#sum").text().isNotBlank() -> TYPE_BEHAVIOUR
else -> TYPE_NORMAL
}
val gradeCountToAverage = subjectElement.select("#avg").text().isNotBlank()
val grades = subjectElement.select(".grade[data-edited]")
val gradesInfo = subjectElement.select(".grade-tip") val gradesInfo = subjectElement.select(".grade-tip")
val gradeValues = subjects.select(".avg-$subjectId .grade-tip > p").first() val gradeValues = if (grades.isNotEmpty()) {
.text().split('+').map { subjects.select(".avg-$subjectId .grade-tip > p").first()
val split = it.split('*') .text().split('+').map {
val weight = split[0].trim().toFloat() val split = it.split('*')
val value = split[1].trim().toFloat() val weight = split[0].trim().toFloat()
val value = split[1].trim().toFloat()
Pair(value, weight) Pair(value, weight)
} }
} else emptyList()
grades.forEachIndexed { index, gradeElement -> grades.forEachIndexed { index, gradeElement ->
val id = Regexes.EDUDZIENNIK_GRADE_ID.find(gradeElement.attr("href"))?.get(1)?.crc32() val id = Regexes.EDUDZIENNIK_GRADE_ID.find(gradeElement.attr("href"))?.get(1)?.crc32()
@ -67,7 +76,8 @@ class EdudziennikWebGrades(override val data: DataEdudziennik,
} }
val info = gradesInfo[index] val info = gradesInfo[index]
val description = info.child(4).text().trim() val category = info.child(4).text().trim()
val description = info.ownText()
val (teacherLastName, teacherFirstName) = info.child(1).text().split(' ') val (teacherLastName, teacherFirstName) = info.child(1).text().split(' ')
val teacher = data.getTeacher(teacherFirstName, teacherLastName) val teacher = data.getTeacher(teacherFirstName, teacherLastName)
@ -88,16 +98,18 @@ class EdudziennikWebGrades(override val data: DataEdudziennik,
val gradeObject = Grade( val gradeObject = Grade(
profileId, profileId,
id, id,
"", category,
color, color,
description, description,
name, name,
value, value,
weight, if (gradeCountToAverage) weight else 0f,
profile.currentSemester, profile.currentSemester,
teacher.id, teacher.id,
subject.id subject.id
) ).apply {
type = gradeType
}
data.gradeList.add(gradeObject) data.gradeList.add(gradeObject)
data.metadataList.add(Metadata( data.metadataList.add(Metadata(
@ -180,6 +192,7 @@ class EdudziennikWebGrades(override val data: DataEdudziennik,
if (!subjects.isNullOrEmpty()) { if (!subjects.isNullOrEmpty()) {
data.toRemove.addAll(listOf( data.toRemove.addAll(listOf(
TYPE_NORMAL, TYPE_NORMAL,
TYPE_BEHAVIOUR,
TYPE_SEMESTER1_PROPOSED, TYPE_SEMESTER1_PROPOSED,
TYPE_SEMESTER2_PROPOSED, TYPE_SEMESTER2_PROPOSED,
TYPE_SEMESTER1_FINAL, TYPE_SEMESTER1_FINAL,