Merge pull request #1393 from WildMeOrg/1390_measurements_reset

1390 measurements reset

Author: erinz2020

frontend/src/components/generalInputs/NumberInput.jsx

@@ -0,0 +1,38 @@
+import React from "react";
+import { Form } from "react-bootstrap";
+
+const NumberInput = ({
+  value,
+  onChange,
+  placeholder = "input number",
+  label,
+  ...props
+}) => {
+  const handleChange = (e) => {
+    const inputValue = e.target.value;
+
+    if (inputValue === "") {
+      onChange("");
+      return;
+    }
+
+    if (/^-?\d*\.?\d*$/.test(inputValue)) {
+      onChange(inputValue);
+    }
+  };
+
+  return (
+    <Form.Group>
+      {label && <Form.Label>{label}</Form.Label>}
+      <Form.Control
+        type="text"
+        value={value}
+        onChange={handleChange}
+        placeholder={placeholder}
+        {...props}
+      />
+    </Form.Group>
+  );
+};
+
+export default NumberInput;

frontend/src/pages/Encounter/MeasurementsEdit.jsx

@@ -1,7 +1,7 @@
 import React, { useContext } from "react";
 import { observer } from "mobx-react-lite";
 import SelectInput from "../../components/generalInputs/SelectInput";
-import TextInput from "../../components/generalInputs/TextInput";
+import NumberInput from "../../components/generalInputs/NumberInput";
 import { Divider } from "../../components/Divider";
 import LocaleContext from "../../IntlProvider";
 import { useIntl } from "react-intl";
@@ -26,18 +26,11 @@ export const MeasurementsEdit = observer(({ store }) => {
               return (
                 <div key={type}>
                   <h6>{type}</h6>
-                  <TextInput
+                  <NumberInput
                     label={unitLabel}
                     value={cur.value ?? ""}
                     onChange={(value) => {
                       store.errors.setFieldError("measurement", type, null);
-                      if (value === "") {
-                        store.errors.setFieldError(
-                          "measurement",
-                          type,
-                          "Value cannot be empty",
-                        );
-                      }
                       store.setMeasurementValue(type, value);
                     }}
                   />
@@ -47,13 +40,6 @@ export const MeasurementsEdit = observer(({ store }) => {
                     options={samplingProtocolOptions}
                     onChange={(samplingProtocol) => {
                       store.errors.setFieldError("measurement", type, null);
-                      if (!samplingProtocol || samplingProtocol === "") {
-                        store.errors.setFieldError(
-                          "measurement",
-                          type,
-                          "Value cannot be empty",
-                        );
-                      }
                       store.setMeasurementSamplingProtocol(
                         type,
                         samplingProtocol,

frontend/src/pages/Encounter/stores/EncounterStore.js

@@ -954,25 +954,27 @@ class EncounterStore {
   async patchMeasurements() {
     const tasks = [];
     let hasErrors = false;
+
     for (const m of this.measurementValues) {
-      if (m.value == null || m.value === "") {
-        this.errors.setFieldError(
-          "measurement",
-          m.type,
-          "value cannot be empty",
-        );
-        continue;
-      }
-      const payload = {
-        op: "replace",
-        path: "measurements",
-        value: {
-          type: m.type,
-          units: m.units,
-          value: m.value,
-          samplingProtocol: m.samplingProtocol,
-        },
-      };
+      const isEmpty = m.value == null || m.value === "";
+
+      const payload = isEmpty
+        ? {
+            op: "remove",
+            path: "measurements",
+            value: m.type,
+          }
+        : {
+            op: "replace",
+            path: "measurements",
+            value: {
+              type: m.type,
+              units: m.units,
+              value: m.value,
+              samplingProtocol: m.samplingProtocol,
+            },
+          };
+
       tasks.push(
         axios
           .patch(`/api/v3/encounters/${this.encounterData.id}`, [payload], {
@@ -983,12 +985,15 @@ class EncounterStore {
             this.errors.setFieldError(
               "measurement",
               m.type,
-              "Failed to save measurement",
+              isEmpty
+                ? "Failed to remove measurement"
+                : "Failed to save measurement",
             );
             throw err;
           }),
       );
     }
+
     if (tasks.length > 0) {
       await Promise.allSettled(tasks);
     }

src/main/resources/bundles/de/commonConfigurationLabels.properties

@@ -15,9 +15,9 @@ meters.label=Meter
 ppm.label=ppm
 nounits= 
 
-samplingProtocol0.label=pers\u00F6nliche Vermutung
-samplingProtocol1.label=Sch\u00E4tzung des F\u00FChrers/Forschers
-samplingProtocol2.label=direkt gemessen
+samplingProtocol0.label=direkt gemessen
+samplingProtocol1.label=pers\u00F6nliche Vermutung
+samplingProtocol2.label=Sch\u00E4tzung des F\u00FChrers/Forschers
 
 left.label=Links
 right.label=Rechts

src/main/resources/bundles/en/commonConfigurationLabels.properties

@@ -15,9 +15,9 @@ meters.label=Meters
 ppm.label=ppm
 nounits= 
 
-samplingProtocol0.label=personal guess
-samplingProtocol1.label=guess of guide/researcher
-samplingProtocol2.label=directly measured
+samplingProtocol0.label=directly measured
+samplingProtocol1.label=personal guess
+samplingProtocol2.label=guess of guide/researcher
 
 left.label=Left
 right.label=Right

src/main/resources/bundles/es/commonConfigurationLabels.properties

@@ -15,9 +15,9 @@ meters.label=Metros
 ppm.label=ppm
 nounits = 
 
-samplingProtocol0.label=suposici\u00f3n personal
-samplingProtocol1.label=conjetura de gu\u00eda o investigador
-samplingProtocol2.label=medido directamente
+samplingProtocol0.label=medido directamente
+samplingProtocol1.label=suposici\u00f3n personal
+samplingProtocol2.label=conjetura de gu\u00eda o investigador
 
 left.label = Izquierda
 right.label = Derecho

src/main/resources/bundles/fr/commonConfigurationLabels.properties

@@ -15,9 +15,9 @@ meters.label=M\u00e8tres
 ppm.label=ppm
 nounits= 
 
-samplingProtocol0.label=estimation personnelle
-samplingProtocol1.label=estimation de guide/chercheur
-samplingProtocol2.label=directement mesur\u00e9
+samplingProtocol0.label=directement mesur\u00e9
+samplingProtocol1.label=estimation personnelle
+samplingProtocol2.label=estimation de guide/chercheur
 
 left.label=Gauche
 right.label=Droite

src/main/resources/bundles/it/commonConfigurationLabels.properties

@@ -15,9 +15,9 @@ meters.label=Metri
 ppm.label=ppm
 nounits= 
 
-samplingProtocol0.label = stima personale
-samplingProtocol1.label = stima della guida / del ricercatore
-samplingProtocol2.label = misurato direttamente 
+samplingProtocol0.label = misurato direttamente 
+samplingProtocol1.label = stima personale
+samplingProtocol2.label = stima della guida / del ricercatore
 
 left.label = Sinistra
 right.label = Destra