-
Notifications
You must be signed in to change notification settings - Fork 62
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.
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
Refactor register filter with REL tags #3488
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
…to fix-register-filters
…to fix-register-filters
dubdabasoduba
requested changes
Sep 12, 2024
.../main/java/org/smartregister/fhircore/engine/configuration/register/RegisterConfiguration.kt
Outdated
Show resolved
Hide resolved
...ne/src/main/java/org/smartregister/fhircore/engine/data/local/register/RegisterRepository.kt
Outdated
Show resolved
Hide resolved
This works well on the app, the performance is not great but it works Screenrecorder-2024-09-12-16-31-21-294.mp4 |
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
This fix ensures all the nested related resources are loaded too. Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
A lot of memory was used in heap during the allocation. Emojis are not used in the app so intializing them automatically is unnecessary. Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
…to fix-register-filters
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
* Refactor load images tests for different views. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Remove unutilized imports. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Run spotlessApply Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Refactor load images tests for different views. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Resolve conflicts. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> --------- Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
...oid/quest/src/main/java/org/smartregister/fhircore/quest/util/extensions/ConfigExtensions.kt
Outdated
Show resolved
Hide resolved
* Load map data in batches Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Update observer Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Deactivate infinite scroll by default Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> --------- Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
…#3456) * Fetch search results in batches for when loading all * Fix infinite loop for mocks with FhirEngine#search in tests * Add comparable FhirEngine#search vs batchedSearch integration tests
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
11 tasks
…to fix-register-filters
…to fix-register-filters
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
…to fix-register-filters
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
…to fix-register-filters
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
We need to reload all features when the search term is reset Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
qiarie
pushed a commit
that referenced
this pull request
Jan 15, 2025
* Refactor register filter with REL tags Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Update default pageSize to 15 Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix loading locations on map Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Refactor data structure used on base resource search results Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Refactor code Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Delete unnecessary code Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Refactor retrieving related resources Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Optimize data structures and perform parallel processing Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Use recent version of rules engine library Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Refactor implementation for decoding image resources to bitmap Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix related resource count on register Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix loading related resources This fix ensures all the nested related resources are loaded too. Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Batch related resource queries Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Map resources to RepositoryResourceData with async map Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Make infinite scroll the default register behavior Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Disable automatic intialization of emoji2 A lot of memory was used in heap during the allocation. Emojis are not used in the app so intializing them automatically is unnecessary. Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * ⬆️ Update the map box and kujaku versions * Run spotlessApply Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Update tests for displaying images (#3506) * Refactor load images tests for different views. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Remove unutilized imports. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Run spotlessApply Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Refactor load images tests for different views. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Resolve conflicts. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> --------- Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Refactor navigation to GeowidgetLauncher workflow Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Load map data in batches (#3511) * Load map data in batches Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Update observer Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Deactivate infinite scroll by default Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> --------- Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix failing tests Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Batch searching when list might be large or when count is not defined (#3456) * Fetch search results in batches for when loading all * Fix infinite loop for mocks with FhirEngine#search in tests * Add comparable FhirEngine#search vs batchedSearch integration tests * Run spotlessApply Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix Geowidget tests Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix spotlessCheck Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Add missing import Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix rules execution before map render Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * - Update android manifest to use exported values * Prevent leaking map features via viewmodel Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Format code Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Only search map features via keyboard action We need to reload all features when the search term is reset Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> --------- Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> Co-authored-by: Benjamin Mwalimu <dubdabasoduba@gmail.com> Co-authored-by: Lentumunai Mark <90028422+Lentumunai-Mark@users.noreply.github.com> Co-authored-by: L≡ZRS <12814349+LZRS@users.noreply.github.com>
asad-zaman
pushed a commit
to Mpower-social/fhircore-smart-health-bd
that referenced
this pull request
Jan 20, 2025
* Refactor register filter with REL tags Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Update default pageSize to 15 Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix loading locations on map Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Refactor data structure used on base resource search results Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Refactor code Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Delete unnecessary code Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Refactor retrieving related resources Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Optimize data structures and perform parallel processing Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Use recent version of rules engine library Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Refactor implementation for decoding image resources to bitmap Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix related resource count on register Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix loading related resources This fix ensures all the nested related resources are loaded too. Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Batch related resource queries Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Map resources to RepositoryResourceData with async map Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Make infinite scroll the default register behavior Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Disable automatic intialization of emoji2 A lot of memory was used in heap during the allocation. Emojis are not used in the app so intializing them automatically is unnecessary. Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * ⬆️ Update the map box and kujaku versions * Run spotlessApply Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Update tests for displaying images (opensrp#3506) * Refactor load images tests for different views. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Remove unutilized imports. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Run spotlessApply Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Refactor load images tests for different views. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Resolve conflicts. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> --------- Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Refactor navigation to GeowidgetLauncher workflow Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Load map data in batches (opensrp#3511) * Load map data in batches Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Update observer Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Deactivate infinite scroll by default Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> --------- Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix failing tests Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Batch searching when list might be large or when count is not defined (opensrp#3456) * Fetch search results in batches for when loading all * Fix infinite loop for mocks with FhirEngine#search in tests * Add comparable FhirEngine#search vs batchedSearch integration tests * Run spotlessApply Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix Geowidget tests Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix spotlessCheck Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Add missing import Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix rules execution before map render Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * - Update android manifest to use exported values * Prevent leaking map features via viewmodel Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Format code Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Only search map features via keyboard action We need to reload all features when the search term is reset Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> --------- Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> Co-authored-by: Benjamin Mwalimu <dubdabasoduba@gmail.com> Co-authored-by: Lentumunai Mark <90028422+Lentumunai-Mark@users.noreply.github.com> Co-authored-by: L≡ZRS <12814349+LZRS@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Work In Progress
Describes an items that is not complete. Mostly used for scoping issues of discussions
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
IMPORTANT: Where possible all PRs must be linked to a Github issue
Fixes #3473
Engineer Checklist
strings.xml
file./gradlew spotlessApply
and./gradlew spotlessCheck
to check my code follows the project's style guideCode Reviewer Checklist
strings.xml
file