Merge pull request #668 from WHOIGit/mario_dev_1.7.0

update crispy forms, bootstrap datepicker

config/settings/base.py

@@ -87,6 +87,7 @@
 ]
 THIRD_PARTY_APPS = [
     "crispy_forms",
+    "crispy_bootstrap4",
     "allauth",
     "allauth.account",
     "allauth.socialaccount",
@@ -126,6 +127,9 @@
 # https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps
 INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS
 
+CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap4"
+CRISPY_TEMPLATE_PACK = "bootstrap4"
+
 # MIGRATIONS
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#migration-modules

requirements/base.txt

@@ -15,7 +15,8 @@ django==4.2.13  # # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==4.0.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.63.3  # https://github.com/pennersr/django-allauth
-django-crispy-forms==1.9.2  # https://github.com/django-crispy-forms/django-crispy-forms
+django-crispy-forms==2.2  # https://github.com/django-crispy-forms/django-crispy-forms
+crispy-bootstrap4
 django-redis==4.12.1  # https://github.com/niwinz/django-redis
 
 # Django REST Framework
@@ -29,7 +30,7 @@ drf-flex-fields==1.0.2
 # Your custom requirements go here
 django-mptt==0.16.0
 django-summernote==0.8.20.0
-django-bootstrap-datepicker-plus==3.0.5
+django-bootstrap-datepicker-plus==5.0.5
 sigfig==1.1.8 #https://pypi.org/project/sigfig/
 django-tables2==2.7.0  # https://github.com/jieter/django-tables2
 #tablib==3.6.1  # https://github.com/jazzband/tablib for exporting/downloading tables2/tabular data

requirements/local.txt

@@ -7,7 +7,7 @@ psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.782  # https://github.com/python/mypy
-django-stubs==1.6.0  # https://github.com/typeddjango/django-stubs
+django-stubs==5.0.2  # https://github.com/typeddjango/django-stubs
 pytest==6.1.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 

roundabout/assemblies/forms.py

@@ -27,7 +27,7 @@
 from django.utils.translation import gettext_lazy as _
 
 from django_summernote.widgets import SummernoteWidget
-from bootstrap_datepicker_plus import DatePickerInput, DateTimePickerInput
+from bootstrap_datepicker_plus.widgets import DatePickerInput, DateTimePickerInput
 
 from roundabout.ooi_ci_tools.models import ReferenceDesignator, ReferenceDesignatorEvent
 from roundabout.ooi_ci_tools.forms import validate_reference_designator

roundabout/builds/forms.py

@@ -22,7 +22,7 @@
 from django import forms
 from django.forms.models import inlineformset_factory
 from django.utils import timezone
-from bootstrap_datepicker_plus import DatePickerInput, DateTimePickerInput
+from bootstrap_datepicker_plus.widgets import DatePickerInput, DateTimePickerInput
 from django.contrib.sites.models import Site
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import Layout, Fieldset, ButtonHolder, Submit, Div, Field

roundabout/calibrations/forms.py

@@ -19,7 +19,7 @@
 # If not, see <http://www.gnu.org/licenses/>.
 """
 
-from bootstrap_datepicker_plus import DatePickerInput
+from bootstrap_datepicker_plus.widgets import DatePickerInput
 from django import forms
 from django.core.exceptions import ValidationError
 from django.forms.models import inlineformset_factory

roundabout/configs_constants/forms.py

@@ -25,7 +25,7 @@
 from roundabout.parts.models import Part
 from roundabout.users.models import User
 from django.forms.models import inlineformset_factory, BaseInlineFormSet
-from bootstrap_datepicker_plus import DatePickerInput
+from bootstrap_datepicker_plus.widgets import DatePickerInput
 from sigfig import round
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _

roundabout/cruises/forms.py

@@ -21,7 +21,7 @@
 
 from django import forms
 from django.utils import timezone
-from bootstrap_datepicker_plus import DateTimePickerInput
+from bootstrap_datepicker_plus.widgets import DateTimePickerInput
 from roundabout.ooi_ci_tools.models import CruiseEvent
 from roundabout.calibrations.utils import reviewer_users
 

roundabout/inventory/forms.py

@@ -29,7 +29,7 @@
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import Layout, Fieldset, ButtonHolder, Submit, Div, Field
 from django_summernote.widgets import SummernoteInplaceWidget, SummernoteWidget
-from bootstrap_datepicker_plus import DatePickerInput, DateTimePickerInput
+from bootstrap_datepicker_plus.widgets import DatePickerInput, DateTimePickerInput
 from django.contrib.sites.models import Site
 
 from .models import (

roundabout/parts/forms.py

@@ -28,7 +28,7 @@
 from django.forms.models import inlineformset_factory
 from django.template.defaultfilters import slugify
 from django_summernote.widgets import SummernoteWidget
-from bootstrap_datepicker_plus import DatePickerInput, DateTimePickerInput
+from bootstrap_datepicker_plus.widgets import DatePickerInput, DateTimePickerInput
 from mptt.forms import TreeNodeChoiceField
 
 from .models import Part, PartType, Documentation, Revision