Removed bespoke implementation for assessment record request view, ad…

…ded knockout lib to static page
AtlasOfLivingAustralia · Mar 14, 2024 · 04f8462 · 04f8462
1 parent 42d9259
commit 04f8462
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 169 deletions.
diff --git a/grails-app/assets/javascripts/knockout-core.js b/grails-app/assets/javascripts/knockout-core.js
@@ -0,0 +1 @@
+//= require knockout/3.4.0/knockout-3.4.0.js
diff --git a/grails-app/assets/javascripts/requestAssessmentRecordsModel.js b/grails-app/assets/javascripts/requestAssessmentRecordsModel.js
diff --git a/grails-app/assets/stylesheets/reference-assessment.css b/grails-app/assets/stylesheets/reference-assessment.css
diff --git a/grails-app/conf/application.groovy b/grails-app/conf/application.groovy
@@ -678,35 +678,6 @@ script.read.extensions.list = ['js','min.js','png', 'json', 'jpg', 'jpeg']
 
 
 refAssess.hub = 'hcat'
-refAssess.title = 'Image Assessment'
-refAssess.reference.filterName = 'vegetation groups'
-refAssess.reference.filterTypes = [
-        "Acacia Forests and Woodlands": "Open forest and woodland",
-        "Acacia Open Woodlands": "Shrublands",
-        "Acacia Shrublands": "Shrublands",
-        "Callitris Forests and Woodlands": "Open forest and woodland",
-        "Casuarina Forests and Woodlands": "Open forest and woodland",
-        "Chenopod Shrublands, Samphire Shrublands and Forblands": "Grasslands",
-        "Eucalypt Low Open Forests": "Open forest and woodland",
-        "Eucalypt Open Forests": "Open forest and woodland",
-        "Eucalypt Open Woodlands": "Open forest and woodland",
-        "Eucalypt Tall Open Forests": "Wet and closed forests and thickets",
-        "Eucalypt Woodlands": "Open forest and woodland",
-        "Heathlands": "Shrublands",
-        "Hummock Grasslands": "Grasslands",
-        "Low Closed Forests and Tall Closed Shrublands": "Shrublands",
-        "Mallee Open Woodlands and Sparse Mallee Shrublands": "Shrublands",
-        "Mallee Woodlands and Shrublands": "Shrublands",
-        "Mangroves": "Shrublands",
-        "Melaleuca Forests and Woodlands": "Open forest and woodland",
-        "Naturally Bare - sand, rock, claypan, mudflat": "Grasslands",
-        "Other Forests and Woodlands": "Open forest and woodland",
-        "Other Grasslands, Herblands, Sedgelands and Rushlands": "Grasslands",
-        "Other Shrublands": "Shrublands",
-        "Rainforests and Vine Thickets": "Wet and closed forests and thickets",
-        "Tropical Eucalypt Woodlands/Grasslands": "Open forest and woodland",
-        "Tussock Grasslands": "Grasslands"
-]
-refAssess.reference.projectActivityId = 'e0ce9fcc-77f2-4349-825f-9ea442c1c239'
-refAssess.assessment.projectActivityId = 'e61eb018-02a9-4e3b-a4b3-9d6be33d9cbb'
+refAssess.reference.projectActivityId = 'e5a03b7e-17e3-4ea0-872f-d2a58a1becd7'
+refAssess.assessment.projectActivityId = '5da93123-96b3-4209-b3ca-527749cd7970'
 refAssess.assessment.recordsToCreate = 3
diff --git a/grails-app/controllers/au/org/ala/biocollect/ReferenceAssessmentController.groovy b/grails-app/controllers/au/org/ala/biocollect/ReferenceAssessmentController.groovy
@@ -118,13 +118,4 @@ class ReferenceAssessmentController {
 
         render assessActivities as JSON
     }
-
-    def show() {
-        def user = userService.getUser()
-        if (!user) {
-            redirect(controller: 'hub')
-        } else {
-            render view: 'requestAssessmentRecords'
-        }
-    }
 }
diff --git a/grails-app/controllers/au/org/ala/biocollect/UrlMappings.groovy b/grails-app/controllers/au/org/ala/biocollect/UrlMappings.groovy
@@ -83,12 +83,6 @@ class UrlMappings {
                         }
                 }
 
-                "/$hub/requestAssessmentRecords"(controller: 'referenceAssessment', action: 'show') {
-                        constraints {
-                                hub validator: {val, obj -> isHubValid(val) && val == grailsApplication.config.refAssess.hub}
-                        }
-                }
-
                 "/$hub/nocas/geoService"(controller: 'home', action: 'geoService') {
                         constraints {
                                 hub validator: {val, obj -> isHubValid( val)}

diff --git a/grails-app/views/referenceAssessment/requestAssessmentRecords.gsp b/grails-app/views/referenceAssessment/requestAssessmentRecords.gsp
diff --git a/grails-app/views/staticPage/index.gsp b/grails-app/views/staticPage/index.gsp
@@ -21,6 +21,7 @@
 <head>
     <meta name="layout" content="${mobile ? "mobile" : "bs4"}"/>
     <title></title>
+    <asset:javascript src="knockout-core.js"/>
 </head>
 
 <body>
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,6 +21,7 @@ @@
     <head>
         <meta name="layout" content="${mobile ? "mobile" : "bs4"}"/>
         <title></title>
+        <asset:javascript src="knockout-core.js"/>
     </head>
     <body>
@@ Expand Down @@