WIP: GPS coordinates during registration

client/src/elm/App/Model.elm

@@ -1,6 +1,7 @@
 module App.Model exposing
     ( ConfiguredModel
     , Flags
+    , GPSCoordinates
     , LoggedInModel
     , MemoryQuota
     , Model
@@ -163,6 +164,9 @@ type alias Model =
 
     -- List of errors we'll send to console.log
     , errors : List Error
+
+    -- GPS coordinates that need to be recorded during registration.
+    , coordinates : Maybe GPSCoordinates
     }
 
 
@@ -214,6 +218,13 @@ emptyModel key url flags =
     , villageId = villageId
     , syncManager = SyncManager.Model.emptyModel syncManagerFlags
     , errors = []
+    , coordinates = Nothing
+    }
+
+
+type alias GPSCoordinates =
+    { latitude : Float
+    , longitude : Float
     }
 
 
@@ -403,6 +414,7 @@ type Msg
     | SetPersistentStorage Bool
     | SetStorageQuota StorageQuota
     | SetMemoryQuota MemoryQuota
+    | SetGPSCoordinates GPSCoordinates
     | SetHealthCenter (Maybe HealthCenterId)
     | SetVillage (Maybe VillageId)
     | Tick Time.Posix

client/src/elm/App/Ports.elm

@@ -1,6 +1,6 @@
 port module App.Ports exposing (..)
 
-import App.Model exposing (MemoryQuota, StorageQuota)
+import App.Model exposing (GPSCoordinates, MemoryQuota, StorageQuota)
 
 
 {-| Saves PIN code entered by user, so that we can use it again if
@@ -14,6 +14,11 @@ port cachePinCode : String -> Cmd msg
 port setLanguage : String -> Cmd msg
 
 
+{-| Requests GPS coordinates.
+-}
+port getCoordinates : () -> Cmd msg
+
+
 {-| Let the Javascript tell us if we've successfully requested persistent
 storage.
 -}
@@ -30,6 +35,11 @@ port memoryQuota : (MemoryQuota -> msg) -> Sub msg
 port storageQuota : (StorageQuota -> msg) -> Sub msg
 
 
+{-| Let the Javascript tell us about our GPS coordinates.
+-}
+port coordinates : (GPSCoordinates -> msg) -> Sub msg
+
+
 {-| Saves Health center ID selected by user, so that we can use it again if
 the browser is reloaded.
 -}

client/src/elm/App/Update.elm

@@ -274,6 +274,7 @@ update msg model =
                     Backend.Update.updateIndexedDb model.language
                         currentDate
                         model.currentTime
+                        model.coordinates
                         model.zscores
                         site
                         features
@@ -1097,6 +1098,14 @@ update msg model =
                 cmd =
                     Nav.pushUrl model.navigationKey (Url.toString redirectUrl)
 
+                extraCmd =
+                    case page of
+                        UserPage (CreatePersonPage _ _) ->
+                            App.Ports.getCoordinates ()
+
+                        _ ->
+                            Cmd.none
+
                 extraMsgs =
                     case page of
                         -- When navigating to Device page (which is used for Sync management), trigger Sync.
@@ -1128,7 +1137,7 @@ update msg model =
                             []
             in
             ( { model | activePage = page }
-            , cmd
+            , Cmd.batch [ cmd, extraCmd ]
             )
                 |> sequence update extraMsgs
 
@@ -1147,6 +1156,11 @@ update msg model =
             , Cmd.none
             )
 
+        SetGPSCoordinates coordinates ->
+            ( { model | coordinates = Just coordinates }
+            , Cmd.none
+            )
+
         SetStorageQuota quota ->
             ( { model | storageQuota = Just quota }
             , Cmd.none
@@ -1532,6 +1546,7 @@ subscriptions model =
          , persistentStorage SetPersistentStorage
          , storageQuota SetStorageQuota
          , memoryQuota SetMemoryQuota
+         , coordinates SetGPSCoordinates
          , Sub.map App.Model.MsgSyncManager (SyncManager.Update.subscriptions model.syncManager)
          ]
             ++ checkDataWanted

