diff options
| -rw-r--r-- | archaeological_files/forms.py | 23 | ||||
| -rw-r--r-- | archaeological_files/views.py | 3 | ||||
| -rw-r--r-- | archaeological_operations/forms.py | 14 | ||||
| -rw-r--r-- | archaeological_operations/views.py | 6 |
4 files changed, 38 insertions, 8 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)], diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index 7d7b79d63..bcdd44cf6 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -589,8 +589,13 @@ OperationSourceFormSelection = get_form_selection( ################################################ class AdministrativeActOpeSelect(TableSelect): - operation__towns = get_town_field() + 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(AdministrativeActOpeSelect, self).__init__(*args, **kwargs) @@ -682,13 +687,12 @@ class GenerateDocForm(forms.Form): self.fields['doc_generation'].choices = [('', u'-'*9)] + \ [(choice.pk , unicode(choice)) for choice in choices] -class AdministrativeActRegisterSelect(TableSelect): - signature_date__year = forms.IntegerField(label=_(u"Year")) - act_type = forms.ChoiceField(label=_("Act type"), choices=[]) +class AdministrativeActRegisterSelect(AdministrativeActOpeSelect): def __init__(self, *args, **kwargs): super(AdministrativeActRegisterSelect, self).__init__(*args, **kwargs) - self.fields['act_type'].choices = models.ActType.get_types() + self.fields['act_type'].choices = models.ActType.get_types( + dct={'indexed':True}) self.fields['act_type'].help_text = models.ActType.get_help() class AdministrativeActRegisterFormSelection(forms.Form): diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py index 7e5a64ab4..a957fe8c1 100644 --- a/archaeological_operations/views.py +++ b/archaeological_operations/views.py @@ -148,12 +148,14 @@ get_administrativeactop = get_item(models.AdministrativeAct, 'get_administrativeactop', 'administrativeactop', extra_request_keys={'associated_file__towns':'associated_file__towns__pk', 'operation__towns':'operation__towns__pk', - 'act_type__intented_to':'act_type__intented_to'}, + 'act_type__intented_to':'act_type__intented_to', + 'year':'signature_date__year', + }, relative_session_names={'operation':'operation__pk'}) get_administrativeact = get_item(models.AdministrativeAct, 'get_administrativeact', 'administrativeact', - extra_request_keys={}) + extra_request_keys={'year':'signature_date__year',}) show_administrativeact = show_item(models.AdministrativeAct, 'administrativeact') def dashboard_operation(request, *args, **kwargs): |