(.+?):\s*(.+?)\s*
""".toRegex(DOT_MATCHES_ALL) + } + val MOBIDZIENNIK_HOMEWORK_BODY by lazy { + """Treść:(.+?)""".toRegex(DOT_MATCHES_ALL)
+ }
+ val MOBIDZIENNIK_HOMEWORK_ID by lazy {
+ """zadanieFormularz\(([0-9]+),""".toRegex(DOT_MATCHES_ALL)
+ }
+ val MOBIDZIENNIK_HOMEWORK_ATTACHMENT by lazy {
+ """zalacznik(_zadania)?=([0-9]+)'.+?word-break">(.+?)""".toRegex(DOT_MATCHES_ALL)
+ }
+
+
+
+ val IDZIENNIK_LOGIN_HIDDEN_FIELDS by lazy {
+ """""".toRegex(DOT_MATCHES_ALL)
+ }
+ val IDZIENNIK_LOGIN_ERROR by lazy {
+ """id="spanErrorMessage">(.*?)(.+?)""".toRegex(DOT_MATCHES_ALL)
+ }
+ val IDZIENNIK_LOGIN_FIRST_IS_PARENT by lazy {
+ """id="ctl00_CzyRodzic" value="([01])" />""".toRegex()
+ }
+ val IDZIENNIK_LOGIN_FIRST_SCHOOL_YEAR by lazy {
+ """name="ctl00\${"$"}dxComboRokSzkolny".+?selected="selected".*?value="([0-9]+)">([0-9]+)/([0-9]+)<""".toRegex(DOT_MATCHES_ALL)
+ }
+ val IDZIENNIK_LOGIN_FIRST_STUDENT_SELECT by lazy {
+ """ (.*?) (.*?) (.*?) (.+?) (.+?)(.+?) """.toRegex()
+ }
+ val EDUDZIENNIK_ATTENDANCE_TYPES by lazy {
+ """.*?.*?(.*?)""".toRegex(DOT_MATCHES_ALL)
+ }
+
+ val EDUDZIENNIK_SUBJECT_ID by lazy {
+ """/Courses/([\w-_]+?)/""".toRegex()
+ }
+ val EDUDZIENNIK_GRADE_ID by lazy {
+ """/Grades/([\w-_]+?)/""".toRegex()
+ }
+ val EDUDZIENNIK_EXAM_ID by lazy {
+ """/Evaluations/([\w-_]+?)/""".toRegex()
+ }
+ val EDUDZIENNIK_EVENT_TYPE_ID by lazy {
+ """/GradeLabels/([\w-_]+?)/""".toRegex()
+ }
+ val EDUDZIENNIK_ANNOUNCEMENT_ID by lazy {
+ """/Announcement/([\w-_]+?)/""".toRegex()
+ }
+ val EDUDZIENNIK_HOMEWORK_ID by lazy {
+ """/Homework/([\w-_]+?)/""".toRegex()
+ }
+ val EDUDZIENNIK_TEACHER_ID by lazy {
+ """/Teachers/([\w-_]+?)/""".toRegex()
+ }
+ val EDUDZIENNIK_EVENT_ID by lazy {
+ """/KlassEvent/([\w-_]+?)/""".toRegex()
+ }
+ val EDUDZIENNIK_NOTE_ID by lazy {
+ """/RegistryNotes/([\w-_]+?)/""".toRegex()
+ }
+
+ val EDUDZIENNIK_SCHOOL_DETAIL_ID by lazy {
+ """.*?.*?" + text.trim() + "
")
+
+ doc.getElementsByTag("tr").forEach { eventElement ->
+ val date = Date.fromY_m_d(eventElement.child(1).text())
+
+ val titleElement = eventElement.child(2).child(0)
+ val title = titleElement.text().trim()
+
+ val id = EDUDZIENNIK_EVENT_ID.find(titleElement.attr("href"))?.get(1)?.crc32()
+ ?: return@forEach
+
+ val eventObject = Event(
+ profileId = profileId,
+ id = id,
+ date = date,
+ time = null,
+ topic = title,
+ color = null,
+ type = Event.TYPE_CLASS_EVENT,
+ teacherId = -1,
+ subjectId = -1,
+ teamId = data.teamClass?.id ?: -1
+ )
+
+ data.eventList.add(eventObject)
+ data.metadataList.add(Metadata(
+ profileId,
+ Metadata.TYPE_EVENT,
+ id,
+ profile.empty,
+ profile.empty
+ ))
+ }
+
+ data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_CLASS_EVENT))
+
+ data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_EVENTS, SYNC_ALWAYS)
+ onSuccess(ENDPOINT_EDUDZIENNIK_WEB_EVENTS)
+ }
+ } ?: onSuccess(ENDPOINT_EDUDZIENNIK_WEB_EVENTS) }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebExams.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebExams.kt
new file mode 100644
index 00000000..f6abf637
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebExams.kt
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-24
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.crc32
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_EVENT_TYPE_ID
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_EXAM_ID
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_SUBJECT_ID
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_EXAMS
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.db.entity.Event
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class EdudziennikWebExams(override val data: DataEdudziennik,
+ override val lastSync: Long?,
+ val onSuccess: (endpointId: Int) -> Unit
+) : EdudziennikWeb(data, lastSync) {
+ companion object {
+ const val TAG = "EdudziennikWebExams"
+ }
+
+ init { profile?.also { profile ->
+ webGet(TAG, data.studentAndClassEndpoint + "Evaluations", xhr = true) { text ->
+ val doc = Jsoup.parseBodyFragment("" + text.trim() + "
")
+
+ doc.select("tr").forEach { examElement ->
+ val id = EDUDZIENNIK_EXAM_ID.find(examElement.child(0).child(0).attr("href"))
+ ?.get(1)?.crc32() ?: return@forEach
+ val topic = examElement.child(0).text().trim()
+
+ val subjectElement = examElement.child(1).child(0)
+ val subjectId = EDUDZIENNIK_SUBJECT_ID.find(subjectElement.attr("href"))?.get(1)
+ ?: return@forEach
+ val subjectName = subjectElement.text().trim()
+ val subject = data.getSubject(subjectId, subjectName)
+
+ val dateString = examElement.child(2).text().trim()
+ if (dateString.isBlank()) return@forEach
+ val date = Date.fromY_m_d(dateString)
+
+ val lessons = data.app.db.timetableDao().getAllForDateNow(profileId, date)
+ val startTime = lessons.firstOrNull { it.displaySubjectId == subject.id }?.displayStartTime
+
+ val eventTypeElement = examElement.child(3).child(0)
+ val eventTypeId = EDUDZIENNIK_EVENT_TYPE_ID.find(eventTypeElement.attr("href"))?.get(1)
+ ?: return@forEach
+ val eventTypeName = eventTypeElement.text()
+ val eventType = data.getEventType(eventTypeId, eventTypeName)
+
+ val eventObject = Event(
+ profileId = profileId,
+ id = id,
+ date = date,
+ time = startTime,
+ topic = topic,
+ color = null,
+ type = eventType.id,
+ teacherId = -1,
+ subjectId = subject.id,
+ teamId = data.teamClass?.id ?: -1
+ )
+
+ data.eventList.add(eventObject)
+ data.metadataList.add(Metadata(
+ profileId,
+ Metadata.TYPE_EVENT,
+ id,
+ profile.empty,
+ profile.empty
+ ))
+ }
+
+ data.toRemove.add(DataRemoveModel.Events.futureExceptTypes(listOf(
+ Event.TYPE_HOMEWORK,
+ Event.TYPE_CLASS_EVENT
+ )))
+
+ data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_EXAMS, SYNC_ALWAYS)
+ onSuccess(ENDPOINT_EDUDZIENNIK_WEB_EXAMS)
+ }
+ }}
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebGetAnnouncement.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebGetAnnouncement.kt
new file mode 100644
index 00000000..5d915e64
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebGetAnnouncement.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-26
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.data.api.Regexes
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.api.events.AnnouncementGetEvent
+import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
+import pl.szczodrzynski.edziennik.get
+
+class EdudziennikWebGetAnnouncement(override val data: DataEdudziennik,
+ private val announcement: AnnouncementFull,
+ val onSuccess: () -> Unit
+) : EdudziennikWeb(data, null) {
+ companion object {
+ const val TAG = "EdudziennikWebGetAnnouncement"
+ }
+
+ init {
+ webGet(TAG, "Announcement/${announcement.idString}") { text ->
+ val description = Regexes.EDUDZIENNIK_ANNOUNCEMENT_DESCRIPTION.find(text)?.get(1)?.trim() ?: ""
+
+ announcement.text = description
+
+ EventBus.getDefault().postSticky(AnnouncementGetEvent(announcement))
+
+ data.announcementList.add(announcement)
+ onSuccess()
+ }
+ }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebGetHomework.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebGetHomework.kt
new file mode 100644
index 00000000..84171699
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebGetHomework.kt
@@ -0,0 +1,45 @@
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import android.text.Html
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.data.api.Regexes
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.api.events.EventGetEvent
+import pl.szczodrzynski.edziennik.data.db.full.EventFull
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.isNotNullNorEmpty
+
+class EdudziennikWebGetHomework(
+ override val data: DataEdudziennik,
+ val event: EventFull,
+ val onSuccess: () -> Unit
+) : EdudziennikWeb(data, null) {
+ companion object {
+ const val TAG = "EdudziennikWebGetHomework"
+ }
+
+ init {
+ if (event.attachmentNames.isNotNullNorEmpty()) {
+ val id = event.attachmentNames!![0]
+
+ webGet(TAG, "Homework/$id") { text ->
+ val description = Regexes.EDUDZIENNIK_HOMEWORK_DESCRIPTION.find(text)?.get(1)?.trim()
+
+ if (description != null) event.topic = Html.fromHtml(description).toString()
+
+ event.homeworkBody = ""
+ event.attachmentNames = null
+
+ data.eventList += event
+ data.eventListReplace = true
+
+ EventBus.getDefault().postSticky(EventGetEvent(event))
+ onSuccess()
+ }
+ } else {
+ EventBus.getDefault().postSticky(EventGetEvent(event))
+ onSuccess()
+ }
+ }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebGrades.kt
new file mode 100644
index 00000000..459f13aa
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebGrades.kt
@@ -0,0 +1,230 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-25
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import android.graphics.Color
+import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.colorFromCssName
+import pl.szczodrzynski.edziennik.crc32
+import pl.szczodrzynski.edziennik.data.api.Regexes
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_GRADES
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.db.entity.Grade
+import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_NORMAL
+import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_POINT_SUM
+import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER1_FINAL
+import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER1_PROPOSED
+import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER2_FINAL
+import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER2_PROPOSED
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.utils.Utils
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class EdudziennikWebGrades(override val data: DataEdudziennik,
+ override val lastSync: Long?,
+ val onSuccess: (endpointId: Int) -> Unit
+) : EdudziennikWeb(data, lastSync) {
+ companion object {
+ private const val TAG = "EdudziennikWebGrades"
+ }
+
+ private var requestSemester: Int? = null
+
+ init {
+ if (profile?.empty == true && data.currentSemester == 2) requestSemester = 1
+ getGrades()
+ }
+
+ private fun getGrades() { data.profile?.also { profile ->
+ webGet(TAG, data.studentEndpoint + "start", semester = requestSemester) { text ->
+ val semester = requestSemester ?: data.currentSemester
+
+ val doc = Jsoup.parse(text)
+ val subjects = doc.select("#student_grades tbody").firstOrNull()?.children()
+
+ subjects?.forEach { subjectElement ->
+ if (subjectElement.id().isBlank()) return@forEach
+
+ val subjectId = subjectElement.id().trim()
+ val subjectName = subjectElement.child(0).text().trim()
+ val subject = data.getSubject(subjectId, subjectName)
+
+ val gradeType = when {
+ subjectElement.select("#sum").text().isNotBlank() -> TYPE_POINT_SUM
+ else -> TYPE_NORMAL
+ }
+
+ val gradeCountToAverage = subjectElement.select("#avg").text().isNotBlank()
+
+ val grades = subjectElement.select(".grade[data-edited]")
+ val gradesInfo = subjectElement.select(".grade-tip")
+
+ val gradeValues = if (grades.isNotEmpty()) {
+ subjects.select(".avg-$subjectId .grade-tip > p").first()
+ .text().split('+').map {
+ val split = it.split('*')
+ val value = split[1].trim().toFloatOrNull()
+ val weight = value?.let { split[0].trim().toFloatOrNull() } ?: 0f
+
+ Pair(value ?: 0f, weight)
+ }
+ } else emptyList()
+
+ grades.forEachIndexed { index, gradeElement ->
+ val id = Regexes.EDUDZIENNIK_GRADE_ID.find(gradeElement.attr("href"))?.get(1)?.crc32()
+ ?: return@forEachIndexed
+ val (value, weight) = gradeValues[index]
+ val name = gradeElement.text().trim().let {
+ if (it.contains(',') || it.contains('.')) {
+ val replaced = it.replace(',', '.')
+ val float = replaced.toFloatOrNull()
+
+ if (float != null && float % 1 == 0f) float.toInt().toString()
+ else it
+ } else it
+ }
+
+ val info = gradesInfo[index]
+ val fullName = info.child(0).text().trim()
+ val columnName = info.child(4).text().trim()
+ val comment = info.ownText()
+
+ val description = columnName + if (comment.isNotBlank()) " - $comment" else null
+
+ val teacherName = info.child(1).text()
+ val teacher = data.getTeacherByLastFirst(teacherName)
+
+ val addedDate = info.child(2).text().split(' ').let {
+ val day = it[0].toInt()
+ val month = Utils.monthFromName(it[1])
+ val year = it[2].toInt()
+
+ Date(year, month, day).inMillis
+ }
+
+ val color = Regexes.STYLE_CSS_COLOR.find(gradeElement.attr("style"))?.get(1)?.let {
+ if (it.startsWith('#')) Color.parseColor(it)
+ else colorFromCssName(it)
+ } ?: -1
+
+ val gradeObject = Grade(
+ profileId = profileId,
+ id = id,
+ name = name,
+ type = gradeType,
+ value = value,
+ weight = if (gradeCountToAverage) weight else 0f,
+ color = color,
+ category = fullName,
+ description = description,
+ comment = null,
+ semester = semester,
+ teacherId = teacher.id,
+ subjectId = subject.id,
+ addedDate = addedDate
+ )
+
+ data.gradeList.add(gradeObject)
+ data.metadataList.add(Metadata(
+ profileId,
+ Metadata.TYPE_GRADE,
+ id,
+ profile.empty,
+ profile.empty
+ ))
+ }
+
+ val proposed = subjectElement.select(".proposal").firstOrNull()?.text()?.trim()
+
+ if (proposed != null && proposed.isNotBlank()) {
+ val proposedGradeObject = Grade(
+ profileId = profileId,
+ id = (-1 * subject.id) - 1,
+ name = proposed,
+ type = when (semester) {
+ 1 -> TYPE_SEMESTER1_PROPOSED
+ else -> TYPE_SEMESTER2_PROPOSED
+ },
+ value = proposed.toFloatOrNull() ?: 0f,
+ weight = 0f,
+ color = -1,
+ category = null,
+ description = null,
+ comment = null,
+ semester = semester,
+ teacherId = -1,
+ subjectId = subject.id
+ )
+
+ data.gradeList.add(proposedGradeObject)
+ data.metadataList.add(Metadata(
+ profileId,
+ Metadata.TYPE_GRADE,
+ proposedGradeObject.id,
+ profile.empty,
+ profile.empty
+ ))
+ }
+
+ val final = subjectElement.select(".final").firstOrNull()?.text()?.trim()
+
+ if (final != null && final.isNotBlank()) {
+ val finalGradeObject = Grade(
+ profileId = profileId,
+ id = (-1 * subject.id) - 2,
+ name = final,
+ type = when (semester) {
+ 1 -> TYPE_SEMESTER1_FINAL
+ else -> TYPE_SEMESTER2_FINAL
+ },
+ value = final.toFloatOrNull() ?: 0f,
+ weight = 0f,
+ color = -1,
+ category = null,
+ description = null,
+ comment = null,
+ semester = semester,
+ teacherId = -1,
+ subjectId = subject.id
+ )
+
+ data.gradeList.add(finalGradeObject)
+ data.metadataList.add(Metadata(
+ data.profileId,
+ Metadata.TYPE_GRADE,
+ finalGradeObject.id,
+ profile.empty,
+ profile.empty
+ ))
+ }
+ }
+
+ if (!subjects.isNullOrEmpty()) {
+ data.toRemove.addAll(listOf(
+ TYPE_NORMAL,
+ TYPE_POINT_SUM,
+ TYPE_SEMESTER1_PROPOSED,
+ TYPE_SEMESTER2_PROPOSED,
+ TYPE_SEMESTER1_FINAL,
+ TYPE_SEMESTER2_FINAL
+ ).map {
+ DataRemoveModel.Grades.semesterWithType(semester, it)
+ })
+ }
+
+ if (profile.empty && requestSemester == 1 && data.currentSemester == 2) {
+ requestSemester = null
+ getGrades()
+ } else {
+ data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_GRADES, SYNC_ALWAYS)
+ onSuccess(ENDPOINT_EDUDZIENNIK_WEB_GRADES)
+ }
+ }
+ } ?: onSuccess(ENDPOINT_EDUDZIENNIK_WEB_GRADES) }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebHomework.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebHomework.kt
new file mode 100644
index 00000000..169a5127
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebHomework.kt
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-29
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.crc32
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_HOMEWORK_ID
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_SUBJECT_ID
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_HOMEWORK
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.db.entity.Event
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class EdudziennikWebHomework(override val data: DataEdudziennik,
+ override val lastSync: Long?,
+ val onSuccess: (endpointId: Int) -> Unit
+) : EdudziennikWeb(data, lastSync) {
+ companion object {
+ const val TAG = "EdudziennikWebHomework"
+ }
+
+ init { data.profile?.also { profile ->
+ webGet(TAG, data.courseStudentEndpoint + "Homework", xhr = true) { text ->
+ val doc = Jsoup.parseBodyFragment("" + text.trim() + "
")
+
+ if (doc.getElementsByClass("message").text().trim() != "Brak prac domowych") {
+ doc.getElementsByTag("tr").forEach { homeworkElement ->
+ val dateElement = homeworkElement.getElementsByClass("date").first().child(0)
+ val idStr = EDUDZIENNIK_HOMEWORK_ID.find(dateElement.attr("href"))?.get(1) ?: return@forEach
+ val id = idStr.crc32()
+ val date = Date.fromY_m_d(dateElement.text())
+
+ val subjectElement = homeworkElement.child(1).child(0)
+ val subjectId = EDUDZIENNIK_SUBJECT_ID.find(subjectElement.attr("href"))?.get(1)
+ ?: return@forEach
+ val subjectName = subjectElement.text()
+ val subject = data.getSubject(subjectId, subjectName)
+
+ val lessons = data.app.db.timetableDao().getAllForDateNow(profileId, date)
+ val startTime = lessons.firstOrNull { it.subjectId == subject.id }?.displayStartTime
+
+ val teacherName = homeworkElement.child(2).text()
+ val teacher = data.getTeacherByFirstLast(teacherName)
+
+ val topic = homeworkElement.child(4).text()?.trim()
+
+ val eventObject = Event(
+ profileId = profileId,
+ id = id,
+ date = date,
+ time = startTime,
+ topic = topic ?: "",
+ color = null,
+ type = Event.TYPE_HOMEWORK,
+ teacherId = teacher.id,
+ subjectId = subject.id,
+ teamId = data.teamClass?.id ?: -1
+ )
+
+ eventObject.attachmentNames = mutableListOf(idStr)
+
+ data.eventList.add(eventObject)
+ data.metadataList.add(Metadata(
+ profileId,
+ Metadata.TYPE_HOMEWORK,
+ id,
+ profile.empty,
+ profile.empty
+ ))
+ }
+ }
+
+ data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_HOMEWORK))
+
+ data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_HOMEWORK, SYNC_ALWAYS)
+ onSuccess(ENDPOINT_EDUDZIENNIK_WEB_HOMEWORK)
+ }
+ } ?: onSuccess(ENDPOINT_EDUDZIENNIK_WEB_HOMEWORK) }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebLuckyNumber.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebLuckyNumber.kt
new file mode 100644
index 00000000..db8164c8
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebLuckyNumber.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-23
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_LUCKY_NUMBER
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.db.entity.LuckyNumber
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class EdudziennikWebLuckyNumber(override val data: DataEdudziennik,
+ override val lastSync: Long?,
+ val onSuccess: (endpointId: Int) -> Unit
+) : EdudziennikWeb(data, lastSync) {
+ companion object {
+ private const val TAG = "EdudziennikWebLuckyNumber"
+ }
+
+ init { data.profile?.also { profile ->
+ webGet(TAG, data.schoolEndpoint + "Lucky", xhr = true) { text ->
+ text.toIntOrNull()?.also { luckyNumber ->
+ val luckyNumberObject = LuckyNumber(
+ profileId = profileId,
+ date = Date.getToday(),
+ number = luckyNumber
+ )
+
+ data.luckyNumberList.add(luckyNumberObject)
+ data.metadataList.add(Metadata(
+ profileId,
+ Metadata.TYPE_LUCKY_NUMBER,
+ luckyNumberObject.date.value.toLong(),
+ true,
+ profile.empty
+ ))
+ }
+
+ data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_LUCKY_NUMBER, SYNC_ALWAYS)
+ onSuccess(ENDPOINT_EDUDZIENNIK_WEB_LUCKY_NUMBER)
+ }
+ } ?: onSuccess(ENDPOINT_EDUDZIENNIK_WEB_LUCKY_NUMBER) }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebNotes.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebNotes.kt
new file mode 100644
index 00000000..35a78168
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebNotes.kt
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-1-1
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.crc32
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_NOTE_ID
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_NOTES
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.Notice
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class EdudziennikWebNotes(override val data: DataEdudziennik,
+ override val lastSync: Long?,
+ val onSuccess: (endpointId: Int) -> Unit
+) : EdudziennikWeb(data, lastSync) {
+ companion object {
+ const val TAG = "EdudziennikWebNotes"
+ }
+
+ init { data.profile?.also { profile ->
+ webGet(TAG, data.classStudentEndpoint + "RegistryNotesStudent", xhr = true) { text ->
+ val doc = Jsoup.parseBodyFragment("" + text.trim() + "
")
+
+ doc.getElementsByTag("tr").forEach { noteElement ->
+ val dateElement = noteElement.getElementsByClass("date").first().child(0)
+ val addedDate = Date.fromY_m_d(dateElement.text()).inMillis
+
+ val id = EDUDZIENNIK_NOTE_ID.find(dateElement.attr("href"))?.get(0)?.crc32()
+ ?: return@forEach
+
+ val teacherName = noteElement.child(1).text()
+ val teacher = data.getTeacherByFirstLast(teacherName)
+
+ val description = noteElement.child(3).text()
+
+ val noticeObject = Notice(
+ profileId = profileId,
+ id = id,
+ type = Notice.TYPE_NEUTRAL,
+ semester = profile.currentSemester,
+ text = description,
+ category = null,
+ points = null,
+ teacherId = teacher.id,
+ addedDate = addedDate
+ )
+
+ data.noticeList.add(noticeObject)
+ data.metadataList.add(Metadata(
+ profileId,
+ Metadata.TYPE_NOTICE,
+ id,
+ profile.empty,
+ profile.empty
+ ))
+ }
+
+ data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_NOTES, SYNC_ALWAYS)
+ onSuccess(ENDPOINT_EDUDZIENNIK_WEB_NOTES)
+ }
+ } ?: onSuccess(ENDPOINT_EDUDZIENNIK_WEB_NOTES) }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebStart.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebStart.kt
new file mode 100644
index 00000000..66cb7a59
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebStart.kt
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-23
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import pl.szczodrzynski.edziennik.MONTH
+import pl.szczodrzynski.edziennik.crc32
+import pl.szczodrzynski.edziennik.data.api.ERROR_EDUDZIENNIK_WEB_TEAM_MISSING
+import pl.szczodrzynski.edziennik.data.api.Regexes
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_SUBJECTS_START
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_START
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.db.entity.Team
+import pl.szczodrzynski.edziennik.firstLettersName
+import pl.szczodrzynski.edziennik.get
+
+class EdudziennikWebStart(override val data: DataEdudziennik,
+ override val lastSync: Long?,
+ val onSuccess: (endpointId: Int) -> Unit
+) : EdudziennikWeb(data, lastSync) {
+ companion object {
+ private const val TAG = "EdudziennikWebStart"
+ }
+
+ init {
+ webGet(TAG, data.studentEndpoint + "start") { text ->
+ getSchoolAndTeam(text)
+ getSubjects(text)
+
+ data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_START, MONTH)
+ onSuccess(ENDPOINT_EDUDZIENNIK_WEB_START)
+ }
+ }
+
+ private fun getSchoolAndTeam(text: String) {
+ val schoolId = Regexes.EDUDZIENNIK_SCHOOL_DETAIL_ID.find(text)?.get(1)?.trim()
+ val schoolLongName = Regexes.EDUDZIENNIK_SCHOOL_DETAIL_NAME.find(text)?.get(1)?.trim()
+ data.schoolId = schoolId
+
+ val classId = Regexes.EDUDZIENNIK_CLASS_DETAIL_ID.find(text)?.get(1)?.trim()
+ val className = Regexes.EDUDZIENNIK_CLASS_DETAIL_NAME.find(text)?.get(1)?.trim()
+ data.classId = classId
+
+ if (classId == null || className == null || schoolId == null || schoolLongName == null) {
+ data.error(ApiError(TAG, ERROR_EDUDZIENNIK_WEB_TEAM_MISSING)
+ .withApiResponse(text))
+ return
+ }
+
+ val schoolName = schoolId.crc32().toString() + schoolLongName.firstLettersName + "_edu"
+ data.schoolName = schoolName
+
+ val teamId = classId.crc32()
+ val teamCode = "$schoolName:$className"
+
+ val teamObject = Team(
+ data.profileId,
+ teamId,
+ className,
+ Team.TYPE_CLASS,
+ teamCode,
+ -1
+ )
+
+ data.teamClass = teamObject
+ data.teamList.put(teamObject.id, teamObject)
+ }
+
+ private fun getSubjects(text: String) {
+ EDUDZIENNIK_SUBJECTS_START.findAll(text).forEach {
+ val id = it[1].trim()
+ val name = it[2].trim()
+ data.getSubject(id, name)
+ }
+ }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebTeachers.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebTeachers.kt
new file mode 100644
index 00000000..d2f3ba15
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebTeachers.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-25
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import pl.szczodrzynski.edziennik.MONTH
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_TEACHERS
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_TEACHERS
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.get
+
+class EdudziennikWebTeachers(override val data: DataEdudziennik,
+ override val lastSync: Long?,
+ val onSuccess: (endpointId: Int) -> Unit
+) : EdudziennikWeb(data, lastSync) {
+ companion object {
+ private const val TAG = "EdudziennikWebTeachers"
+ }
+
+ init {
+ webGet(TAG, data.studentAndTeacherClassEndpoint + "grid") { text ->
+ EDUDZIENNIK_TEACHERS.findAll(text).forEach {
+ val lastName = it[1].trim()
+ val firstName = it[2].trim()
+ data.getTeacher(firstName, lastName)
+ }
+
+ data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_TEACHERS, MONTH)
+ onSuccess(ENDPOINT_EDUDZIENNIK_WEB_TEACHERS)
+ }
+ }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebTimetable.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebTimetable.kt
new file mode 100644
index 00000000..94db15ef
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebTimetable.kt
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-23
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web
+
+import org.jsoup.Jsoup
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_SUBJECT_ID
+import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_TEACHER_ID
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_TIMETABLE
+import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.db.entity.Lesson
+import pl.szczodrzynski.edziennik.data.db.entity.LessonRange
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.singleOrNull
+import pl.szczodrzynski.edziennik.utils.Utils.d
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
+import pl.szczodrzynski.edziennik.utils.models.Week
+
+class EdudziennikWebTimetable(override val data: DataEdudziennik,
+ override val lastSync: Long?,
+ val onSuccess: (endpointId: Int) -> Unit
+) : EdudziennikWeb(data, lastSync) {
+ companion object {
+ private const val TAG = "EdudziennikWebTimetable"
+ }
+
+ init { data.profile?.also { profile ->
+
+ val currentWeekStart = Week.getWeekStart()
+
+ if (Date.getToday().weekDay > 4) {
+ currentWeekStart.stepForward(0, 0, 7)
+ }
+
+ val getDate = data.arguments?.getString("weekStart") ?: currentWeekStart.stringY_m_d
+
+ val weekStart = Date.fromY_m_d(getDate)
+ val weekEnd = weekStart.clone().stepForward(0, 0, 6)
+
+ webGet(TAG, data.timetableEndpoint + "print?date=$getDate") { text ->
+ val doc = Jsoup.parse(text)
+
+ val dataDays = mutableListOf
")
+
+ val readDate = if (jMessage.getBoolean("odczytana") == true) Date.fromIso(jMessage.getString("wersjaRekordu")) else 0
+ val sentDate = Date.fromIso(jMessage.getString("dataWyslania"))
+
+ val sender = jMessage.getAsJsonObject("nadawca")
+ var firstName = sender.getString("imie")
+ var lastName = sender.getString("nazwisko")
+ if (firstName.isNullOrEmpty() || lastName.isNullOrEmpty()) {
+ firstName = "usunięty"
+ lastName = "użytkownik"
+ }
+ val rTeacher = data.getTeacher(
+ firstName,
+ lastName
+ )
+ rTeacher.loginId = /*sender.getString("id") + ":" + */sender.getString("usr")
+ rTeacher.setTeacherType(Teacher.TYPE_OTHER)
+
+ val message = Message(
+ profileId = profileId,
+ id = messageId,
+ type = if (jMessage.getBoolean("rekordUsuniety") == true) TYPE_DELETED else TYPE_RECEIVED,
+ subject = subject,
+ body = body,
+ senderId = rTeacher.id,
+ addedDate = sentDate
+ )
+
+ val messageRecipient = MessageRecipient(
+ profileId,
+ -1 /* me */,
+ -1,
+ readDate,
+ /*messageId*/ messageId
+ )
+
+ data.messageList.add(message)
+ data.messageRecipientList.add(messageRecipient)
+ data.setSeenMetadataList.add(Metadata(
+ profileId,
+ Metadata.TYPE_MESSAGE,
+ message.id,
+ readDate > 0,
+ readDate > 0 || profile?.empty ?: false
+ ))
+ }
+
+ data.setSyncNext(ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX, SYNC_ALWAYS)
+ onSuccess(ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX)
+ }
+ }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/api/IdziennikApiMessagesSent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiMessagesSent.kt
similarity index 61%
rename from app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/api/IdziennikApiMessagesSent.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiMessagesSent.kt
index 6c809d8b..87b3264d 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/api/IdziennikApiMessagesSent.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiMessagesSent.kt
@@ -2,25 +2,27 @@
* Copyright (c) Kuba Szczodrzyński 2019-10-30.
*/
-package pl.szczodrzynski.edziennik.api.v2.idziennik.data.api
+package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.api
import com.google.gson.JsonArray
import pl.szczodrzynski.edziennik.DAY
import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES
-import pl.szczodrzynski.edziennik.api.v2.IDZIENNIK_API_MESSAGES_SENT
-import pl.szczodrzynski.edziennik.api.v2.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.api.v2.idziennik.ENDPOINT_IDZIENNIK_API_MESSAGES_SENT
-import pl.szczodrzynski.edziennik.api.v2.idziennik.data.IdziennikApi
import pl.szczodrzynski.edziennik.asJsonObjectList
-import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
-import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_SENT
-import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipient
-import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_API_MESSAGES_SENT
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_API_MESSAGES_SENT
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikApi
+import pl.szczodrzynski.edziennik.data.db.entity.Message
+import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_SENT
+import pl.szczodrzynski.edziennik.data.db.entity.MessageRecipient
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
import pl.szczodrzynski.edziennik.utils.Utils.crc32
import pl.szczodrzynski.edziennik.utils.models.Date
class IdziennikApiMessagesSent(override val data: DataIdziennik,
- val onSuccess: () -> Unit) : IdziennikApi(data) {
+ override val lastSync: Long?,
+ val onSuccess: (endpointId: Int) -> Unit
+) : IdziennikApi(data, lastSync) {
companion object {
private const val TAG = "IdziennikApiMessagesSent"
}
@@ -28,7 +30,7 @@ class IdziennikApiMessagesSent(override val data: DataIdziennik,
init {
apiGet(TAG, IDZIENNIK_API_MESSAGES_SENT) { json ->
if (json !is JsonArray) {
- onSuccess()
+ onSuccess(ENDPOINT_IDZIENNIK_API_MESSAGES_SENT)
return@apiGet
}
@@ -44,13 +46,13 @@ class IdziennikApiMessagesSent(override val data: DataIdziennik,
val sentDate = Date.fromIso(jMessage.get("dataWyslania").asString)
val message = Message(
- profileId,
- messageId,
- subject,
- body,
- TYPE_SENT,
- -1,
- -1
+ profileId = profileId,
+ id = messageId,
+ type = TYPE_SENT,
+ subject = subject,
+ body = body,
+ senderId = null,
+ addedDate = sentDate
)
for (recipientEl in jMessage.getAsJsonArray("odbiorcy")) {
@@ -62,7 +64,7 @@ class IdziennikApiMessagesSent(override val data: DataIdziennik,
lastName = "użytkownik"
}
val rTeacher = data.getTeacher(firstName, lastName)
- rTeacher.loginId = recipient.get("id").asString + ":" + recipient.get("usr").asString
+ rTeacher.loginId = /*recipient.get("id").asString + ":" + */recipient.get("usr").asString
val messageRecipient = MessageRecipient(
profileId,
@@ -74,12 +76,12 @@ class IdziennikApiMessagesSent(override val data: DataIdziennik,
data.messageRecipientIgnoreList.add(messageRecipient)
}
- data.messageIgnoreList.add(message)
- data.metadataList.add(Metadata(profileId, Metadata.TYPE_MESSAGE, message.id, true, true, sentDate))
+ data.messageList.add(message)
+ data.metadataList.add(Metadata(profileId, Metadata.TYPE_MESSAGE, message.id, true, true))
}
data.setSyncNext(ENDPOINT_IDZIENNIK_API_MESSAGES_SENT, DAY, DRAWER_ITEM_MESSAGES)
- onSuccess()
+ onSuccess(ENDPOINT_IDZIENNIK_API_MESSAGES_SENT)
}
}
}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebAnnouncements.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebAnnouncements.kt
new file mode 100644
index 00000000..531cbeeb
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebAnnouncements.kt
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-28.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
+
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
+import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_ANNOUNCEMENTS
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_ANNOUNCEMENTS
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.db.entity.Announcement
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.getJsonObject
+import pl.szczodrzynski.edziennik.getLong
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class IdziennikWebAnnouncements(override val data: DataIdziennik,
+ override val lastSync: Long?,
+ val onSuccess: (endpointId: Int) -> Unit
+) : IdziennikWeb(data, lastSync) {
+ companion object {
+ private const val TAG = "IdziennikWebAnnouncements"
+ }
+
+ init {
+ val param = JsonObject()
+ param.add("parametryFiltrow", JsonArray())
+
+ webApiGet(TAG, IDZIENNIK_WEB_ANNOUNCEMENTS, mapOf(
+ "uczenId" to (data.studentId ?: ""),
+ "param" to param
+ )) { result ->
+ val json = result.getJsonObject("d") ?: run {
+ data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
+ .withApiResponse(result))
+ return@webApiGet
+ }
+
+ for (jAnnouncementEl in json.getAsJsonArray("ListK")) {
+ val jAnnouncement = jAnnouncementEl.asJsonObject
+ // jAnnouncement
+ val announcementId = jAnnouncement.getLong("Id") ?: -1
+
+ val rTeacher = data.getTeacherByFirstLast(jAnnouncement.getString("Autor") ?: "")
+ val addedDate = jAnnouncement.getString("DataDodania")?.replace("[^\\d]".toRegex(), "")?.toLongOrNull() ?: System.currentTimeMillis()
+ val startDate = jAnnouncement.getString("DataWydarzenia")?.replace("[^\\d]".toRegex(), "")?.toLongOrNull()?.let { Date.fromMillis(it) }
+
+ val announcementObject = Announcement(
+ profileId = profileId,
+ id = announcementId,
+ subject = jAnnouncement.get("Temat").asString,
+ text = jAnnouncement.get("Tresc").asString,
+ startDate = startDate,
+ endDate = null,
+ teacherId = rTeacher.id,
+ addedDate = addedDate
+ )
+ data.announcementList.add(announcementObject)
+ data.metadataList.add(Metadata(
+ profileId,
+ Metadata.TYPE_ANNOUNCEMENT,
+ announcementObject.id,
+ profile?.empty ?: false,
+ profile?.empty ?: false
+ ))
+ }
+
+ data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_ANNOUNCEMENTS, SYNC_ALWAYS)
+ onSuccess(ENDPOINT_IDZIENNIK_WEB_ANNOUNCEMENTS)
+ }
+ }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebAttendance.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebAttendance.kt
new file mode 100644
index 00000000..e77c9eac
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebAttendance.kt
@@ -0,0 +1,180 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-28.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
+
+import pl.szczodrzynski.edziennik.crc16
+import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
+import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_ATTENDANCE
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_ATTENDANCE
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.db.entity.Attendance
+import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_ABSENT
+import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_ABSENT_EXCUSED
+import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_BELATED
+import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_PRESENT
+import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_PRESENT_CUSTOM
+import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_RELEASED
+import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_UNKNOWN
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.getInt
+import pl.szczodrzynski.edziennik.getJsonObject
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
+
+class IdziennikWebAttendance(override val data: DataIdziennik,
+ override val lastSync: Long?,
+ val onSuccess: (endpointId: Int) -> Unit
+) : IdziennikWeb(data, lastSync) {
+ companion object {
+ private const val TAG = "IdziennikWebAttendance"
+ }
+
+ private var attendanceYear = Date.getToday().year
+ private var attendanceMonth = Date.getToday().month
+ private var attendancePrevMonthChecked = false
+
+ init {
+ getAttendance()
+ }
+
+ private fun getAttendance() {
+ webApiGet(TAG, IDZIENNIK_WEB_ATTENDANCE, mapOf(
+ "idPozDziennika" to data.registerId,
+ "mc" to attendanceMonth,
+ "rok" to attendanceYear,
+ "dataTygodnia" to ""
+ )) { result ->
+ val json = result.getJsonObject("d") ?: run {
+ data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
+ .withApiResponse(result))
+ return@webApiGet
+ }
+
+ for (jAttendanceEl in json.getAsJsonArray("Obecnosci")) {
+ val jAttendance = jAttendanceEl.asJsonObject
+ // jAttendance
+ val type = jAttendance.get("TypObecnosci").asInt
+
+ // skip "zajęcia nie odbyły się" and "Ferie"
+ if (type == 5 || type == 7)
+ continue
+
+ val date = Date.fromY_m_d(jAttendance.get("Data").asString)
+ val time = Time.fromH_m(jAttendance.get("OdDoGodziny").asString)
+ if (date.combineWith(time) > System.currentTimeMillis())
+ continue
+
+ val id = jAttendance.get("IdLesson").asString.crc16().toLong()
+ val rSubject = data.getSubject(jAttendance.get("Przedmiot").asString, jAttendance.get("IdPrzedmiot").asLong, "")
+ val rTeacher = data.getTeacherByFDotSpaceLast(jAttendance.get("PrzedmiotNauczyciel").asString)
+
+ var baseType = TYPE_UNKNOWN
+ var typeName = "nieznany rodzaj"
+ var typeSymbol: String? = null
+ var typeColor: Long? = null
+
+ /* https://iuczniowie.progman.pl/idziennik/mod_panelRodzica/obecnosci/obecnosciUcznia_lmt637231494660000000.js */
+ /* https://iuczniowie.progman.pl/idziennik/mod_panelRodzica/obecnosci/obecnosci_lmt637231494660000000.css */
+ when (type) {
+ 1 -> {
+ baseType = TYPE_ABSENT_EXCUSED
+ typeName = "nieobecność usprawiedliwiona"
+ typeColor = 0xffffe099
+ }
+ 2 -> {
+ baseType = TYPE_BELATED
+ typeName = "spóźnienie"
+ typeColor = 0xffffffaa
+ }
+ 3 -> {
+ baseType = TYPE_ABSENT
+ typeName = "nieobecność nieusprawiedliwiona"
+ typeColor = 0xffffad99
+ }
+ 4, 9 -> {
+ baseType = TYPE_RELEASED
+ if (type == 4) {
+ typeName = "zwolnienie"
+ typeColor = 0xffa8beff
+ }
+ if (type == 9) {
+ typeName = "zwolniony / obecny"
+ typeSymbol = "zb"
+ typeColor = 0xffff69b4
+ }
+ }
+ 8 -> {
+ baseType = TYPE_PRESENT_CUSTOM
+ typeName = "wycieczka"
+ typeSymbol = "w"
+ typeColor = null
+ }
+ 0 -> {
+ baseType = TYPE_PRESENT
+ typeName = "obecny"
+ typeColor = 0xffccffcc
+ }
+ }
+
+ val semester = profile?.dateToSemester(date) ?: 1
+
+ val attendanceObject = Attendance(
+ profileId = profileId,
+ id = id,
+ baseType = baseType,
+ typeName = typeName,
+ typeShort = typeSymbol ?: data.app.attendanceManager.getTypeShort(baseType),
+ typeSymbol = typeSymbol ?: data.app.attendanceManager.getTypeShort(baseType),
+ typeColor = typeColor?.toInt(),
+ date = date,
+ startTime = time,
+ semester = semester,
+ teacherId = rTeacher.id,
+ subjectId = rSubject.id
+ ).also {
+ it.lessonTopic = jAttendance.getString("PrzedmiotTemat")
+ it.lessonNumber = jAttendance.getInt("Godzina")
+ }
+
+ data.attendanceList.add(attendanceObject)
+ if (attendanceObject.baseType != TYPE_PRESENT) {
+ data.metadataList.add(Metadata(
+ profileId,
+ Metadata.TYPE_ATTENDANCE,
+ attendanceObject.id,
+ profile?.empty ?: false || baseType == TYPE_PRESENT_CUSTOM || baseType == TYPE_UNKNOWN,
+ profile?.empty ?: false || baseType == TYPE_PRESENT_CUSTOM || baseType == TYPE_UNKNOWN
+ ))
+ }
+ }
+
+ val attendanceDateValue = attendanceYear * 10000 + attendanceMonth * 100
+ if (profile?.empty == true && attendanceDateValue > profile?.getSemesterStart(1)?.value ?: 99999999) {
+ attendancePrevMonthChecked = true // do not need to check prev month later
+ attendanceMonth--
+ if (attendanceMonth < 1) {
+ attendanceMonth = 12
+ attendanceYear--
+ }
+ getAttendance()
+ } else if (!attendancePrevMonthChecked /* get also the previous month */) {
+ attendanceMonth--
+ if (attendanceMonth < 1) {
+ attendanceMonth = 12
+ attendanceYear--
+ }
+ attendancePrevMonthChecked = true
+ getAttendance()
+ } else {
+ data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_ATTENDANCE, SYNC_ALWAYS)
+ onSuccess(ENDPOINT_IDZIENNIK_WEB_ATTENDANCE)
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebExams.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebExams.kt
new file mode 100644
index 00000000..25c06945
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebExams.kt
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-28.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
+
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
+import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_EXAMS
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_EXAMS
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.db.entity.Event
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.utils.models.Date
+import java.util.*
+
+class IdziennikWebExams(override val data: DataIdziennik,
+ override val lastSync: Long?,
+ val onSuccess: (endpointId: Int) -> Unit
+) : IdziennikWeb(data, lastSync) {
+ companion object {
+ private const val TAG = "IdziennikWebExams"
+ }
+
+ private var examsYear = Date.getToday().year
+ private var examsMonth = Date.getToday().month
+ private var examsMonthsChecked = 0
+ private var examsNextMonthChecked = false // TO DO temporary // no more // idk
+
+ init {
+ getExams()
+ }
+
+ private fun getExams() {
+ val param = JsonObject().apply {
+ addProperty("strona", 1)
+ addProperty("iloscNaStrone", "99")
+ addProperty("iloscRekordow", -1)
+ addProperty("kolumnaSort", "ss.Nazwa,sp.Data_sprawdzianu")
+ addProperty("kierunekSort", 0)
+ addProperty("maxIloscZaznaczonych", 0)
+ addProperty("panelFiltrow", 0)
+ }
+
+ webApiGet(TAG, IDZIENNIK_WEB_EXAMS, mapOf(
+ "idP" to data.registerId,
+ "rok" to examsYear,
+ "miesiac" to examsMonth,
+ "param" to param
+ )) { result ->
+ val json = result.getJsonObject("d") ?: run {
+ data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
+ .withApiResponse(result))
+ return@webApiGet
+ }
+
+ json.getJsonArray("ListK")?.asJsonObjectList()?.forEach { exam ->
+ val id = exam.getLong("_recordId") ?: return@forEach
+ val examDate = Date.fromY_m_d(exam.getString("data") ?: return@forEach)
+ val subjectName = exam.getString("przedmiot") ?: return@forEach
+ val subjectId = data.getSubject(subjectName, null, subjectName).id
+ val teacherName = exam.getString("wpisal") ?: return@forEach
+ val teacherId = data.getTeacherByLastFirst(teacherName).id
+ val topic = exam.getString("zakres")?.trim() ?: ""
+
+ val lessonList = data.db.timetableDao().getAllForDateNow(profileId, examDate)
+ val startTime = lessonList.firstOrNull { it.subjectId == subjectId }?.startTime
+
+ val eventType = when (exam.getString("rodzaj")?.toLowerCase(Locale.getDefault())) {
+ "sprawdzian/praca klasowa",
+ "sprawdzian",
+ "praca klasowa" -> Event.TYPE_EXAM
+ "kartkówka" -> Event.TYPE_SHORT_QUIZ
+ else -> Event.TYPE_EXAM
+ }
+
+ val eventObject = Event(
+ profileId = profileId,
+ id = id,
+ date = examDate,
+ time = startTime,
+ topic = topic,
+ color = null,
+ type = eventType,
+ teacherId = teacherId,
+ subjectId = subjectId,
+ teamId = data.teamClass?.id ?: -1
+ )
+
+ data.eventList.add(eventObject)
+ data.metadataList.add(Metadata(
+ profileId,
+ Metadata.TYPE_EVENT,
+ eventObject.id,
+ profile?.empty ?: false,
+ profile?.empty ?: false
+ ))
+ }
+
+ if (profile?.empty == true && examsMonthsChecked < 3 /* how many months backwards to check? */) {
+ examsMonthsChecked++
+ examsMonth--
+ if (examsMonth < 1) {
+ examsMonth = 12
+ examsYear--
+ }
+ getExams()
+ } else if (!examsNextMonthChecked /* get also one month forward */) {
+ val showDate = Date.getToday().stepForward(0, 1, 0)
+ examsYear = showDate.year
+ examsMonth = showDate.month
+ examsNextMonthChecked = true
+ getExams()
+ } else {
+ data.toRemove.add(DataRemoveModel.Events.futureExceptType(Event.TYPE_HOMEWORK))
+
+ data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_EXAMS, SYNC_ALWAYS)
+ onSuccess(ENDPOINT_IDZIENNIK_WEB_EXAMS)
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetAttachment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetAttachment.kt
new file mode 100644
index 00000000..b7a462f6
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetAttachment.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-28
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
+
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_GET_ATTACHMENT
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent
+import pl.szczodrzynski.edziennik.data.db.entity.Message
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.utils.Utils
+import java.io.File
+
+class IdziennikWebGetAttachment(override val data: DataIdziennik,
+ val owner: Any,
+ val attachmentId: Long,
+ val attachmentName: String,
+ val onSuccess: () -> Unit
+) : IdziennikWeb(data, null) {
+ companion object {
+ const val TAG = "IdziennikWebGetAttachment"
+ }
+
+ init {
+ val message = owner as Message
+
+ val messageId = "\\[META:([A-z0-9]+);([0-9-]+)]".toRegex().find(message.body ?: "")?.get(2) ?: -1
+ val targetFile = File(Utils.getStorageDir(), attachmentName)
+
+ webGetFile(TAG, IDZIENNIK_WEB_GET_ATTACHMENT, targetFile, mapOf(
+ "id" to messageId,
+ "fileName" to attachmentName
+ ), { file ->
+ val event = AttachmentGetEvent(
+ profileId,
+ owner,
+ attachmentId,
+ AttachmentGetEvent.TYPE_FINISHED,
+ file.absolutePath
+ )
+
+ val attachmentDataFile = File(Utils.getStorageDir(), ".${profileId}_${event.ownerId}_${event.attachmentId}")
+ Utils.writeStringToFile(attachmentDataFile, event.fileName)
+
+ EventBus.getDefault().postSticky(event)
+
+ onSuccess()
+
+ }) { written, _ ->
+ val event = AttachmentGetEvent(
+ profileId,
+ owner,
+ attachmentId,
+ AttachmentGetEvent.TYPE_PROGRESS,
+ bytesWritten = written
+ )
+
+ EventBus.getDefault().postSticky(event)
+ }
+ }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetHomework.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetHomework.kt
new file mode 100644
index 00000000..12d804db
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetHomework.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-4-1.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
+
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
+import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_GET_HOMEWORK
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.data.api.events.EventGetEvent
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.db.full.EventFull
+import pl.szczodrzynski.edziennik.getBoolean
+import pl.szczodrzynski.edziennik.getJsonObject
+import pl.szczodrzynski.edziennik.getString
+
+class IdziennikWebGetHomework(override val data: DataIdziennik,
+ val event: EventFull,
+ val onSuccess: () -> Unit
+) : IdziennikWeb(data, null) {
+ companion object {
+ private const val TAG = "IdziennikWebGetHomework"
+ }
+
+ init {
+ webApiGet(TAG, IDZIENNIK_WEB_GET_HOMEWORK, mapOf(
+ "idP" to data.registerId,
+ "idPD" to event.id
+ )) { result ->
+ val json = result.getJsonObject("d") ?: run {
+ data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
+ .withApiResponse(result))
+ return@webApiGet
+ }
+
+ val homework = json.getJsonObject("praca") ?: return@webApiGet
+
+ if (homework.getBoolean("zalacznik", false)) {
+ event.attachmentIds = mutableListOf(event.id)
+ event.attachmentNames = mutableListOf("Załącznik do zadania")
+ }
+ else {
+ event.attachmentIds = mutableListOf()
+ event.attachmentNames = mutableListOf()
+ }
+ event.homeworkBody = homework.getString("tresc")
+
+ data.eventList.add(event)
+ data.eventListReplace = true
+
+ EventBus.getDefault().postSticky(EventGetEvent(event))
+ onSuccess()
+ }
+ }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetHomeworkAttachment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetHomeworkAttachment.kt
new file mode 100644
index 00000000..f4a60f98
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetHomeworkAttachment.kt
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-4-1.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
+
+import com.google.gson.JsonObject
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_GET_HOMEWORK_ATTACHMENT
+import pl.szczodrzynski.edziennik.data.api.Regexes
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent
+import pl.szczodrzynski.edziennik.data.db.entity.Event
+import pl.szczodrzynski.edziennik.get
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.set
+import pl.szczodrzynski.edziennik.utils.Utils
+import java.io.File
+
+class IdziennikWebGetHomeworkAttachment(override val data: DataIdziennik,
+ val owner: Any,
+ val attachmentId: Long,
+ val attachmentName: String,
+ val onSuccess: () -> Unit
+) : IdziennikWeb(data, null) {
+ companion object {
+ const val TAG = "IdziennikWebGetHomeworkAttachment"
+ }
+
+ init {
+ val homework = owner as Event
+
+ /*val request = Request.Builder()
+ .url("")
+ .build()
+ data.app.http.newCall(request).enqueue(object : Callback {
+ override fun onFailure(call: Call, e: IOException) {
+ data.error(ApiError(TAG, ERROR_REQUEST_FAILURE)
+ .withThrowable(e))
+ }
+
+ override fun onResponse(call: Call, response: Response) {
+ val filename = response.header("content-disposition")?.substringAfter("\"")?.substringBeforeLast("\"")
+
+ val file: File = File(Utils.getStorageDir(), filename)
+ val sink = file.sink().buffer()
+ response.body()?.source()?.let {
+ sink.writeAll(it)
+ }
+ sink.close()
+ }
+ })*/
+
+ webGet(TAG, IDZIENNIK_WEB_GET_HOMEWORK_ATTACHMENT) { text ->
+ val hiddenFields = JsonObject()
+ Regexes.IDZIENNIK_LOGIN_HIDDEN_FIELDS.findAll(text).forEach {
+ hiddenFields[it[1]] = it[2]
+ }
+
+ webGetFile(TAG, IDZIENNIK_WEB_GET_HOMEWORK_ATTACHMENT, Utils.getStorageDir(), mapOf(
+ "__VIEWSTATE" to hiddenFields.getString("__VIEWSTATE", ""),
+ "__VIEWSTATEGENERATOR" to hiddenFields.getString("__VIEWSTATEGENERATOR", ""),
+ "__EVENTVALIDATION" to hiddenFields.getString("__EVENTVALIDATION", ""),
+ "__EVENTTARGET" to "ctl00\$cphContent\$bt_pobraniePliku",
+ "ctl00\$dxComboUczniowie" to data.registerId,
+ "ctl00\$cphContent\$idPracyDomowej" to attachmentId
+ ), { file ->
+ val event = AttachmentGetEvent(
+ profileId,
+ owner,
+ attachmentId,
+ AttachmentGetEvent.TYPE_FINISHED,
+ file.absolutePath
+ )
+
+ val attachmentDataFile = File(Utils.getStorageDir(), ".${profileId}_${event.ownerId}_${event.attachmentId}")
+ Utils.writeStringToFile(attachmentDataFile, event.fileName)
+
+ homework.attachmentNames = mutableListOf(file.name)
+ data.eventList.add(homework)
+ data.eventListReplace = true
+
+ EventBus.getDefault().postSticky(event)
+ onSuccess()
+
+ }) { written, _ ->
+ val event = AttachmentGetEvent(
+ profileId,
+ owner,
+ attachmentId,
+ AttachmentGetEvent.TYPE_PROGRESS,
+ bytesWritten = written
+ )
+
+ EventBus.getDefault().postSticky(event)
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetMessage.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetMessage.kt
new file mode 100644
index 00000000..bd1808df
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetMessage.kt
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-12-28
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
+
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_GET_MESSAGE
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.data.api.events.MessageGetEvent
+import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_RECEIVED
+import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_SENT
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.full.MessageFull
+import pl.szczodrzynski.edziennik.data.db.full.MessageRecipientFull
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class IdziennikWebGetMessage(override val data: DataIdziennik,
+ private val message: MessageFull,
+ val onSuccess: () -> Unit
+) : IdziennikWeb(data, null) {
+ companion object {
+ const val TAG = "IdziennikWebGetMessage"
+ }
+
+ init { data.profile?.also { profile ->
+ val metaPattern = "\\[META:([A-z0-9]+);([0-9-]+)]".toRegex()
+ val meta = metaPattern.find(message.body!!)
+ val messageIdString = meta?.get(1) ?: ""
+
+ webApiGet(TAG, IDZIENNIK_WEB_GET_MESSAGE, parameters = mapOf(
+ "idWiadomosci" to messageIdString,
+ "typWiadomosci" to if (message.type == TYPE_SENT) 1 else 0
+ )) { json ->
+ json.getJsonObject("d")?.getJsonObject("Wiadomosc")?.also {
+ val id = it.getLong("_recordId")
+ message.body = message.body?.replace(metaPattern, "[META:$messageIdString;$id]")
+
+ message.clearAttachments()
+ it.getJsonArray("ListaZal")?.asJsonObjectList()?.forEach { attachment ->
+ message.addAttachment(
+ attachment.getLong("Id") ?: return@forEach,
+ attachment.getString("Nazwa") ?: return@forEach,
+ -1
+ )
+ }
+
+ message.recipients?.clear()
+ when (message.type) {
+ TYPE_RECEIVED -> {
+ val recipientObject = MessageRecipientFull(
+ profileId = profileId,
+ id = -1,
+ messageId = message.id
+ )
+
+ val readDateString = it.getString("DataOdczytania")
+ recipientObject.readDate = if (readDateString.isNullOrBlank()) System.currentTimeMillis()
+ else Date.fromIso(readDateString)
+
+ recipientObject.fullName = profile.accountName ?: profile.studentNameLong
+
+ data.messageRecipientList.add(recipientObject)
+ message.addRecipient(recipientObject)
+ }
+
+ TYPE_SENT -> {
+ it.getJsonArray("ListaOdbiorcow")?.asJsonObjectList()?.forEach { recipient ->
+ val recipientName = recipient.getString("NazwaOdbiorcy") ?: return@forEach
+ val teacher = data.getTeacherByLastFirst(recipientName)
+
+ val recipientObject = MessageRecipientFull(
+ profileId = profileId,
+ id = teacher.id,
+ messageId = message.id
+ )
+
+ recipientObject.readDate = recipient.getLong("Status") ?: return@forEach
+ recipientObject.fullName = teacher.fullName
+
+ data.messageRecipientList.add(recipientObject)
+ message.addRecipient(recipientObject)
+ }
+ }
+ }
+
+ if (!message.seen) {
+ message.seen = true
+
+ data.setSeenMetadataList.add(Metadata(
+ profileId,
+ Metadata.TYPE_MESSAGE,
+ message.id,
+ message.seen,
+ message.notified
+ ))
+ }
+
+ data.messageList.add(message)
+ data.messageListReplace = true
+
+ EventBus.getDefault().postSticky(MessageGetEvent(message))
+ onSuccess()
+ }
+ }
+ } ?: onSuccess() }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetRecipientList.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetRecipientList.kt
new file mode 100644
index 00000000..a14efc24
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGetRecipientList.kt
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-12-30.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
+
+import androidx.room.OnConflictStrategy
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
+import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_GET_RECIPIENT_LIST
+import pl.szczodrzynski.edziennik.data.api.Regexes
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.data.api.events.RecipientListGetEvent
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+
+class IdziennikWebGetRecipientList(override val data: DataIdziennik,
+ val onSuccess: () -> Unit
+) : IdziennikWeb(data, null) {
+ companion object {
+ private const val TAG = "IdziennikWebGetRecipientList"
+ }
+
+ init {
+ webApiGet(TAG, IDZIENNIK_WEB_GET_RECIPIENT_LIST, mapOf(
+ "idP" to data.registerId
+ )) { result ->
+ val json = result.getJsonObject("d") ?: run {
+ data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
+ .withApiResponse(result))
+ return@webApiGet
+ }
+
+ json.getJsonArray("ListK_Pracownicy")?.asJsonObjectList()?.forEach { recipient ->
+ val name = recipient.getString("ImieNazwisko") ?: ": "
+ val (fullName, subject) = name.split(": ").let {
+ Pair(it.getOrNull(0), it.getOrNull(1))
+ }
+ val guid = recipient.getString("Id") ?: ""
+ // get teacher by ID or create it
+ val teacher = data.getTeacherByFirstLast(fullName ?: " ")
+ teacher.loginId = guid
+ teacher.setTeacherType(Teacher.TYPE_TEACHER)
+ // unset OTHER that is automatically set in IdziennikApiMessages*
+ teacher.unsetTeacherType(Teacher.TYPE_OTHER)
+ teacher.typeDescription = subject
+ }
+
+ json.getJsonArray("ListK_Opiekunowie")?.asJsonObjectList()?.forEach { recipient ->
+ val name = recipient.getString("ImieNazwisko") ?: ": "
+ val (fullName, parentOf) = Regexes.IDZIENNIK_MESSAGES_RECIPIENT_PARENT.find(name)?.let {
+ Pair(it.groupValues.getOrNull(1), it.groupValues.getOrNull(2))
+ } ?: Pair(null, null)
+ val guid = recipient.getString("Id") ?: ""
+ // get teacher by ID or create it
+ val teacher = data.getTeacherByFirstLast(fullName ?: " ")
+ teacher.loginId = guid
+ teacher.setTeacherType(Teacher.TYPE_PARENT)
+ // unset OTHER that is automatically set in IdziennikApiMessages*
+ teacher.unsetTeacherType(Teacher.TYPE_OTHER)
+ teacher.typeDescription = parentOf
+ }
+
+ val event = RecipientListGetEvent(
+ data.profileId,
+ data.teacherList.filter { it.loginId != null }
+ )
+
+ profile?.lastReceiversSync = System.currentTimeMillis()
+
+ data.teacherOnConflictStrategy = OnConflictStrategy.REPLACE
+ EventBus.getDefault().postSticky(event)
+ onSuccess()
+ }
+ }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGrades.kt
similarity index 57%
rename from app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebGrades.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGrades.kt
index e99387f6..90e17401 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebGrades.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGrades.kt
@@ -2,28 +2,32 @@
* Copyright (c) Kuba Szczodrzyński 2019-10-28.
*/
-package pl.szczodrzynski.edziennik.api.v2.idziennik.data.web
+package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
import android.graphics.Color
import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
-import pl.szczodrzynski.edziennik.api.v2.IDZIENNIK_WEB_GRADES
-import pl.szczodrzynski.edziennik.api.v2.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.api.v2.idziennik.ENDPOINT_IDZIENNIK_WEB_GRADES
-import pl.szczodrzynski.edziennik.api.v2.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
-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.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
+import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_GRADES
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_GRADES
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.db.entity.Grade
+import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_NORMAL
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
import pl.szczodrzynski.edziennik.utils.models.Date
class IdziennikWebGrades(override val data: DataIdziennik,
- val onSuccess: () -> Unit) : IdziennikWeb(data) {
+ override val lastSync: Long?,
+ val onSuccess: (endpointId: Int) -> Unit
+) : IdziennikWeb(data, lastSync) {
companion object {
private const val TAG = "IdziennikWebGrades"
}
- init {
+ init { data.profile?.also { profile ->
webApiGet(TAG, IDZIENNIK_WEB_GRADES, mapOf(
"idPozDziennika" to data.registerId
)) { result ->
@@ -59,18 +63,24 @@ class IdziennikWebGrades(override val data: DataIdziennik,
colorInt = Color.parseColor("#$gradeColor")
}
+ val addedDate = grade.getString("Data_wystaw")?.let { Date.fromY_m_d(it).inMillis } ?: System.currentTimeMillis()
+
val gradeObject = Grade(
- profileId,
- id,
- category,
- colorInt,
- "",
- name,
- value,
- weight,
- semester,
- teacher.id,
- subject.id)
+ profileId = profileId,
+ id = id,
+ name = name,
+ type = TYPE_NORMAL,
+ value = value,
+ weight = weight,
+ color = colorInt,
+ category = category,
+ description = null,
+ comment = null,
+ semester = semester,
+ teacherId = teacher.id,
+ subjectId = subject.id,
+ addedDate = addedDate
+ )
when (grade.getInt("Typ")) {
0 -> {
@@ -88,30 +98,39 @@ class IdziennikWebGrades(override val data: DataIdziennik,
count += weight
}
- val historyObject = Grade(
- profileId,
- gradeObject.id * -1,
- historyItem.get("Kategoria").asString,
- Color.parseColor("#" + historyItem.get("Kolor").asString),
- historyItem.get("Uzasadnienie").asString,
- historyItem.get("Ocena").asString,
- value,
- if (value > 0f && countToTheAverage) weight * -1f else 0f,
- historyItem.get("Semestr").asInt,
- teacher.id,
- subject.id)
- historyObject.parentId = gradeObject.id
+ val historyColor = historyItem.getString("Kolor") ?: ""
+ colorInt = 0xff2196f3.toInt()
+ if (historyColor.isNotEmpty()) {
+ colorInt = Color.parseColor("#$historyColor")
+ }
val addedDate = historyItem.getString("Data_wystaw")?.let { Date.fromY_m_d(it).inMillis } ?: System.currentTimeMillis()
+ val historyObject = Grade(
+ profileId = profileId,
+ id = gradeObject.id * -1,
+ name = historyItem.getString("Ocena") ?: "",
+ type = TYPE_NORMAL,
+ value = value,
+ weight = if (value > 0f && countToTheAverage) weight * -1f else 0f,
+ color = colorInt,
+ category = historyItem.getString("Kategoria"),
+ description = historyItem.getString("Uzasadnienie"),
+ comment = null,
+ semester = historyItem.getInt("Semestr") ?: 1,
+ teacherId = teacher.id,
+ subjectId = subject.id,
+ addedDate = addedDate
+ )
+ historyObject.parentId = gradeObject.id
+
data.gradeList.add(historyObject)
data.metadataList.add(Metadata(
profileId,
Metadata.TYPE_GRADE,
historyObject.id,
true,
- true,
- addedDate
+ true
))
}
// update the current grade's value with an average of all historical grades and itself
@@ -123,33 +142,37 @@ class IdziennikWebGrades(override val data: DataIdziennik,
}
1 -> {
gradeObject.type = Grade.TYPE_SEMESTER1_FINAL
- gradeObject.name = name
+ gradeObject.name = value.toInt().toString()
gradeObject.weight = 0f
}
2 -> {
gradeObject.type = Grade.TYPE_YEAR_FINAL
- gradeObject.name = name
+ gradeObject.name = value.toInt().toString()
gradeObject.weight = 0f
}
}
- val addedDate = grade.getString("Data_wystaw")?.let { Date.fromY_m_d(it).inMillis } ?: System.currentTimeMillis()
-
data.gradeList.add(gradeObject)
data.metadataList.add(
Metadata(
profileId,
Metadata.TYPE_GRADE,
id,
- data.profile?.empty ?: false,
- data.profile?.empty ?: false,
- addedDate
+ data.profile.empty,
+ data.profile.empty
))
}
}
+ data.toRemove.addAll(listOf(
+ Grade.TYPE_NORMAL,
+ Grade.TYPE_SEMESTER1_FINAL,
+ Grade.TYPE_YEAR_FINAL
+ ).map {
+ DataRemoveModel.Grades.semesterWithType(profile.currentSemester, it)
+ })
data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_GRADES, SYNC_ALWAYS)
- onSuccess()
+ onSuccess(ENDPOINT_IDZIENNIK_WEB_GRADES)
}
- }
+ } ?: onSuccess(ENDPOINT_IDZIENNIK_WEB_GRADES) }
}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebHomework.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebHomework.kt
new file mode 100644
index 00000000..10b4a0c3
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebHomework.kt
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-11-25
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
+
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
+import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_HOMEWORK
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_HOMEWORK
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.db.entity.Event
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class IdziennikWebHomework(override val data: DataIdziennik,
+ override val lastSync: Long?,
+ val onSuccess: (endpointId: Int) -> Unit
+) : IdziennikWeb(data, lastSync) {
+ companion object {
+ private const val TAG = "IdziennikWebHomework"
+ }
+
+ init {
+ val param = JsonObject().apply {
+ addProperty("strona", 1)
+ addProperty("iloscNaStrone", 997)
+ addProperty("iloscRekordow", -1)
+ addProperty("kolumnaSort", "DataZadania")
+ addProperty("kierunekSort", 0)
+ addProperty("maxIloscZaznaczonych", 0)
+ addProperty("panelFiltrow", 0)
+ }
+
+ webApiGet(TAG, IDZIENNIK_WEB_HOMEWORK, mapOf(
+ "idP" to data.registerId,
+ "data" to Date.getToday().stringY_m_d,
+ "wszystkie" to true,
+ "param" to param
+ )) { result ->
+ val json = result.getJsonObject("d") ?: run {
+ data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
+ .withApiResponse(result))
+ return@webApiGet
+ }
+
+ json.getJsonArray("ListK")?.asJsonObjectList()?.forEach { homework ->
+ val id = homework.getLong("_recordId") ?: return@forEach
+ val eventDate = Date.fromY_m_d(homework.getString("dataO") ?: return@forEach)
+ val addedDate = Date.fromY_m_d(homework.getString("dataZ") ?: return@forEach)
+ val subjectName = homework.getString("przed") ?: return@forEach
+ val subjectId = data.getSubject(subjectName, null, subjectName).id
+ val teacherName = homework.getString("usr") ?: return@forEach
+ val teacherId = data.getTeacherByLastFirst(teacherName).id
+ val lessonList = data.db.timetableDao().getAllForDateNow(profileId, eventDate)
+ val startTime = lessonList.firstOrNull { it.subjectId == subjectId }?.displayStartTime
+ val topic = homework.getString("tytul")?.trim() ?: ""
+
+ val seen = when (profile?.empty) {
+ true -> true
+ else -> eventDate < Date.getToday()
+ }
+
+
+ val eventObject = Event(
+ profileId = profileId,
+ id = id,
+ date = eventDate,
+ time = startTime,
+ topic = topic,
+ color = null,
+ type = Event.TYPE_HOMEWORK,
+ teacherId = teacherId,
+ subjectId = subjectId,
+ teamId = data.teamClass?.id ?: -1,
+ addedDate = addedDate.inMillis
+ )
+
+ data.eventList.add(eventObject)
+ data.metadataList.add(Metadata(
+ profileId,
+ Metadata.TYPE_HOMEWORK,
+ eventObject.id,
+ seen,
+ seen
+ ))
+ }
+
+ data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_HOMEWORK))
+
+ data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_HOMEWORK, SYNC_ALWAYS)
+ onSuccess(ENDPOINT_IDZIENNIK_WEB_HOMEWORK)
+ }
+ }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebNotices.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebNotices.kt
similarity index 51%
rename from app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebNotices.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebNotices.kt
index 7cdaf3af..64108bfd 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/web/IdziennikWebNotices.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebNotices.kt
@@ -2,24 +2,29 @@
* Copyright (c) Kuba Szczodrzyński 2019-10-28.
*/
-package pl.szczodrzynski.edziennik.api.v2.idziennik.data.web
+package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
-import pl.szczodrzynski.edziennik.api.v2.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
-import pl.szczodrzynski.edziennik.api.v2.IDZIENNIK_WEB_NOTICES
-import pl.szczodrzynski.edziennik.api.v2.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.api.v2.idziennik.ENDPOINT_IDZIENNIK_WEB_NOTICES
-import pl.szczodrzynski.edziennik.api.v2.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
import pl.szczodrzynski.edziennik.crc16
-import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
-import pl.szczodrzynski.edziennik.data.db.modules.notices.Notice
-import pl.szczodrzynski.edziennik.data.db.modules.notices.Notice.*
+import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
+import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_NOTICES
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_NOTICES
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.Notice
+import pl.szczodrzynski.edziennik.data.db.entity.Notice.Companion.TYPE_NEGATIVE
+import pl.szczodrzynski.edziennik.data.db.entity.Notice.Companion.TYPE_NEUTRAL
+import pl.szczodrzynski.edziennik.data.db.entity.Notice.Companion.TYPE_POSITIVE
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
import pl.szczodrzynski.edziennik.getJsonObject
+import pl.szczodrzynski.edziennik.getString
import pl.szczodrzynski.edziennik.utils.models.Date
class IdziennikWebNotices(override val data: DataIdziennik,
- val onSuccess: () -> Unit) : IdziennikWeb(data) {
+ override val lastSync: Long?,
+ val onSuccess: (endpointId: Int) -> Unit
+) : IdziennikWeb(data, lastSync) {
companion object {
private const val TAG = "IdziennikWebNotices"
}
@@ -51,25 +56,29 @@ class IdziennikWebNotices(override val data: DataIdziennik,
}
val noticeObject = Notice(
- profileId,
- noticeId,
- jNotice.get("Tresc").asString,
- jNotice.get("Semestr").asInt,
- nType,
- rTeacher.id)
+ profileId = profileId,
+ id = noticeId,
+ type = nType,
+ semester = jNotice.get("Semestr").asInt,
+ text = jNotice.getString("Tresc") ?: "",
+ category = null,
+ points = null,
+ teacherId = rTeacher.id,
+ addedDate = addedDate.inMillis
+ )
+
data.noticeList.add(noticeObject)
data.metadataList.add(Metadata(
profileId,
Metadata.TYPE_NOTICE,
noticeObject.id,
profile?.empty ?: false,
- profile?.empty ?: false,
- addedDate.inMillis
+ profile?.empty ?: false
))
}
data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_NOTICES, SYNC_ALWAYS)
- onSuccess()
+ onSuccess(ENDPOINT_IDZIENNIK_WEB_NOTICES)
}
}
}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebProposedGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebProposedGrades.kt
new file mode 100644
index 00000000..b23e9f98
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebProposedGrades.kt
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-28.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
+
+import pl.szczodrzynski.edziennik.asJsonObjectList
+import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
+import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_MISSING_GRADES
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.data.db.entity.Grade
+import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_DESCRIPTIVE
+import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER1_PROPOSED
+import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_YEAR_PROPOSED
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.getJsonArray
+import pl.szczodrzynski.edziennik.getJsonObject
+import pl.szczodrzynski.edziennik.getString
+
+class IdziennikWebProposedGrades(override val data: DataIdziennik,
+ override val lastSync: Long?,
+ val onSuccess: (endpointId: Int) -> Unit
+) : IdziennikWeb(data, lastSync) {
+ companion object {
+ private const val TAG = "IdziennikWebProposedGrades"
+ }
+
+ init { data.profile?.also { profile ->
+ webApiGet(TAG, IDZIENNIK_WEB_MISSING_GRADES, mapOf(
+ "idPozDziennika" to data.registerId
+ )) { result ->
+ val json = result.getJsonObject("d") ?: run {
+ data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
+ .withApiResponse(result))
+ return@webApiGet
+ }
+ val manager = data.app.gradesManager
+
+ json.getJsonArray("Przedmioty")?.asJsonObjectList()?.forEach { subject ->
+ val subjectName = subject.getString("Przedmiot") ?: return@forEach
+ val subjectObject = data.getSubject(subjectName, null, subjectName)
+
+ val semester1Proposed = subject.getString("OcenaSem1") ?: ""
+ val semester1Value = manager.getGradeValue(semester1Proposed)
+ val semester1Id = subjectObject.id * (-100) - 1
+ val semester1Type =
+ if (semester1Value == 0f) TYPE_DESCRIPTIVE
+ else TYPE_SEMESTER1_PROPOSED
+ val semester1Name = when {
+ semester1Value == 0f -> " "
+ semester1Value % 1.0f == 0f -> semester1Value.toInt().toString()
+ else -> semester1Value.toString()
+ }
+ val semester1Color =
+ if (semester1Value == 0f) 0xff536dfe.toInt()
+ else -1
+
+ val semester2Proposed = subject.getString("OcenaSem2") ?: ""
+ val semester2Value = manager.getGradeValue(semester2Proposed)
+ val semester2Id = subjectObject.id * (-100) - 2
+ val semester2Type =
+ if (semester2Value == 0f) TYPE_DESCRIPTIVE
+ else TYPE_YEAR_PROPOSED
+ val semester2Name = when {
+ semester2Value == 0f -> " "
+ semester2Value % 1.0f == 0f -> semester2Value.toInt().toString()
+ else -> semester2Value.toString()
+ }
+ val semester2Color =
+ if (semester2Value == 0f) 0xffff4081.toInt()
+ else -1
+
+ if (semester1Proposed != "") {
+ val addedDate = if (data.profile.empty)
+ data.profile.dateSemester1Start.inMillis
+ else
+ System.currentTimeMillis()
+
+ val gradeObject = Grade(
+ profileId = profileId,
+ id = semester1Id,
+ name = semester1Name,
+ type = semester1Type,
+ value = semester1Value,
+ weight = 0f,
+ color = semester1Color,
+ category = if (semester1Value == 0f) "Ocena opisowa semestralna" else null,
+ description = if (semester1Value == 0f) semester1Proposed else null,
+ comment = null,
+ semester = 1,
+ teacherId = -1,
+ subjectId = subjectObject.id,
+ addedDate = addedDate
+ )
+
+ data.gradeList.add(gradeObject)
+ data.metadataList.add(Metadata(
+ profileId,
+ Metadata.TYPE_GRADE,
+ gradeObject.id,
+ profile.empty,
+ profile.empty
+ ))
+ }
+
+ if (semester2Proposed != "") {
+ val addedDate = if (data.profile.empty)
+ data.profile.dateSemester2Start.inMillis
+ else
+ System.currentTimeMillis()
+
+ val gradeObject = Grade(
+ profileId = profileId,
+ id = semester2Id,
+ name = semester2Name,
+ type = semester2Type,
+ value = semester2Value,
+ weight = 0f,
+ color = semester2Color,
+ category = if (semester2Value == 0f) "Ocena opisowa końcoworoczna" else null,
+ description = if (semester2Value == 0f) semester2Proposed else null,
+ comment = null,
+ semester = 2,
+ teacherId = -1,
+ subjectId = subjectObject.id,
+ addedDate = addedDate
+ )
+
+ data.gradeList.add(gradeObject)
+ data.metadataList.add(Metadata(
+ profileId,
+ Metadata.TYPE_GRADE,
+ gradeObject.id,
+ profile.empty,
+ profile.empty
+ ))
+ }
+ }
+
+ data.toRemove.addAll(listOf(TYPE_SEMESTER1_PROPOSED, TYPE_YEAR_PROPOSED).map {
+ DataRemoveModel.Grades.semesterWithType(profile.currentSemester, it)
+ })
+ data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES, SYNC_ALWAYS)
+ onSuccess(ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES)
+ }
+ } ?: onSuccess(ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES) }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebSendMessage.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebSendMessage.kt
new file mode 100644
index 00000000..343ebcac
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebSendMessage.kt
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-12-30.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
+
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
+import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_SEND_MESSAGE
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
+import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.api.IdziennikApiMessagesSent
+import pl.szczodrzynski.edziennik.data.api.events.MessageSentEvent
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.db.entity.Message
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import java.util.*
+
+class IdziennikWebSendMessage(override val data: DataIdziennik,
+ val recipients: List
")
- .replace("", "")
messageObject.apply {
@@ -56,24 +58,57 @@ class LibrusMessagesGetMessage(
when (messageObject.type) {
TYPE_RECEIVED -> {
- val senderLoginId = message.select("senderId").text()
- data.teacherList.singleOrNull { it.id == messageObject.senderId }?.loginId = senderLoginId
+ val senderLoginId = message.select("senderId").text().notEmptyOrNull()
+ val senderGroupId = message.select("senderGroupId").text().toIntOrNull()
+ val userClass = message.select("userClass").text().notEmptyOrNull()
+ data.teacherList.singleOrNull { it.id == messageObject.senderId }?.apply {
+ loginId = senderLoginId
+ setTeacherType(when (senderGroupId) {
+ /* https://api.librus.pl/2.0/Messages/Role */
+ 0, 1, 99 -> Teacher.TYPE_SUPER_ADMIN
+ 2 -> Teacher.TYPE_SCHOOL_ADMIN
+ 3 -> Teacher.TYPE_PRINCIPAL
+ 4 -> Teacher.TYPE_TEACHER
+ 5, 9 -> {
+ if (typeDescription == null)
+ typeDescription = userClass
+ Teacher.TYPE_PARENT
+ }
+ 7 -> Teacher.TYPE_SECRETARIAT
+ 8 -> {
+ if (typeDescription == null)
+ typeDescription = userClass
+ Teacher.TYPE_STUDENT
+ }
+ 10 -> Teacher.TYPE_PEDAGOGUE
+ 11 -> Teacher.TYPE_LIBRARIAN
+ 12 -> Teacher.TYPE_SPECIALIST
+ 21 -> {
+ typeDescription = "Jednostka Nadrzędna"
+ Teacher.TYPE_OTHER
+ }
+ 50 -> {
+ typeDescription = "Jednostka Samorządu Terytorialnego"
+ Teacher.TYPE_OTHER
+ }
+ else -> Teacher.TYPE_OTHER
+ })
+ }
val readDateText = message.select("readDate").text()
- val readDate = when (readDateText.isNotEmpty()) {
+ val readDate = when (readDateText.isNotNullNorEmpty()) {
true -> Date.fromIso(readDateText)
else -> 0
}
val messageRecipientObject = MessageRecipientFull(
- profileId,
- -1,
- -1,
- readDate,
- messageObject.id
+ profileId = profileId,
+ id = -1,
+ messageId = messageObject.id,
+ readDate = readDate
)
- messageRecipientObject.fullName = profile.accountNameLong ?: profile.studentNameLong
+ messageRecipientObject.fullName = profile.accountName ?: profile.studentNameLong ?: ""
messageRecipientList.add(messageRecipientObject)
}
@@ -90,17 +125,16 @@ class LibrusMessagesGetMessage(
teacher?.loginId = receiverLoginId
val readDateText = message.select("readed").text()
- val readDate = when (readDateText.isNotEmpty()) {
+ val readDate = when (readDateText.isNotNullNorEmpty()) {
true -> Date.fromIso(readDateText)
else -> 0
}
val messageRecipientObject = MessageRecipientFull(
- profileId,
- receiverId,
- -1,
- readDate,
- messageObject.id
+ profileId = profileId,
+ id = receiverId,
+ messageId = messageObject.id,
+ readDate = readDate
)
messageRecipientObject.fullName = "$receiverFirstName $receiverLastName"
@@ -111,19 +145,20 @@ class LibrusMessagesGetMessage(
}
if (!messageObject.seen) {
- data.messageMetadataList.add(Metadata(
+ data.setSeenMetadataList.add(Metadata(
messageObject.profileId,
Metadata.TYPE_MESSAGE,
messageObject.id,
true,
- true,
- messageObject.addedDate
+ true
))
}
messageObject.recipients = messageRecipientList
data.messageRecipientList.addAll(messageRecipientList)
+
data.messageList.add(messageObject)
+ data.messageListReplace = true
EventBus.getDefault().postSticky(MessageGetEvent(messageObject))
onSuccess()
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetRecipientList.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetRecipientList.kt
new file mode 100644
index 00000000..053258d8
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetRecipientList.kt
@@ -0,0 +1,175 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-12-31.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages
+
+import androidx.core.util.set
+import androidx.room.OnConflictStrategy
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
+import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusMessages
+import pl.szczodrzynski.edziennik.data.api.events.RecipientListGetEvent
+import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+
+class LibrusMessagesGetRecipientList(override val data: DataLibrus,
+ val onSuccess: () -> Unit
+) : LibrusMessages(data, null) {
+ companion object {
+ private const val TAG = "LibrusMessagesGetRecipientList"
+ }
+
+ private val listTypes = mutableListOf
+
+
+
+ */
+
+ fun webGet(
+ tag: String,
+ endpoint: String,
+ method: Int = GET,
+ parameters: ListWażna informacja!
+
+
+ Korzystasz z hasła, które zostało wygenerowane automatycznie.
+ Pamiętaj, aby je zmienić oraz uzupełnić dane w swoim profilu.
+ Obie te operacje można wykonać uruchamiając opcję
+ Moje konto->Edycja profilu.
+Problemy z wydajnością
")) {
+ data.error(ApiError(TAG, ERROR_MOBIDZIENNIK_WEB_SERVER_PROBLEM)
+ .withResponse(response))
+ return
+ }
+
+ try {
+ onSuccess(text)
+ } catch (e: Exception) {
+ data.error(ApiError(tag, EXCEPTION_MOBIDZIENNIK_WEB_REQUEST)
+ .withResponse(response)
+ .withThrowable(e)
+ .withApiResponse(text))
+ }
+ }
+
+ override fun onFailure(response: Response?, throwable: Throwable?) {
+ data.error(ApiError(TAG, ERROR_REQUEST_FAILURE)
+ .withResponse(response)
+ .withThrowable(throwable))
+ }
+ }
+
+ data.app.cookieJar.set("${data.loginServerName}.mobidziennik.pl", data.webSessionKey, data.webSessionValue)
+ data.app.cookieJar.set("${data.loginServerName}.mobidziennik.pl", "SERVERID", data.webServerId)
+
+ Request.builder()
+ .url(url)
+ .userAgent(MOBIDZIENNIK_USER_AGENT)
+ .apply {
+ when (method) {
+ GET -> get()
+ POST -> post()
+ }
+ parameters.map { (name, value) ->
+ addParameter(name, value)
+ }
+ }
+ .callback(callback)
+ .build()
+ .enqueue()
+ }
+
+ fun webGetFile(tag: String, action: String, targetFile: File, onSuccess: (file: File) -> Unit,
+ onProgress: (written: Long, total: Long) -> Unit) {
+ val url = "https://${data.loginServerName}.mobidziennik.pl$action"
+
+ d(tag, "Request: Mobidziennik/Web - $url")
+
+ if (data.webSessionKey == null) {
+ data.error(TAG, ERROR_MOBIDZIENNIK_WEB_NO_SESSION_KEY)
+ return
+ }
+ if (data.webSessionValue == null) {
+ data.error(TAG, ERROR_MOBIDZIENNIK_WEB_NO_SESSION_VALUE)
+ return
+ }
+ if (data.webServerId == null) {
+ data.error(TAG, ERROR_MOBIDZIENNIK_WEB_NO_SERVER_ID)
+ return
+ }
+
+ val callback = object : FileCallbackHandler(targetFile) {
+ override fun onSuccess(file: File?, response: Response?) {
+ if (file == null) {
+ data.error(ApiError(TAG, ERROR_FILE_DOWNLOAD)
+ .withResponse(response))
+ return
+ }
+
+ try {
+ onSuccess(file)
+ } catch (e: Exception) {
+ data.error(ApiError(tag, EXCEPTION_MOBIDZIENNIK_WEB_FILE_REQUEST)
+ .withResponse(response)
+ .withThrowable(e))
+ }
+ }
+
+ override fun onProgress(bytesWritten: Long, bytesTotal: Long) {
+ try {
+ onProgress(bytesWritten, bytesTotal)
+ } catch (e: Exception) {
+ data.error(ApiError(tag, EXCEPTION_MOBIDZIENNIK_WEB_FILE_REQUEST)
+ .withThrowable(e))
+ }
+ }
+
+ override fun onFailure(response: Response?, throwable: Throwable?) {
+ data.error(ApiError(TAG, ERROR_REQUEST_FAILURE)
+ .withResponse(response)
+ .withThrowable(throwable))
+ }
+ }
+
+ data.app.cookieJar.set("${data.loginServerName}.mobidziennik.pl", data.webSessionKey, data.webSessionValue)
+ data.app.cookieJar.set("${data.loginServerName}.mobidziennik.pl", "SERVERID", data.webServerId)
+
+ Request.builder()
+ .url(url)
+ .userAgent(MOBIDZIENNIK_USER_AGENT)
+ .callback(callback)
+ .build()
+ .enqueue()
+ }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApi.kt
similarity index 64%
rename from app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApi.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApi.kt
index 4a4069ed..323aeb14 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApi.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApi.kt
@@ -2,17 +2,19 @@
* Copyright (c) Kuba Szczodrzyński 2019-10-11.
*/
-package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.api
+package pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.api
-import pl.szczodrzynski.edziennik.api.v2.ERROR_MOBIDZIENNIK_WEB_INVALID_RESPONSE
-import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
-import pl.szczodrzynski.edziennik.api.v2.mobidziennik.ENDPOINT_MOBIDZIENNIK_API_MAIN
-import pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.MobidziennikWeb
-import pl.szczodrzynski.edziennik.api.v2.models.ApiError
-import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.api.ERROR_MOBIDZIENNIK_WEB_INVALID_RESPONSE
+import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.DataMobidziennik
+import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.ENDPOINT_MOBIDZIENNIK_API_MAIN
+import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.MobidziennikWeb
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
class MobidziennikApi(override val data: DataMobidziennik,
- val onSuccess: () -> Unit) : MobidziennikWeb(data) {
+ override val lastSync: Long?,
+ val onSuccess: (endpointId: Int) -> Unit
+) : MobidziennikWeb(data, lastSync) {
companion object {
private const val TAG = "MobidziennikApi"
}
@@ -37,7 +39,7 @@ class MobidziennikApi(override val data: DataMobidziennik,
9 -> MobidziennikApiTeams(data, null, rows)
14 -> MobidziennikApiGradeCategories(data, rows)
15 -> MobidziennikApiLessons(data, rows)
- 16 -> MobidziennikApiAttendance(data, rows)
+ //16 -> MobidziennikApiAttendance(data, rows) // disabled since the new web scrapper is used
17 -> MobidziennikApiNotices(data, rows)
18 -> MobidziennikApiGrades(data, rows)
21 -> MobidziennikApiEvents(data, rows)
@@ -47,7 +49,7 @@ class MobidziennikApi(override val data: DataMobidziennik,
}
data.setSyncNext(ENDPOINT_MOBIDZIENNIK_API_MAIN, SYNC_ALWAYS)
- onSuccess()
+ onSuccess(ENDPOINT_MOBIDZIENNIK_API_MAIN)
}
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiAttendance.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiAttendance.kt
new file mode 100644
index 00000000..473b3691
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiAttendance.kt
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-11.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.api
+
+import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.DataMobidziennik
+import pl.szczodrzynski.edziennik.data.db.entity.Attendance
+import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_ABSENT
+import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_ABSENT_EXCUSED
+import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_PRESENT
+import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_RELEASED
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+
+class MobidziennikApiAttendance(val data: DataMobidziennik, rows: List