Fixed image uploading for assessment records, switched knockout-core …

…reference to common.js
AtlasOfLivingAustralia · Mar 27, 2024 · 72c98cc · 72c98cc
1 parent 71732c1
commit 72c98cc
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 13 deletions.
diff --git a/grails-app/assets/javascripts/knockout-core.js b/grails-app/assets/javascripts/knockout-core.js
diff --git a/grails-app/controllers/au/org/ala/biocollect/ReferenceAssessmentController.groovy b/grails-app/controllers/au/org/ala/biocollect/ReferenceAssessmentController.groovy
@@ -8,12 +8,29 @@ import java.time.Instant
 
 class ReferenceAssessmentController {
     UserService userService
-    ProjectService projectService
     ProjectActivityService projectActivityService
     ActivityService activityService
 
 
     private def createAssessmentRecordFromReference(Object referenceActivity, Object assessProjectActivity) {
+        def refDoc = referenceActivity.documents[0]
+        def assessPhoto = [
+                licence: refDoc["licence"],
+                notes: refDoc["notes"],
+                filesize: refDoc["filesize"],
+                staged: true,
+                url: grailsApplication.config.serverURL + refDoc["url"],
+                filename: refDoc["filename"],
+                attribution: referenceActivity.outputs[0].data["imageAttribution"],
+                name: refDoc["name"],
+                documentId: '',
+                contentType: refDoc["contentType"],
+                dateTaken: refDoc["dateTaken"],
+                formattedSize: refDoc["formattedSize"],
+                thumbnailUrl: grailsApplication.config.serverURL + refDoc["thumbnailUrl"],
+                status: "active"
+        ]
+
         def assessActivity = [
                 outputs: [
                         [
@@ -25,7 +42,8 @@ class ReferenceAssessmentController {
                                         lowerConditionBound: "0",
                                         overallConditionBestEstimate: "0",
                                         mvgGroup: referenceActivity.outputs[0].data.vegetationStructureGroup,
-                                        huchinsonGroup: referenceActivity.outputs[0].data.huchinsonGroup
+                                        huchinsonGroup: referenceActivity.outputs[0].data.huchinsonGroup,
+                                        sitePhoto: [assessPhoto]
                                 ],
                                 name: assessProjectActivity["pActivityFormName"]
                         ]
@@ -112,13 +130,6 @@ class ReferenceAssessmentController {
         // Combine the two lists
         refActivities = priorityRecords + otherRecords
 
-//        if (true) {
-//            response.status = 200
-//            result = [message: 'Test!']
-//            render result as JSON
-//            return
-//        }
-
         // Ensure there are reference records after filtering
         if (refActivities.size() == 0) {
             response.status = 400
@@ -129,7 +140,11 @@ class ReferenceAssessmentController {
 
         def assessProjectActivity = projectActivityService.get(config.assessment.projectActivityId)
         def assessActivities = []
-        for (int projectIndex = 0; projectIndex < min(config.assessment.maxRecordsToCreate, refActivities.size()); projectIndex++) {
+        for (
+                int projectIndex = 0;
+                projectIndex < Math.min(config.assessment.maxRecordsToCreate, refActivities.size());
+                projectIndex++
+        ) {
             assessActivities.push(
                     createAssessmentRecordFromReference(
                             refActivities[projectIndex],
@@ -138,6 +153,8 @@ class ReferenceAssessmentController {
             )
         }
 
-        render assessActivities as JSON
+        response.status = 200
+        result = [message: "Found ${assessActivities.size()} images for assessment, please standby..."]
+        render result as JSON
     }
 }
diff --git a/grails-app/views/staticPage/index.gsp b/grails-app/views/staticPage/index.gsp
@@ -21,7 +21,7 @@
 <head>
     <meta name="layout" content="${mobile ? "mobile" : "bs4"}"/>
     <title></title>
-    <asset:javascript src="knockout-core.js"/>
+    <asset:javascript src="common.js"/>
 </head>
 
 <body>