Skip to content

[Quest/Malawi Core] In the app, sort the order of the tasks on the patient profile with 'double' values #2096

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 28, 2023
Merged

[Quest/Malawi Core] In the app, sort the order of the tasks on the patient profile with 'double' values #2096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a3168d
[Quest/Malawi Core] In the app, sort the order of the tasks on the pa…
calmwalija Feb 28, 2023
d221d88
Merge branch 'mwcore-dev' into 890-questmalawi-core-in-the-app-sort-t…
calmwalija Feb 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...src/main/java/org/smartregister/fhircore/engine/data/local/register/dao/HivRegisterDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ constructor(
.activeTasks()
.sortedWith(
compareBy<Task>(
{ it.clinicVisitOrder(metaCodingSystemTag) ?: Integer.MAX_VALUE },
{ it.clinicVisitOrder(metaCodingSystemTag) ?: Double.MAX_VALUE },
// tasks with no clinicVisitOrder, would be sorted with Task#description
{ it.description }
)
Expand Down
6 changes: 2 additions & 4 deletions ...id/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/TaskExtension.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package org.smartregister.fhircore.engine.util.extension

import androidx.core.text.isDigitsOnly
import org.hl7.fhir.r4.model.Coding
import org.hl7.fhir.r4.model.Task
import org.smartregister.fhircore.engine.util.DateUtils
Expand Down Expand Up @@ -44,9 +43,8 @@ fun Task.clinicVisitOrder(systemTag: String) =
.filter { it.system.equals(systemTag, true) }
.filterNot { it.code.isNullOrBlank() }
.map { it.code.replace("_", "-").substringAfterLast("-").trim() }
.filter { it.isDigitsOnly() }
.map { it.toInt() }
.firstOrNull()
.map { it.toDouble() }
.lastOrNull()

fun Task.isGuardianVisit(systemTag: String) =
this.meta.tag.filter { it.system.equals(systemTag, true) }.any {
Expand Down