Merge pull request #3047 from AtlasOfLivingAustralia/feature/issue3040

Add the ability to identify sites created by Monitor #3040

Author: salomon-j

grails-app/assets/javascripts/projects.js

@@ -1047,7 +1047,7 @@ function ProjectPageViewModel(project, sites, activities, organisations, userRol
         };
         sitesViewModel.typeFilter.subscribe(function(filterValue) {
 
-            if (filterValue == 'Both') {
+            if (filterValue == 'All') {
                 filterValue = "";  // Clear the search.
             }
             $sitesTable.DataTable().column(2).search(filterValue).draw();

grails-app/assets/javascripts/sites.js

@@ -994,6 +994,17 @@ var SitesViewModel =  function(sites, map, mapFeatures, isUserEditor, projectId)
         if (!site.type) {
             site.type = 'worksArea';
         }
+        site.filterType = 'P';
+        site.filterTypeLabel = 'Planning site';
+        if (site.type === 'compound') {
+            site.filterType = 'R';
+            site.filterTypeLabel = 'Reporting site';
+        }
+        else if (site.externalIds && site.externalIds[0] && site.externalIds[0].idType == 'MONITOR_PLOT_GUID') {
+            site.filterType = 'E';
+            site.filterTypeLabel = 'Site created via EMSA protocol using the Monitor App';
+        }
+
         site.readOnly = site.type == 'compound' || PublicationStatus.isReadOnly(site.publicationStatus);
         return site;
     });
@@ -1029,7 +1040,7 @@ var SitesViewModel =  function(sites, map, mapFeatures, isUserEditor, projectId)
         }
         return '';
     };
-    self.typeOptions = ['Both', 'P', 'R'];
+    self.typeOptions = ['All', 'P', 'R', 'E'];
     self.typeFilter = ko.observable(self.typeOptions[0]);
 
     // Animation callbacks for the lists
@@ -1187,7 +1198,7 @@ var SitesViewModel =  function(sites, map, mapFeatures, isUserEditor, projectId)
     this.viewSite = function (site) {
         var url = fcConfig.siteViewUrl + '/' + site.siteId;
         if (projectId) {
-            url += '&projectId='+projectId;
+            url += '?projectId='+projectId;
         }
         document.location.href = url;
     };

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

@@ -206,7 +206,7 @@ class ProjectController {
         else if (template == RLP_TEMPLATE) {
 
             // The RLP Project Template doesn't need site details or activities.
-            project.sites = new JSONArray(project.sites?.collect{new JSONObject([name:it.name, siteId:it.siteId, lastUpdated:it.lastUpdated, type:it.type, extent:[:], publicationStatus:it.publicationStatus])} ?: [])
+            project.sites = new JSONArray(project.sites?.collect{new JSONObject([name:it.name, siteId:it.siteId, lastUpdated:it.lastUpdated, type:it.type, extent:[:], publicationStatus:it.publicationStatus, externalIds:it.externalIds])} ?: [])
             project.remove('activities')
             model.overview.template = 'rlpOverview'
 

grails-app/views/site/_sitesList.gsp

@@ -29,7 +29,7 @@
                 <tr>
                     <th><input type="checkbox" id="select-all-sites"></th>
                     <th></th>
-                    <th>Type <fc:iconHelp html="true">Planning site (P) or Reporting site (R)</fc:iconHelp><br/>
+                    <th>Type <fc:iconHelp html="true">Planning site (P), Reporting site (R) or EMSA site created with the Monitor app (E)</fc:iconHelp><br/>
                         <select data-bind="value:typeFilter, options:typeOptions">
 
                         </select>
@@ -52,7 +52,7 @@
                             </span>
                         </g:if>
                     </td>
-                    <td data-bind="text:type == 'compound' ? 'R' : 'P', title:type == 'compound' ? 'Reporting site' :  'Planning site'">
+                    <td data-bind="text:filterType, title:filterTypeTitle">
                     </td>
 
                     <td>

src/main/scripts/releases/3.1/fixSiteExternalIds.js

@@ -16,5 +16,15 @@ while (sites.hasNext()) {
     site.externalId = null;
     db.site.replaceOne({_id:site._id}, site);
 
+    audit(site, site.siteId, 'au.org.ala.ecodata.Site', adminUserId);
+}
+
+sites = db.site.find({externalId:{$ne:null}});
+while (sites.hasNext()) {
+    let site = sites.next();
+    site.externalIds = [{idType:'UNSPECIFIED', externalId: site.externalId}];
+    delete site.externalId;
+    db.site.replaceOne({_id:site._id}, site);
+
     audit(site, site.siteId, 'au.org.ala.ecodata.Site', adminUserId);
 }