use regular WTForms DateField for requests dates
This commit is contained in:
@@ -1,23 +1,6 @@
|
||||
from wtforms.fields.html5 import DateField
|
||||
from wtforms.fields import Field, SelectField as SelectField_
|
||||
from wtforms.widgets import TextArea
|
||||
|
||||
from atst.domain.date import parse_date
|
||||
|
||||
|
||||
class DateField(DateField):
|
||||
def _value(self):
|
||||
if self.data:
|
||||
return parse_date(self.data)
|
||||
else:
|
||||
return None
|
||||
|
||||
def process_formdata(self, values):
|
||||
if values:
|
||||
self.data = values[0]
|
||||
else:
|
||||
self.data = None
|
||||
|
||||
|
||||
class NewlineListField(Field):
|
||||
widget = TextArea()
|
||||
|
@@ -1,9 +1,9 @@
|
||||
from wtforms.fields.html5 import EmailField, TelField
|
||||
from wtforms.fields.html5 import DateField, EmailField, TelField
|
||||
from wtforms.fields import RadioField, StringField
|
||||
from wtforms.validators import Required, Email
|
||||
import pendulum
|
||||
|
||||
from .fields import DateField, SelectField
|
||||
from .fields import SelectField
|
||||
from .forms import ValidatedForm
|
||||
from .validators import DateRange, PhoneNumber, Alphabet
|
||||
from .data import SERVICE_BRANCHES
|
||||
@@ -60,4 +60,5 @@ class OrgForm(ValidatedForm):
|
||||
message="Must be a date within the last year.",
|
||||
),
|
||||
],
|
||||
format="%m/%d/%Y",
|
||||
)
|
||||
|
@@ -1,8 +1,8 @@
|
||||
from wtforms.fields.html5 import IntegerField
|
||||
from wtforms.fields.html5 import DateField, IntegerField
|
||||
from wtforms.fields import RadioField, TextAreaField
|
||||
from wtforms.validators import Optional, Required
|
||||
|
||||
from .fields import DateField, SelectField
|
||||
from .fields import SelectField
|
||||
from .forms import ValidatedForm
|
||||
from .data import (
|
||||
SERVICE_BRANCHES,
|
||||
@@ -135,4 +135,5 @@ class RequestForm(ValidatedForm):
|
||||
start_date = DateField(
|
||||
description="When do you expect to start using the JEDI Cloud (not for billing purposes)?",
|
||||
validators=[Required()],
|
||||
format="%m/%d/%Y",
|
||||
)
|
||||
|
@@ -2,13 +2,11 @@ import re
|
||||
from wtforms.validators import ValidationError
|
||||
import pendulum
|
||||
|
||||
from atst.domain.date import parse_date
|
||||
|
||||
|
||||
def DateRange(lower_bound=None, upper_bound=None, message=None):
|
||||
def _date_range(form, field):
|
||||
now = pendulum.now().date()
|
||||
date = parse_date(field.data)
|
||||
date = field.data
|
||||
|
||||
if lower_bound is not None:
|
||||
if (now - lower_bound) > date:
|
||||
|
Reference in New Issue
Block a user