Skip to content

Commit 3ac49e7

Browse files
authored
teams: smoother task querying (fixes #8991) (#8963)
1 parent ae4b6e6 commit 3ac49e7

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ android {
99
applicationId "org.ole.planet.myplanet"
1010
minSdk = 26
1111
targetSdk = 36
12-
versionCode = 3707
13-
versionName = "0.37.7"
12+
versionCode = 3708
13+
versionName = "0.37.8"
1414
ndkVersion = '26.3.11579264'
1515
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1616
vectorDrawables.useSupportLibrary = true

app/src/main/java/org/ole/planet/myplanet/ui/team/teamTask/TeamTaskFragment.kt

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -208,21 +208,11 @@ class TeamTaskFragment : BaseTeamFragment(), OnCompletedListener {
208208
}
209209

210210
private fun allTasks() {
211-
val uncompletedTasks = mRealm.where(RealmTeamTask::class.java)
211+
list = mRealm.where(RealmTeamTask::class.java)
212212
.equalTo("teamId", teamId)
213213
.notEqualTo("status", "archived")
214-
.equalTo("completed", false)
215-
.sort("deadline", Sort.DESCENDING)
214+
.sort(arrayOf("completed", "deadline"), arrayOf(Sort.ASCENDING, Sort.DESCENDING))
216215
.findAll()
217-
218-
val completedTasks = mRealm.where(RealmTeamTask::class.java)
219-
.equalTo("teamId", teamId)
220-
.notEqualTo("status", "archived")
221-
.equalTo("completed", true)
222-
.sort("completedTime", Sort.DESCENDING)
223-
.findAll()
224-
225-
list = uncompletedTasks + completedTasks
226216
}
227217

228218
private fun completedTasks() {

0 commit comments

Comments
 (0)