6.1.1-SNAPSHOT

- create site when siteId is missing
AtlasOfLivingAustralia · Sep 19, 2023 · 2ee8860 · 2ee8860
1 parent 3a0e07f
commit 2ee8860
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -18,7 +18,7 @@ plugins {
 }
 
 
-version "6.1"
+version "6.1.1-SNAPSHOT"
 group "org.grails.plugins"
 
 apply plugin:"eclipse"

diff --git a/grails-app/assets/javascripts/viewModels.js b/grails-app/assets/javascripts/viewModels.js
@@ -305,9 +305,15 @@ function enmapify(args) {
     viewModel.getSiteId = function () {
         return siteIdObservable();
     };
-    viewModel.loadActivitySite = function () {
+    viewModel.loadActivitySite = function (data) {
         var siteId = activityLevelData.activity && activityLevelData.activity.siteId;
         siteId && siteIdObservable(siteId);
+        // if siteId is not set, then we need to create a site from lat and lon coordinates
+        if (edit && !siteIdObservable() && data) {
+            if (data.decimalLatitude && data.decimalLongitude) {
+                viewModel.addMarker(data);
+            }
+        }
     };
 
     function isEmpty(value){

diff --git a/grails-app/taglib/au/org/ala/ecodata/forms/ModelJSTagLib.groovy b/grails-app/taglib/au/org/ala/ecodata/forms/ModelJSTagLib.groovy
@@ -298,7 +298,7 @@ class ModelJSTagLib {
                     if (data.${mod.name} && typeof data.${mod.name} !== 'undefined') {
                         self.data.${mod.name}(data.${mod.name});
                     } else {
-                        self.loadActivitySite();
+                        self.loadActivitySite({decimalLatitude: data.${mod.name}Latitude, decimalLongitude: data.${mod.name}Longitude);
                     }
                     
                     if (data.${mod.name}Accuracy){