Changes to embargo feature #1201

Introduced new embargo settings for ALA admin
Added apiKey to indexing call.
Increased data tab map height

Author: sat01a

grails-app/assets/javascripts/projectActivity.js

@@ -833,9 +833,9 @@ var SurveyVisibilityViewModel = function (visibility) {
     }
 
     self.embargoOption = ko.observable(visibility.embargoOption ? visibility.embargoOption : 'NONE');   // 'NONE', 'DAYS', 'DATE' -> See au.org.ala.ecodata.EmbargoOptions in Ecodata
-
     self.embargoForDays = ko.observable(visibility.embargoForDays ? visibility.embargoForDays : 10).extend({numeric:0});     // 1 - 180 days
     self.embargoUntil = ko.observable(visibility.embargoUntil).extend({simpleDate: true});
+    self.alaAdminEnforcedEmbargo = ko.observable(visibility.alaAdminEnforcedEmbargo);
 };
 
 var AlertViewModel = function (alert) {

grails-app/controllers/au/org/ala/biocollect/BioActivityController.groovy

@@ -98,6 +98,7 @@ class BioActivityController {
                 def photoPoints = postBody.remove('photoPoints')
                 postBody.projectActivityId = pActivity.projectActivityId
                 postBody.userId = userId
+                pActivity?.visibility?.alaAdminEnforcedEmbargo ? postBody.embargoed = true : null
 
                 result = activityService.update(id, postBody)
 

grails-app/i18n/messages.properties

@@ -271,6 +271,12 @@ facets.isDataManagementPolicyDocumented.no=No
 facets.isDataManagementPolicyDocumented.T=Yes
 facets.isDataManagementPolicyDocumented.F=No
 
+facets.embargoed.yes=Yes
+facets.embargoed.no=No
+facets.embargoed.T=Yes
+facets.embargoed.F=No
+
+
 facets.spatialAccuracy.high=High
 facets.spatialAccuracy.moderate=Moderate
 facets.spatialAccuracy.low=Low

grails-app/services/au/org/ala/biocollect/merit/AdminService.groovy

@@ -21,7 +21,7 @@ class AdminService {
      * Triggers a full site re-index.
      */
     def reIndexAll() {
-        webService.getJson(grailsApplication.config.ecodata.service.url + '/admin/reIndexAll')
+        webService.getJson(grailsApplication.config.ecodata.service.url + '/admin/reIndexAll', 50000, true)
     }
 
     static outputDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ssZ")

grails-app/views/bioActivity/_activities.gsp

@@ -164,7 +164,7 @@
                                             <div>
                                                 <!-- ko if: $parents[1].embargoed() -->
                                                 <a href="#" class="helphover"
-                                                   data-bind="popover: {title:'Only project members can access the record.', content:'Embargoed until : ' + moment($parents[1].embargoUntil()).format('DD/MM/YYYY')}">
+                                                   data-bind="popover: {title:'Embargoed', content:'Indicates that only project members can access the record'}">
                                                     <span class="fa fa-lock"></span>
                                                 </a>
                                                 <!--/ko -->
@@ -269,10 +269,10 @@
                                             <!-- ko if:  type == 'symbols' -->
                                             <td>
                                                 <div>
+                                                    <span data-bind="text: $parent.embargoed()"></span>
                                                     <!-- ko if: $parent.embargoed() -->
                                                     <a href="#" class="helphover"
-                                                       data-bind="popover: {title:'Indicates that only project members can access the record.', content:'Embargoed until : ' + moment($parent.embargoUntil()).format('DD/MM/YYYY')}">
-                                                        <span class="fa fa-lock"></span>
+                                                       data-bind="popover: {title:'Embargoed.', content:'Indicates that only project members can access the record'}">
                                                     </a>
                                                     <!--/ko -->
                                                 </div>
@@ -376,9 +376,11 @@
                                 <span data-bind="if: !transients.loading()">No Results</span>
                             </span>
                         </span>
+
                         <span data-bind="visible: transients.totalPoints() > 0 && !transients.loadingMap() ">
-                            <m:map id="recordOrActivityMap" width="100%"/>
+                            <m:map height="650px" width="auto" id="recordOrActivityMap" />
                         </span>
+                        
                     </div>
                     <!-- ko stopBinding:true -->
                     <div class="tab-pane" id="imageGallery">

grails-app/views/projectActivity/_indexingNote.gsp

@@ -1,9 +1,7 @@
 <span>
     <div class="row-fluid">
-        <div class="span4 text-right"></div>
-        <div class="span8 text-right">
-            <div class="margin-top-2"></div>
-            <small class="text-muted">Note: Changes made to this tab will be reflected in search results after 24 hours</small>
+        <div class="span12 text-left">
+            <span class="text-muted">Note: Changes made to this tab will be reflected in search results after 24 hours</span>
         </div>
     </div>
 </span>

grails-app/views/projectActivity/_visibility.gsp

@@ -36,7 +36,18 @@
                         </label>
                    </div>
 
+
                 </div>
+
+                <g:if test="${fc.userIsAlaOrFcAdmin()}">
+                    <hr>
+                    <h4>ALA ADMIN Only: </h4>
+                    <input type="checkbox" data-bind="checked: visibility.alaAdminEnforcedEmbargo"/> Embargo all new records/activities
+                    <hr>
+                </g:if>
+                <!-- ko if: visibility.alaAdminEnforcedEmbargo() -->
+                    <span class="text-muted">Important: All new records will be embargoed for this survey. Project Moderator/Admin can release records via "Data tab". For more information please contact us at <a href='${grailsApplication.config.biocollect.support.email.address}'>${grailsApplication.config.biocollect.support.email.address}</a></span>
+                <!-- /ko -->
                 <g:render template="../projectActivity/indexingNote"/>
             <!-- /ko -->
         <!-- /ko -->