diff --git a/app/build.gradle b/app/build.gradle index 53503488..811ba11c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -72,7 +72,7 @@ ext.supportVersion = "28.0.0" dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - implementation('com.github.wulkanowy:api:a5667f8000') { exclude module: "threetenbp" } + implementation('com.github.wulkanowy:api:1400211f0d') { exclude module: "threetenbp" } implementation "com.android.support:support-v4:$supportVersion" implementation "com.android.support:appcompat-v7:$supportVersion" diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/AttendanceLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/AttendanceLocalTest.kt index 01e2ad39..39eddc73 100644 --- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/AttendanceLocalTest.kt +++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/AttendanceLocalTest.kt @@ -34,13 +34,13 @@ class AttendanceLocalTest { @Test fun saveAndReadTest() { attendanceLocal.saveAttendance(listOf( - Attendance("1", "2", LocalDate.of(2018, 9, 10), 0, "", ""), - Attendance("1", "2", LocalDate.of(2018, 9, 14), 0, "", ""), - Attendance("1", "2", LocalDate.of(2018, 9, 17), 0, "", "") + Attendance(1, 2, LocalDate.of(2018, 9, 10), 0, "", ""), + Attendance(1, 2, LocalDate.of(2018, 9, 14), 0, "", ""), + Attendance(1, 2, LocalDate.of(2018, 9, 17), 0, "", "") )) val attendance = attendanceLocal - .getAttendance(Semester(1, "1", "2", "", "3", 1), + .getAttendance(Semester(1, 1, 2, "", 3, 1), LocalDate.of(2018, 9, 10), LocalDate.of(2018, 9, 14) ) diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/ExamLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/ExamLocalTest.kt index 0470754d..f2179236 100644 --- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/ExamLocalTest.kt +++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/ExamLocalTest.kt @@ -34,13 +34,13 @@ class ExamLocalTest { @Test fun saveAndReadTest() { examLocal.saveExams(listOf( - Exam("1", "2", LocalDate.of(2018, 9, 10), LocalDate.now(), "", "", "", "", "", ""), - Exam("1", "2", LocalDate.of(2018, 9, 14), LocalDate.now(), "", "", "", "", "", ""), - Exam("1", "2", LocalDate.of(2018, 9, 17), LocalDate.now(), "", "", "", "", "", "") + Exam(1, 2, LocalDate.of(2018, 9, 10), LocalDate.now(), "", "", "", "", "", ""), + Exam(1, 2, LocalDate.of(2018, 9, 14), LocalDate.now(), "", "", "", "", "", ""), + Exam(1, 2, LocalDate.of(2018, 9, 17), LocalDate.now(), "", "", "", "", "", "") )) val exams = examLocal - .getExams(Semester(1, "1", "2", "", "3", 1), + .getExams(Semester(1, 1, 2, "", 3, 1), LocalDate.of(2018, 9, 10), LocalDate.of(2018, 9, 14) ) diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/SessionLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/SessionLocalTest.kt index b4efb7e0..08eff5ab 100644 --- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/SessionLocalTest.kt +++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/SessionLocalTest.kt @@ -38,12 +38,12 @@ class SessionLocalTest { @Test fun saveAndReadTest() { - sessionLocal.saveStudent(Student(email = "test", password = "test123", schoolId = "23", endpoint = "fakelog.cf", loginType = "AUTO")).blockingAwait() + sessionLocal.saveStudent(Student(email = "test", password = "test123", schoolSymbol = "23", endpoint = "fakelog.cf", loginType = "AUTO")).blockingAwait() assert(sharedHelper.getLong(SessionLocal.LAST_USER_KEY, 0) == 1L) assert(sessionLocal.isSessionSaved) val student = sessionLocal.getLastStudent().blockingGet() - assertEquals("23", student.schoolId) + assertEquals("23", student.schoolSymbol) } } diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/TimetableLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/TimetableLocalTest.kt index 5e176519..534b6fc1 100644 --- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/TimetableLocalTest.kt +++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/TimetableLocalTest.kt @@ -35,16 +35,16 @@ class TimetableLocalTest { @Test fun saveAndReadTest() { timetableDb.saveTimetable(listOf( - Timetable("1", "2", 1, LocalDateTime.now(), LocalDateTime.now(), + Timetable(1, 2, 1, LocalDateTime.now(), LocalDateTime.now(), LocalDate.of(2018, 9, 10), "", "", "", "", ""), - Timetable("1", "2", 1, LocalDateTime.now(), LocalDateTime.now(), + Timetable(1, 2, 1, LocalDateTime.now(), LocalDateTime.now(), LocalDate.of(2018, 9, 14), "", "", "", "", ""), - Timetable("1", "2", 1, LocalDateTime.now(), LocalDateTime.now(), + Timetable(1, 2, 1, LocalDateTime.now(), LocalDateTime.now(), LocalDate.of(2018, 9, 17), "", "", "", "", "") )) val exams = timetableDb.getTimetable( - Semester(0, "1", "2", "3", "", 1), + Semester(0, 1, 2, "3", 1, 1), LocalDate.of(2018, 9, 10), LocalDate.of(2018, 9, 14) ).blockingGet() diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceDao.kt index 6f9f2536..f29dfcfa 100644 --- a/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceDao.kt +++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceDao.kt @@ -18,5 +18,5 @@ interface AttendanceDao { fun deleteAll(exams: List) @Query("SELECT * FROM Attendance WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end") - fun getExams(diaryId: String, studentId: String, from: LocalDate, end: LocalDate): Maybe> + fun getExams(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe> } diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/ExamDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/ExamDao.kt index 8c5dd3d8..5f96a9ba 100644 --- a/app/src/main/java/io/github/wulkanowy/data/db/dao/ExamDao.kt +++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/ExamDao.kt @@ -18,5 +18,5 @@ interface ExamDao { fun deleteAll(exams: List) @Query("SELECT * FROM Exams WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end") - fun getExams(diaryId: String, studentId: String, from: LocalDate, end: LocalDate): Maybe> + fun getExams(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe> } diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt index 5149e473..a95be3d6 100644 --- a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt +++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt @@ -17,5 +17,5 @@ interface GradeDao { fun deleteAll(grades: List) @Query("SELECT * FROM Grades WHERE semester_id = :semesterId AND student_id = :studentId") - fun getGrades(semesterId: String, studentId: String): Maybe> + fun getGrades(semesterId: Int, studentId: Int): Maybe> } diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt index 6670b565..8f67501d 100644 --- a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt +++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt @@ -18,5 +18,5 @@ interface GradeSummaryDao { fun deleteAll(gradesSummary: List) @Query("SELECT * FROM grades_summary WHERE student_id = :studentId AND semester_id = :semesterId") - fun getGradesSummary(semesterId: String, studentId: String): Maybe> + fun getGradesSummary(semesterId: Int, studentId: Int): Maybe> } diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt index 8cbc12d0..dac3068e 100644 --- a/app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt +++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt @@ -13,5 +13,5 @@ interface SemesterDao { fun insertAll(semester: List) @Query("SELECT * FROM Semesters WHERE student_id = :studentId") - fun getSemester(studentId: String): Single> + fun getSemester(studentId: Int): Single> } diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableDao.kt index 58dba51a..77b04f60 100644 --- a/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableDao.kt +++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableDao.kt @@ -18,5 +18,5 @@ interface TimetableDao { fun deleteAll(exams: List) @Query("SELECT * FROM Timetable WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end") - fun getTimetable(diaryId: String, studentId: String, from: LocalDate, end: LocalDate): Maybe> + fun getTimetable(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe> } diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt index a52f09d6..57083c94 100644 --- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt +++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt @@ -10,10 +10,10 @@ import java.io.Serializable data class Attendance( @ColumnInfo(name = "student_id") - var studentId: String, + var studentId: Int, @ColumnInfo(name = "diary_id") - var diaryId: String, + var diaryId: Int, var date: LocalDate, diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Exam.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Exam.kt index d54f5660..6177b120 100644 --- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Exam.kt +++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Exam.kt @@ -10,10 +10,10 @@ import java.io.Serializable data class Exam( @ColumnInfo(name = "student_id") - var studentId: String, + var studentId: Int, @ColumnInfo(name = "diary_id") - var diaryId: String, + var diaryId: Int, var date: LocalDate, diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt index 1fee97a8..52ac967f 100644 --- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt +++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt @@ -10,10 +10,10 @@ import java.io.Serializable data class Grade( @ColumnInfo(name = "semester_id") - var semesterId: String, + var semesterId: Int, @ColumnInfo(name = "student_id") - var studentId: String, + var studentId: Int, var subject: String, diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt index 6996ed3c..5bd72aa2 100644 --- a/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt +++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt @@ -8,10 +8,10 @@ import android.arch.persistence.room.PrimaryKey data class GradeSummary( @ColumnInfo(name = "semester_id") - var semesterId: String, + var semesterId: Int, @ColumnInfo(name = "student_id") - var studentId: String, + var studentId: Int, var subject: String, diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt index 82c52b77..4941ba73 100644 --- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt +++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt @@ -11,16 +11,16 @@ data class Semester( var id: Long = 0, @ColumnInfo(name = "student_id") - var studentId: String, + var studentId: Int, @ColumnInfo(name = "diary_id") - var diaryId: String, + var diaryId: Int, @ColumnInfo(name = "diary_name") var diaryName: String, @ColumnInfo(name = "semester_id") - var semesterId: String, + var semesterId: Int, @ColumnInfo(name = "semester_name") var semesterName: Int, diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt index 30186610..acadb181 100644 --- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt +++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt @@ -21,13 +21,13 @@ data class Student( var symbol: String = "", @ColumnInfo(name = "student_id") - var studentId: String = "", + var studentId: Int = 0, @ColumnInfo(name = "student_name") var studentName: String = "", @ColumnInfo(name = "school_id") - var schoolId: String = "", + var schoolSymbol: String = "", @ColumnInfo(name = "school_name") var schoolName: String = "" diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt index 2a3ba2e1..bf35cece 100644 --- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt +++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt @@ -11,10 +11,10 @@ import java.io.Serializable data class Timetable( @ColumnInfo(name = "student_id") - var studentId: String, + var studentId: Int, @ColumnInfo(name = "diary_id") - var diaryId: String, + var diaryId: Int, val number: Int = 0, diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/GradeRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/remote/GradeRemote.kt index e380777e..52940231 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/GradeRemote.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/remote/GradeRemote.kt @@ -17,7 +17,7 @@ class GradeRemote @Inject constructor(private val api: Api) { diaryId = semester.diaryId notifyDataChanged() } - }).flatMap { api.getGrades(semester.semesterId.toInt()) } + }).flatMap { api.getGrades(semester.semesterId) } .map { grades -> grades.map { Grade( diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/GradeSummaryRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/remote/GradeSummaryRemote.kt index b08e8f59..f8cbdca4 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/GradeSummaryRemote.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/remote/GradeSummaryRemote.kt @@ -16,7 +16,7 @@ class GradeSummaryRemote @Inject constructor(private val api: Api) { diaryId = semester.diaryId notifyDataChanged() } - }).flatMap { api.getGradesSummary(semester.semesterId.toInt()) } + }).flatMap { api.getGradesSummary(semester.semesterId) } .map { gradesSummary -> gradesSummary.map { GradeSummary( diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/SessionRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/remote/SessionRemote.kt index bbe02135..a02b0ada 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/SessionRemote.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/remote/SessionRemote.kt @@ -22,7 +22,7 @@ class SessionRemote @Inject constructor(private val api: Api) { symbol = it.symbol, studentId = it.studentId, studentName = it.studentName, - schoolId = it.schoolId, + schoolSymbol = it.schoolSymbol, schoolName = it.schoolName, endpoint = endpoint, loginType = it.loginType.name @@ -40,7 +40,7 @@ class SessionRemote @Inject constructor(private val api: Api) { studentId = student.studentId, diaryId = it.diaryId, diaryName = it.diaryName, - semesterId = it.semesterId.toString(), + semesterId = it.semesterId, semesterName = it.semesterNumber, current = it.current ) @@ -51,14 +51,14 @@ class SessionRemote @Inject constructor(private val api: Api) { } fun initApi(student: Student, checkInit: Boolean = false) { - if (if (checkInit) api.studentId.isEmpty() else true) { + if (if (checkInit) 0 == api.studentId else true) { api.run { email = student.email password = student.password symbol = student.symbol host = URL(student.endpoint).run { host + ":$port".removeSuffix(":-1") } ssl = student.endpoint.startsWith("https") - schoolId = student.schoolId + schoolSymbol = student.schoolSymbol studentId = student.studentId loginType = Api.LoginType.valueOf(student.loginType) notifyDataChanged() diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grade/GradeFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/main/grade/GradeFragment.kt index 4b6675dd..82ac05ec 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/main/grade/GradeFragment.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/main/grade/GradeFragment.kt @@ -99,11 +99,11 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MenuFragmentView { presenter.onChildViewRefresh() } - fun onChildFragmentLoaded(semesterId: String) { + fun onChildFragmentLoaded(semesterId: Int) { presenter.onChildViewLoaded(semesterId) } - override fun notifyChildLoadData(index: Int, semesterId: String, forceRefresh: Boolean) { + override fun notifyChildLoadData(index: Int, semesterId: Int, forceRefresh: Boolean) { (childFragmentManager.fragments[index] as GradeView.GradeChildView).onParentLoadData(semesterId, forceRefresh) } diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grade/GradePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/main/grade/GradePresenter.kt index 5916ad47..add00e92 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/main/grade/GradePresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/main/grade/GradePresenter.kt @@ -19,7 +19,7 @@ class GradePresenter @Inject constructor( private var semesters = emptyList() - private val loadedSemesterId = mutableMapOf() + private val loadedSemesterId = mutableMapOf() fun onAttachView(view: GradeView, savedIndex: Int?) { super.onAttachView(view) @@ -55,7 +55,7 @@ class GradePresenter @Inject constructor( view?.let { loadChild(it.currentPageIndex(), forceRefresh = true) } } - fun onChildViewLoaded(semesterId: String) { + fun onChildViewLoaded(semesterId: Int) { view?.apply { showContent(true) showProgress(false) diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grade/GradeView.kt b/app/src/main/java/io/github/wulkanowy/ui/main/grade/GradeView.kt index fa2d4f51..a343e53d 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/main/grade/GradeView.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/main/grade/GradeView.kt @@ -14,7 +14,7 @@ interface GradeView : BaseView { fun showSemesterDialog(selectedIndex: Int) - fun notifyChildLoadData(index: Int, semesterId: String, forceRefresh: Boolean) + fun notifyChildLoadData(index: Int, semesterId: Int, forceRefresh: Boolean) fun notifyChildParentReselected(index: Int) @@ -24,7 +24,7 @@ interface GradeView : BaseView { fun onParentChangeSemester() - fun onParentLoadData(semesterId: String, forceRefresh: Boolean) + fun onParentLoadData(semesterId: Int, forceRefresh: Boolean) fun onParentReselected() } diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsFragment.kt index 79d31b7b..06c64557 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsFragment.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsFragment.kt @@ -102,7 +102,7 @@ class GradeDetailsFragment : BaseFragment(), GradeDetailsView, GradeView.GradeCh GradeDetailsDialog.newInstance(grade).show(fragmentManager, grade.toString()) } - override fun onParentLoadData(semesterId: String, forceRefresh: Boolean) { + override fun onParentLoadData(semesterId: Int, forceRefresh: Boolean) { presenter.onParentViewLoadData(semesterId, forceRefresh) } @@ -114,7 +114,7 @@ class GradeDetailsFragment : BaseFragment(), GradeDetailsView, GradeView.GradeCh presenter.onParentViewChangeSemester() } - override fun notifyParentDataLoaded(semesterId: String) { + override fun notifyParentDataLoaded(semesterId: Int) { (parentFragment as? GradeFragment)?.onChildFragmentLoaded(semesterId) } diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsPresenter.kt index ec028074..dd9e2671 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsPresenter.kt @@ -22,7 +22,7 @@ class GradeDetailsPresenter @Inject constructor( view.initView() } - fun onParentViewLoadData(semesterId: String, forceRefresh: Boolean) { + fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) { disposable.add(sessionRepository.getSemesters() .flatMap { gradeRepository.getGrades(it.first { item -> item.semesterId == semesterId }, forceRefresh) } .map { createGradeItems(it.groupBy { grade -> grade.subject }.toSortedMap()) } diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsView.kt b/app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsView.kt index 0091fe99..20b0c2b6 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsView.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsView.kt @@ -40,7 +40,7 @@ interface GradeDetailsView : BaseView { fun weightString(): String - fun notifyParentDataLoaded(semesterId: String) + fun notifyParentDataLoaded(semesterId: Int) fun notifyParentRefresh() } diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryFragment.kt index e91c97f5..729e9384 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryFragment.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryFragment.kt @@ -81,7 +81,7 @@ class GradeSummaryFragment : BaseFragment(), GradeSummaryView, GradeView.GradeCh gradeSummarySwipe.isRefreshing = show } - override fun onParentLoadData(semesterId: String, forceRefresh: Boolean) { + override fun onParentLoadData(semesterId: Int, forceRefresh: Boolean) { presenter.onParentViewLoadData(semesterId, forceRefresh) } @@ -93,7 +93,7 @@ class GradeSummaryFragment : BaseFragment(), GradeSummaryView, GradeView.GradeCh presenter.onParentViewChangeSemester() } - override fun notifyParentDataLoaded(semesterId: String) { + override fun notifyParentDataLoaded(semesterId: Int) { (parentFragment as? GradeFragment)?.onChildFragmentLoaded(semesterId) } diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryPresenter.kt index 07686865..8fc28d0b 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryPresenter.kt @@ -25,7 +25,7 @@ class GradeSummaryPresenter @Inject constructor( view.initView() } - fun onParentViewLoadData(semesterId: String, forceRefresh: Boolean) { + fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) { disposable.add(sessionRepository.getSemesters() .map { semester -> semester.first { it.semesterId == semesterId } } .flatMap { diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryView.kt b/app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryView.kt index 6ddfb86d..29a23f3a 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryView.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryView.kt @@ -26,7 +26,7 @@ interface GradeSummaryView : BaseView { fun finalString(): String - fun notifyParentDataLoaded(semesterId: String) + fun notifyParentDataLoaded(semesterId: Int) fun notifyParentRefresh() } diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/AttendanceRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/AttendanceRemoteTest.kt index fe981c45..ade7f874 100644 --- a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/AttendanceRemoteTest.kt +++ b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/AttendanceRemoteTest.kt @@ -36,9 +36,9 @@ class AttendanceRemoteTest { getAttendance("2018-09-17") )) - every { mockApi.diaryId } returns "1" - every { semesterMock.studentId } returns "1" - every { semesterMock.diaryId } returns "1" + every { mockApi.diaryId } returns 1 + every { semesterMock.studentId } returns 1 + every { semesterMock.diaryId } returns 1 val attendance = AttendanceRemote(mockApi).getAttendance(semesterMock, LocalDate.of(2018, 9, 10), diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/ExamRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/ExamRemoteTest.kt index 856f1a9c..d7f97b35 100644 --- a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/ExamRemoteTest.kt +++ b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/ExamRemoteTest.kt @@ -36,9 +36,9 @@ class ExamRemoteTest { getExam("2018-09-17") )) - every { mockApi.diaryId } returns "1" - every { semesterMock.studentId } returns "1" - every { semesterMock.diaryId } returns "1" + every { mockApi.diaryId } returns 1 + every { semesterMock.studentId } returns 1 + every { semesterMock.diaryId } returns 1 val exams = ExamRemote(mockApi).getExams(semesterMock, LocalDate.of(2018, 9, 10), diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/SessionRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/SessionRemoteTest.kt index 882fa035..dc234882 100644 --- a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/SessionRemoteTest.kt +++ b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/SessionRemoteTest.kt @@ -22,7 +22,7 @@ class SessionRemoteTest { @Test fun testRemoteAll() { - doReturn(Single.just(listOf(Pupil("", "", "", "test", "", "", Api.LoginType.AUTO)))) + doReturn(Single.just(listOf(Pupil("", "", 1, "test", "", "", Api.LoginType.AUTO)))) .`when`(mockApi).getPupils() val students = SessionRemote(mockApi).getConnectedStudents("", "", "", "http://fakelog.cf").blockingGet() diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/TimetableRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/TimetableRemoteTest.kt index 910bb8c2..dcad80e9 100644 --- a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/TimetableRemoteTest.kt +++ b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/TimetableRemoteTest.kt @@ -36,9 +36,9 @@ class TimetableRemoteTest { getTimetable("2018-09-17") )) - every { mockApi.diaryId } returns "1" - every { semesterMock.studentId } returns "1" - every { semesterMock.diaryId } returns "1" + every { mockApi.diaryId } returns 1 + every { semesterMock.studentId } returns 1 + every { semesterMock.diaryId } returns 1 val timetable = TimetableRemote(mockApi).getTimetable(semesterMock, LocalDate.of(2018, 9, 10), diff --git a/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt b/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt index 264de400..1209b2cb 100644 --- a/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt +++ b/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt @@ -13,19 +13,19 @@ class GradeExtensionTest { fun calcWeightedAverage() { val localDate = mock(LocalDate::class.java) assertEquals(3.47, listOf( - Grade("", "", "", "", 5, 0.33 + Grade(1, 1, "", "", 5, 0.33 , "", "", "", "", "", 6, localDate, ""), - Grade("", "", "", "", 5, -0.33 + Grade(1, 1, "", "", 5, -0.33 , "", "", "", "", "", 5, localDate, ""), - Grade("", "", "", "", 4, 0.0 + Grade(1, 1, "", "", 4, 0.0 , "", "", "", "", "", 1, localDate, ""), - Grade("", "", "", "", 1, 0.5 + Grade(1, 1, "", "", 1, 0.5 , "", "", "", "", "", 9, localDate, ""), - Grade("", "", "", "", 0, 0.0 + Grade(1, 1, "", "", 0, 0.0 , "", "", "", "", "", 0, localDate, "") ).calcAverage(), 0.005) @@ -34,10 +34,10 @@ class GradeExtensionTest { @Test fun calcSummaryAverage() { assertEquals(2.5, listOf( - GradeSummary("", "", "", "", "5"), - GradeSummary("", "", "", "", "-5"), - GradeSummary("", "", "", "", "test"), - GradeSummary("", "", "", "", "0") + GradeSummary(1, 1, "", "", "5"), + GradeSummary(1, 1, "", "", "-5"), + GradeSummary(1, 1, "", "", "test"), + GradeSummary(1, 1, "", "", "0") ).calcAverage(), 0.005) } }