Merge remote-tracking branch 'origin/dev' into feature/issue3421

Author: chrisala

forms/mongo/insertParatooProtocolConfig.js

@@ -346,12 +346,7 @@ var protocols = {
                     "dataType": "species"
                 },
                 "recruitment-sapling-and-seedling-count.juvenile_count": {
-                    "dwcAttribute": "individualCount"
-                },
-                "recruitment-sapling-and-seedling-count.seedling_count": {
-                    "dwcAttribute": "individualCount"
-                },
-                "recruitment-sapling-and-seedling-count.sapling_count": {
+                    "dwcExpression": "(['juvenile_count'] == null ? 0 : ['juvenile_count']) + (['seedling_count'] == null ? 0 : ['seedling_count']) + (['sapling_count'] == null ? 0 :['sapling_count'])",
                     "dwcAttribute": "individualCount"
                 },
                 "recruitment-sapling-and-seedling-count.voucher_full.host_species": {

grails-app/controllers/au/org/ala/merit/ProjectController.groovy

@@ -931,12 +931,11 @@ class ProjectController {
             if (model.activity.siteId) {
                 model.reportSite = sites?.find { it.siteId == model.activity.siteId }
             }
-
-            Map siteData = projectService.projectSites(projectId)
-            if (!siteData.error) {
-                model.projectArea = siteData.projectArea
-                model.features = siteData.features
+            Map projectArea = sites?.find { it.type == SiteService.SITE_TYPE_PROJECT_AREA }
+            if (projectArea) {
+                model.projectArea = siteService.getSiteGeoJson(projectArea.siteId)
             }
+            model.selectableFeaturesUrl = g.createLink(action:'ajaxProjectSites', id:projectId)
         }
         model
     }

grails-app/views/activity/activityReport.gsp

@@ -40,6 +40,9 @@
                 initialScrollPositionDelay: "${grailsApplication.config.getProperty('reports.initialScrollPositionDelay') ?: 1000}"
             },
             here = document.location.href;
+            <g:if test="${selectableFeaturesUrl}">
+            fcConfig.selectableFeaturesUrl = "${selectableFeaturesUrl}";
+            </g:if>
     </script>
     <asset:stylesheet src="common-bs4.css"/>
     <asset:stylesheet src="activity.css"/>
@@ -140,17 +143,40 @@
             };
 
             var locked = ${locked};
-            var metaModel = <fc:modelAsJavascript model="${metaModel}" default="{}"/>
+            var metaModel = <fc:modelAsJavascript model="${metaModel}" default="{}"/>;
             var master = null;
             var mapPopupSelector = '#map-modal';
-            var features = <fc:modelAsJavascript model="${features}" default="{}"/>
             var reportMasterOptions = {
                 locked: locked,
                 activityUpdateUrl: fcConfig.activityUpdateUrl,
                 healthCheckUrl: fcConfig.healthCheckUrl,
                 projectTargetsAndScoresUrl: fcConfig.projectTargetsAndScoresUrl,
                 performOverDeliveryCheck: true
             };
+            function categoriseSelectableSites(features) {
+                if (!features || !_.isArray(features)) {
+                    return null;
+                }
+                var planningSitesCategory = 'Planning Sites';
+                var planningFeatures = [];
+                var allFeatures = [];
+                _.each(features, function (feature) {
+                    // Group the planning sites together into a single collection
+                    if (feature.properties && feature.properties.category && feature.properties.category == planningSitesCategory) {
+                        planningFeatures.push(feature);
+                    } else {
+                        allFeatures.push(feature);
+                    }
+                });
+                if (planningFeatures.length > 0) {
+                    allFeatures.unshift({
+                        type: 'Feature Collection',
+                        features: planningFeatures,
+                        properties: {category: planningSitesCategory, name: planningSitesCategory}
+                    });
+                }
+                return allFeatures;
+            }
             if (metaModel.supportsSites) {
                 // Workaround for problems with IE11 and leaflet draw
                 L.Browser.touch = false;
@@ -159,29 +185,13 @@
                 if (fcConfig.useGoogleBaseMap) {
                     mapOptions.baseLayersName = 'Google'; // Default is Open Street Maps
                 }
-                var planningSitesCategory = 'Planning Sites';
-                if (features && _.isArray(features)) {
-                    var planningFeatures = [];
-                    var allFeatures = [];
-                    _.each(features, function (feature) {
-                        // Group the planning sites together into a single collection
-                        if (feature.properties && feature.properties.category && feature.properties.category == planningSitesCategory) {
-                            planningFeatures.push(feature);
-                        } else {
-                            allFeatures.push(feature);
-                        }
-                    });
-                    if (planningFeatures.length > 0) {
-                        allFeatures.unshift({
-                            type: 'Feature Collection',
-                            features: planningFeatures,
-                            properties: {category: planningSitesCategory, name: planningSitesCategory}
-                        });
-                    }
-                    mapOptions.selectableFeatures = allFeatures;
-
 
-                }
+                mapOptions.selectableFeatures = $.Deferred();
+                $.get(fcConfig.selectableFeaturesUrl).done(function(features) {
+                    if (features && features.features) {
+                        mapOptions.selectableFeatures.resolve(categoriseSelectableSites(features.features));
+                    }
+                });
 
                 var formFeatures = new ecodata.forms.FeatureCollection(reportSite ? reportSite.features : []);
                 context.featureCollection = formFeatures;

src/main/scripts/releases/4.2/restoreSites.js

@@ -0,0 +1,12 @@
+load("../../utils/audit.js");
+let projectId = '7743afa2-6a8d-4476-a38d-964c037421bd';
+let excludedNames = ['219', '259', '284', '1022', '1331', '830', '228', '1434', '1047'];
+
+db.site.find({projects:projectId, type:'worksArea', name: {$nin: excludedNames}}).forEach(function(site) {
+    site.status = 'active';
+    site.notes = null;
+
+    db.site.replaceOne({_id:site._id}, site);
+
+    audit('site', site.siteId, 'update', '<system>');
+});