Fix ControlDecimal and Date filter in ControlQueryList

pyforms_web/controls/control_decimal.py

@@ -16,8 +16,5 @@ def deserialize(self, properties):
 
         :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_querylist.py

@@ -1,26 +1,16 @@
-from decimal import Decimal
+import locale, csv, itertools, simplejson, datetime
 
-from pyforms_web.controls.control_base import ControlBase
+from decimal import Decimal
+from django.db import models
 from django.apps import apps
-
-from pyforms_web.web.middleware import PyFormsMiddleware
-from django.core.exceptions import FieldDoesNotExist
-
-from django.utils.dateparse import parse_datetime
 from django.db.models import Q
-import simplejson, datetime
-from django.utils import timezone
-from django.conf import settings
-from django.db import models
-from datetime import timedelta
-from calendar import monthrange
 from django.utils import timezone
-import locale, csv, itertools
-
-from pyforms_web.utils import get_lookup_verbose_name, get_lookup_value, get_lookup_field
+from django.http import HttpResponse
 from django.db.models.fields.files import FieldFile
+from pyforms_web.web.middleware import PyFormsMiddleware
+from pyforms_web.controls.control_base import ControlBase
+from pyforms_web.utils import get_lookup_verbose_name, get_lookup_value, get_lookup_field
 
-from django.http import HttpResponse
 
 class ControlQueryList(ControlBase):
 
@@ -209,10 +199,10 @@ def value(self, value):
 
 
     def serialize(self, init_form=False):
-        data            = ControlBase.serialize(self)
-        queryset        = self.value
+        data     = ControlBase.serialize(self)
+        queryset = self.value
 
-        rows            = []
+        rows = []
 
         if self._update_list and queryset:
             row_start = self.rows_per_page*(self._current_page-1)

pyforms_web/web/static/pyformsjs/ControlQueryList.js

@@ -135,6 +135,16 @@ class ControlQueryList extends ControlBase{
         }
     }
 
+    pad(number, size){
+        var s = String(number);
+        while (s.length < (size || 2)) {s = "0" + s;}
+        return s;
+    }
+
+    formatdate(date){
+        return date.getFullYear()+'-'+this.pad(date.getMonth()+1,2)+'-'+this.pad(date.getDate(),2);
+    }
+
     collect_filters_values(){
         var filters = this.properties.filters_list;
         this.properties.filter_by = [];
@@ -151,8 +161,15 @@ class ControlQueryList extends ControlBase{
                     var end   = $(`#${this.control_id()}-filter-${filter.column} .end`).val();
                     var filter_value = begin?`${filter.column}__gte=${begin}`:'';
                     filter_value += (begin && end)?`&`:'';
-                    filter_value += end?`${filter.column}__lte=${end}`:'';
 
+                    if( end ){
+                        end = new Date(end);
+                        end.setDate( end.getDate()+1 );
+                    }else{
+                        end = undefined;
+                    }
+
+                    filter_value += end?`${filter.column}__lte=${this.formatdate(end)}`:'';
                     break;
             }