Add Geowidget module #1548

ekigamba · 2022-08-17T10:17:08Z

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

Fixes #1558

Integrate into Quest
Add Geowidget debug build variant that enables running quest with Geowidget
Implement displaying families with locations on Quest
Implement family registration with location from geo-widget

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 FHIR Core app to verify my change fixes the issue and/or does not break the app

To-do

Remove testFeatureGeneration in P2PReceiverTransferDaoTest
Re-enable removed sync configs in quest/src/main/assets/configs/app/sync_config.json
Update the AppMainActivity#launchFamilyProfile with navigation to the family profile

Notes

BLOCKED by configurable family profile work
Use app\debug as the app-id to use the local default configurations with Location syncing enabled

- Integrate into Quest - Add Geowidget debug build variant that enables running quest with Geowidget - Implement displaying families with locations on Quest - Implement family registration with location from geowidget

- Turf is used for measurements and calculations but a runtime dependency on Mapbox SDK

- Remove hardcoded Geowidget menu - Remove geowidget module from FHIR Core engine - Move kujaku dependency to deps.gradle file - Update naming in fhircore_style.json - Add GEOWIDGET_ENABLED BuildConfig to disable the maps menu - Fix maps English translation for configurable menu - Code cleanup

- Add family-id to feature JSON - Cleanup code in GeowidgetActivity - Comment out hardcoded questionnaire and structure-map

- Enable parsing feature from the Location Boundary GeoJSON extension - Refactor code in GeowidgetActivity - Code reformat - Move strings to strings.xml

- Add jacoco report generation to the Geowidget module - Add licenses to the Geowidget module files - Fix wildcard imports in Geowidget tests

codecov · 2022-08-21T10:28:53Z

Codecov Report

Merging #1548 (da25ddd) into main (98f2c5e) will decrease coverage by 1.59%.
The diff coverage is 31.03%.

@@             Coverage Diff              @@
##               main    #1548      +/-   ##
============================================
- Coverage     52.29%   50.69%   -1.60%     
- Complexity      661      666       +5     
============================================
  Files           196      205       +9     
  Lines          6959     7196     +237     
  Branches       1250     1363     +113     
============================================
+ Hits           3639     3648       +9     
- Misses         2709     2882     +173     
- Partials        611      666      +55

Flag	Coverage Δ
engine	`63.98% <23.07%> (-0.81%)`	⬇️
geowidget	`40.09% <40.09%> (?)`
quest	`32.69% <22.66%> (-2.09%)`	⬇️

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

Impacted Files	Coverage Δ
...gister/fhircore/engine/configuration/ConfigType.kt	`70.00% <0.00%> (-7.78%)`	⬇️
...ter/fhircore/engine/configuration/Configuration.kt	`25.00% <ø> (ø)`
...fhircore/engine/configuration/app/ConfigService.kt	`80.85% <ø> (-3.94%)`	⬇️
.../configuration/geowidget/GeoWidgetConfiguration.kt	`0.00% <0.00%> (ø)`
...rcore/engine/ui/usersetting/UserSettingFragment.kt	`0.00% <0.00%> (ø)`
...hircore/engine/ui/usersetting/UserSettingScreen.kt	`0.00% <0.00%> (ø)`
...core/engine/ui/usersetting/UserSettingViewModel.kt	`90.47% <ø> (ø)`
...hircore/engine/util/extension/AndroidExtensions.kt	`40.25% <0.00%> (-2.21%)`	⬇️
...egister/fhircore/geowidget/model/GeoWidgetEvent.kt	`0.00% <0.00%> (ø)`
...egister/fhircore/quest/navigation/NavigationArg.kt	`0.00% <ø> (-50.00%)`	⬇️
... and 64 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

- Rename KujakuConversionInterface to KujakuFhirCoreConverter - Code cleanup

- This fixes the build failure

- Fix codacy reported issues

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Refactor the implementation for navigating to maps UI to use the Navigation configs. Also fix sync location by organization. Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Introduce GeoWidgetConfiguration which will be used to configure the map. Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

...id/geowidget/src/main/java/org/smartregister/fhircore/geowidget/screens/GeoWidgetActivity.kt

In order to honor the single Activtivity architecture, the GeoWidgetActivity has been converted to a Fragment and all the composable screens are now wrapped in a Fragment. Using a Fragment allows for a more hybrid approach that will also take care of other custom views that are still using XML layout at the same time be able to render composable views. Instead of using Composable (MainScreen) as the NavigationHost, we now use the AppMainActivity as the Host, with NavHostFragment as the container for the fragments. UserProfileScreen has also been renamed to UserSettingScreen and it is now rendered in the UserSettingFragment. The application side menu (drawer navigation) has been moved to RegisterFragement setContent method. It makes sense to be able to access the drawer via the registers. MainScreen is therefore no longer needed so it has been deleted. GeoWidgetViewModel is now instantiated in the GeoWidgetFragement with the activityViewModels extension function. This is to allow the activity to access the geoWidgetEventLiveData to react to the events created via the GeoWidgetFragment. Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Indicate tests that are passing, skipped or failed Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

