Exclude "Project Site" from survey site list #1198

Author: sat01a

Diff for: grails-app/assets/javascripts/projectActivities.js

@@ -345,6 +345,7 @@ var ProjectActivitiesSettingsViewModel = function (pActivitiesVM, placeHolder) {
     self.create = function (pActivity, caller){
         var pActivity = self.current();
         var url = fcConfig.projectActivityCreateUrl;
+        blockUIWithMessage("Saving...");
         $.ajax({
             url: url,
             type: 'POST',
@@ -359,19 +360,25 @@ var ProjectActivitiesSettingsViewModel = function (pActivitiesVM, placeHolder) {
                         }
                     });
                     self.updateLogo(data);
-                    showAlert("Successfully created", "alert-success", self.placeHolder);
+                    blockUIWithMessage("Successfully created");
                 } else {
-                    showAlert(errorMsgSurveyInfo, "alert-error", self.placeHolder);
+                    blockUIWithMessage(errorMsgSurveyInfo);
                 }
             },
             error: function (data) {
-                showAlert("Error creating the survey -" + data.status, "alert-error", self.placeHolder);
+                blockUIWithMessage("Error creating the survey -" + data.status);
+            },
+            complete: function() {
+                setTimeout(function () {
+                    $.unblockUI();
+                }, 2500);
             }
         });
     };
 
     self.update = function(pActivity, caller){
         var url =  fcConfig.projectActivityUpdateUrl + "/" + pActivity.projectActivityId();
+        blockUIWithMessage("Saving...");
         $.ajax({
             url: url,
             type: 'POST',
@@ -382,13 +389,18 @@ var ProjectActivitiesSettingsViewModel = function (pActivitiesVM, placeHolder) {
                 if (result && result.message == 'updated') {
                     self.updateLogo(data);
                     self.updateProjectResources(data);
-                    showAlert("Successfully updated ", "alert-success", self.placeHolder);
+                    blockUIWithMessage("Successfully updated...");
                 } else {
-                    showAlert(errorMsgSurveyInfo, "alert-error", self.placeHolder);
+                    blockUIWithMessage(errorMsgSurveyInfo);
                 }
             },
             error: function (data) {
-                showAlert("Error updating the survey -" + data.status, "alert-error", self.placeHolder);
+                blockUIWithMessage("Error updating the survey -" + data.status);
+            },
+            complete: function() {
+                setTimeout(function () {
+                    $.unblockUI();
+                }, 2500);
             }
         });
     };

Diff for: grails-app/assets/javascripts/projectActivity.js

@@ -19,6 +19,7 @@ var ProjectActivity = function (params) {
     self.selectFromSitesOnly = ko.observable(pActivity.selectFromSitesOnly);
     self.legalCustodianOrganisation = ko.utils.unwrapObservable(pActivity.legalCustodianOrganisation || organisationName);
     self.sites = ko.observableArray();
+    self.excludeProjectSite = ko.observable(pActivity.excludeProjectSite ? pActivity.excludeProjectSite : false);
     self.allowPolygons = ko.observable(('allowPolygons' in pActivity)? pActivity.allowPolygons : false);
     self.allowPoints = ko.observable(('allowPoints' in pActivity)? pActivity.allowPoints : true);
     self.defaultZoomArea = ko.observable(('defaultZoomArea' in pActivity)? pActivity.defaultZoomArea : project?project.projectSiteId:'');
@@ -630,6 +631,7 @@ var ProjectActivity = function (params) {
             jsData.selectFromSitesOnly = self.selectFromSitesOnly();
             jsData.baseLayersName = self.baseLayersName();
             jsData.allowPolygons = self.allowPolygons();
+            jsData.excludeProjectSite = self.excludeProjectSite();
             jsData.allowPoints = self.allowPoints();
             jsData.defaultZoomArea = self.defaultZoomArea();
         }

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

@@ -246,6 +246,8 @@ class BioActivityController {
             model.autocompleteUrl = "${request.contextPath}/search/searchSpecies/${pActivity.projectActivityId}?limit=10"
             addOutputModel(model)
             addDefaultSpecies(activity)
+            // Remove projectSite from the survey site list
+            model?.projectSite && model.pActivity?.excludeProjectSite ? model.pActivity.sites?.remove(model.projectSite) : null
         }
 
         if (mobile && flash.message) {
@@ -275,6 +277,9 @@ class BioActivityController {
             model.id = id
             model.speciesConfig = [surveyConfig: [speciesFields: pActivity?.speciesFields]]
             model.returnTo = params.returnTo ? params.returnTo : g.createLink(controller: 'bioActivity', action: 'index') + "/" + id
+            // Remove projectSite from the survey site list
+            model?.projectSite && model.pActivity?.excludeProjectSite ? model.pActivity.sites?.remove(model.projectSite) : null
+
         } else {
             flash.message = "Access denied: User is not an owner of this activity ${activity?.activityId}"
             if(!mobile)  redirect(controller: 'project', action: 'index', id: projectId)

Diff for: grails-app/i18n/messages.properties

@@ -341,6 +341,8 @@ project.survey.info.submitter=Submitter
 project.survey.info.submitter.content=The name of the person submitting the dataset to AEKOS
 project.survey.info.submissionPublicationDate=Submission Date
 project.survey.info.submissionPublicationDate.content=Date of dataset submission to AEKOS
+project.survey.site.config=Survey page, site dropdown config:
+project.survey.site.config.content=Remove project site from survey site dropdown list
 
 project.survey.alert.species=Species name
 project.survey.alert.species.content=Enter species name

Diff for: grails-app/views/projectActivity/_sites.gsp

@@ -159,6 +159,17 @@
     </div>
 
 
+    <div class="row-fluid">
+
+        <div class="span12">
+            <p>
+                <h3><g:message code="project.survey.site.config"/></h3>
+                <input type="checkbox" data-bind="checked: excludeProjectSite"/> <g:message code="project.survey.site.config.content"/>
+            </p>
+        </div>
+
+    </div>
+
     <!--
     Not supported.
     <div class="row-fluid">