Merge branch 'develop'

Indicia-Team · Jan 11, 2024 · cdc6fde · cdc6fde
2 parents 10e8dd3 + dd44980
commit cdc6fde
Show file tree

Hide file tree

Showing 15 changed files with 828 additions and 242 deletions.
diff --git a/css/report-filters.css b/css/report-filters.css
@@ -22,7 +22,7 @@
   padding-right: 24px;
   box-sizing:border-box;
   -moz-box-sizing:border-box;
-  -webkit-box-sizing:border-box
+  -webkit-box-sizing:border-box;
   height: auto;
 }
 

diff --git a/css/theme-bootstrap-3.css b/css/theme-bootstrap-3.css
diff --git a/css/theme-bootstrap-3.css.map b/css/theme-bootstrap-3.css.map
diff --git a/css/theme-generic.css b/css/theme-generic.css
diff --git a/css/theme-generic.css.map b/css/theme-generic.css.map
diff --git a/js/controls/speciesmap_controls.js b/js/controls/speciesmap_controls.js
@@ -278,8 +278,8 @@ var control_speciesmap_addcontrols;
       $('#' + indiciaData.control_speciesmap_opts.messageId).empty().append(indiciaData.lang.speciesMap.AddDataMessage);
       $('#' + indiciaData.control_speciesmap_opts.buttonsId).each(function () {window.scroll(0, $(this).offset().top); });
       showButtons(['cancel', 'finish']);
-      if (typeof indiciaData.control_speciesmap_opts.sampleMethodId !== "undefined" && indiciaData.control_speciesmap_opts.sampleMethodId !== '') {
-        $('<input type="hidden" name="sc:' + gridIdx + '::sample:sample_method_id" value="' + indiciaData.control_speciesmap_opts.sampleMethodId + '" />')
+      if (typeof indiciaData.control_speciesmap_opts.sample_method_id !== "undefined" && indiciaData.control_speciesmap_opts.sample_method_id !== '') {
+        $('<input type="hidden" name="sc:' + gridIdx + '::sample:sample_method_id" value="' + indiciaData.control_speciesmap_opts.sample_method_id + '" />')
           .appendTo(subsampleBlock);
         sampleControlsDiv = $('#' + indiciaData.control_speciesmap_opts.id + '-subsample-ctrls')
           .clone(true, true)

diff --git a/js/indicia.datacomponents/idc.core.js b/js/indicia.datacomponents/idc.core.js
@@ -746,18 +746,22 @@
       var key = entity === 'parent_event' ? 'parent_attributes' : 'attributes';
       // Tolerate sample or event for entity parameter.
       entity = $.inArray(entity, ['sample', 'event', 'parent_event']) > -1 ? 'event' : 'occurrence';
-      // When requesting an event attribute, allow the parent event attribute
-      // value to be used if necessary.
-      if (entity === 'event' && key === 'attributes' && !doc[entity][key] && doc[entity]['parent_attributes']) {
-        key = 'parent_attributes';
-      }
       if (doc[entity] && doc[entity][key]) {
         $.each(doc[entity][key], function eachAttr() {
           if (this.id === params[1]) {
             output.push(this.value);
           }
         });
       }
+      // When requesting an event attribute, allow the parent event attribute
+      // value to be used if necessary.
+      if (doc[entity] && output.length === 0 && entity === 'event' && key === 'attributes' && doc[entity]['parent_attributes']) {
+        $.each(doc[entity]['parent_attributes'], function eachAttr() {
+          if (this.id === params[1]) {
+            output.push(this.value);
+          }
+        });
+      }
       return output.join('; ');
     },