diff options
Diffstat (limited to 'archaeological_files/forms.py')
| -rw-r--r-- | archaeological_files/forms.py | 75 |
1 files changed, 54 insertions, 21 deletions
diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py index 42b3f6b6f..8b3513438 100644 --- a/archaeological_files/forms.py +++ b/archaeological_files/forms.py @@ -53,14 +53,25 @@ class FileSelect(TableSelect): internal_reference = forms.CharField(max_length=200, label=_("Other reference")) towns = get_town_field() + parcel = ParcelField(label=_("Parcel (section/number)")) if settings.ISHTAR_DPTS: towns__numero_insee__startswith = forms.ChoiceField( label="Department", choices=[]) name = forms.CharField(label=_(u"File name"), max_length=200) file_type = forms.ChoiceField(label=_("File type"), choices=[]) - saisine_type = forms.ChoiceField(label=_("Saisine type"), choices=[]) - parcel = ParcelField(label=_("Parcel (section/number)")) end_date = forms.NullBooleanField(label=_(u"Is active?")) + saisine_type = forms.ChoiceField(label=_("Saisine type"), choices=[]) + permit_type = forms.ChoiceField(label=_("Permit type"), choices=[]) + permit_reference = forms.CharField(max_length=200, + label=_("Permit reference")) + comment = forms.CharField(label=_(u"Comment"), max_length=500) + in_charge = forms.IntegerField( + label=_(u"In charge"), + widget=widgets.JQueryAutoComplete( + reverse_lazy('autocomplete-person', + args=[SRA_AGENT.pk]), + associated_model=Person), + validators=[valid_id(Person)]) general_contractor = forms.IntegerField( label=_(u"General contractor"), widget=widgets.JQueryAutoComplete( @@ -75,27 +86,27 @@ class FileSelect(TableSelect): args=[GENERAL_CONTRACTOR_ORGA.pk]), associated_model=Organization), validators=[valid_id(Organization)]) - in_charge = forms.IntegerField( - label=_(u"In charge"), + history_creator = forms.IntegerField( + label=_(u"Created by"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-person', - args=[SRA_AGENT.pk]), + args=['0', 'user']), associated_model=Person), validators=[valid_id(Person)]) - history_creator = forms.IntegerField( - label=_(u"Created by"), + history_modifier = forms.IntegerField( + label=_(u"Modified by"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-person', args=['0', 'user']), associated_model=Person), validators=[valid_id(Person)]) - permit_reference = forms.CharField(max_length=200, - label=_("Permit reference")) def __init__(self, *args, **kwargs): super(FileSelect, self).__init__(*args, **kwargs) self.fields['saisine_type'].choices = models.SaisineType.get_types() self.fields['saisine_type'].help_text = models.SaisineType.get_help() + self.fields['permit_type'].choices = models.PermitType.get_types() + self.fields['permit_type'].help_text = models.PermitType.get_help() self.fields['file_type'].choices = models.FileType.get_types() self.fields['file_type'].help_text = models.FileType.get_help() if settings.ISHTAR_DPTS: @@ -407,8 +418,21 @@ class AdministrativeActFileModifySelect(TableSelect): class AdministrativeActFileSelect(TableSelect): - associated_file__towns = get_town_field() + year = forms.IntegerField(label=_("Year")) + index = forms.IntegerField(label=_("Index")) + if settings.COUNTRY == 'fr': + ref_sra = forms.CharField(label=u"Autre référence", + max_length=15) act_type = forms.ChoiceField(label=_("Act type"), choices=[]) + indexed = forms.NullBooleanField(label=_(u"Indexed?")) + associated_file__towns = get_town_field() + parcel = ParcelField(label=_("Parcel (section/number)")) + if settings.ISHTAR_DPTS: + associated_file__towns__numero_insee__startswith = forms.ChoiceField( + label=_(u"Department"), choices=[]) + act_object = forms.CharField(label=_(u"Object"), + max_length=300) + signature_date_after = forms.DateField( label=_(u"Signature date after"), widget=widgets.JQueryDate) signature_date_before = forms.DateField( @@ -433,12 +457,12 @@ class AdministrativeActFileSelect(TableSelect): associated_model=Organization), validators=[valid_id(Organization)]) associated_file__numeric_reference = forms.IntegerField( - label=_("Numeric reference")) - associated_file__year = forms.IntegerField(label=_("Year")) + label=_("File numeric reference")) + associated_file__year = forms.IntegerField(label=_("File year")) associated_file__internal_reference = forms.CharField( - max_length=200, label=_("Other reference")) + max_length=200, label=_("File other reference")) associated_file__in_charge = forms.IntegerField( - label=_(u"In charge"), + label=_(u"File in charge"), widget=widgets.JQueryAutoComplete( reverse_lazy( 'autocomplete-person', @@ -446,12 +470,7 @@ class AdministrativeActFileSelect(TableSelect): associated_model=Person), validators=[valid_id(Person)]) associated_file__permit_reference = forms.CharField( - max_length=200, label=_("Permit reference")) - if settings.ISHTAR_DPTS: - operation__towns__numero_insee__startswith = forms.ChoiceField( - label=_(u"Department"), choices=[]) - act_object = forms.CharField(label=_(u"Object (full text search)"), - max_length=300) + max_length=200, label=_("File permit reference")) history_creator = forms.IntegerField( label=_(u"Created by"), widget=widgets.JQueryAutoComplete( @@ -460,6 +479,13 @@ class AdministrativeActFileSelect(TableSelect): args=['0', 'user']), associated_model=Person), validators=[valid_id(Person)]) + history_modifier = forms.IntegerField( + label=_(u"Modified by"), + widget=widgets.JQueryAutoComplete( + reverse_lazy('autocomplete-person', + args=['0', 'user']), + associated_model=Person), + validators=[valid_id(Person)]) def __init__(self, *args, **kwargs): super(AdministrativeActFileSelect, self).__init__(*args, **kwargs) @@ -468,10 +494,17 @@ class AdministrativeActFileSelect(TableSelect): self.fields['act_type'].help_text = ActType.get_help( dct={'intented_to': 'F'}) if settings.ISHTAR_DPTS: - k = 'operation__towns__numero_insee__startswith' + k = 'associated_file__towns__numero_insee__startswith' self.fields[k].choices = [ ('', '--')] + list(settings.ISHTAR_DPTS) + def get_input_ids(self): + ids = super(AdministrativeActFileSelect, self).get_input_ids() + ids.pop(ids.index('parcel')) + ids.append('parcel_0') + ids.append('parcel_1') + return ids + class AdministrativeActFileFormSelection(AdministrativeActOpeFormSelection): pk = forms.IntegerField( |