all: smoother pending survey notifications (fixes #4900) (#4901)

Co-authored-by: dogi <[email protected]>
open-learning-exchange · Dec 20, 2024 · 29c9864 · 29c9864
1 parent 77ae301
commit 29c9864
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 26
         targetSdkVersion 34
-        versionCode 2147
-        versionName "0.21.47"
+        versionCode 2148
+        versionName "0.21.48"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt b/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt
@@ -313,7 +313,7 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, N
 
         val hasUnfinishedSurvey = mRealm.where(RealmStepExam::class.java)
             .equalTo("courseId", courseId)
-            .equalTo("type", "surveys")
+            .equalTo("type", "survey")
             .findAll()
             .any { survey -> !TakeCourseFragment.existsSubmission(mRealm, survey.id, "survey") }
 
@@ -561,8 +561,9 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, N
     private fun getSurveyTitlesFromSubmissions(submissions: List<RealmSubmission>): List<String> {
         val titles = mutableListOf<String>()
         submissions.forEach { submission ->
+            val examId = submission.parentId?.split("@")?.firstOrNull() ?: ""
             val exam = mRealm.where(RealmStepExam::class.java)
-                .equalTo("id", submission.parentId)
+                .equalTo("id", examId)
                 .findFirst()
             exam?.name?.let { titles.add(it) }
         }

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt.lite b/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt.lite
@@ -313,7 +313,7 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, N
 
         val hasUnfinishedSurvey = mRealm.where(RealmStepExam::class.java)
             .equalTo("courseId", courseId)
-            .equalTo("type", "surveys")
+            .equalTo("type", "survey")
             .findAll()
             .any { survey -> !TakeCourseFragment.existsSubmission(mRealm, survey.id, "survey") }
 
@@ -561,8 +561,9 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, N
     private fun getSurveyTitlesFromSubmissions(submissions: List<RealmSubmission>): List<String> {
         val titles = mutableListOf<String>()
         submissions.forEach { submission ->
+            val examId = submission.parentId?.split("@")?.firstOrNull() ?: ""
             val exam = mRealm.where(RealmStepExam::class.java)
-                .equalTo("id", submission.parentId)
+                .equalTo("id", examId)
                 .findFirst()
             exam?.name?.let { titles.add(it) }
         }