-
Notifications
You must be signed in to change notification settings - Fork 59
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
Fix sort and filter issues #3254
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>
Previously only the filter criteria that were updated by content from the Questionnaire fields were used. 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>
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #3254 +/- ##
=========================================
- Coverage 29.6% 29.4% -0.2%
- Complexity 658 693 +35
=========================================
Files 239 252 +13
Lines 11204 11912 +708
Branches 1948 2080 +132
=========================================
+ Hits 3323 3512 +189
- Misses 7447 7939 +492
- Partials 434 461 +27
Flags with carried forward coverage won't be shown. Click here to find out more.
|
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
dubdabasoduba
approved these changes
May 14, 2024
ellykits
added a commit
that referenced
this pull request
Jul 18, 2024
* Add Internationalization documentation 📝 (#3221) * Add Internationalization documentation 📝 * Disable autobackup - not recommended * Pin Mac OS runner version to previous stable version | Fix build 💚 * Remove init block blocking thrown errors (#3231) * Interpolate image visible property (#3234) * Configs Versioning (#3189) * Configs versioning setup * init implementation guide version in settings screen * remove unused tag * add string resource * fetch composition referenced in IG * add implementationguide to test * Add ImplementationGuide resource * update tests * Update implementation_guide_config.json * Refactor flow * Rename implementationGuideUrl to implementationGuideId - Code cleanup * Format implementation_guide_config.json * Run spotlessApply * Remove implementationGuideId entry from app config - Add name field to IG config - Update variable name * Refactor implementation from config registry * refactor to use IG by version * Run spotlessApply * Refactors and bug fixes * Update sample ImplementationGuide URL and version * Update fetchRemoteIG app URL * Remove flavour from versionName when fetching IG * Save IG after fetch * save ImplementationGuide to database * introduce fetchConfiguration IG test skeletons * Update IG URL to FQDN * find and sort IG by context-quantity * fix failing tests * update IG tests * use implmentaionGuide extension guide * use version code for context-quantity * empty commit to trigger checks * run spotlessApply * remove unnecessary implementationGuide details from userSettingsScreen * spotlessApply * initiate Implementation Guide documentation * Update strings.xml Co-authored-by: Peter Lubell-Doughtie <peter@ona.io> --------- Co-authored-by: Simon Njoroge <snjoroge@ona.io> Co-authored-by: Benjamin Mwalimu <dubdabasoduba@gmail.com> Co-authored-by: Peter Lubell-Doughtie <peter@ona.io> * Fix questionnaire prepopulation using initialExpression (#3240) * Implement searchable multiselect widget (#3123) * Implement multiselectview Start implementation on multi-select view. Includes the checkbox and listeners Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Change preview data Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Use TristateCheckbox on MultiSelect view Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Implement functionality for generating map required in multiselectview Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Implement bottomsheet for multi select widget Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix multi-select checkbox select color Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Implement functionality for node selection Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Refactor multi select implementation Use Tree data structure as required. Search Tree instead of searching the map. Render the UI from the Tree. Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Improve UX on multi selector widget search Hide keyboard when search action is triggered. Reset data when search text is empty. Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Refactor MultiSelect UI to use Compose Scaffold Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Use ProtoDataStore to store SyncLocations Also refactored how root nodes are identified. Use configuration instead of defaulting to a node without a parent node as the root node. Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Use selected locations from multi-select widget to sync resources Add comma separated values for _syncLocations query parameter for all requests for the configured sync Resources. Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Refactor ApplicationConfiguration.syncStrategies to syncStrategy Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix child node checked state issue * Show progress dialog * Add no results view * Refactor initial sync logic + disable sync progresss dialog * Disable progress dialog on initial sync * Fix spotless formatting errors * Add Practitioner to SyncStrategy * Fix failing tests Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> --------- Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> Co-authored-by: Benjamin Mwalimu <dubdabasoduba@gmail.com> Co-authored-by: Hamza Ahmed Khan <70560433+hamza-vd@users.noreply.github.com> Co-authored-by: Hamza Ahmed Khan <hamza.khan@venturedive.com> * Change questionnaire button styling (#3244) * [Build Variant] ECD App (#3222) * Initial Commit * Add custom view holder for choice input type password in Questionnaire * Add ECD Hack config * Update constants to one place * Remove ECDHack app variant --------- Co-authored-by: mapratama <muh.angga06@gmail.com> Co-authored-by: Sebastian <36365043+SebaMutuku@users.noreply.github.com> Co-authored-by: SebaMutuku <sebastian.muthiani@gmail.com> * Bump express from 4.18.2 to 4.19.2 (#3182) Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](expressjs/express@4.18.2...4.19.2) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Implement feature to compute distance between two locations via Rules (#3107) * Add location service with Preference feature. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Update tests WIP Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Use subject's Related Entity Location meta tag on related resources (#3097) * Use subject's Related Entity Location meta tag on related resources --------- Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> Co-authored-by: pld <peter@ona.io> * eir demo flavor (#3102) * update admin-dashboard-feature docs (#3084) Co-authored-by: Benjamin Mwalimu <dubdabasoduba@gmail.com> * Add location service with Preference feature. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Resolve conflicts Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Run spotless apply. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Run spotless Apply. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Add deny permission for UI automator Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Grant permission on tests where required. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Remove unused functions. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * rename function to be more descriptive. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Adress PR feedback provided. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Format files changed by running spotlessApply Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Update application config to remove outdated variables * Use data store on Location service Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Change grant permission rule. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * fix spotless check Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Change how we're accessing permission rule. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Run spotless check. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Try resolve failing test. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Add permission granted rule. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Add @ignore to the failing tests Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Test commit, trying out new CI fixes. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Fix spotless check Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Update AppMainActivityTest.kt * Fix spotless check failing. 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> Co-authored-by: Elly Kitoto <junkmailstoelly@gmail.com> Co-authored-by: pld <peter@ona.io> Co-authored-by: Roy <84201465+roywanyaga@users.noreply.github.com> Co-authored-by: Owais <62104757+owais-vd@users.noreply.github.com> Co-authored-by: Benjamin Mwalimu <dubdabasoduba@gmail.com> * Enhance Insight Screen UX (#3195) * swap app and assignment info * update tests * edit insights screen * edit insights screen * edit insights screen * edit insights screen * remove null username * cater for empty parameters * Enhance UI Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> --------- Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> Co-authored-by: Martin Ndegwa <ndegwamartin@users.noreply.github.com> Co-authored-by: Elly Kitoto <junkmailstoelly@gmail.com> * added new property in service-card configs to control the status-icon-size on register screen (#3219) Co-authored-by: owais-vd <owais.ali@venturedive.com> Co-authored-by: Benjamin Mwalimu <dubdabasoduba@gmail.com> * Fix remove household (#3262) Co-authored-by: Aleem Azhar <aleem.azhar@venturedive.com> * Fix disable edit fields not working (#3247) * Remove unanswered linkId from questionnaireResponse so that default initial values for the linkId get picked from Questionnaire * Apply patch changes from #3218 * Migrate Knowledge and Workflow SDK library versions (#3266) * Update Code release process documentation * Migrate Knowledge and Workflow SDK library versions * Docs for P2P Sync (#3192) * Docs for P2P Sync * Update image correctly * Update formatting * cleanup text and fix image location * Add links to references * Update p2p documentation --------- Co-authored-by: pld <peter@ona.io> Co-authored-by: Benjamin Mwalimu <dubdabasoduba@gmail.com> Co-authored-by: Francis Odhiambo <4540684+f-odhiambo@users.noreply.github.com> Co-authored-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix sort and filter issues (#3254) * Activate sorting for related resources Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Remove material3 dependencies Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Use all the provided register filter criteria Previously only the filter criteria that were updated by content from the Questionnaire fields were used. Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Set questionnaire submit button text via configuration Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Implement clear all action on register filter questionnaire Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Add more assertion on register filter data queries test Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> --------- Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> Co-authored-by: Benjamin Mwalimu <dubdabasoduba@gmail.com> * Fix filtering by integer * Activate sorting for related resources Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Remove material3 dependencies Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Use all the provided register filter criteria Previously only the filter criteria that were updated by content from the Questionnaire fields were used. Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Set questionnaire submit button text via configuration Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Implement clear all action on register filter questionnaire Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Add more assertion on register filter data queries test Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix filter by number Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> --------- Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> Co-authored-by: Benjamin Mwalimu <dubdabasoduba@gmail.com> * Add Encounter Participant to TransformSupportServices * added structure-defnition resource-type in ConfigurationRegistry * 🐛 [WIP] Adding the value set resolver --------- Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> Co-authored-by: L≡ZRS <12814349+LZRS@users.noreply.github.com> Co-authored-by: Hamza Ahmed Khan <70560433+hamza-vd@users.noreply.github.com> Co-authored-by: Hilary Baraka Egesa <hilpitome@gmail.com> Co-authored-by: Simon Njoroge <snjoroge@ona.io> Co-authored-by: Benjamin Mwalimu <dubdabasoduba@gmail.com> Co-authored-by: Peter Lubell-Doughtie <peter@ona.io> Co-authored-by: Elly Kitoto <junkmailstoelly@gmail.com> Co-authored-by: Hamza Ahmed Khan <hamza.khan@venturedive.com> Co-authored-by: Francis Odhiambo <4540684+f-odhiambo@users.noreply.github.com> Co-authored-by: mapratama <muh.angga06@gmail.com> Co-authored-by: Sebastian <36365043+SebaMutuku@users.noreply.github.com> Co-authored-by: SebaMutuku <sebastian.muthiani@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Lentumunai Mark <90028422+Lentumunai-Mark@users.noreply.github.com> Co-authored-by: Roy <84201465+roywanyaga@users.noreply.github.com> Co-authored-by: Owais <62104757+owais-vd@users.noreply.github.com> Co-authored-by: Rachel Murabula <110402503+Raynafs@users.noreply.github.com> Co-authored-by: Syed Owais Ali <syedowaisali@users.noreply.github.com> Co-authored-by: owais-vd <owais.ali@venturedive.com> Co-authored-by: Aleem Azhar <aleem.azhar@venturedive.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 #3172
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