- FIX: Disable mouse wheel on input boxes to prevent accidental value…

… changes. - FIX: Fixed navigation to next plot on blur event of last input. - FIX: Fixed line wrapping issue on export page due to newline characters in comment.
cropgeeks · Jul 12, 2022 · 058be1a · 058be1a
1 parent 32bf6ab
commit 058be1a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/components/DataEntryInput.vue b/src/components/DataEntryInput.vue
@@ -19,6 +19,7 @@
                 @keyup.enter="$emit('enter')"
                 :value="values[index]"
                 @change="(event) => $emit('onValueChanged', +event)"
+                @wheel.prevent
                 type="number"
                 :min="(trait.restrictions && trait.restrictions.min !== null && trait.restrictions.min !== undefined) ? trait.restrictions.min : null"
                 :max="(trait.restrictions && trait.restrictions.max !== null && trait.restrictions.max !== undefined) ? trait.restrictions.max : null" />
@@ -32,6 +33,7 @@
                 :value="values[index]"
                 @change="(event) => $emit('onValueChanged', +event)"
                 type="number"
+                @wheel.prevent
                 :min="(trait.restrictions && trait.restrictions.min !== null && trait.restrictions.min !== undefined) ? trait.restrictions.min : null"
                 :max="(trait.restrictions && trait.restrictions.max !== null && trait.restrictions.max !== undefined) ? trait.restrictions.max : null"
                 :step="0.02" />

diff --git a/src/components/DataPointEntry.vue b/src/components/DataPointEntry.vue
@@ -489,11 +489,11 @@ export default {
 
           this.speak(this.visibleTraitMapping[newIndex].trait.name)
         }
-      } else {
-        if (this.isGuidedWalk) {
-          // Automatically call submit
-          this.$emit('submit')
-        }
+      // } else {
+      //   if (this.isGuidedWalk) {
+      //     // Automatically call submit
+      //     this.$emit('submit')
+      //   }
       }
     },
     onValueChanged: function (event, index) {

diff --git a/src/views/Export.vue b/src/views/Export.vue
@@ -316,7 +316,7 @@ export default {
               }
 
               // Comments
-              result += '\t' + (cell.comment ? cell.comment : '')
+              result += '\t' + (cell.comment ? cell.comment.replace(/\r?\n/, ' ') : '')
             }
           }
         }
@@ -362,7 +362,7 @@ export default {
               }
 
               // Comments
-              result += '\t' + (cell.comment ? cell.comment : '')
+              result += '\t' + (cell.comment ? cell.comment.replace(/\r?\n/, ' ') : '')
             }
           }
         }