DSD-2237 General settings fix + handling of enter on calibration form improved

Closes DSD-2237

src/components/general-settings/PanelPermanentSettingsForm.vue

 <template>
     <form novalidate @submit.prevent="validate(formName)" :data-vv-scope="formName" :class="{ 'in-progress': inProgress }">
+
+        <button type="submit" class="submit-catcher"
+        :disabled="inProgress"></button>    <!-- needs to be the first button on page, otherwise factory reset button catches enter -->
+
         <div class="row"
         :class="{ 'hide': !errors.any(formName) }">
             <div class="column">
@@ -589,4 +593,11 @@
         margin-top: -0.5rem;
         margin-bottom: 0.5rem;
     }
+
+    .submit-catcher {
+        opacity: 0;
+        width: 0;
+        height: 0;
+        position: absolute;
+    }
 </style>

src/components/general-settings/PanelSensorCalibrationForm.vue

 <template>
-    <form novalidate @submit.prevent="validate(formName)" :data-vv-scope="formName">
+    <form novalidate :data-vv-scope="formName">
         <div class="row">
             <div class="column">
                 <div class="alert callout space-bottom"
@@ -55,6 +55,7 @@
                         css-class="sensor-value"
                         :invalid="errors.has(formName + '.' + sensor.id + '_actual')"
                         :error-message="errors.first(formName + '.' + sensor.id + '_actual')"
+                        @keydown.enter.prevent.native.stop="calibrateSensorValue(sensor.id, getValueAsFloat(sensor.id + '_actual'))"
                         ></ds-input-with-unit>
                     </div>
                     <div class="column expand">
@@ -158,31 +159,34 @@
                 return { ...sensor, exactValue, roundValue, realReading, rangeMin, rangeMax };
             },
             calibrateSensorValue (sensorId, value) {
-                if (this.errors.has(this.formName + '.' + sensorId + '_actual')) {
-                    return;
-                }
-                Vue.set(this.sensorsInProgress, sensorId, true);
-                const sensorType = this.sensors.filter((sensor) => sensor.id === sensorId)[0].type;
-                const dsuid = this.device.dSUID;
-                const calibrationDetails = calibrableSensors[sensorType];
-                this.setDeviceWritingStatus(dsuid);
-                Promise.all([ this.setSensorOffset({ dsuid, sensorType, value }), (this.sensorsToUpdateOnLeave[sensorId] = { dsuid: this.device.dSUID }) ])
-                .then(() => {
-                    this.sensorsToUpdateOnLeave[sensorId].completed = true;
-                })
-                .then(() => this.fetchGeneralSetting({
-                    dsuid,
-                    settingName: calibrationDetails.correctionSettingName,
-                    errorMessage: 'Could not read current sensor correction value, allowed range is not up to date any more.'
-                }))
-                .then(() => {
-                    this.setSensorValue({ dsuid, id: sensorId, type: sensorType, exactValue: value, valid: true }); // change value in store
-                    this.updateSensors(); // update local copy
-                    Vue.set(this.sensorsInProgress, sensorId, false);
-                })
-                .catch((e) => {
-                    c.log(JSON.stringify(e));
-                    Vue.set(this.sensorsInProgress, sensorId, false);
+                this.$validator.validate(this.formName + '.' + sensorId + '_actual')
+                .then((result) => {
+                    if (!result) {
+                        return;
+                    }
+                    Vue.set(this.sensorsInProgress, sensorId, true);
+                    const sensorType = this.sensors.filter((sensor) => sensor.id === sensorId)[0].type;
+                    const dsuid = this.device.dSUID;
+                    const calibrationDetails = calibrableSensors[sensorType];
+                    this.setDeviceWritingStatus(dsuid);
+                    Promise.all([ this.setSensorOffset({ dsuid, sensorType, value }), (this.sensorsToUpdateOnLeave[sensorId] = { dsuid: this.device.dSUID }) ])
+                    .then(() => {
+                        this.sensorsToUpdateOnLeave[sensorId].completed = true;
+                    })
+                    .then(() => this.fetchGeneralSetting({
+                        dsuid,
+                        settingName: calibrationDetails.correctionSettingName,
+                        errorMessage: 'Could not read current sensor correction value, allowed range is not up to date any more.'
+                    }))
+                    .then(() => {
+                        this.setSensorValue({ dsuid, id: sensorId, type: sensorType, exactValue: value, valid: true }); // change value in store
+                        this.updateSensors(); // update local copy
+                        Vue.set(this.sensorsInProgress, sensorId, false);
+                    })
+                    .catch((e) => {
+                        c.log(JSON.stringify(e));
+                        Vue.set(this.sensorsInProgress, sensorId, false);
+                    });
                 });
             }
         }