From 4fc965d970c436706818425c01eba3bfc3370aeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= <kuba@szczodrzynski.pl>
Date: Sat, 20 Feb 2021 23:52:40 +0100
Subject: [PATCH] [Vulcan/Hebe] Add saving unit ID.

---
 .../edziennik/data/api/edziennik/vulcan/DataVulcan.kt  | 10 ++++++++++
 .../data/api/edziennik/vulcan/data/VulcanHebe.kt       |  2 +-
 .../api/edziennik/vulcan/data/hebe/VulcanHebeMain.kt   |  6 +++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/DataVulcan.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/DataVulcan.kt
index 1b70faff..19e28e3a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/DataVulcan.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/DataVulcan.kt
@@ -158,6 +158,16 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
         get() { mStudentSemesterId = mStudentSemesterId ?: profile?.getStudentData("studentSemesterId", 0); return mStudentSemesterId ?: 0 }
         set(value) { profile?.putStudentData("studentSemesterId", value) ?: return; mStudentSemesterId = value }
 
+    private var mStudentUnitId: Int? = null
+    var studentUnitId: Int
+        get() { mStudentUnitId = mStudentUnitId ?: profile?.getStudentData("studentUnitId", 0); return mStudentUnitId ?: 0 }
+        set(value) { profile?.putStudentData("studentUnitId", value) ?: return; mStudentUnitId = value }
+
+    private var mStudentConstituentId: Int? = null
+    var studentConstituentId: Int
+        get() { mStudentConstituentId = mStudentConstituentId ?: profile?.getStudentData("studentConstituentId", 0); return mStudentConstituentId ?: 0 }
+        set(value) { profile?.putStudentData("studentConstituentId", value) ?: return; mStudentConstituentId = value }
+
     private var mSemester1Id: Int? = null
     var semester1Id: Int
         get() { mSemester1Id = mSemester1Id ?: profile?.getStudentData("semester1Id", 0); return mSemester1Id ?: 0 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanHebe.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanHebe.kt
index cae27d43..cf6beff8 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanHebe.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanHebe.kt
@@ -263,7 +263,7 @@ open class VulcanHebe(open val data: DataVulcan, open val lastSync: Long?) {
 
         when (filterType) {
             HebeFilterType.BY_PUPIL -> {
-                // query["unitId"] = data.studentUnitId
+                query["unitId"] = data.studentUnitId.toString()
                 query["pupilId"] = data.studentId.toString()
                 query["periodId"] = data.studentSemesterId.toString()
             }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeMain.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeMain.kt
index 438c50ae..020509c3 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeMain.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeMain.kt
@@ -57,7 +57,7 @@ class VulcanHebeMain(
                     return@forEach
 
                 val unit = student.getJsonObject("Unit")
-                //val constituentUnit = student.getJsonObject("ConstituentUnit")
+                val constituentUnit = student.getJsonObject("ConstituentUnit")
                 val login = student.getJsonObject("Login")
                 val periods = student.getJsonArray("Periods")?.map {
                     it.asJsonObject
@@ -79,6 +79,8 @@ class VulcanHebeMain(
                 val schoolShort = unit.getString("Short") ?: return@forEach
                 val schoolCode = "${data.symbol}_$schoolSymbol"
 
+                val studentUnitId = unit.getInt("Id") ?: return@forEach
+                val studentConstituentId = constituentUnit.getInt("Id") ?: return@forEach
                 val studentLoginId = login.getInt("Id") ?: return@forEach
                 //val studentClassId = student.getInt("IdOddzial") ?: return@forEach
                 val studentClassName = student.getString("ClassDisplay") ?: return@forEach
@@ -127,6 +129,8 @@ class VulcanHebeMain(
                     studentData["symbol"] = data.symbol
 
                     studentData["studentId"] = studentId
+                    studentData["studentUnitId"] = studentUnitId
+                    studentData["studentConstituentId"] = studentConstituentId
                     studentData["studentLoginId"] = studentLoginId
                     studentData["studentSemesterId"] = studentSemesterId
                     studentData["studentSemesterNumber"] = studentSemesterNumber