Merge branch 'master' of https://github.com/AtlasOfLivingAustralia/biocollect

Author: temi

application.properties

@@ -2,4 +2,4 @@
 #Sat Nov 03 13:30:44 AEDT 2018
 app.grails.version=2.5.6
 app.name=biocollect
-app.version=4.8.1.1-SNAPSHOT
+app.version=4.8.5

grails-app/assets/javascripts/activity.js

@@ -886,6 +886,15 @@ var ActivityRecordViewModel = function (activity) {
         return fcConfig.projectIndexUrl + '/' + self.projectId() +
             (fcConfig.version !== undefined ? "?version=" + fcConfig.version : '');
     });
+
+    self.transients = {};
+    self.transients.viewUrl = ko.observable((self.isWorksProject() ? fcConfig.worksActivityViewUrl : fcConfig.activityViewUrl) + "/" + self.activityId()).extend({returnTo: fcConfig.returnTo, dataVersion: fcConfig.version});
+    self.transients.editUrl = ko.observable((self.isWorksProject() ? fcConfig.worksActivityEditUrl : fcConfig.activityEditUrl) + "/" + self.activityId()).extend({returnTo: fcConfig.returnTo});
+    self.transients.addUrl = ko.observable(fcConfig.activityAddUrl + "/" + self.projectActivityId()).extend({returnTo: fcConfig.returnTo});
+    self.transients.parent = activity.parent;
+    self.transients.thumbnailUrl = ko.observable(activity.thumbnailUrl ||  fcConfig.imageLocation + "no-image-2.png");
+    self.transients.imageTitle = ko.observable(activity.thumbnailUrl? '' : 'No image' );
+
     self.records = ko.observableArray();
     self.siteUrl = fcConfig.siteViewUrl + '/' + self.siteId();
     var projectActivityOpen = true;
@@ -897,17 +906,10 @@ var ActivityRecordViewModel = function (activity) {
 
     var allRecords = $.map(activity.records ? activity.records : [], function (record, index) {
         record.parent = self;
+        record.thumbnailUrl = self.transients.thumbnailUrl();
         return new RecordVM(record);
     });
     self.records(allRecords);
-
-    self.transients = {};
-    self.transients.viewUrl = ko.observable((self.isWorksProject() ? fcConfig.worksActivityViewUrl : fcConfig.activityViewUrl) + "/" + self.activityId()).extend({returnTo: fcConfig.returnTo, dataVersion: fcConfig.version});
-    self.transients.editUrl = ko.observable((self.isWorksProject() ? fcConfig.worksActivityEditUrl : fcConfig.activityEditUrl) + "/" + self.activityId()).extend({returnTo: fcConfig.returnTo});
-    self.transients.addUrl = ko.observable(fcConfig.activityAddUrl + "/" + self.projectActivityId()).extend({returnTo: fcConfig.returnTo});
-    self.transients.parent = activity.parent;
-    self.transients.thumbnailUrl = ko.observable(activity.thumbnailUrl ||  fcConfig.imageLocation + "no-image-2.png");
-    self.transients.imageTitle = ko.observable(activity.thumbnailUrl? '' : 'No image' );
 };
 
 var RecordVM = function (record) {
@@ -924,6 +926,7 @@ var RecordVM = function (record) {
     self.eventTime = record.eventTime;
     self.individualCount = ko.observable(record.individualCount);
     self.eventDate =  ko.observable(record.eventDate).extend({simpleDate: false});
+    self.thumbnailUrl = ko.observable(record.thumbnailUrl);
 };
 
 ActivityRecordViewModel.prototype.getPropertyValue = RecordVM.prototype.getPropertyValue = function (config) {

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

@@ -64,9 +64,22 @@ class ProjectController {
             // redirect to MERIT to view the project.
             redirect(uri:grailsApplication.config.merit.project.url+'/'+id)
         }
+
         else {
             project.sites?.sort {it.name}
-            project.projectSite = project.sites?.find{it.siteId == project.projectSiteId}
+
+
+            if(project.sites?.find{it.siteId == project.projectSiteId}) {
+                project.projectSite = project.sites?.find{it.siteId == project.projectSiteId}
+            } else if(project.projectSiteId) {
+                // Project site is missing, update site and sync project site info
+                project.projectSite = siteService.get(project.projectSiteId, [view:'brief'])
+                List projectIds = project.projectSite?.projects
+                projectIds = projectIds?.findAll{it != '' && it != null} ?: []
+                projectIds << project.projectId
+                siteService.update(project.projectSiteId, [projects: projectIds])
+            }
+
             if(project.origin){
                 project.origin = messageSource.getMessage("facets.origin." + project.origin, [].toArray(), project.origin, Locale.default)
             }
@@ -517,7 +530,6 @@ class ProjectController {
                 projectSite.projects += id
 
             def siteUpdate = siteService.update(values.projectSiteId, projectSite)
-            log.info(siteUpdate)
         }
         if (result.error) {
             log.error(result.error);

grails-app/views/bioActivity/_activities.gsp

@@ -126,11 +126,16 @@
                                         <!-- ko if: type == 'image' -->
                                         <td>
                                             <div class="projectLogo">
+                                                <!--
                                                 <a href=""
                                                    data-bind="attr:{href:fcConfig.imageLeafletViewer + '?file=' + encodeURIComponent(($parent.multimedia[0] && $parent.multimedia[0].identifier) || '${noImageUrl}')}, fancybox: {nextEffect:'fade', preload:0, 'prevEffect':'fade', type: 'iframe', width:'80%'}"
                                                    target="fancybox">
                                                     <img class="image-logo image-window" data-bind="attr:{title:($parent.multimedia[0] && $parent.multimedia[0].title) || 'No Image', src:($parent.multimedia[0] && $parent.multimedia[0].identifier) || '${noImageUrl}'}"  onload="findLogoScalingClass(this, 200, 150)">
                                                 </a>
+                                                -->
+                                                <a data-bind="attr: {href: $parents[1].transients.viewUrl}">
+                                                    <img class="image-logo image-window" onload="findLogoScalingClass(this, 200, 150)" data-bind="attr:{src:$parent.thumbnailUrl}"/>
+                                                </a>
                                             </div>
                                         </td>
                                         <!-- /ko -->

grails-app/views/project/_aboutCitizenScienceProject.gsp

@@ -223,7 +223,6 @@
     <g:if test="${projectSite?.extent?.geometry}">
     if ((typeof map === 'undefined' || Object.keys(map).length == 0)) {
         var projectArea = <fc:modelAsJavascript model="${projectSite.extent.geometry}"/>;
-        console.log(projectArea);
         if (projectArea) {
             var mapOptions = {
                 drawControl: false,

grails-app/views/project/csProjectTemplate.gsp

@@ -183,7 +183,7 @@
         var projectViewModel = new ProjectViewModel(project, ${user?.isEditor?:false});
         var user = <fc:modelAsJavascript model="${user}"/>;
         var vocabList = <fc:modelAsJavascript model="${vocabList}" />;
-        var projectArea = <fc:modelAsJavascript model="${projectSite.extent.geometry}"/>;
+        var projectArea = <fc:modelAsJavascript model="${projectSite?.extent?.geometry}"/>;
         var licences = <fc:modelAsJavascript model="${licences}"/>;
 
         var ViewModel = function() {