client/src/elm/Backend/Person/Decoder.elm

@@ -43,6 +43,8 @@ decodePerson =
         |> optional "sector" (nullable decodeGeoField) Nothing
         |> optional "cell" (nullable decodeGeoField) Nothing
         |> optional "village" (nullable decodeGeoField) Nothing
+        |> optional "latitude" (nullable string) Nothing
+        |> optional "longitude" (nullable string) Nothing
         |> optional "phone_number" (nullable string) Nothing
         |> optional "health_center" (nullable decodeEntityUuid) Nothing
         |> required "deleted" bool

client/src/elm/Backend/Person/Encoder.elm

@@ -40,6 +40,8 @@ encodePerson person =
     , ( "sector", maybe string person.sector )
     , ( "cell", maybe string person.cell )
     , ( "village", maybe string person.village )
+    , ( "latitude", maybe string person.registrationLatitude )
+    , ( "longitude", maybe string person.registrationLongitude )
     , ( "phone_number", maybe string person.telephoneNumber )
     , ( "health_center", maybe encodeEntityUuid person.healthCenterId )
     , ( "deleted", bool person.deleted )

client/src/elm/Backend/Person/Form.elm

@@ -429,6 +429,8 @@ validatePerson site maybeRelated operation maybeCurrentDate =
                 |> andMap (field sector (validateSector geoInfo maybeRelated))
                 |> andMap (field cell (validateCell geoInfo maybeRelated))
                 |> andMap (field village (validateVillage geoInfo maybeRelated))
+                |> andMap (succeed Nothing)
+                |> andMap (succeed Nothing)
                 |> andMap (field phoneNumber <| nullable validateDigitsOnly)
                 |> andMap (field healthCenter (validateHealthCenterId maybeRelated))
                 |> andMap (succeed False)
@@ -468,6 +470,8 @@ validateContact site =
                 |> andMap (field sector (validateSectorForContact geoInfo))
                 |> andMap (field cell (validateCellForContact geoInfo))
                 |> andMap (field village (validateVillageForContact geoInfo))
+                |> andMap (succeed Nothing)
+                |> andMap (succeed Nothing)
                 |> andMap (field phoneNumber <| nullable validateDigitsOnly)
                 |> andMap (succeed Nothing)
                 |> andMap (succeed False)

client/src/elm/Backend/Person/Model.elm

@@ -27,6 +27,8 @@ type alias Person =
     , sector : Maybe String
     , cell : Maybe String
     , village : Maybe String
+    , registrationLatitude : Maybe String
+    , registrationLongitude : Maybe String
     , telephoneNumber : Maybe String
     , healthCenterId : Maybe HealthCenterId
     , deleted : Bool

client/src/elm/Backend/Update.elm

@@ -153,6 +153,7 @@ updateIndexedDb :
     Language
     -> NominalDate
     -> Time.Posix
+    -> Maybe App.Model.GPSCoordinates
     -> ZScore.Model.Model
     -> Site
     -> EverySet SiteFeature
@@ -166,7 +167,7 @@ updateIndexedDb :
     -> MsgIndexedDb
     -> ModelIndexedDb
     -> ( ModelIndexedDb, Cmd MsgIndexedDb, List App.Model.Msg )
-updateIndexedDb language currentDate currentTime zscores site features nurseId healthCenterId villageId isChw isLabTech activePage syncManager msg model =
+updateIndexedDb language currentDate currentTime coordinates zscores site features nurseId healthCenterId villageId isChw isLabTech activePage syncManager msg model =
     let
         noChange =
             ( model, Cmd.none, [] )
