Fix bug with ControlDate

UmSenhorQualquer · Apr 4, 2019 · c278257 · c278257
1 parent 173a67e
commit c278257
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/pyforms_web/controls/control_date.py b/pyforms_web/controls/control_date.py
@@ -1,4 +1,5 @@
 import datetime
+from datetime import date
 from pyforms_web.controls.control_base import ControlBase
 import simplejson
 
@@ -20,9 +21,7 @@ def value(self, value):
 
             if value is not None and not isinstance(value, datetime.date):
                 try:
-                    value = parse_datetime(value)
-                    value = timezone.localtime(value)
-                    value = value.date()
+                    value = datetime.datetime.strptime(value, '%Y%m%d')
                 except:
                     raise Exception('The value is not a valid date')
 
@@ -35,7 +34,7 @@ def value(self, value):
 
     def serialize(self):
         data = ControlBase.serialize(self)
-        
+
         if self.value:
             data.update({'value': self.value.isoformat()}  )
         return data
diff --git a/pyforms_web/web/static/pyforms.js b/pyforms_web/web/static/pyforms.js
diff --git a/pyforms_web/web/static/pyformsjs/ControlDate.js b/pyforms_web/web/static/pyformsjs/ControlDate.js
@@ -1,7 +1,6 @@
 class ControlDate extends ControlBase{
 
 	get_value(){ 
-		//if(this.jquery().length==0) return this.properties.value;
 		return this.jquery().datepicker('getDate');
 	};
 
@@ -22,6 +21,12 @@ class ControlDate extends ControlBase{
             this.jquery().val('');
     }
 
+    serialize(){
+		var d = this.get_value();
+		this.properties.value = d.getFullYear()+("0"+(d.getMonth()+1)).slice(-2)+ ("0" + d.getDate()).slice(-2);
+        return this.properties;
+    }
+
 	////////////////////////////////////////////////////////////////////////////////
 
 	init_control(){