feat: use proper datepicker widgets

Resolves #58
This commit is contained in:
James Graham
2021-02-01 16:50:12 +00:00
parent afae0fd943
commit 25a28755c6
3 changed files with 5 additions and 14 deletions

View File

@@ -157,6 +157,7 @@ THIRD_PARTY_APPS = [
'django_select2', 'django_select2',
'rest_framework', 'rest_framework',
'post_office', 'post_office',
'bootstrap_datepicker_plus',
] ]
FIRST_PARTY_APPS = [ FIRST_PARTY_APPS = [

View File

@@ -3,25 +3,13 @@
import typing import typing
from django import forms from django import forms
from django.forms.widgets import SelectDateWidget
from django.utils import timezone
from bootstrap_datepicker_plus import DatePickerInput
from django_select2.forms import ModelSelect2Widget, Select2Widget, Select2MultipleWidget from django_select2.forms import ModelSelect2Widget, Select2Widget, Select2MultipleWidget
from . import models from . import models
def get_date_year_range() -> typing.Iterable[int]:
"""
Get sensible year range for SelectDateWidgets in the past.
By default these widgets show 10 years in the future.
"""
num_years_display = 60
this_year = timezone.datetime.now().year
return range(this_year, this_year - num_years_display, -1)
class OrganisationForm(forms.ModelForm): class OrganisationForm(forms.ModelForm):
"""Form for creating / updating an instance of :class:`Organisation`.""" """Form for creating / updating an instance of :class:`Organisation`."""
class Meta: class Meta:
@@ -100,6 +88,7 @@ class PersonAnswerSetForm(forms.ModelForm, DynamicAnswerSetBase):
widgets = { widgets = {
'nationality': Select2Widget(), 'nationality': Select2Widget(),
'country_of_residence': Select2Widget(), 'country_of_residence': Select2Widget(),
'organisation_started_date': DatePickerInput(format='%Y-%m-%d'),
'themes': Select2MultipleWidget(), 'themes': Select2MultipleWidget(),
'latitude': forms.HiddenInput, 'latitude': forms.HiddenInput,
'longitude': forms.HiddenInput, 'longitude': forms.HiddenInput,
@@ -196,5 +185,5 @@ class NetworkFilterForm(DynamicAnswerSetBase):
# Add date field to select relationships at a particular point in time # Add date field to select relationships at a particular point in time
self.fields['date'] = forms.DateField( self.fields['date'] = forms.DateField(
required=False, required=False,
widget=SelectDateWidget(years=get_date_year_range()), widget=DatePickerInput(format='%Y-%m-%d'),
help_text='Show relationships as they were on this date') help_text='Show relationships as they were on this date')

View File

@@ -4,6 +4,7 @@ dj-database-url==0.5.0
Django==2.2.10 Django==2.2.10
django-appconf==1.0.3 django-appconf==1.0.3
django-bootstrap4==1.1.1 django-bootstrap4==1.1.1
django-bootstrap-datepicker-plus==3.0.5
django-constance==2.6.0 django-constance==2.6.0
django-countries==5.5 django-countries==5.5
django-dbbackup==3.2.0 django-dbbackup==3.2.0