Merge pull request #42 from senaite/fix-smaller-decimals

Fix cannot enter small decimals in breakpoint table

Author: ramonski

docs/changelog.rst

@@ -4,6 +4,7 @@ Changelog
 1.2.0 (unreleased)
 ------------------
 
+- #42 Fix cannot enter small decimals in breakpoint table
 - #40 Compatibility with core#2537 (Support multi-text on result entry)
 - #39 Compatibility with core#2584 (SampleType to DX)
 - #38 Compatibility with core#2595 (Move ARAnalysesField logic to data manager)

src/senaite/ast/configure.zcml

@@ -20,6 +20,7 @@
   <include package=".adapters" />
   <include package=".behaviors" />
   <include package=".browser"/>
+  <include package=".patches"/>
   <include package=".subscribers"/>
   <include package=".upgrade"/>
   <include package=".workflow"/>

src/senaite/ast/patches/__init__.py

@@ -0,0 +1,14 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:monkey="http://namespaces.plone.org/monkey"
+    i18n_domain="senaite.ast">
+
+  <monkey:patch
+      description="Patch `z3c.form.converter.NumberDataConverter` to prevent
+                   the error 'The entered value is not a valid decimal literal`
+                   for small declimal values like '0.0625'"
+      class="z3c.form.converter.NumberDataConverter"
+      original="toFieldValue"
+      replacement=".converter.toFieldValue" />
+
+</configure>

src/senaite/ast/patches/configure.zcml

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+import zope.i18n.format
+from z3c.form.converter import FormatterValidationError
+
+DECIMAL_PATTERN = u'#,##0.######;-#,##0.######'
+
+def toFieldValue(self, value):
+    """See interfaces.IDataConverter"""
+    if value == u'':
+        return self.field.missing_value
+    try:
+        return self.formatter.parse(value, pattern=DECIMAL_PATTERN)
+    except zope.i18n.format.NumberParseError:
+        raise FormatterValidationError(self.errorMessage, value)