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

Jump to bottom

Filter register data by selected related entity locations #3284

Merged
merged 19 commits into from
Jun 12, 2024
Merged

Filter register data by selected related entity locations #3284

merged 19 commits into from
Jun 12, 2024

Conversation

ellykits
Copy link
Collaborator

@ellykits ellykits commented May 22, 2024 •
edited by dubdabasoduba

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

Fixes #3290

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

@ellykits
Filter register data by selected related entity locations
3c2745c 
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
@ellykits
Merge branch 'main' into filter-data-by-selected-locations
1501f7e 
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
@ellykits
Fix failing tests
aee9c29 
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
@codecov Codecov
Copy link

codecov bot commented May 22, 2024 •
edited

Codecov Report

Attention: Patch coverage is 13.25301% with 72 lines in your changes missing coverage. Please review.

Project coverage is 28.4%. Comparing base (ac82739) to head (c9dd2c0).
Report is 84 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff            @@
##              main   #3284     +/-   ##
=========================================
- Coverage     29.6%   28.4%   -1.3%     
- Complexity     658     719     +61     
=========================================
  Files          239     266     +27     
  Lines        11204   12582   +1378     
  Branches      1948    2221    +273     
=========================================
+ Hits          3323    3575    +252     
- Misses        7447    8537   +1090     
- Partials       434     470     +36
Flag Coverage Δ
engine 64.8% <26.1%> (-1.4%) ⬇️
geowidget 18.7% <ø> (-28.5%) ⬇️
quest 5.2% <0.0%> (-0.3%) ⬇️

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

Files Coverage Δ
...r/fhircore/engine/datastore/PreferenceDataStore.kt 69.2% <ø> (ø)
...gister/fhircore/engine/datastore/ProtoDataStore.kt 68.7% <ø> (+3.2%) ⬆️
...smartregister/fhircore/quest/data/DataMigration.kt 0.0% <0.0%> (ø)
...org/smartregister/fhircore/quest/event/AppEvent.kt 66.6% <0.0%> (-33.4%) ⬇️
...re/quest/ui/launcher/GeoWidgetLauncherViewModel.kt 0.0% <0.0%> (ø)
...e/engine/data/local/register/RegisterRepository.kt 70.3% <71.4%> (+0.1%) ⬆️
...est/data/report/measure/MeasureReportRepository.kt 0.0% <0.0%> (ø)
...rcore/quest/ui/multiselect/MultiSelectViewModel.kt 0.0% <0.0%> (ø)
...egister/fhircore/quest/ui/main/AppMainViewModel.kt 5.2% <0.0%> (+0.7%) ⬆️
...ter/fhircore/quest/ui/register/RegisterFragment.kt 5.6% <0.0%> (+<0.1%) ⬆️
... and 3 more

... and 11 files with indirect coverage changes

@ellykits
Fix GeowidgetLauncher
4eb0d48 
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
@ellykits
Test filter register data via RelatedEntityLocation
5cc2b85 
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
@ellykits
Correct resource ID
9d89e22 
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
pld
pld previously approved these changes May 23, 2024
View reviewed changes
pld
pld reviewed May 23, 2024
View reviewed changes
Copy link
Member

@pld pld left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need to add any docs wrt how to configure this?

@ellykits
Copy link
Collaborator Author

Yes we need to document this.

@dubdabasoduba
Copy link
Member

@ellykits I have reviewed this and it seems to fail.
Here is a video

Filter.by.multi-widget.2.mp4

Below are the configs
Screenshot 2024-06-04 at 14 49 37

dubdabasoduba
dubdabasoduba requested changes Jun 4, 2024
View reviewed changes
Copy link
Member

@dubdabasoduba dubdabasoduba left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to fail, please check attach screenshot

@ellykits
Filter locations
df799fd 
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
@ellykits
Copy link
Collaborator Author

@dubdabasoduba Can you re-test this?

dubdabasoduba
dubdabasoduba requested changes Jun 10, 2024
View reviewed changes
Copy link
Member

@dubdabasoduba dubdabasoduba left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ellykits This still seems to fail

Filtering.using.multi-select.mp4

@ellykits
Copy link
Collaborator Author

Did you re-open the register?

@ellykits
Copy link
Collaborator Author

Screenshot_1718091374

@ellykits
Copy link
Collaborator Author

I was able to reproduce the issue @dubdabasoduba. Fixed it.

@pld
Copy link
Member

pld commented Jun 11, 2024

@dubdabasoduba can you take a look at this?

@ellykits
Merge branch 'main' into filter-data-by-selected-locations
c49cc44 
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
@ellykits
Merge branch 'filter-data-by-selected-locations' of github.com:opensr…
c9dd2c0 
…p/fhircore into filter-data-by-selected-locations
@dubdabasoduba
Copy link
Member

dubdabasoduba commented Jun 11, 2024 •
edited

@ellykits @pld this works like a charm

Filtering.by.multi-select.works.mp4

@pld pld enabled auto-merge (squash) June 11, 2024 18:09
@ellykits ellykits merged commit a77cc54 into main Jun 12, 2024
4 of 5 checks passed
@ellykits ellykits deleted the filter-data-by-selected-locations branch June 12, 2024 08:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pld pld pld left review comments

@dubdabasoduba dubdabasoduba dubdabasoduba approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Filter the register results based on the Location selection on the multi-select widget
4 participants
@ellykits @dubdabasoduba @pld @ndegwamartin