diff options
| -rw-r--r-- | archaeological_operations/forms.py | 93 |
1 files changed, 48 insertions, 45 deletions
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index 8bb30b730..981e4e3b9 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -411,24 +411,18 @@ OPERATOR, created = OrganizationType.objects.get_or_create(txt_idx='operator') class OperationSelect(TableSelect): - year = forms.IntegerField(label=_("Year")) - operation_code = forms.IntegerField(label=_(u"Numeric reference")) - common_name = forms.CharField(label=_(u"Name (full text search)"), - max_length=30) if settings.COUNTRY == 'fr': code_patriarche = forms.IntegerField(label="Code PATRIARCHE") - archaeological_sites = forms.IntegerField( - label=_("Archaelogical site"), - widget=widgets.JQueryAutoComplete( - reverse_lazy('autocomplete-archaeologicalsite'), - associated_model=models.ArchaeologicalSite), - validators=[valid_id(models.ArchaeologicalSite)]) + common_name = forms.CharField(label=_(u"Name (full text search)"), + max_length=30) + operation_type = forms.ChoiceField(label=_(u"Operation type"), + choices=[]) + year = forms.IntegerField(label=_("Year")) + operation_code = forms.IntegerField(label=_(u"Numeric reference")) towns = get_town_field() if settings.ISHTAR_DPTS: towns__numero_insee__startswith = forms.ChoiceField( label="Department", choices=[]) - operation_type = forms.ChoiceField(label=_(u"Operation type"), - choices=[]) scientist = forms.IntegerField( widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-person-permissive', @@ -436,6 +430,14 @@ class OperationSelect(TableSelect): unicode(SRA_AGENT.pk)])]), associated_model=Person), label=_(u"Scientist in charge")) + operator = forms.IntegerField( + label=_("Operator"), + widget=widgets.JQueryAutoComplete( + reverse_lazy('autocomplete-organization', args=[OPERATOR.pk]), + associated_model=Organization), + validators=[valid_id(Organization)]) + operator_reference = forms.CharField(label=_(u"Operator reference"), + max_length=20) in_charge = forms.IntegerField( widget=widgets.JQueryAutoComplete( reverse_lazy( @@ -445,14 +447,12 @@ class OperationSelect(TableSelect): ), associated_model=Person), label=_(u"In charge")) - operator = forms.IntegerField( - label=_("Operator"), + archaeological_sites = forms.IntegerField( + label=_("Archaelogical site"), widget=widgets.JQueryAutoComplete( - reverse_lazy('autocomplete-organization', args=[OPERATOR.pk]), - associated_model=Organization), - validators=[valid_id(Organization)]) - remains = forms.ChoiceField(label=_(u"Remains"), choices=[]) - periods = forms.ChoiceField(label=_(u"Periods"), choices=[]) + reverse_lazy('autocomplete-archaeologicalsite'), + associated_model=models.ArchaeologicalSite), + validators=[valid_id(models.ArchaeologicalSite)]) start_before = forms.DateField(label=_(u"Started before"), widget=widgets.JQueryDate) start_after = forms.DateField(label=_(u"Started after"), @@ -461,6 +461,8 @@ class OperationSelect(TableSelect): widget=widgets.JQueryDate) end_after = forms.DateField(label=_(u"Ended after"), widget=widgets.JQueryDate) + remains = forms.ChoiceField(label=_(u"Remains"), choices=[]) + periods = forms.ChoiceField(label=_(u"Periods"), choices=[]) parcel = ParcelField(label=_("Parcel (section/number)")) end_date = forms.NullBooleanField(label=_(u"Is open?")) history_creator = forms.IntegerField( @@ -664,6 +666,21 @@ class OperationFormGeneral(forms.Form): 'report_processing': models.ReportState, 'archaeological_site': models.ArchaeologicalSite} pk = forms.IntegerField(required=False, widget=forms.HiddenInput) + if settings.COUNTRY == 'fr': + code_patriarche = forms.IntegerField(label=u"Code PATRIARCHE", + required=False) + common_name = forms.CharField(label=_(u"Generic name"), required=False, + max_length=120, widget=forms.Textarea) + operation_type = forms.ChoiceField(label=_(u"Operation type"), + choices=[]) + year = forms.IntegerField(label=_(u"Year"), + initial=lambda: datetime.datetime.now().year, + validators=[validators.MinValueValidator(1900), + validators.MaxValueValidator(2100)]) + operation_code = forms.IntegerField( + label=_(u"Operation code"), + initial=models.Operation.get_available_operation_code, + widget=OperationCodeInput(attrs={'readonly': 'readonly'})) scientist = forms.IntegerField( label=_("Head scientist"), widget=widgets.JQueryAutoComplete( @@ -681,6 +698,8 @@ class OperationFormGeneral(forms.Form): limit={'organization_type': (OPERATOR.pk,)}, associated_model=Organization, new=True), validators=[valid_id(Organization)], required=False) + operator_reference = forms.CharField(label=_(u"Operator reference"), + required=False, max_length=20) in_charge = forms.IntegerField( label=_("In charge"), widget=widgets.JQueryAutoComplete( @@ -689,8 +708,14 @@ class OperationFormGeneral(forms.Form): associated_model=Person, limit={'person_types': [SRA_AGENT.pk]}, new=True), validators=[valid_id(Person)], required=False) - operation_type = forms.ChoiceField(label=_(u"Operation type"), - choices=[]) + surface = forms.IntegerField( + required=False, widget=widgets.AreaWidget, + label=_(u"Total surface (m2)"), + validators=[validators.MinValueValidator(0), + validators.MaxValueValidator(999999999)]) + archaeological_site = widgets.MultipleAutocompleteField( + model=models.ArchaeologicalSite, + label=_("Associated archaeological sites"), new=True, required=False) start_date = forms.DateField( label=_(u"Start date"), required=False, widget=widgets.JQueryDate) excavation_end_date = forms.DateField( @@ -701,36 +726,14 @@ class OperationFormGeneral(forms.Form): widget=widgets.JQueryDate) report_processing = forms.ChoiceField(label=_(u"Report processing"), choices=[], required=False) - surface = forms.IntegerField( - required=False, widget=widgets.AreaWidget, - label=_(u"Total surface (m2)"), - validators=[validators.MinValueValidator(0), - validators.MaxValueValidator(999999999)]) - year = forms.IntegerField(label=_(u"Year"), - initial=lambda: datetime.datetime.now().year, - validators=[validators.MinValueValidator(1900), - validators.MaxValueValidator(2100)]) - operation_code = forms.IntegerField( - label=_(u"Operation code"), - initial=models.Operation.get_available_operation_code, - widget=OperationCodeInput(attrs={'readonly': 'readonly'})) - common_name = forms.CharField(label=_(u"Generic name"), required=False, - max_length=120, widget=forms.Textarea) - operator_reference = forms.CharField(label=_(u"Operator reference"), - required=False, max_length=20) - archaeological_site = widgets.MultipleAutocompleteField( - model=models.ArchaeologicalSite, - label=_("Associated archaeological sites"), new=True, required=False) if settings.COUNTRY == 'fr': - negative_result = forms.NullBooleanField( - required=False, label=u"Résultat considéré comme négatif") - code_patriarche = forms.IntegerField(label=u"Code PATRIARCHE", - required=False) code_dracar = forms.CharField( label=u"Code DRACAR", required=False, validators=[validators.MaxLengthValidator(10)]) cira_date = forms.DateField(label=u"Date avis CIRA", required=False, widget=widgets.JQueryDate) + negative_result = forms.NullBooleanField( + required=False, label=u"Résultat considéré comme négatif") cira_rapporteur = forms.IntegerField( label=u"Rapporteur CIRA", widget=widgets.JQueryAutoComplete( |