- FIX: Fixed issues with input of numeric values when using the numpad (keycode 110).

Author: sebastian-raubach

src/components/TraitInput.vue

@@ -214,25 +214,25 @@ export default {
     }
   },
   methods: {
-    preventNonNumber: function (evt) {
-      if (evt.keyCode === 69) {
-        evt.preventDefault()
-      } else if (evt.keyCode === 110) {
-        // Comma/fullstop on keypad
-        evt.target.type = 'text'
-        const start = evt.target.selectionStart
-        const end = evt.target.selectionEnd
-        const oldValue = evt.target.value
-
-        const newValue = oldValue.slice(0, start) + '.' + oldValue.slice(end)
-        evt.target.value = newValue
-        this.value = newValue
-        
-        evt.target.selectionStart = start + 1
-        evt.target.selectionEnd = start + 1
-        evt.target.type = 'number'
-
-        evt.preventDefault()
+    preventNonNumber: function (event) {
+      if (event.keyCode === 69) {
+        event.preventDefault()
+      } else if (event.keyCode === 110) {
+        // // Comma/fullstop on keypad
+        // event.target.type = 'text'
+        // const start = event.target.selectionStart
+        // const end = event.target.selectionEnd
+        // const oldValue = event.target.value
+
+        // const newValue = oldValue.slice(0, start) + '.' + oldValue.slice(end)
+        // event.target.value = newValue
+        // this.value = newValue
+
+        // event.preventDefault()
+
+        // nextTick(() => {
+        //   event.target.selectionEnd = event.target.selectionStart = start + 1
+        // })
       }
     },
     setGps: function (latitude, longitude) {

src/plugins/misc.js

@@ -557,7 +557,7 @@ const trialsDataToLongFormat = (data, trial, aggregate = true, includePeople = f
 }
 
 const trialsDataToMatrix = (data, trial, aggregate = true) => {
-  let result = `Line/Trait\tRep\tRow\tColumn\tDate\t${trial.traits.map(t => t.name).join('\t')}\tLatitude\tLongitude`
+  let result = `Line/Trait\tRep\tRow\tColumn\tSet\tDate\t${trial.traits.map(t => t.name).join('\t')}\tLatitude\tLongitude`
 
   if (aggregate) {
     Object.values(data).forEach(v => {
@@ -574,7 +574,7 @@ const trialsDataToMatrix = (data, trial, aggregate = true) => {
         const dateArray = [...dates].sort((a, b) => a.localeCompare(b))
 
         dateArray.forEach(date => {
-          result += `\n${germplasmMeta}\t${date}`
+          result += `\n${germplasmMeta}\t\t${date}`
 
           trial.traits.forEach(t => {
             const td = v.measurements[t.id]
@@ -625,9 +625,10 @@ const trialsDataToMatrix = (data, trial, aggregate = true) => {
                 .filter(val => val !== undefined && val !== null && val !== '')
 
               if (values && values.length > 0) {
-                values.forEach(val => {
+                values.forEach((val, setPosition) => {
                   measurements.push({
                     traitId: t.id,
+                    setPosition,
                     date: dp.timestamp.split('T')[0],
                     value: t.dataType === 'categorical' ? t.restrictions.categories[+val] : val,
                     geography: v.geography
@@ -640,7 +641,7 @@ const trialsDataToMatrix = (data, trial, aggregate = true) => {
 
         measurements.forEach(m => {
           const values = trial.traits.map(t => `${t.id === m.traitId ? m.value : ''}`).join('\t')
-          result += `\n${germplasmMeta}\t${m.date}\t${values}`
+          result += `\n${germplasmMeta}\t${m.setPosition + 1}\t${m.date}\t${values}`
 
           if (m.geography) {
             result += getLatLngAverage(m.geography)

src/views/TrialExportView.vue

@@ -407,14 +407,14 @@ export default {
     },
     exportTrialLayout: function () {
       if (this.trial.layout && this.trialData) {
-        let result = 'Germplasm\tRep\tRow\tColumn\tTreatment\tBarcode\tFriendly name'
+        let result = 'Germplasm\tRep\tRow\tColumn\tTreatment\tFriendly name\tBarcode\tPedigree'
 
         for (let row = 0; row < this.trial.layout.rows; row++) {
           for (let column = 0; column < this.trial.layout.columns; column++) {
             const c = this.trialData[`${row}|${column}`]
 
             if (c) {
-              result += `\n${c.germplasm}\t${c.rep || ''}\t${c.displayRow}\t${c.displayColumn}\t${c.treatment || ''}\t${c.barcode || ''}\t${c.friendlyName || ''}`
+              result += `\n${c.germplasm}\t${c.rep || ''}\t${c.displayRow}\t${c.displayColumn}\t${c.treatment || ''}\t${c.friendlyName || ''}\t${c.barcode || ''}\t${c.pedigree || ''}`
             }
           }
         }