Skip to content
Snippets Groups Projects
Commit 95b70459 authored by anonymous's avatar anonymous
Browse files

fix date handling

parent eb16cd60
No related branches found
No related tags found
No related merge requests found
...@@ -30,17 +30,15 @@ this.ckan.module('odsh_datepicker', function ($, _) ...@@ -30,17 +30,15 @@ this.ckan.module('odsh_datepicker', function ($, _)
{ {
var dateString = $(ev.target).val() var dateString = $(ev.target).val()
var date = moment(dateString, "DD.MM.YYYY", true) var date = moment(dateString, "DD.MM.YYYY", true)
console.log(date)
var isValid = date.isValid() && (dateString.length == 10) var isValid = date.isValid() && (dateString.length == 10)
if (isValid) if (isValid)
{ {
var serverDate = date.format(serverFormat); var serverDate = date.format(serverFormat);
console.log(serverDate)
target.val(serverDate); target.val(serverDate);
} }
else else
{ {
target.val(''); target.val(dateString);
} }
} }
var onClear = function (ev) var onClear = function (ev)
......
...@@ -82,8 +82,6 @@ def _set_value(data, field, value): ...@@ -82,8 +82,6 @@ def _set_value(data, field, value):
def validate_extra_date_new(key, field, data, optional, errors): def validate_extra_date_new(key, field, data, optional, errors):
value = _extract_value(data, field) value = _extract_value(data, field)
print("DATE", value)
if not value: if not value:
if not optional: if not optional:
errors[field] = 'empty' errors[field] = 'empty'
...@@ -91,15 +89,11 @@ def validate_extra_date_new(key, field, data, optional, errors): ...@@ -91,15 +89,11 @@ def validate_extra_date_new(key, field, data, optional, errors):
else: else:
if re.match(r'\d\d\d\d-\d\d-\d\d', value): if re.match(r'\d\d\d\d-\d\d-\d\d', value):
try: try:
print ("BEOFRE PARSE", value)
dt=parse(value) dt=parse(value)
print("PARSED DATE", dt)
_set_value(data, field, dt.isoformat()) _set_value(data, field, dt.isoformat())
return return
except ValueError: except ValueError:
print('ERROR from Exception')
pass pass
print('ERROR')
errors[field] = 'not a valid date' errors[field] = 'not a valid date'
def validate_licenseAttributionByText(key, data, errors,context): def validate_licenseAttributionByText(key, data, errors,context):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment