From 14548e7a72373e8521e964bb0a8ff0938237643b Mon Sep 17 00:00:00 2001 From: Jack Brinkman Date: Tue, 27 Aug 2024 07:36:50 +1000 Subject: [PATCH 1/5] #1630 Add isSuitableForChildren for sciStarter initiator --- .../groovy/au/org/ala/biocollect/projectresult/SciStarter.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/groovy/au/org/ala/biocollect/projectresult/SciStarter.groovy b/src/main/groovy/au/org/ala/biocollect/projectresult/SciStarter.groovy index 31db7e687..f85a90623 100644 --- a/src/main/groovy/au/org/ala/biocollect/projectresult/SciStarter.groovy +++ b/src/main/groovy/au/org/ala/biocollect/projectresult/SciStarter.groovy @@ -69,6 +69,7 @@ class SciStarter { ecoScienceType : doc.ecoScienceType, isDIY : doc.isDIY?.toBoolean(), isSciStarter : doc.isSciStarter?.toBoolean(), + isSuitableForChildren : doc.isSuitableForChildren?.toBoolean(), hasParticipantCost : doc.hasParticipantCost?.toBoolean(), equipment : doc.gear, plannedStartDate : doc.plannedStartDate, From c09aa048ffbafeeb91a130f77a1241935a915af3 Mon Sep 17 00:00:00 2001 From: Jack Brinkman Date: Wed, 28 Aug 2024 11:12:49 +1000 Subject: [PATCH 2/5] #1630 Add origin field to sciStarter initiator --- .../groovy/au/org/ala/biocollect/projectresult/SciStarter.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/groovy/au/org/ala/biocollect/projectresult/SciStarter.groovy b/src/main/groovy/au/org/ala/biocollect/projectresult/SciStarter.groovy index f85a90623..e7a989495 100644 --- a/src/main/groovy/au/org/ala/biocollect/projectresult/SciStarter.groovy +++ b/src/main/groovy/au/org/ala/biocollect/projectresult/SciStarter.groovy @@ -71,6 +71,7 @@ class SciStarter { isSciStarter : doc.isSciStarter?.toBoolean(), isSuitableForChildren : doc.isSuitableForChildren?.toBoolean(), hasParticipantCost : doc.hasParticipantCost?.toBoolean(), + origin : doc.origin, equipment : doc.gear, plannedStartDate : doc.plannedStartDate, plannedEndDate : doc.plannedEndDate, From 557faef00c2359fe784f74b13a74b6f55b53c61a Mon Sep 17 00:00:00 2001 From: Jack Brinkman Date: Mon, 2 Sep 2024 09:03:49 +1000 Subject: [PATCH 3/5] #1630 Updated SciStarter import method to match output of new ecodata process --- .../services/au/org/ala/biocollect/merit/ProjectService.groovy | 2 +- grails-app/views/admin/tools.gsp | 2 +- 2 files changed, 2 insertions(+), 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 index 93311545f..d5658d7aa 100644 --- 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 index 9fed06c5b..b92a0ebd3 100644 --- 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); From e4b02fc4bf8dd228e7152f76223b9dcab83a3284 Mon Sep 17 00:00:00 2001 From: Jack Brinkman Date: Tue, 24 Sep 2024 13:42:30 +1000 Subject: [PATCH 4/5] Bump chromedriver version to latest --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 088225664..5cf4ea72c 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ }, "devDependencies": { "@metahub/karma-jasmine-jquery": "^2.0.1", - "chromedriver": "^126.0.4", + "chromedriver": "^129.0.0", "jasmine-core": "^3.5.0", "jasmine-jquery": "^2.0.0", "jquery": "^3.4.1", From 8cc957b5a7bc2b3fa9d50ffcf5a8fd8ac99b904f Mon Sep 17 00:00:00 2001 From: Jack Brinkman Date: Tue, 24 Sep 2024 14:41:21 +1000 Subject: [PATCH 5/5] Changed chromedriver version to 128.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5cf4ea72c..b3e1baa05 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ }, "devDependencies": { "@metahub/karma-jasmine-jquery": "^2.0.1", - "chromedriver": "^129.0.0", + "chromedriver": "^128.0.0", "jasmine-core": "^3.5.0", "jasmine-jquery": "^2.0.0", "jquery": "^3.4.1",