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.

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

Enhance Insight Screen UX #3195

Merged
merged 18 commits into from
May 14, 2024
Merged

Enhance Insight Screen UX #3195

merged 18 commits into from
May 14, 2024

Conversation

Raynafs
Copy link
Contributor

@Raynafs Raynafs commented Apr 12, 2024

IMPORTANT: Where possible all PRs must be linked to a Github issue

Fixes #3194

Engineer Checklist

  • I have written Unit tests for any new feature(s) and edge cases for bug fixes
  • I have added any strings visible on UI components to the strings.xml file
  • I have updated the CHANGELOG.md file for any notable changes to the codebase
  • I have run ./gradlew spotlessApply and ./gradlew spotlessCheck to check my code follows the project's style guide
  • I have built and run the FHIRCore app to verify my change fixes the issue and/or does not break the app
  • I have checked that this PR does NOT introduce breaking changes that require an update to Content and/or Configs? If it does add a sample here or a link to exactly what changes need to be made to the content.

Code Reviewer Checklist

  • I have verified Unit tests have been written for any new feature(s) and edge cases
  • I have verified any strings visible on UI components are in the strings.xml file
  • I have verifed the CHANGELOG.md file has any notable changes to the codebase
  • I have verified the solution has been implemented in a configurable and generic way for reuseable components
  • I have built and run the FHIRCore app to verify the change fixes the issue and/or does not break the app

Copy link

codecov bot commented Apr 12, 2024

Codecov Report

Attention: Patch coverage is 6.97674% with 40 lines in your changes are missing coverage. Please review.

Project coverage is 29.3%. Comparing base (ac82739) to head (eda52e9).
Report is 42 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff            @@
##              main   #3195     +/-   ##
=========================================
- Coverage     29.6%   29.3%   -0.4%     
- Complexity     658     678     +20     
=========================================
  Files          239     248      +9     
  Lines        11204   11738    +534     
  Branches      1948    2055    +107     
=========================================
+ Hits          3323    3443    +120     
- Misses        7447    7844    +397     
- Partials       434     451     +17     
Flag Coverage Δ
engine 65.6% <ø> (-0.6%) ⬇️
geowidget 47.2% <ø> (ø)
quest 5.4% <6.9%> (+<0.1%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
...e/quest/ui/usersetting/UserSettingInsightScreen.kt 11.1% <6.9%> (+0.5%) ⬆️

... and 7 files with indirect coverage changes

@Raynafs
Copy link
Contributor Author

Raynafs commented Apr 26, 2024

Image showing the implementation when the username is null. This case applies to even when the others return null. They will show -

image

@Raynafs
Copy link
Contributor Author

Raynafs commented Apr 26, 2024

image
Possible implementation of all resources synced.

@Raynafs
Copy link
Contributor Author

Raynafs commented Apr 26, 2024

Video showing when all resources are synced and when we have unsynced resources

Screencast.from.26-04-2024.08.54.34.ASUBUHI.webm

@ellykits
Copy link
Collaborator

Merging this. More UI tests can be added once instrumentation tests are re-activated to run on CI. For now the updated tests will suffice.

@ellykits ellykits merged commit 3bfcb31 into main May 14, 2024
3 checks passed
@ellykits ellykits deleted the enhance-insights-screen-ux branch May 14, 2024 09:25
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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Enhance Insights screen UX
3 participants