Add ControlDecimal and fix the ModelForm

docs/source/api-reference/python/controls.rst

@@ -151,6 +151,17 @@ ControlDateTime
 
 ----------------------------
 
+ControlDecimal
+----------------------------
+
+.. autoclass:: pyforms_web.controls.control_decimal.ControlDecimal
+    :members:
+    :undoc-members:
+    :show-inheritance:
+    :exclude-members: init_form, serialize, deserialize
+
+----------------------------
+
 ControlDir
 ----------------------------
 

pyforms_web/allcontrols.py

@@ -12,6 +12,7 @@
 from .controls.control_date                   import ControlDate
 from .controls.control_datetime               import ControlDateTime
 from .controls.control_dir                    import ControlDir
+from .controls.control_decimal                import ControlDecimal
 from .controls.control_email                  import ControlEmail
 from .controls.control_emptywidget            import ControlEmptyWidget
 from .controls.control_feed                   import ControlFeed

pyforms_web/controls/control_decimal.py

@@ -0,0 +1,23 @@
+from pyforms_web.controls.control_base import ControlBase
+import simplejson, decimal
+
+class ControlDecimal(ControlBase):
+
+	def init_form(self):
+		return """new ControlFloat('{0}', {1})""".format(
+			self._name, 
+			simplejson.dumps(self.serialize()) 
+		)
+
+
+	def deserialize(self, properties):
+		"""
+        Serialize the control data.
+
+        :param dict properties: Serialized data to load.
+        """
+		super().deserialize(properties)
+
+		str_val = properties.get('value', None)
+
+		self.value = decimal.Decimal(str_val) if str_val else None

pyforms_web/controls/control_float.py

@@ -1,6 +1,5 @@
 from pyforms_web.controls.control_base import ControlBase
 import simplejson
-from decimal import Decimal
 
 class ControlFloat(ControlBase):
 

pyforms_web/widgets/django/modelform.py

@@ -3,26 +3,22 @@
 from pyforms_web.controls.control_text               import ControlText
 from pyforms_web.controls.control_integer            import ControlInteger
 from pyforms_web.controls.control_float              import ControlFloat
+from pyforms_web.controls.control_decimal            import ControlDecimal
 from pyforms_web.controls.control_combo              import ControlCombo
 from pyforms_web.controls.control_autocomplete       import ControlAutoComplete
 from pyforms_web.controls.control_date               import ControlDate
 from pyforms_web.controls.control_datetime           import ControlDateTime
 from pyforms_web.controls.control_button             import ControlButton
-from pyforms_web.controls.control_querylist          import ControlQueryList
 from pyforms_web.controls.control_emptywidget        import ControlEmptyWidget
 from pyforms_web.controls.control_fileupload         import ControlFileUpload
 from pyforms_web.controls.control_checkbox           import ControlCheckBox
-from pyforms_web.controls.control_multipleselectionquery  import ControlMultipleSelectionQuery
-
-import collections
 from pyforms_web.web.middleware import PyFormsMiddleware
 from django.core.exceptions import ValidationError, FieldDoesNotExist, NON_FIELD_ERRORS
 from .utils import get_fieldsets_strings
 import traceback
 from django.conf import settings
 from django.db import models
 import os
-from django.db.models import Q
 from confapp import conf
 
 from pyforms_web.utils import get_lookup_verbose_name
@@ -703,6 +699,7 @@ def update_object_fields(self, obj):
             pyforms_field = getattr(self, field.name)
             value         = pyforms_field.value
 
+
             # if AutoField
             if   isinstance(field, models.AutoField):
                 continue
@@ -1038,7 +1035,7 @@ def create_model_formfields(self):
             elif isinstance(field, models.BooleanField):                pyforms_field = ControlCheckBox( label, default=field.default )
             elif isinstance(field, models.DateTimeField):               pyforms_field = ControlDateTime( label, default=field.default )
             elif isinstance(field, models.DateField):                   pyforms_field = ControlDate( label, default=field.default )
-            elif isinstance(field, models.DecimalField):                pyforms_field = ControlFloat( label, default=field.default )
+            elif isinstance(field, models.DecimalField):                pyforms_field = ControlDecimal( label, default=field.default )
             elif isinstance(field, models.FileField):                   pyforms_field = ControlFileUpload( label, default=field.default )
             elif isinstance(field, models.FloatField):                  pyforms_field = ControlFloat( label, default=field.default )
             elif isinstance(field, models.ImageField):                  pyforms_field = ControlFileUpload( label, default=field.default )