diff options
Diffstat (limited to 'archaeological_files_pdl/forms.py')
| -rw-r--r-- | archaeological_files_pdl/forms.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/archaeological_files_pdl/forms.py b/archaeological_files_pdl/forms.py index e0a8f119b..14cb0e4d9 100644 --- a/archaeological_files_pdl/forms.py +++ b/archaeological_files_pdl/forms.py @@ -30,12 +30,13 @@ from ishtar_common.models import Person, Town, Department, valid_id, \ from archaeological_files import models from ishtar_common.forms import get_now, reverse_lazy, ManageOldType, \ - CustomForm, FieldType + CustomForm, FieldType, IshtarForm from ishtar_common import widgets +from bootstrap_datepicker.widgets import DatePicker -class FileFormGeneral(CustomForm, ManageOldType, forms.Form): +class FileFormGeneral(CustomForm, ManageOldType): form_label = _("General") form_admin_name = _(u"Archaeological file - 010 - General") form_slug = "file-010-general" @@ -46,9 +47,9 @@ class FileFormGeneral(CustomForm, ManageOldType, forms.Form): validators=[validators.MinValueValidator(1000), validators.MaxValueValidator(2100)]) creation_date = forms.DateField(label=_(u"Creation date"), - initial=get_now, widget=widgets.JQueryDate) + initial=get_now, widget=DatePicker) reception_date = forms.DateField( - label=_(u"Reception date"), initial=get_now, widget=widgets.JQueryDate) + label=_(u"Reception date"), initial=get_now, widget=DatePicker) TYPES = [ FieldType('file_type', models.FileType), @@ -149,7 +150,7 @@ class PersonOrgaForm(forms.Form): def _media(self): if self.status == 'corporation': - return forms.Media(js=('pdl/JQueryCorporation.js',)) + return forms.Media(js=('js/JQueryCorporation.js',)) media = property(_media) def __init__(self, *args, **kwargs): @@ -403,7 +404,7 @@ class FileFormPlanningService(CustomForm, forms.Form): ) -class FileFormInstruction(CustomForm, forms.Form): +class FileFormInstruction(CustomForm, IshtarForm): form_label = u"Instruction SRA" form_admin_name = _("Archaeological file - 050 - Instruction") form_slug = "file-050-instruction" @@ -428,7 +429,7 @@ class FileFormInstruction(CustomForm, forms.Form): validators=[valid_id(models.File)]) comment = forms.CharField(label=_(u"Comment"), widget=forms.Textarea, required=False) - instruction_deadline = forms.DateField(widget=widgets.JQueryDate, + instruction_deadline = forms.DateField(widget=DatePicker, required=False) year = forms.IntegerField(label=_("Year"), validators=[validators.MinValueValidator(1000), @@ -436,7 +437,7 @@ class FileFormInstruction(CustomForm, forms.Form): numeric_reference = forms.IntegerField(label=_("Numeric reference"), required=False) numeric_reference_is_readonly = True - end_date = forms.DateField(widget=widgets.JQueryDate, required=False) + end_date = forms.DateField(widget=DatePicker, required=False) def __init__(self, *args, **kwargs): c_year = datetime.date.today().year |