commit updates #3178

AtlasOfLivingAustralia · May 9, 2024 · 101d64a · 101d64a
1 parent b8da1a3
commit 101d64a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/grails-app/views/dataSet/_editDataSet.gsp b/grails-app/views/dataSet/_editDataSet.gsp
@@ -105,7 +105,7 @@
     </div>
 
     <div class="form-group row">
-        <label for="measurementTypes" class="col-sm-5 col-form-label required">9b. What types of measurements or observations does the dataset include? <br/>To select more than one answer, hold down the ‘CTRL’ button whilst selecting an option from the drop-down list</label>
+        <label for="measurementTypes" class="col-sm-5 col-form-label required">9b. What types of measurements or observations does the dataset include?</label>
         <div class="col-sm-7">
             <select multiple="multiple" type="text" class="form-control" id="measurementTypes" data-validation-engine="validate[required]" data-bind="disable: protocol() != 'other', multiSelect2:{value:measurementTypes}">
                 <option>Abundance</option>
@@ -144,7 +144,7 @@
         </div>
     </div>
     <div class="form-group row">
-        <label for="methods" class="col-sm-5 col-form-label required">10. Identify the method(s) used to collect the data. <br/>To select more than one answer, hold down the ‘CTRL’ button whilst selecting an option from the drop-down list</label>
+        <label for="methods" class="col-sm-5 col-form-label required">10. Identify the method(s) used to collect the data.</label>
         <div class="col-sm-7">
             <select class="form-control" multiple="multiple" id="methods" data-validation-engine="validate[required]" data-bind="disable: protocol() != 'other', multiSelect2:{value:methods}">
                 <option>Active searching</option>

diff --git a/grails-app/views/dataSet/_viewDataSet.gsp b/grails-app/views/dataSet/_viewDataSet.gsp
@@ -71,13 +71,25 @@
     <!-- /ko -->
 
     <div class="form-group row">
-        <label class="col-sm-5 col-form-label required">8. Is this (a) a baseline dataset associated with a project outcome i.e. against which, change will be measured, (b) a project progress dataset that is tracking change against an established project baseline dataset or (c) a standalone, foundational dataset to inform future management interventions?</label>
+        <label class="col-sm-5 col-form-label required">8a. Is this (a) a baseline dataset associated with a project outcome i.e. against which, change will be measured, (b) a project progress dataset that is tracking change against an established project baseline dataset or (c) a standalone, foundational dataset to inform future management interventions?</label>
         <div class="col-sm-7">
-            <span data-bind="text:type"></span>
+            <span data-bind="text:type"></span> - <span data-bind="text:otherDataSetType"></span>
         </div>
     </div>
     <div class="form-group row">
-        <label class="col-sm-5 col-form-label required">9. What types of measurements or observations does the dataset include? <br/>To select more than one answer, hold down the ‘CTRL’ button whilst selecting an option from the drop-down list</label>
+        <label class="col-sm-5 col-form-label required">8b. Which project baseline does this data set relate to or describe?</label>
+        <div class="col-sm-7">
+            <span data-bind="text:baselines"></span>
+        </div>
+    </div>
+    <div class="form-group row">
+        <label class="col-sm-5 col-form-label required">9a. What EMSA protocol was used when collecting the data?</label>
+        <div class="col-sm-7">
+            <span data-bind="text:protocol"></span>
+        </div>
+    </div>
+    <div class="form-group row">
+        <label class="col-sm-5 col-form-label required">9b. What types of measurements or observations does the dataset include?</label>
         <div class="col-sm-7">
             <span data-bind="text:measurementTypes"></span>
         </div>
@@ -89,7 +101,7 @@
         </div>
     </div>
     <div class="form-group row">
-        <label class="col-sm-5 col-form-label required">10. Identify the method(s) used to collect the data. <br/>To select more than one answer, hold down the ‘CTRL’ button whilst selecting an option from the drop-down list</label>
+        <label class="col-sm-5 col-form-label required">10. Identify the method(s) used to collect the data.</label>
         <div class="col-sm-7">
             <span data-bind="text:methods"></span>
         </div>