[API/Librus] Add grades

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

@@ -6,8 +6,10 @@ package pl.szczodrzynski.edziennik.api.v2.librus.data
 
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.api.v2.ENDPOINT_LIBRUS_API_ME
+import pl.szczodrzynski.edziennik.api.v2.ENDPOINT_LIBRUS_API_NORMAL_GRADES
 import pl.szczodrzynski.edziennik.api.v2.ENDPOINT_LIBRUS_API_SCHOOLS
 import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.data.api.LibrusApiGrades
 import pl.szczodrzynski.edziennik.api.v2.librus.data.api.LibrusApiMe
 import pl.szczodrzynski.edziennik.api.v2.librus.data.api.LibrusApiSchools
 import pl.szczodrzynski.edziennik.utils.Utils
@@ -48,7 +50,11 @@ class LibrusData(val data: DataLibrus, val onSuccess: () -> Unit) {
                 data.startProgress(R.string.edziennik_progress_endpoint_school_info)
                 LibrusApiSchools(data) { onSuccess() }
             }
+            ENDPOINT_LIBRUS_API_NORMAL_GRADES -> {
+                data.startProgress(R.string.sync_action_syncing_grades)
+                LibrusApiGrades(data) { onSuccess() }
+            }
             else -> onSuccess()
         }
     }
-}
+}

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiGrades.kt

@@ -1,21 +1,102 @@
 package pl.szczodrzynski.edziennik.api.v2.librus.data.api
 
-import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.models.Data
+import pl.szczodrzynski.edziennik.api.v2.ENDPOINT_LIBRUS_API_NORMAL_GRADES
-import pl.szczodrzynski.edziennik.data.api.interfaces.ProgressCallback
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.utils.Utils
+import pl.szczodrzynski.edziennik.utils.models.Date
 
 
-class LibrusApiGrades(val app: App,
+class LibrusApiGrades(override val data: DataLibrus,
-                      val profile: Profile,
+                      val onSuccess: () -> Unit) : LibrusApi(data) {
-                      val loginStore: LoginStore,
+    companion object {
-                      val data: Data,
+        const val TAG = "LibrusApiGrades"
-                      val callback: ProgressCallback,
+    }
-                      val onSuccess: () -> Unit) {
-
 
     init {
+        apiGet(TAG, "Grades") { json ->
+            val grades = json.getJsonArray("Grades")
 
+
+            grades?.forEach { gradeEl ->
+                val grade = gradeEl.asJsonObject
+
+                val id = grade.get("id").asLong
+                val categoryId = grade.get("Category").asJsonObject.get("Id").asLong
+                val name = grade.get("Grade").asString
+                val semester = grade.get("Semester").asInt
+                val teacherId = grade.get("AddedBy").asJsonObject.get("Id").asLong
+                val subjectId = grade.get("Subject").asJsonObject.get("Id").asLong
+
+                val category = data.gradeCategoryList.firstOrNull { it.categoryId == categoryId }
+                val categoryName = category?.text ?: ""
+                val color = category?.color ?: -1
+                var weight = category?.weight ?: 0f
+                val value = Utils.getGradeValue(name)
+
+
+                if (name == "-" || name == "+"
+                        || name.equals("np", ignoreCase = true)
+                        || name.equals("bz", ignoreCase = true)) {
+                    weight = 0f
+                }
+
+                val gradeObject = Grade(
+                        profileId,
+                        id,
+                        categoryName,
+                        color,
+                        "",
+                        name,
+                        value,
+                        weight,
+                        semester,
+                        teacherId,
+                        subjectId
+                )
+
+                when {
+                    grade.get("IsConstituent").asBoolean ->
+                        gradeObject.type = Grade.TYPE_NORMAL
+                    grade.get("IsSemester").asBoolean -> // semester final
+                        gradeObject.type = if (gradeObject.semester == 1) Grade.TYPE_SEMESTER1_FINAL else Grade.TYPE_SEMESTER2_FINAL
+                    grade.get("IsSemesterProposition").asBoolean -> // semester proposed
+                        gradeObject.type = if (gradeObject.semester == 1) Grade.TYPE_SEMESTER1_PROPOSED else Grade.TYPE_SEMESTER2_PROPOSED
+                    grade.get("IsFinal").asBoolean -> // year final
+                        gradeObject.type = Grade.TYPE_YEAR_FINAL
+                    grade.get("IsFinalProposition").asBoolean -> // year final
+                        gradeObject.type = Grade.TYPE_YEAR_PROPOSED
+                }
+
+                grade.getJsonObject("Improvement")?.also {
+                    val historicalId = it.get("Id").asLong
+                    data.gradeList.firstOrNull { grade -> grade.id == historicalId }?.also { grade ->
+                        grade.parentId = gradeObject.id
+                        if (grade.name == "nb") grade.weight = 0f
+                    }
+                    gradeObject.isImprovement = true
+                }
+
+                val addedDate = Date.fromIso(grade.get("AddDate").asString)
+
+                data.gradeList.add(gradeObject)
+                data.metadataList.add(
+                        Metadata(
+                                profileId,
+                                Metadata.TYPE_GRADE,
+                                id,
+                                profile?.empty ?: false,
+                                profile?.empty ?: false,
+                                addedDate
+                        ))
+
+                data.setSyncNext(ENDPOINT_LIBRUS_API_NORMAL_GRADES, SYNC_ALWAYS, MainActivity.DRAWER_ITEM_GRADES)
+                onSuccess()
+            }
+        }
     }
-}
+}

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiSchools.kt

@@ -20,7 +20,7 @@ class LibrusApiSchools(override val data: DataLibrus,
 
     init {
         apiGet(TAG, "Schools") { json ->
-            val school = json?.getJsonObject("School")
+            val school = json.getJsonObject("School")
             val schoolId = school?.getInt("Id")
             val schoolNameLong = school?.getString("Name")
 
@@ -56,4 +56,4 @@ class LibrusApiSchools(override val data: DataLibrus,
             onSuccess()
         }
     }
-}
+}