Merge branch 'hotfix/5.0.5'

Author: temi

build.gradle

@@ -17,7 +17,7 @@ plugins {
     id 'war'
 }
 
-version "5.0.4"
+version "5.0.5"
 group "au.org.ala"
 
 apply plugin:"eclipse"

grails-app/assets/javascripts/activity.js

@@ -911,7 +911,7 @@ var ActivityRecordViewModel = function (activity) {
     if (activity.endDate) {
         projectActivityOpen = moment(activity.endDate).isAfter(moment());
     }
-    self.showAdd = ko.observable(projectActivityOpen);
+    self.showAdd = ko.observable( self.isWorksProject() ? false : projectActivityOpen);
     self.readOnly = ko.observable((fcConfig.version || '' ).length > 0)//183,238,252
 
     var allRecords = $.map(activity.records ? activity.records : [], function (record, index) {

grails-app/assets/javascripts/mapWithFeatures.js

@@ -141,9 +141,11 @@
                 self.allLocationsLoaded();
             }
         },
-        loadFeature: function(loc, iw){
+        loadFeature: function(loc, iw, ignoreDefaultArea){
             var self = this, f;
             var loaded = false;
+            ignoreDefaultArea = ignoreDefaultArea || false;
+
             if(loc != null && loc.type != null){
                 if (loc.type.toLowerCase() === 'point') {
                     var ll = new google.maps.LatLng(Number(loc.coordinates[1]), Number(loc.coordinates[0]));
@@ -152,7 +154,7 @@
                         position: ll,
                         title: loc.name
                     });
-                    if (!self.defaultZoomArea || self.defaultZoomArea == loc.id) {
+                    if ((!self.defaultZoomArea || self.defaultZoomArea == loc.id) || ignoreDefaultArea) {
                         self.featureBounds.extend(ll);
                     }
                     self.addFeature(f, loc);
@@ -183,7 +185,7 @@
                         this.allMarkers.push(markerMap);
                     }
 
-                    if (!self.defaultZoomArea || self.defaultZoomArea == loc.id) {
+                    if ((!self.defaultZoomArea || self.defaultZoomArea == loc.id) || ignoreDefaultArea) {
                         self.featureBounds.extend(ll);
                     }
 
@@ -199,7 +201,7 @@
                     });
                     //set the extend of the map
                     //console.log("f.getBounds()",f.getBounds());
-                    if (!self.defaultZoomArea || self.defaultZoomArea == loc.id) {
+                    if ((!self.defaultZoomArea || self.defaultZoomArea == loc.id)  || ignoreDefaultArea) {
                         self.featureBounds.extend(f.getBounds().getNorthEast());
                         self.featureBounds.extend(f.getBounds().getSouthWest());
                     }
@@ -219,7 +221,7 @@
                     // flatten arrays to array of points
                     points = [].concat.apply([], paths);
                     // extend bounds by each point
-                    if (!self.defaultZoomArea || self.defaultZoomArea == loc.id) {
+                    if ((!self.defaultZoomArea || self.defaultZoomArea == loc.id)  || ignoreDefaultArea) {
                         $.each(points, function (i,obj) {self.featureBounds.extend(obj);});
                     }
 
@@ -242,7 +244,7 @@
                                 // The bounding box of a point is a linestring with two points
                                 pointArray = [pointArray[0], pointArray[1], pointArray[0], pointArray[1]];
                             }
-                            if (!self.defaultZoomArea || self.defaultZoomArea == loc.id) {
+                            if ((!self.defaultZoomArea || self.defaultZoomArea == loc.id)  || ignoreDefaultArea) {
                                 self.featureBounds.extend(new google.maps.LatLng(pointArray[1].split(" ")[1], pointArray[1].split(" ")[0]));
                                 self.featureBounds.extend(new google.maps.LatLng(pointArray[3].split(" ")[1], pointArray[3].split(" ")[0]));
                             }
@@ -276,11 +278,20 @@
                 iw = new google.maps.InfoWindow({maxWidth: 360});
             }
 
+            // List of features sometimes does not contain default zoom area. Hence map zoom to an extent not containing
+            // sites. The below setting tells loadFeature to ignore the default zoom area check and add site to extent
+            // calculation.
+            var defaultArea = $.grep(features, function (loc) {
+                    return loc.id == self.defaultZoomArea;
+                }),
+                ignoreDefaultArea = defaultArea.length === 0;
+
+
             $.each(features, function (i,loc) {
                 //console.log('Loading feature with type:' + loc.type + "|" + loc.latitude);
                 if(loc != null){
 
-                    self.loadFeature(loc, iw);
+                    self.loadFeature(loc, iw, ignoreDefaultArea);
                     //self.locationLoaded();
                 }
             });

grails-app/views/site/index.gsp

@@ -37,6 +37,8 @@
             activityDeleteUrl: "${createLink(controller: 'bioActivity', action: 'delete')}",
             activityAddUrl: "${createLink(controller: 'bioActivity', action: 'create')}",
             activityListUrl: "${createLink(controller: 'bioActivity', action: 'ajaxList')}",
+            worksActivityEditUrl: "${createLink(controller: 'activity', action: 'enterData')}",
+            worksActivityViewUrl: "${createLink(controller: 'activity', action: 'index')}",
             searchProjectActivitiesUrl: "${createLink(controller: 'bioActivity', action: 'searchProjectActivities')}",
             downloadProjectDataUrl: "${createLink(controller: 'bioActivity', action: 'downloadProjectData')}",
             getRecordsForMapping: "${createLink(controller: 'bioActivity', action: 'getProjectActivitiesRecordsForMapping')}",
@@ -67,7 +69,7 @@
         <button type="button" class="close" data-dismiss="alert">&times;</button>
         <strong>Heads up!</strong> You can only edit the site if you have at least 'editor' privilege on all projects associated with the site. Check the projects this site is associated with on the 'Projects' tab below.
     </div>
-    <ul class="breadcrumb pull-right">
+    <ul class="breadcrumb pull-right margin-top-10">
         <li>
             <g:set var="disabled">${(!user) ? "disabled='disabled' title='login required'" : ''}</g:set>
         %{--Favourite functionality only available to authenticated users --}%
@@ -296,7 +298,7 @@
                                         <a data-bind="attr:{'href': transients.editUrl}"><i
                                                 class="fa fa-edit" title="Edit survey"></i></a>
                                     </span>
-                                    <span class="margin-left-1">
+                                    <span class="margin-left-1" data-bind="visible: false">
                                         <a href="#" data-bind="click: $parent.remove"><i
                                                 class="fa fa-remove" title="Delete survey"></i></a>
                                     </span>

karma.conf.js

@@ -35,6 +35,7 @@ module.exports = function (config) {
             'grails-app/assets/javascripts/organisation.js',
             'grails-app/assets/javascripts/pagination.js',
             'grails-app/assets/javascripts/sites.js',
+            'grails-app/assets/javascripts/activity.js',
             'node_modules/leaflet/dist/leaflet.js',
             'grails-app/assets/vendor/leaflet-plugins-2.0.0/layer/tile/Google.js',
             'grails-app/assets/javascripts/MapUtilities.js',

src/test/js/spec/ActivitySpec.js

@@ -0,0 +1,14 @@
+
+describe('Test activity view models', function () {
+    beforeAll(function() {
+        window.fcConfig = {
+        }
+    });
+
+    it('add button should be hidden for works projects', function () {
+        var vm = new ActivityRecordViewModel({projectType: "works"});
+        expect(vm.showAdd()).toBe(false);
+        var vm = new ActivityRecordViewModel({projectType: "survey"});
+        expect(vm.showAdd()).toBe(true);
+    });
+});