fixed map search #3491

syedowaisali · 2024-09-12T08:34:37Z

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

Fixes [link to issue]

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

f-odhiambo

See comments

f-odhiambo · 2024-09-12T08:37:12Z

android/quest/src/main/res/values/strings.xml

@@ -123,7 +123,7 @@
    <string name="submit_questionnaire">Submit</string>
    <string name="invalid_base_resource">The base resource for GeoWidgetConfiguration MUST be Location</string>
    <string name="no_search_coonfigs_provided">No configs provided for search bar</string>
-    <string name="no_found_locations_matching_text">No location found matching text \"%1$s\"</string>
+    <string name="no_found_locations_matching_text">No caregiver found matching text \"%1$s\"</string>


@owais-vd This change should not be here. But pushed to the Strings XML file of the build variant

@f-odhiambo done

codecov · 2024-09-12T08:52:36Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 27.2%. Comparing base (2f8055b) to head (e05b2c5).

Additional details and impacted files

@@           Coverage Diff           @@
##              main   #3491   +/-   ##
=======================================
  Coverage     27.2%   27.2%           
  Complexity     749     749           
=======================================
  Files          275     275           
  Lines        13940   13936    -4     
  Branches      2532    2531    -1     
=======================================
  Hits          3794    3794           
+ Misses        9622    9618    -4     
  Partials       524     524

Flag	Coverage Δ
engine	`64.3% <ø> (ø)`

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

Files with missing lines	Coverage Δ
...er/fhircore/geowidget/screens/GeoWidgetFragment.kt	`0.6% <ø> (+<0.1%)`	⬆️
...re/quest/ui/geowidget/GeoWidgetLauncherFragment.kt	`0.0% <ø> (ø)`

ellykits · 2024-09-19T14:25:55Z

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

  private fun zoomToLocationsOnMap(features: List<Feature>) {
-    if (features.isEmpty()) return
+    if (features.isEmpty()) {
+      geoJsonSource?.setGeoJson(null as FeatureCollection?)
+      mapView.getMapAsync { mapboxMap -> mapboxMap.easeCamera(CameraUpdateFactory.newCameraPosition(CameraPosition.DEFAULT)) }
+      return
+    }
    featureCollection = FeatureCollection.fromFeatures(features)

    val locationPoints =


This implementation was refactored.

This would no longer be required.

ellykits · 2024-09-19T14:26:56Z

...est/src/main/java/org/smartregister/fhircore/quest/ui/geowidget/GeoWidgetLauncherFragment.kt

+                    geoWidgetViewModel.features.postValue(geoJsonFeatures)
+                    if (geoJsonFeatures.isEmpty()) {
                      geoWidgetLauncherViewModel.emitSnackBarState(
                        SnackBarMessageConfig(
                          message =
-                            getString(R.string.no_found_locations_matching_text, searchText),
+                          getString(R.string.no_found_locations_matching_text, searchText),
                        ),
                      )
                    }


This condition has just been inverted. Not necessary.

@owais-vd @syedowaisali please look into this.

ellykits · 2024-09-19T14:28:03Z

android/quest/src/gizEir/res/values/strings.xml

+<resources>
+    <string name="no_found_locations_matching_text">No caregiver found matching text \"%1$s\"</string>
+</resources>


Close this PR and create a new PR pointing to the main branch with this change in gizEir build variant. @f-odhiambo

@ellykits I might be wrong but this is on the gizEir strings.xml. I think it's fine there

ellykits · 2024-09-19T14:30:13Z

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

  private fun zoomToLocationsOnMap(features: List<Feature>) {
-    if (features.isEmpty()) return
+    if (features.isEmpty()) {
+      geoJsonSource?.setGeoJson(null as FeatureCollection?)
+      mapView.getMapAsync { mapboxMap -> mapboxMap.easeCamera(CameraUpdateFactory.newCameraPosition(CameraPosition.DEFAULT)) }
+      return
+    }
    featureCollection = FeatureCollection.fromFeatures(features)

    val locationPoints =


This would no longer be required.

ellykits · 2024-09-19T14:31:02Z

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

  private fun zoomToLocationsOnMap(features: List<Feature>) {
-    if (features.isEmpty()) return
+    if (features.isEmpty()) {
+      geoJsonSource?.setGeoJson(null as FeatureCollection?)
+      mapView.getMapAsync { mapboxMap -> mapboxMap.easeCamera(CameraUpdateFactory.newCameraPosition(CameraPosition.DEFAULT)) }
+      return
+    }
    featureCollection = FeatureCollection.fromFeatures(features)

    val locationPoints =


dubdabasoduba · 2024-09-19T23:29:44Z

android/quest/src/gizEir/res/values/strings.xml

+<resources>
+    <string name="no_found_locations_matching_text">No caregiver found matching text \"%1$s\"</string>
+</resources>


@ellykits I might be wrong but this is on the gizEir strings.xml. I think it's fine there

fixed map search

56a90eb

syedowaisali marked this pull request as draft September 12, 2024 08:34

f-odhiambo requested changes Sep 12, 2024

View reviewed changes

owais-vd added 3 commits September 12, 2024 13:53

added string in giz-eir flavor

4071283

Merge branch 'main' into map-search-fix

54adbba

remove invalid char

0b9f5f3

syedowaisali marked this pull request as ready for review September 19, 2024 08:41

Merge branch 'main' into map-search-fix

e05b2c5

ellykits requested changes Sep 19, 2024

View reviewed changes

Merge branch 'main' into map-search-fix

566ace9

dubdabasoduba requested changes Sep 19, 2024

View reviewed changes

dubdabasoduba and others added 3 commits September 20, 2024 02:44

Merge branch 'main' into map-search-fix

80d4f8e

Merge branch 'main' into map-search-fix

eb3867f

fixed compilation errors

194bdfd

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fixed map search #3491

fixed map search #3491

syedowaisali commented Sep 12, 2024

f-odhiambo left a comment

f-odhiambo Sep 12, 2024

syedowaisali Sep 12, 2024

codecov bot commented Sep 12, 2024 •

edited

Loading

ellykits Sep 19, 2024

ellykits Sep 19, 2024

ellykits Sep 19, 2024

ellykits Sep 19, 2024

dubdabasoduba Sep 20, 2024

ellykits Sep 19, 2024

dubdabasoduba Sep 19, 2024

ellykits Sep 19, 2024

ellykits Sep 19, 2024

dubdabasoduba Sep 19, 2024

fixed map search #3491

Are you sure you want to change the base?

fixed map search #3491

Conversation

syedowaisali commented Sep 12, 2024

f-odhiambo left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Sep 12, 2024 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Sep 12, 2024 •

edited

Loading