Skip to content
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

Initial expression x-fhir-query and revamp expressions #2045

Closed
wants to merge 11 commits into from
Closed

Initial expression x-fhir-query and revamp expressions #2045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8910896
Resolve conflicts | Fix expiry condition
maimoonak Jun 14, 2023
3ec9a37
Expression context map
maimoonak Jun 19, 2023
4e4ad7a
Merge branch 'master' into init-exp-xfhirq
maimoonak Jun 21, 2023
d1e1949
Merge branch 'master' into init-exp-xfhirq
maimoonak Jun 27, 2023
09ed387
Expression types handling
maimoonak Jun 27, 2023
5d84a4d
Merge branch 'init-exp-xfhirq' of https://github.com/opensrp/android-…
maimoonak Jun 27, 2023
27633e9
Context expression implementation
maimoonak Jul 14, 2023
08bb4a4
Merge branch 'master' into init-exp-xfhirq
maimoonak Jul 26, 2023
9080cd1
refactor model
maimoonak Aug 21, 2023
c743fe6
reset with master
maimoonak Oct 11, 2023
9ab1c5e
resolve conflicts
maimoonak Oct 11, 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
26 changes: 26 additions & 0 deletions datacapture/src/main/java/com/google/android/fhir/datacapture/ContextVariable.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package com.google.android.fhir.datacapture

import org.hl7.fhir.r4.model.Base
import org.hl7.fhir.r4.model.Expression

sealed class ContextVariable(
open val name: String
)

data class ContextVariableImmutable(
override val name: String,
val data: Base?
) : ContextVariable(name)

data class ContextVariableMutable(
override val name: String,
val expression: Expression,
var data: Base?
) : ContextVariable(name)

data class ContextVariableGroup(
override val name: String,
val expression: Expression,
var data: List<Base>
) : ContextVariable(name)

363 changes: 204 additions & 159 deletions datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreExpressions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,14 @@

package com.google.android.fhir.datacapture.extensions

import org.hl7.fhir.r4.model.CodeType
import org.hl7.fhir.r4.model.Expression

internal val Expression.isXFhirQuery: Boolean
get() = this.language == Expression.ExpressionLanguage.APPLICATION_XFHIRQUERY.toCode()

internal val Expression.isFhirPath: Boolean
get() = this.language == Expression.ExpressionLanguage.TEXT_FHIRPATH.toCode()

internal val fhirPathCode: CodeType
get() = CodeType(Expression.ExpressionLanguage.TEXT_FHIRPATH.toCode())
6 changes: 6 additions & 0 deletions datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreExtension.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package com.google.android.fhir.datacapture.extensions

import org.hl7.fhir.r4.model.Extension

internal val Extension.isRunOnceExpression: Boolean
get() = this.url == ITEM_INITIAL_EXPRESSION_URL || this.url == EXTENSION_ITEM_POPULATE_CONTEXT_URL
4 changes: 4 additions & 0 deletions ...in/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,10 @@ internal const val EXTENSION_VARIABLE_URL = "http://hl7.org/fhir/StructureDefini
internal const val ITEM_INITIAL_EXPRESSION_URL: String =
"http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression"

internal const val EXTENSION_ITEM_POPULATE_CONTEXT_URL =
"http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-itemPopulationContext"


// ********************************************************************************************** //
// //
// Rendering extensions: item control, choice orientation, etc. //
Expand Down
7 changes: 7 additions & 0 deletions datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreTypes.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,18 @@ import org.hl7.fhir.r4.model.CodeType
import org.hl7.fhir.r4.model.Coding
import org.hl7.fhir.r4.model.DateTimeType
import org.hl7.fhir.r4.model.DateType
import org.hl7.fhir.r4.model.DecimalType
import org.hl7.fhir.r4.model.Enumerations.FHIRAllTypes
import org.hl7.fhir.r4.model.Expression
import org.hl7.fhir.r4.model.IdType
import org.hl7.fhir.r4.model.IntegerType
import org.hl7.fhir.r4.model.PrimitiveType
import org.hl7.fhir.r4.model.Quantity
import org.hl7.fhir.r4.model.Questionnaire
import org.hl7.fhir.r4.model.QuestionnaireResponse
import org.hl7.fhir.r4.model.Reference
import org.hl7.fhir.r4.model.StringType
import org.hl7.fhir.r4.model.TimeType
import org.hl7.fhir.r4.model.Type
import org.hl7.fhir.r4.model.UriType

Expand Down Expand Up @@ -137,3 +141,6 @@ fun Type.valueOrCalculateValue(): Type {
this
}
}

val Type.isNamedExpression: Boolean
get() = this.hasType(FHIRAllTypes.EXPRESSION.toCode()) && this.castToExpression(this).hasName()
Loading