tidying

Author: ddooley

lib/DataHarmonizer.js

@@ -254,7 +254,6 @@ class DataHarmonizer {
         attributes[name],
         this.context.template.current.schema.slots[name]
       );
-      // console.log(field);
 
       //let field = attributes[name];
       let section_title = null;
@@ -579,7 +578,7 @@ class DataHarmonizer {
     // signaling changes.
     await this.doPreValidationRepairs(data); // Screen refresh requires await().
     this.invalid_cells = this.getInvalidCells(data);
-    console.log("INVALID CELLS", this.invalid_cells);
+    //console.log("INVALID CELLS", this.invalid_cells);
     this.hot.render();
   }
 
@@ -2656,6 +2655,7 @@ class DataHarmonizer {
         if (number >= 0) {
           // Here we have the 3 field call, with units sandwitched in the middle
           if (binOffset === 2) {
+
             const unit = matrix[row][hotRowNextCol];
             // Host age unit is interpreted by default to be year.
             // If user selects month, value is converted into years for binning.
@@ -2691,8 +2691,9 @@ class DataHarmonizer {
           selection = bin_value; // Default value is itself.
 
           const bin_values = fields[hotRowBinCol].flatVocabulary;
-          if (!bin_value || (bin_value === '' && value in bin_values)) {
+          if (value in bin_values && (!bin_value || bin_value === '')) {
             selection = value;
+            console.log("no bin value", value);
           }
           // If a unit field exists, then set that to metadata too.
           if (binOffset == 2) {
@@ -2701,7 +2702,7 @@ class DataHarmonizer {
                 ? matrix[hotRowPtr][hotRowNextCol]
                 : null;
             const unit_values = fields[col + 1].flatVocabulary;
-            if (!unit_value || (unit_value === '' && value in unit_values)) {
+            if (value in unit_values && (!unit_value || unit_value === '')) {
               triggered_changes.push([
                 hotRowPtr,
                 hotRowNextCol,