diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2014-01-17 14:28:41 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2014-01-17 14:28:41 +0100 |
| commit | 99c8984ef19e524c0b0a419a17f0e9c0732b0138 (patch) | |
| tree | 162945d752cf37ae82c874b6b4fba0ae804ad0f5 /archaeological_files | |
| parent | f3cb91ccbaf0c90f74e99fffb8e2122bd1d0db0e (diff) | |
| download | Ishtar-99c8984ef19e524c0b0a419a17f0e9c0732b0138.tar.bz2 Ishtar-99c8984ef19e524c0b0a419a17f0e9c0732b0138.zip | |
Improve administrativ act search (refs #1624)
Diffstat (limited to 'archaeological_files')
| -rw-r--r-- | archaeological_files/forms.py | 23 | ||||
| -rw-r--r-- | archaeological_files/views.py | 3 |
2 files changed, 25 insertions, 1 deletions
diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py index f65ee85c0..31badf4cb 100644 --- a/archaeological_files/forms.py +++ b/archaeological_files/forms.py @@ -220,6 +220,22 @@ class FinalFileDeleteForm(FinalForm): confirm_msg = " " confirm_end_msg = _(u"Would you like to delete this archaelogical file ?") +class AdministrativeActFileModifySelect(TableSelect): + year = forms.IntegerField(label=_("Year")) + index = forms.IntegerField(label=_("Index")) + if settings.COUNTRY == 'fr': + ref_sra = forms.CharField(label=u"Référence SRA", + max_length=15) + act_type = forms.ChoiceField(label=_("Act type"), choices=[]) + operation__towns = get_town_field() + + def __init__(self, *args, **kwargs): + super(AdministrativeActFileModifySelect, self).__init__(*args, **kwargs) + self.fields['act_type'].choices = ActType.get_types( + dct={'intented_to':'F'}) + self.fields['act_type'].help_text = ActType.get_help( + dct={'intented_to':'F'}) + class AdministrativeActFileSelect(TableSelect): associated_file__towns = get_town_field() act_type = forms.ChoiceField(label=_("Act type"), choices=[]) @@ -273,6 +289,13 @@ class AdministrativeActFileFormSelection(AdministrativeActOpeFormSelection): table_cols='TABLE_COLS_FILE'), validators=[valid_id(AdministrativeAct)]) +class AdministrativeActFileModifyFormSelection(AdministrativeActOpeFormSelection): + pk = forms.IntegerField(label="", required=False, + widget=widgets.JQueryJqGrid(reverse_lazy('get-administrativeactfile'), + AdministrativeActFileModifySelect, AdministrativeAct, + table_cols='TABLE_COLS_FILE'), + validators=[valid_id(AdministrativeAct)]) + class AdministrativeActFileForm(AdministrativeActOpeForm): act_type = forms.ChoiceField(label=_(u"Act type"), choices=[]) diff --git a/archaeological_files/views.py b/archaeological_files/views.py index 46032ba48..75443aab5 100644 --- a/archaeological_files/views.py +++ b/archaeological_files/views.py @@ -87,6 +87,7 @@ get_administrativeactfile = get_item(AdministrativeAct, (Person, 'associated_file__general_contractor')], dated_fields = ['signature_date__lte', 'signature_date__gte'], extra_request_keys={ + 'year':'signature_date__year', 'associated_file__towns':'associated_file__towns__pk', 'operation__towns':'operation__towns__pk', 'act_type__intented_to':'act_type__intented_to', @@ -170,7 +171,7 @@ file_administrativeactfile_wizard = FileAdministrativeActWizard.as_view([ file_administrativeactfile_modification_wizard = \ FileEditAdministrativeActWizard.as_view([ ('selec-file_administrativeactfile_modification', - AdministrativeActFileFormSelection), + AdministrativeActFileModifyFormSelection), ('administrativeact-file_administrativeactfile_modification', AdministrativeActFileForm), ('final-file_administrativeactfile_modification', FinalForm)], |