#1572 Add capability to group survey templates

AtlasOfLivingAustralia · Jan 25, 2024 · 217ff73 · 217ff73
1 parent f168fdb
commit 217ff73
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/grails-app/assets/javascripts/projectActivities.js b/grails-app/assets/javascripts/projectActivities.js
@@ -6,7 +6,13 @@ var ProjectActivitiesViewModel = function (params, projectViewModel) {
  self.projectViewModel = projectViewModel;
 
  self.organisationName = params.organisationName;
- self.pActivityForms = params.pActivityForms;
+ self.pActivityForms = params.pActivityForms.sort((a,b) => a.name.localeCompare(b.name))
+
+ $(document).ready(function() {
+ $('.js-example-basic-single').select2();
+ });
+
+
  self.sites = params.sites;
  self.projectStartDate = params.projectStartDate;
  self.project = params.project;
@@ -161,16 +167,18 @@ var ProjectActivitiesDataViewModel = function (pActivitiesVM) {
 };
 
 
-var ProjectActivitiesSettingsViewModel = function (pActivitiesVM, placeHolder) {
+var ProjectActivitiesSettingsViewModel = function (pActivitiesVM, placeHolder, query) {
 
  var self = $.extend(this, pActivitiesVM);
  var surveyInfoTab = '#survey-info-tab';
  var project = pActivitiesVM.project;
  var errorMsgSurveyInfo = "Failed to save survey. Are you sure all mandatory fields in 'Survey Info' tab is filled?";
  self.placeHolder = placeHolder;
  self.datesOptions = [60, 90, 120, 180];
+ self.query = query;
  self.formNames = ko.observableArray($.map(self.pActivityForms ? self.pActivityForms : [], function (obj, i) {
  return obj.name;
+ // return obj.name.filter(i => (i === query));
  }));
 
  self.addProjectActivity = function () {
@@ -591,5 +599,20 @@ var ProjectActivitiesSettingsViewModel = function (pActivitiesVM, placeHolder) {
  })
 
  self.getSitesWithDataForProjectActivitiesInProject();
+
+ // $('body').on('shown.bs.modal', '.modal', function() {
+ // $(this).find('select').each(function() {
+ // var dropdownParent = $(document.body);
+ // if ($(this).parents('.modal.in:first').length !== 0)
+ // dropdownParent = $(this).parents('.modal.in:first');
+ // $(this).select2({
+ // dropdownParent: dropdownParent
+ // // ...
+ // });
+ // });
+ // });
+
+
+
 };
 
diff --git a/grails-app/views/projectActivity/_survey.gsp b/grails-app/views/projectActivity/_survey.gsp
@@ -27,7 +27,7 @@
 %{-- </div>--}%
  <div class="col-8">
  <div class="btn-space">
- <select class="form-control" id="template" data-validation-engine="validate[required]" data-bind="options: $root.formNames, value: pActivityFormName, optionsCaption: 'Please select'" ></select>
+ <select class="js-example-basic-single" data-bind="options: $root.formNames, value: pActivityFormName, optionsCaption: 'Please select'" ></select>
  <button class="btn btn-sm btn-primary-dark" data-bind="click: function() {previewActivity('<g:createLink controller="bioActivity" action="previewActivity"/>', pActivityFormName())}"> <i class="far fa-eye"></i> Preview Survey</button>
  </div>
  </div>
@@ -48,4 +48,4 @@
  </div>
  </div>
  <!-- /ko -->
-<!-- /ko -->
+<!-- /ko -->