@@ -328,6 +329,7 @@ updateIndexedDb language currentDate currentTime zscores site features nurseId h
                     (updateIndexedDb language
                         currentDate
                         currentTime
+                        coordinates
                         zscores
                         site
                         features
@@ -1474,6 +1476,7 @@ updateIndexedDb language currentDate currentTime zscores site features nurseId h
                     (updateIndexedDb language
                         currentDate
                         currentTime
+                        coordinates
                         zscores
                         site
                         features
@@ -4141,6 +4144,7 @@ updateIndexedDb language currentDate currentTime zscores site features nurseId h
                     (updateIndexedDb language
                         currentDate
                         currentTime
+                        coordinates
                         zscores
                         site
                         features
@@ -4196,8 +4200,21 @@ updateIndexedDb language currentDate currentTime zscores site features nurseId h
             )
 
         PostPerson relation initiator person ->
+            let
+                -- Adding GPS coordinates.
+                personWithCoordinates =
+                    Maybe.map
+                        (\coords ->
+                            { person
+                                | registrationLatitude = String.fromFloat coords.latitude |> Just
+                                , registrationLongitude = String.fromFloat coords.longitude |> Just
+                            }
+                        )
+                        coordinates
+                        |> Maybe.withDefault person
+            in
             ( { model | postPerson = Loading }
-            , sw.post personEndpoint person
+            , sw.post personEndpoint personWithCoordinates
                 |> toCmd (RemoteData.fromResult >> RemoteData.map Tuple.first >> HandlePostedPerson relation initiator)
             , []
             )
@@ -4355,6 +4372,7 @@ updateIndexedDb language currentDate currentTime zscores site features nurseId h
                     (updateIndexedDb language
                         currentDate
                         currentTime
+                        coordinates
                         zscores
                         site
                         features

client/src/js/app.js

@@ -517,6 +517,23 @@ elmApp.ports.scrollToElement.subscribe(function(elementId) {
   waitForElement(elementId, scrollToElement, null);
 });
 
+elmApp.ports.getCoordinates.subscribe(function() {
+  if ("geolocation" in navigator) {
+    navigator.geolocation.getCurrentPosition(
+        (position) => {
+            const { latitude, longitude } = position.coords;
+            const result = {latitude: latitude, longitude: longitude};
+            elmApp.ports.coordinates.send(result);
+        },
+        (error) => {
+            console.error("Error fetching location:", error);
+        }
+    );
+  } else {
+      console.error("Geolocation is not available.");
+  }
+});
+
 
 function scrollToElement(elementId) {
   var element = document.getElementById(elementId);

server/hedley/modules/custom/hedley_person/hedley_person.features.field_base.inc

@@ -272,6 +272,50 @@ function hedley_person_field_default_field_bases() {
     'type' => 'text',
   );
 
+  // Exported field_base: 'field_latitude'.
+  $field_bases['field_latitude'] = array(
+    'active' => 1,
+    'cardinality' => 1,
+    'deleted' => 0,
+    'entity_id_type' => NULL,
+    'entity_types' => array(),
+    'field_name' => 'field_latitude',
+    'indexes' => array(
+      'format' => array(
+        0 => 'format',
+      ),
+    ),
+    'locked' => 0,
+    'module' => 'text',
+    'settings' => array(
+      'max_length' => 255,
+    ),
+    'translatable' => 0,
+    'type' => 'text',
+  );
+
+  // Exported field_base: 'field_longitude'.
+  $field_bases['field_longitude'] = array(
+    'active' => 1,
+    'cardinality' => 1,
+    'deleted' => 0,
+    'entity_id_type' => NULL,
+    'entity_types' => array(),
+    'field_name' => 'field_longitude',
+    'indexes' => array(
+      'format' => array(
+        0 => 'format',
+      ),
+    ),
+    'locked' => 0,
+    'module' => 'text',
+    'settings' => array(
+      'max_length' => 255,
+    ),
+    'translatable' => 0,
+    'type' => 'text',
+  );
+
   // Exported field_base: 'field_marital_status'.
   $field_bases['field_marital_status'] = array(
     'active' => 1,