Merge pull request #1634 from AtlasOfLivingAustralia/feature/scistart…

…er-updates Feature/scistarter updates
AtlasOfLivingAustralia · Sep 24, 2024 · ec01f60 · ec01f60
2 parents 3b840a4 + 5edf104
commit ec01f60
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/grails-app/services/au/org/ala/biocollect/merit/ProjectService.groovy b/grails-app/services/au/org/ala/biocollect/merit/ProjectService.groovy
@@ -707,7 +707,7 @@ class ProjectService {
     Map importSciStarterProjects() throws SocketTimeoutException, Exception{
         String url = "${grailsApplication.config.ecodata.service.url}/project/importProjectsFromSciStarter";
         Map response = webService.doPostWithParams(url, [:]);
-        if(response.resp && response.resp.count != null){
+        if(response.resp && response.resp.created != null){
             return response.resp
         } else {
             if(response.error.contains('Timed out')){

diff --git a/grails-app/views/admin/tools.gsp b/grails-app/views/admin/tools.gsp
@@ -109,7 +109,7 @@
                                 method:"POST"
                             }
                     ).done(function(result) {
-                        alert("Successfully imported " + result.count + " SciStarter projects!");
+                        alert("SciStarter import complete: " + result.created + " created, " + result.updated + " updated, " + result.ignored + " ignored");
                         document.location.reload();
                     }).fail(function (result) {
                         alert(result.statusText);

diff --git a/src/main/groovy/au/org/ala/biocollect/projectresult/SciStarter.groovy b/src/main/groovy/au/org/ala/biocollect/projectresult/SciStarter.groovy
@@ -69,7 +69,9 @@ class SciStarter {
                 ecoScienceType         : doc.ecoScienceType,
                 isDIY                  : doc.isDIY?.toBoolean(),
                 isSciStarter           : doc.isSciStarter?.toBoolean(),
+                isSuitableForChildren  : doc.isSuitableForChildren?.toBoolean(),
                 hasParticipantCost     : doc.hasParticipantCost?.toBoolean(),
+                origin                 : doc.origin,
                 equipment              : doc.gear,
                 plannedStartDate       : doc.plannedStartDate,
                 plannedEndDate         : doc.plannedEndDate,