diff --git a/BaseModels/datetime_funcs.py b/BaseModels/datetime_funcs.py new file mode 100644 index 0000000..71719b1 --- /dev/null +++ b/BaseModels/datetime_funcs.py @@ -0,0 +1,11 @@ +from datetime import datetime +import pytz + +def get_cur_DT_by_timezone(timezone, DT=None): + if not DT: + DT = datetime.now() + + if not timezone: + return DT + + return DT.astimezone(tz=pytz.timezone(timezone)) \ No newline at end of file diff --git a/ReferenceDataApp/js_views.py b/ReferenceDataApp/js_views.py index 82cc07f..5dfda7a 100644 --- a/ReferenceDataApp/js_views.py +++ b/ReferenceDataApp/js_views.py @@ -70,7 +70,7 @@ def search_city_ajax(request): res_Dict = { - 'res_search_list': html + 'res_search_list': html, } from GeneralApp.funcs import get_add_to_ajax_response_Dict diff --git a/ReferenceDataApp/templatetags/__init__.py b/ReferenceDataApp/templatetags/__init__.py new file mode 100644 index 0000000..14c7ff2 --- /dev/null +++ b/ReferenceDataApp/templatetags/__init__.py @@ -0,0 +1 @@ +__author__ = 'SDE' diff --git a/ReferenceDataApp/templatetags/reference_data_tags.py b/ReferenceDataApp/templatetags/reference_data_tags.py new file mode 100644 index 0000000..91f8722 --- /dev/null +++ b/ReferenceDataApp/templatetags/reference_data_tags.py @@ -0,0 +1,17 @@ +__author__ = 'SDE' + +from django import template +from django.template.defaultfilters import stringfilter +from django.utils.safestring import mark_safe + +from BaseModels.datetime_funcs import get_cur_DT_by_timezone + +register = template.Library() + + +@register.filter +@stringfilter +def get_cur_DT_by_tz(timezone, DT=None): + return get_cur_DT_by_timezone(timezone, DT) + + diff --git a/RoutesApp/forms.py b/RoutesApp/forms.py index e10e851..2a47be6 100644 --- a/RoutesApp/forms.py +++ b/RoutesApp/forms.py @@ -55,6 +55,7 @@ class RouteForm(forms.ModelForm): error = get_phone_valid_error(cleaned_data["phone"]) if error: self.add_error('phone', error) + cleaned_data['phone'] = self.data['phone'] # if 'extra_phone' in cleaned_data and 'extra_phone' in cleaned_data: # from BaseModels.validators.form_field_validators import get_phone_valid_error diff --git a/templates/v2/content_widgets/cw_w_select_w_for_select.html b/templates/v2/content_widgets/cw_w_select_w_for_select.html index 8c8c101..09c630e 100644 --- a/templates/v2/content_widgets/cw_w_select_w_for_select.html +++ b/templates/v2/content_widgets/cw_w_select_w_for_select.html @@ -1,5 +1,6 @@ {% load static %} {% load i18n %} +{% load reference_data_tags %}