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

Support search by dynamic queries #3550

Merged
merged 10 commits into from
Oct 19, 2024
Merged

Support search by dynamic queries #3550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2cdc668
Support search by dynamic queries
ellykits Oct 9, 2024
3446c88
Merge branch 'main' into search-by-dynamic-query
dubdabasoduba Oct 15, 2024
ae0d0c7
Merge branch 'main' into search-by-dynamic-query
dubdabasoduba Oct 17, 2024
196b9c5
Add custom search param for Patient name and identifier
Rkareko Oct 18, 2024
10cdc2b
Merge branch 'main' into search-by-dynamic-query
Rkareko Oct 18, 2024
b6ebe4d
Merge branch 'patient-search-custom-search-param' of github.com:opens…
Rkareko Oct 18, 2024
c7382bd
Merge branch 'main' into search-by-dynamic-query
Rkareko Oct 18, 2024
4e661f6
Merge branch 'search-by-dynamic-query' of github.com:opensrp/fhircore…
Rkareko Oct 18, 2024
1757cac
Fix failing test
Rkareko Oct 18, 2024
e9a0bf5
Merge branch 'main' into search-by-dynamic-query
pld Oct 18, 2024
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
1 change: 1 addition & 0 deletions ...in/java/org/smartregister/fhircore/engine/configuration/register/RegisterContentConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,5 @@ data class RegisterContentConfig(
val visible: Boolean? = null,
val computedRules: List<String>? = null,
val searchByQrCode: Boolean? = null,
val dataFilterFields: List<RegisterFilterField> = emptyList(),
)
18 changes: 9 additions & 9 deletions ...dTest/java/org/smartregister/fhircore/quest/integration/ui/register/RegisterScreenTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ class RegisterScreenTest {
pagesCount = 0,
progressPercentage = flowOf(0),
isSyncUpload = flowOf(false),
params = emptyMap(),
params = emptyList(),
)
val searchText = mutableStateOf(SearchQuery.emptyText)
val currentPage = mutableStateOf(0)
Expand Down Expand Up @@ -173,7 +173,7 @@ class RegisterScreenTest {
pagesCount = 1,
progressPercentage = flowOf(0),
isSyncUpload = flowOf(false),
params = emptyMap(),
params = emptyList(),
)
val searchText = mutableStateOf(SearchQuery.emptyText)
val currentPage = mutableStateOf(0)
Expand Down Expand Up @@ -218,7 +218,7 @@ class RegisterScreenTest {
pagesCount = 1,
progressPercentage = flowOf(0),
isSyncUpload = flowOf(false),
params = emptyMap(),
params = emptyList(),
)
val searchText = mutableStateOf(SearchQuery.emptyText)
val currentPage = mutableStateOf(0)
Expand Down Expand Up @@ -263,7 +263,7 @@ class RegisterScreenTest {
pagesCount = 1,
progressPercentage = flowOf(0),
isSyncUpload = flowOf(false),
params = emptyMap(),
params = emptyList(),
)
val searchText = mutableStateOf(SearchQuery.emptyText)
val currentPage = mutableStateOf(0)
Expand Down Expand Up @@ -309,7 +309,7 @@ class RegisterScreenTest {
pagesCount = 0,
progressPercentage = flowOf(0),
isSyncUpload = flowOf(false),
params = emptyMap(),
params = emptyList(),
)
val searchText = mutableStateOf(SearchQuery.emptyText)
val currentPage = mutableStateOf(0)
Expand Down Expand Up @@ -356,7 +356,7 @@ class RegisterScreenTest {
pagesCount = 0,
progressPercentage = flowOf(0),
isSyncUpload = flowOf(false),
params = emptyMap(),
params = emptyList(),
)
val searchText = mutableStateOf(SearchQuery.emptyText)
val currentPage = mutableStateOf(0)
Expand Down Expand Up @@ -442,7 +442,7 @@ class RegisterScreenTest {
),
),
),
params = emptyMap(),
params = emptyList(),
)
val searchText = mutableStateOf(SearchQuery.emptyText)
val currentPage = mutableStateOf(0)
Expand Down Expand Up @@ -495,7 +495,7 @@ class RegisterScreenTest {
progressPercentage = flowOf(100),
isSyncUpload = flowOf(false),
currentSyncJobStatus = flowOf(CurrentSyncJobStatus.Succeeded(OffsetDateTime.now())),
params = emptyMap(),
params = emptyList(),
)
val searchText = mutableStateOf(SearchQuery.emptyText)
val currentPage = mutableStateOf(0)
Expand Down Expand Up @@ -547,7 +547,7 @@ class RegisterScreenTest {
progressPercentage = flowOf(100),
isSyncUpload = flowOf(false),
currentSyncJobStatus = flowOf(CurrentSyncJobStatus.Succeeded(OffsetDateTime.now())),
params = emptyMap(),
params = emptyList(),
)
val searchText = mutableStateOf(SearchQuery.emptyText)
val currentPage = mutableStateOf(0)
Expand Down
2 changes: 1 addition & 1 deletion android/quest/src/main/java/org/smartregister/fhircore/quest/ui/register/RegisterScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ fun RegisterScreenWithDataPreview() {
pagesCount = 1,
progressPercentage = flowOf(0),
isSyncUpload = flowOf(false),
params = emptyMap(),
params = emptyList(),
)
val searchText = remember { mutableStateOf(SearchQuery.emptyText) }
val currentPage = remember { mutableIntStateOf(0) }
Expand Down
3 changes: 2 additions & 1 deletion android/quest/src/main/java/org/smartregister/fhircore/quest/ui/register/RegisterUiState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import com.google.android.fhir.sync.CurrentSyncJobStatus
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.flowOf
import org.smartregister.fhircore.engine.configuration.register.RegisterConfiguration
import org.smartregister.fhircore.engine.domain.model.ActionParameter

data class RegisterUiState(
val screenTitle: String = "",
Expand All @@ -32,5 +33,5 @@ data class RegisterUiState(
val progressPercentage: Flow<Int> = flowOf(0),
val isSyncUpload: Flow<Boolean> = flowOf(false),
val currentSyncJobStatus: Flow<CurrentSyncJobStatus?> = flowOf(null),
val params: Map<String, String> = emptyMap(),
val params: List<ActionParameter> = emptyList(),
)
Loading
Loading