ndegwamartin · 2022-09-07T11:20:30Z

@ellykits before merge please create an issue to track the drop in code coverage

* Add Geowidget module - Integrate into Quest - Add Geowidget debug build variant that enables running quest with Geowidget - Implement displaying families with locations on Quest - Implement family registration with location from geowidget * Zoom to registered families & remove register family btn * Fix Kujaku version and add turf dependency - Turf is used for measurements and calculations but a runtime dependency on Mapbox SDK * Connect maps menu to Geowidget - Remove hardcoded Geowidget menu - Remove geowidget module from FHIR Core engine - Move kujaku dependency to deps.gradle file - Update naming in fhircore_style.json - Add GEOWIDGET_ENABLED BuildConfig to disable the maps menu - Fix maps English translation for configurable menu - Code cleanup * Disable maps menu when geowidgetEnabled config is false * Update eCBIS geowidget questionnaire to work with non-geowidget versions * Add empty action when family is clicked - Add family-id to feature JSON - Cleanup code in GeowidgetActivity - Comment out hardcoded questionnaire and structure-map * Enable syncing of Locations in quest * Enable saving new points into Location boundary extension - Enable parsing feature from the Location Boundary GeoJSON extension - Refactor code in GeowidgetActivity - Code reformat - Move strings to strings.xml * Add Geowidget module tests & spotless checks to CI - Add jacoco report generation to the Geowidget module - Add licenses to the Geowidget module files - Fix wildcard imports in Geowidget tests * Move data from AppMainActivity * Add KujakuFhirCoreConverterTest - Rename KujakuConversionInterface to KujakuFhirCoreConverter - Code cleanup * Add GeowidgetViewModel tests * GeowidgetActivity tests * Re-enable removed sync configs * Fix quest sync config failing test * Exclude META-INF/sun-jaxb.episode from packing in Geowidget module - This fixes the build failure * Exclude META-INF files causing build failure in geowidget - Fix codacy reported issues * Set application flavor for geowidget Refactor the implementation for navigating to maps UI to use the Navigation configs. Also fix sync location by organization. Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Navigate to profile from geowidget Introduce GeoWidgetConfiguration which will be used to configure the map. Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Refactor GeoWidgetActivity to a Fragement In order to honor the single Activtivity architecture, the GeoWidgetActivity has been converted to a Fragment and all the composable screens are now wrapped in a Fragment. Using a Fragment allows for a more hybrid approach that will also take care of other custom views that are still using XML layout at the same time be able to render composable views. Instead of using Composable (MainScreen) as the NavigationHost, we now use the AppMainActivity as the Host, with NavHostFragment as the container for the fragments. UserProfileScreen has also been renamed to UserSettingScreen and it is now rendered in the UserSettingFragment. The application side menu (drawer navigation) has been moved to RegisterFragement setContent method. It makes sense to be able to access the drawer via the registers. MainScreen is therefore no longer needed so it has been deleted. GeoWidgetViewModel is now instantiated in the GeoWidgetFragement with the activityViewModels extension function. This is to allow the activity to access the geoWidgetEventLiveData to react to the events created via the GeoWidgetFragment. Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Setup toolbar on map view Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Remove P2P menu for Geowidget NavMenu * Delete irrelevant test Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix failing tests across modules Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix GeoWidgeViewModelTest Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix permissions request from GeoWidgetFragment Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Set test logs Indicate tests that are passing, skipped or failed Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> Co-authored-by: Elly Kitoto <junkmailstoelly@gmail.com> Co-authored-by: Francis Odhiambo Otieno <4540684+f-odhiambo@users.noreply.github.com>

ekigamba added 11 commits August 17, 2022 13:16

Add Geowidget module

0a23997

- Integrate into Quest - Add Geowidget debug build variant that enables running quest with Geowidget - Implement displaying families with locations on Quest - Implement family registration with location from geowidget

Zoom to registered families & remove register family btn

a22d332

Fix Kujaku version and add turf dependency

32b7c78

- Turf is used for measurements and calculations but a runtime dependency on Mapbox SDK

Merge branch 'main' into integrate-kujaku

a36d125

Disable maps menu when geowidgetEnabled config is false

6497075

Update eCBIS geowidget questionnaire to work with non-geowidget versions

b51cd34

Add empty action when family is clicked

