1
0
mirror of https://gitlab.com/animath/si/plateforme.git synced 2024-12-25 05:42:23 +00:00

Remove bootstrap-datepicker-plus dependency, use native HTML selectors

This commit is contained in:
Emmy D'Anello 2023-02-19 19:18:25 +01:00
parent e17273391d
commit 2faade0156
Signed by: ynerant
GPG Key ID: 3A75C55819C8CF85
5 changed files with 18 additions and 21 deletions

View File

@ -6,12 +6,10 @@ from io import StringIO
import re import re
from typing import Iterable from typing import Iterable
from bootstrap_datepicker_plus.widgets import DatePickerInput, DateTimePickerInput
from django import forms from django import forms
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.core.validators import FileExtensionValidator from django.core.validators import FileExtensionValidator
from django.utils import formats
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from pypdf import PdfFileReader from pypdf import PdfFileReader
@ -126,22 +124,20 @@ class TournamentForm(forms.ModelForm):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.fields["date_start"].widget = DatePickerInput( self.fields["date_start"].widget = forms.DateInput(attrs={'type': 'date'}, format='%Y-%m-%d')
format=formats.get_format_lazy(format_type="DATE_INPUT_FORMATS", use_l10n=True)[0]) self.fields["date_end"].widget = forms.DateInput(attrs={'type': 'date'}, format='%Y-%m-%d')
self.fields["date_end"].widget = DatePickerInput( self.fields["inscription_limit"].widget = forms.DateTimeInput(attrs={'type': 'datetime-local'},
format=formats.get_format_lazy(format_type="DATE_INPUT_FORMATS", use_l10n=True)[0]) format='%Y-%m-%d %H:%M')
self.fields["inscription_limit"].widget = DateTimePickerInput( self.fields["solution_limit"].widget = forms.DateTimeInput(attrs={'type': 'datetime-local'},
format=formats.get_format_lazy(format_type="DATETIME_INPUT_FORMATS", use_l10n=True)[0]) format='%Y-%m-%d %H:%M')
self.fields["solution_limit"].widget = DateTimePickerInput( self.fields["solutions_draw"].widget = forms.DateTimeInput(attrs={'type': 'datetime-local'},
format=formats.get_format_lazy(format_type="DATETIME_INPUT_FORMATS", use_l10n=True)[0]) format='%Y-%m-%d %H:%M')
self.fields["solutions_draw"].widget = DateTimePickerInput( self.fields["syntheses_first_phase_limit"].widget = forms.DateTimeInput(attrs={'type': 'datetime-local'},
format=formats.get_format_lazy(format_type="DATETIME_INPUT_FORMATS", use_l10n=True)[0]) format='%Y-%m-%d %H:%M')
self.fields["syntheses_first_phase_limit"].widget = DateTimePickerInput( self.fields["solutions_available_second_phase"].widget = forms.DateTimeInput(attrs={'type': 'datetime-local'},
format=formats.get_format_lazy(format_type="DATETIME_INPUT_FORMATS", use_l10n=True)[0]) format='%Y-%m-%d %H:%M')
self.fields["solutions_available_second_phase"].widget = DateTimePickerInput( self.fields["syntheses_second_phase_limit"].widget = forms.DateTimeInput(attrs={'type': 'datetime-local'},
format=formats.get_format_lazy(format_type="DATETIME_INPUT_FORMATS", use_l10n=True)[0]) format='%Y-%m-%d %H:%M')
self.fields["syntheses_second_phase_limit"].widget = DateTimePickerInput(
format=formats.get_format_lazy(format_type="DATETIME_INPUT_FORMATS", use_l10n=True)[0])
self.fields["organizers"].widget = forms.CheckboxSelectMultiple() self.fields["organizers"].widget = forms.CheckboxSelectMultiple()
self.fields["organizers"].queryset = VolunteerRegistration.objects.all() self.fields["organizers"].queryset = VolunteerRegistration.objects.all()

View File

@ -99,6 +99,10 @@ class StudentRegistrationForm(forms.ModelForm):
""" """
A student can update its class, its school and if it allows Animath to contact him/her later. A student can update its class, its school and if it allows Animath to contact him/her later.
""" """
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.fields["birth_date"].widget = forms.DateInput(attrs={'type': 'date'}, format='%Y-%m-%d')
class Meta: class Meta:
model = StudentRegistration model = StudentRegistration
fields = ('team', 'student_class', 'birth_date', 'gender', 'address', 'zip_code', 'city', 'phone_number', fields = ('team', 'student_class', 'birth_date', 'gender', 'address', 'zip_code', 'city', 'phone_number',

View File

@ -1,5 +1,4 @@
Django>=3.2,<4.0 Django>=3.2,<4.0
django-bootstrap-datepicker-plus~=4.0
django-cas-server~=2.0 django-cas-server~=2.0
django-crispy-forms~=1.14 django-crispy-forms~=1.14
django-extensions~=3.2 django-extensions~=3.2

View File

@ -53,7 +53,6 @@ INSTALLED_APPS = [
'django.contrib.staticfiles', 'django.contrib.staticfiles',
'django.forms', 'django.forms',
'bootstrap_datepicker_plus',
'crispy_forms', 'crispy_forms',
'django_filters', 'django_filters',
'django_tables2', 'django_tables2',

View File

@ -12,7 +12,6 @@ sitepackages = False
deps = deps =
coverage coverage
Django>=3.2,<4.0 Django>=3.2,<4.0
django-bootstrap-datepicker-plus~=4.0
django-crispy-forms~=1.14 django-crispy-forms~=1.14
django-filter~=22.1 django-filter~=22.1
django-haystack~=3.2 django-haystack~=3.2