From 13b9ef1c26bb89349a15be94db7d01512e270d5a Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 12 Feb 2021 15:43:15 +0100 Subject: Refactor - clean --- archaeological_files_pdl/forms.py | 46 +++++++++++++++++++-------------------- archaeological_files_pdl/views.py | 4 ++-- 2 files changed, 25 insertions(+), 25 deletions(-) (limited to 'archaeological_files_pdl') diff --git a/archaeological_files_pdl/forms.py b/archaeological_files_pdl/forms.py index d4cc749a4..54cc51dde 100644 --- a/archaeological_files_pdl/forms.py +++ b/archaeological_files_pdl/forms.py @@ -43,7 +43,7 @@ from bootstrap_datepicker.widgets import DatePicker class FileFormGeneral(CustomForm, ManageOldType): form_label = _("General") - form_admin_name = _(u"Archaeological file - 010 - General") + form_admin_name = _("Archaeological file - 010 - General") form_slug = "file-010-general" associated_models = {'file_type': models.FileType} file_type = forms.ChoiceField(label=_("File type"), choices=[]) @@ -69,14 +69,14 @@ class FileFormGeneral(CustomForm, ManageOldType): class FileFormPreventiveType(CustomForm, ManageOldType, forms.Form): - form_label = u"Saisine" - form_admin_name = _(u"Archaeological file - 013 - Preventive - Saisine") + form_label = "Saisine" + form_admin_name = _("Archaeological file - 013 - Preventive - Saisine") form_slug = "file-013-preventivesaisine" associated_models = {'saisine_type': models.SaisineType, 'permit_type': models.PermitType} - permit_type = forms.ChoiceField(label=_(u"Permit type"), required=False, + permit_type = forms.ChoiceField(label=_("Permit type"), required=False, choices=[]) - saisine_type = forms.ChoiceField(label=_(u"Saisine type"), + saisine_type = forms.ChoiceField(label=_("Saisine type"), choices=[]) TYPES = [ FieldType('saisine_type', models.SaisineType), @@ -90,14 +90,14 @@ class FileFormPreventiveType(CustomForm, ManageOldType, forms.Form): class FileFormPlanning(CustomForm, ManageOldType): - form_label = _(u"Planning") - form_admin_name = _(u"Archaeological file - 017 - Preventive - Planning") + form_label = _("Planning") + form_admin_name = _("Archaeological file - 017 - Preventive - Planning") form_slug = "file-017-preventiveplanning" base_models = ['town', 'department'] associated_models = {'town': Town, 'department': Department} HEADERS = {} HEADERS['town'] = FormHeader(_("Localisation")) - name = forms.CharField(label=_(u"Planning name"), required=False, + name = forms.CharField(label=_("Planning name"), required=False, max_length=100) town = widgets.Select2MultipleField( model=Town, label=_("Towns"), required=False, remote=True) @@ -105,48 +105,48 @@ class FileFormPlanning(CustomForm, ManageOldType): model=Department, label=_("Departments"), required=False, help_text=_("Only relevant when no town is provided.") ) - locality = forms.CharField(label=_(u"Locality"), max_length=100, + locality = forms.CharField(label=_("Locality"), max_length=100, required=False) address = forms.CharField( - label=_(u"Address (number/street)"), - widget=forms.Textarea(attrs={"placeholder": _(u"Number/street")}), + label=_("Address (number/street)"), + widget=forms.Textarea(attrs={"placeholder": _("Number/street")}), required=False) - postal_code = forms.CharField(label=_(u"Postal code"), max_length=10, + postal_code = forms.CharField(label=_("Postal code"), max_length=10, required=False) HEADERS['total_surface'] = FormHeader(_("Surfaces")) total_surface = forms.FloatField( required=False, widget=widgets.AreaWidget, - label=_(u"Total surface (m2)"), + label=_("Total surface (m2)"), validators=[validators.MinValueValidator(0), validators.MaxValueValidator(999999999)]) total_developed_surface = forms.FloatField( widget=widgets.AreaWidget, - label=_(u"Total developed surface (m2)"), + label=_("Total developed surface (m2)"), required=False, validators=[validators.MinValueValidator(0), validators.MaxValueValidator(999999999)]) class FileFormResearchAddress(CustomForm, forms.Form): - form_label = _(u"Address") - form_admin_name = _(u"Archaeological file - 015 - Research - Address") + form_label = _("Address") + form_admin_name = _("Archaeological file - 015 - Research - Address") form_slug = "file-015-researchplanning" base_models = ['town', 'department'] associated_models = {'town': Town, 'department': Department} - name = forms.CharField(label=_(u"Project name"), required=False, + name = forms.CharField(label=_("Project name"), required=False, max_length=100) town = widgets.Select2MultipleField( model=Town, label=_("Towns"), required=False, remote=True) department = widgets.Select2MultipleField( model=Department, label=_("Departments"), required=False) - locality = forms.CharField(label=_(u"Locality"), max_length=100, + locality = forms.CharField(label=_("Locality"), max_length=100, required=False) address = forms.CharField( - label=_(u"Address (number/street)"), - widget=forms.Textarea(attrs={"placeholder": _(u"Number/street")}), + label=_("Address (number/street)"), + widget=forms.Textarea(attrs={"placeholder": _("Number/street")}), required=False) - postal_code = forms.CharField(label=_(u"Postal code"), max_length=10, + postal_code = forms.CharField(label=_("Postal code"), max_length=10, required=False) @@ -247,7 +247,7 @@ class PersonOrgaForm(forms.Form): class FileFormGeneralContractor(CustomForm, ManageOldType): - form_label = _(u"General contractor") + form_label = _("General contractor") form_admin_name = _("Archaeological file - 030 - General contractor") form_slug = "file-030-generalcontractor" extra_form_modals = ["person", "organization"] @@ -404,7 +404,7 @@ class FileFormInstruction(CustomForm, IshtarForm): widget=widgets.JQueryAutoComplete(reverse_lazy('autocomplete-file'), associated_model=models.File), validators=[valid_id(models.File)]) - comment = forms.CharField(label=_(u"Comment"), widget=forms.Textarea, + comment = forms.CharField(label=_("Comment"), widget=forms.Textarea, required=False) instruction_deadline = forms.DateField(widget=DatePicker, required=False) diff --git a/archaeological_files_pdl/views.py b/archaeological_files_pdl/views.py index 0f5d0171d..a7d0dee02 100644 --- a/archaeological_files_pdl/views.py +++ b/archaeological_files_pdl/views.py @@ -46,7 +46,7 @@ file_creation_wizard = FileWizard.as_view([ ('research-file_creation', ref_forms.FileFormResearch), ('instruction-file_creation', forms.FileFormInstruction), ('final-file_creation', ref_forms.FinalForm)], - label=_(u"New file"), + label=_("New file"), condition_dict={ 'preventivetype-file_creation': file_creation_wizard_is_preventive, 'preventiveplanning-file_creation': file_creation_wizard_is_preventive, @@ -73,7 +73,7 @@ file_modification_wizard = FileModificationWizard.as_view([ ('research-file_modification', ref_forms.FileFormResearch), ('instruction-file_modification', forms.FileFormInstructionEdit), ('final-file_modification', ref_forms.FinalForm)], - label=_(u"File modification"), + label=_("File modification"), condition_dict={ 'preventivetype-file_modification': file_modification_wizard_is_preventive, 'preventiveplanning-file_modification': -- cgit v1.2.3