d4b9488

- Add family-id to feature JSON - Cleanup code in GeowidgetActivity - Comment out hardcoded questionnaire and structure-map

Enable syncing of Locations in quest

8fdbf1c

Enable saving new points into Location boundary extension

e8886b4

- Enable parsing feature from the Location Boundary GeoJSON extension - Refactor code in GeowidgetActivity - Code reformat - Move strings to strings.xml

Add Geowidget module tests & spotless checks to CI

f5f39bb

- Add jacoco report generation to the Geowidget module - Add licenses to the Geowidget module files - Fix wildcard imports in Geowidget tests

ekigamba force-pushed the integrate-kujaku branch 2 times, most recently from 5e36d4f to d4baa92 Compare August 21, 2022 09:57

Move data from AppMainActivity

4bdd9cf

ekigamba force-pushed the integrate-kujaku branch from d4baa92 to 4bdd9cf Compare August 21, 2022 10:02

f-odhiambo assigned ekigamba Aug 21, 2022

f-odhiambo added FHIR Core labels Aug 21, 2022

f-odhiambo added this to the Sprint 17 (Aug 16th - Aug 29th) milestone Aug 21, 2022

ekigamba added 4 commits August 21, 2022 22:21

Add KujakuFhirCoreConverterTest

f89d724

- Rename KujakuConversionInterface to KujakuFhirCoreConverter - Code cleanup

Add GeowidgetViewModel tests

8544acd

GeowidgetActivity tests

19193b6

Re-enable removed sync configs

86aa0d7

ekigamba marked this pull request as ready for review August 22, 2022 14:08

Fix quest sync config failing test

fc9bdfc

ukanga requested review from ndegwamartin and ellykits August 22, 2022 14:43

Exclude META-INF/sun-jaxb.episode from packing in Geowidget module

1fc6686

- This fixes the build failure

ekigamba and others added 5 commits August 22, 2022 20:44

Exclude META-INF files causing build failure in geowidget

1b1ba4a

- Fix codacy reported issues

Merge branch 'main' into integrate-kujaku

b157d37

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Set application flavor for geowidget

9fd28f3

Refactor the implementation for navigating to maps UI to use the Navigation configs. Also fix sync location by organization. Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Merge branch 'main' into integrate-kujaku

d8e35b3

Navigate to profile from geowidget

6439f99

Introduce GeoWidgetConfiguration which will be used to configure the map. Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

f-odhiambo modified the milestones: Sprint 17 (Aug 16th - Aug 29th), Sprint 18 (Aug 30th - Sep 12th) Aug 26, 2022

f-odhiambo reviewed Aug 29, 2022

View reviewed changes

...id/geowidget/src/main/java/org/smartregister/fhircore/geowidget/screens/GeoWidgetActivity.kt Outdated Show resolved Hide resolved

ellykits and others added 9 commits September 1, 2022 10:49

Setup toolbar on map view

2a289c6

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Remove P2P menu for Geowidget NavMenu

4f66bde

Merge branch 'main' into integrate-kujaku

3eaa6bf

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Delete irrelevant test

0e28484

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Fix failing tests across modules

7458df6

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Fix GeoWidgeViewModelTest

e818ca3

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Fix permissions request from GeoWidgetFragment

76267c4

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Merge branch 'main' into integrate-kujaku

856f891

ndegwamartin mentioned this pull request Sep 7, 2022

Implement Dynamic Reset of Quest App #1588

Closed

5 tasks

ellykits added 2 commits September 7, 2022 12:38

Set test logs

aa62476

Indicate tests that are passing, skipped or failed Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Merge branch 'main' into integrate-kujaku

da25ddd

ndegwamartin approved these changes Sep 7, 2022

View reviewed changes

f-odhiambo self-requested a review September 7, 2022 12:04

ellykits merged commit 0ffd664 into main Sep 7, 2022

ellykits deleted the integrate-kujaku branch September 7, 2022 12:28

f-odhiambo mentioned this pull request Sep 7, 2022

[Quest] - Address drop in code coverage post merge of geo-widget branch #1610

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Geowidget module #1548

Add Geowidget module #1548

ekigamba commented Aug 17, 2022 •

edited

Loading

codecov bot commented Aug 21, 2022 •

edited

Loading

ndegwamartin commented Sep 7, 2022

Add Geowidget module #1548

Add Geowidget module #1548

Conversation

ekigamba commented Aug 17, 2022 • edited Loading

To-do

Notes

codecov bot commented Aug 21, 2022 • edited Loading

Codecov Report

ndegwamartin commented Sep 7, 2022

ekigamba commented Aug 17, 2022 •

edited

Loading

codecov bot commented Aug 21, 2022 •

edited

Loading