Merge pull request #1112 from mozzy11/develop

Fix test Calculated
I-TECH-UW · Jun 18, 2024 · 058b621 · 058b621
2 parents 8fb3d26 + 64965a1
commit 058b621
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -89,7 +89,7 @@ accessing any of these links, simply follow these steps:
         cd frontend
         npm run format
 
-2.  After making changes to the [backend](./src/) directory, run the formatter to
-    properly format the Java code
+2.  After making changes to the [backend](./src/) directory, run the formatter
+    to properly format the Java code
 
         mvn clean install -P format
diff --git a/frontend/src/components/admin/calculatedValue/CalculatedValueForm.tsx b/frontend/src/components/admin/calculatedValue/CalculatedValueForm.tsx
@@ -477,6 +477,7 @@ const CalculatedValue: React.FC<CalculatedValueProps> = () => {
                 name="value"
                 type="number"
                 id={index + "_" + operationIndex + "_integer"}
+                step="any"
                 labelText={
                   <FormattedMessage id="testcalculation.label.integer" />
                 }

diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
     <minor.version>8</minor.version>
     <state.version>1</state.version>
     <!-- 0 = alpha, 1 = beta, 2 = rc, 3 = deployable -->
-    <fix.version>34</fix.version>
+    <fix.version>35</fix.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <liquibase.propertyFile>${project.basedir}/liquibase/liquibase.properties</liquibase.propertyFile>
     <castor.version>1.4.1</castor.version>

diff --git a/src/main/java/org/openelisglobal/testcalculated/action/util/TestCalculatedUtil.java b/src/main/java/org/openelisglobal/testcalculated/action/util/TestCalculatedUtil.java
@@ -172,7 +172,17 @@ public List<Analysis> addNewTestsToDBForCalculatedTests(
                               Operation.OperationType.TEST_RESULT.toString());
                           break;
                         case INTEGER:
-                          function.append(Integer.valueOf(operation.getValue())).append(" ");
+                          try {
+                            if (operation.getValue().contains(".")) {
+                              double val = Double.parseDouble(operation.getValue());
+                              function.append(val).append(" ");
+                            } else {
+                              int number = Integer.parseInt(operation.getValue());
+                              function.append(number).append(" ");
+                            }
+                          } catch (NumberFormatException e) {
+
+                          }
                           break;
                         case MATH_FUNCTION:
                           if (operation.getValue().equals(Operation.IN_NORMAL_RANGE)) {