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

Author: chrisala

grails-app/assets/javascripts/projects.js

@@ -1162,14 +1162,14 @@ function ProjectPageViewModel(project, sites, activities, userRoles, config) {
                     },
                     {
                         "targets":2,
-                        "orderable": false,
+                        "orderable": true,
                         "searchable": true,
                         "width": "2em",
                         "visible":config.showSiteType
                     },
                     {
                         "targets": 3,
-                        "orderable": false,
+                        "orderable": true,
                         "searchable": true
 
                     },

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

@@ -546,10 +546,10 @@ class ActivityController {
 
                         def result = speciesService.searchByScientificName(scientificName)
                         if (result) {
-                            row[species.name] = [name:result.name, listId:result.listId, guid:result.guid]
+                            row[species.name] = [name:result.name, listId:result.listId, guid:result.guid, scientificName: result.scientificName ?: result.name, commonName: result.commonName]
                         }
                         else {
-                            row[species.name] = [name:scientificName, listId:'unmatched', guid:null]
+                            row[species.name] = [name:scientificName, listId:'unmatched', scientificName:scientificName, commonName: '', guid:null]
                         }
 
                     }

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

@@ -51,17 +51,16 @@ class ManagementUnitController {
                 isManagementUnitStarredByUser = userService.isManagementUnitStarredByUser(user?.userId, mu?.managementUnitId)?.isManagementUnitStarredByUser
             }
 
-            def mapFeatures = mu.managementUnitSiteId?siteService.getSiteGeoJson(mu.managementUnitSiteId) : null
-            if (mapFeatures)
-                mu.mapFeatures = mapFeatures
+            def muExtent = mu.managementUnitSiteId?siteService.getSiteGeoJson(mu.managementUnitSiteId) : null
 
             [managementUnit     : mu,
              roles              : roles,
              user               : user,
              isAdmin            : user?.isAdmin,
              isGrantManager     : user?.isGrantManager,
              content            : content(mu, user),
-             isManagementUnitStarredByUser: isManagementUnitStarredByUser
+             isManagementUnitStarredByUser: isManagementUnitStarredByUser,
+             muExtent:muExtent
              ]
         }
     }

grails-app/services/au/org/ala/merit/RoleService.groovy

@@ -76,10 +76,7 @@ class RoleService {
 
     private static final List MERIT_PROJECT_ROLES = [GRANT_MANAGER_ROLE, PROJECT_ADMIN_ROLE, PROJECT_EDITOR_ROLE, PROJECT_READ_ONLY_ROLE]
     public static final List MERIT_HUB_ROLES = [HUB_ADMIN_ROLE, HUB_SUPPORT_OFFICER_ROLE, HUB_OFFICER_ROLE, HUB_READ_ONLY_ROLE]
-
-    // Disabling the new Monitor app roles until they are implemented in Monitor.
-    //public static final List MONITOR_ONLY_ROLES = [PROJECT_DETERMINER_SURVEYOR_ROLE, PROJECT_MODERATOR_ROLE, PROJECT_DETERMINER_ROLE, PROJECT_SURVEYOR_ROLE]
-    public static final List MONITOR_ONLY_ROLES = [PROJECT_SURVEYOR_ROLE]
+    public static final List MONITOR_ONLY_ROLES = [PROJECT_DETERMINER_SURVEYOR_ROLE, PROJECT_MODERATOR_ROLE, PROJECT_DETERMINER_ROLE, PROJECT_SURVEYOR_ROLE]
     /** Granted to ALA developers, gives access to all functions in MERIT */
     public static final String ALA_ADMIN_ROLE = "alaAdmin"
 
@@ -131,9 +128,7 @@ class RoleService {
     }
 
     Set getAllowedUserRoles() {
-        return new HashSet([PROJECT_ADMIN_ROLE, PROJECT_EDITOR_ROLE, PROJECT_SURVEYOR_ROLE])
-        // Disabling the new Monitor app roles until they are implemented in Monitor.
-        //return new HashSet([PROJECT_MODERATOR_ROLE, PROJECT_ADMIN_ROLE, PROJECT_EDITOR_ROLE, PROJECT_DETERMINER_SURVEYOR_ROLE, PROJECT_SURVEYOR_ROLE, PROJECT_DETERMINER_ROLE])
+        return new HashSet([PROJECT_MODERATOR_ROLE, PROJECT_ADMIN_ROLE, PROJECT_EDITOR_ROLE, PROJECT_DETERMINER_SURVEYOR_ROLE, PROJECT_SURVEYOR_ROLE, PROJECT_DETERMINER_ROLE])
     }
 
 }

grails-app/views/managementUnit/index.gsp

@@ -112,6 +112,8 @@
 
     $(function () {
         var managementUnit =<fc:modelAsJavascript model="${managementUnit}"/>;
+        var muExtent = <fc:modelAsJavascript model="${managementUnitExtent}" default="null"/>;
+        managementUnit.mapFeatures = muExtent;
         var config = _.extend({reportingConfigSelector:'#reporting form'}, fcConfig);
         var managementUnitViewModel = new ManagementUnitPageViewModel(managementUnit, config);
 

grails-app/views/project/_editProject.gsp

@@ -87,7 +87,7 @@
     <div class="col-sm-4">
         <label for="funding">Project Funding (GST Exclusive)</label>
         <div>
-            <g:textField class="form-control form-control-sm input-small" id="funding" name="funding" data-bind="value:funding" data-validation-engine="validate[custom[number]]"/>
+            <input type="number" step="0.01" class="form-control form-control-sm input-small" id="funding" name="funding" data-bind="value:funding" data-validation-engine="validate[custom[number]]" value="">
         </div>
     </div>