Merge branch 'release/3.0.1' into release/3.0.0.2

dhis2 · Jul 12, 2024 · 63753e9 · 63753e9
2 parents d249148 + 03497ce
commit 63753e9
Showing 1 changed file with 2 additions and 11 deletions.
diff --git a/...2-mobile-program-rules/src/main/java/org/dhis2/mobileProgramRules/RuleEngineExtensions.kt b/...2-mobile-program-rules/src/main/java/org/dhis2/mobileProgramRules/RuleEngineExtensions.kt
@@ -473,17 +473,8 @@ fun List<TrackedEntityDataValue>.toRuleDataValue(
                         ""
                     }
             }
-        } else if (de?.valueType()?.isNumeric == true) {
-            value = if (value.isNullOrEmpty()) {
-                ""
-            } else {
-                try {
-                    value.toFloat().toString()
-                } catch (e: Exception) {
-                    Timber.e(e)
-                    ""
-                }
-            }
+        } else if (de?.valueType()?.isNumeric == true && value.isNullOrEmpty()) {
+            value = ""
         }
         RuleDataValue(
             eventDate = event.eventDate()!!.toRuleEngineInstant(),