diff options
| -rw-r--r-- | archaeological_operations/forms.py | 72 | ||||
| -rw-r--r-- | archaeological_operations/views.py | 3 |
2 files changed, 41 insertions, 34 deletions
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index 6966fff50..215ade6ca 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -51,7 +51,7 @@ from ishtar_common.forms import FinalForm, FormSet, get_now, \ reverse_lazy, get_form_selection, TableSelect, get_data_from_formset, \ ManageOldType, CustomForm, FieldType from ishtar_common.forms_common import TownFormSet, SourceForm, SourceSelect, \ - get_town_field + get_town_field, TownForm from archaeological_operations.utils import parse_parcels @@ -477,8 +477,8 @@ class RecordRelationsFormSetBase(FormSet): RecordRelationsFormSet = formset_factory( RecordRelationsForm, can_delete=True, formset=RecordRelationsFormSetBase) RecordRelationsFormSet.form_label = _(u"Relations") -RecordRelationsFormSet.form_admin_name = _("Operations - Relations") -RecordRelationsFormSet.form_slug = "operation-relations" +RecordRelationsFormSet.form_admin_name = _(u"Operation - 080 - Relations") +RecordRelationsFormSet.form_slug = "operation-080-relations" class OperationSelect(TableSelect): @@ -679,8 +679,8 @@ class OperationFormFileChoice(forms.Form): class OperationFormAbstract(CustomForm, forms.Form): form_label = _(u"Abstract") - form_admin_name = _("Operations - Abstract") - form_slug = "operation-abstract" + form_admin_name = _(u"Operation - 090 - Abstract") + form_slug = "operation-090-abstract" abstract = forms.CharField( label=_(u"Abstract"), widget=forms.Textarea(attrs={'class': 'xlarge'}), required=False) @@ -768,8 +768,8 @@ class DashboardForm(forms.Form): class OperationFormGeneral(ManageOldType, CustomForm, forms.Form): form_label = _(u"General") - form_admin_name = _(u"Operation - General") - form_slug = "operation-general" + form_admin_name = _(u"Operation - 010 - General") + form_slug = "operation-010-general" file_upload = True associated_models = {'scientist': Person, @@ -1014,8 +1014,8 @@ OperationFormModifGeneral.associated_models['associated_file'] = File class CollaboratorForm(CustomForm, forms.Form): form_label = _(u"Collaborators") - form_admin_name = _(u"Operation - Collaborators") - form_slug = "operation-collaborators" + form_admin_name = _(u"Operation - 020 - Collaborators") + form_slug = "operation-020-collaborators" base_models = ['collaborator'] associated_models = {'collaborator': Person, } @@ -1030,8 +1030,8 @@ class CollaboratorForm(CustomForm, forms.Form): class OperationFormPreventive(CustomForm, forms.Form): form_label = _(u"Preventive informations - excavation") - form_admin_name = _(u"Operation - Preventive - Excavation") - form_slug = "operation-preventive-excavation" + form_admin_name = _(u"Operation - 033 - Preventive - Excavation") + form_slug = "operation-033-preventive-excavation" cost = forms.IntegerField(label=_(u"Cost (euros)"), required=False) scheduled_man_days = forms.IntegerField(label=_(u"Scheduled man-days"), @@ -1049,8 +1049,8 @@ class OperationFormPreventive(CustomForm, forms.Form): class OperationFormPreventiveDiag(CustomForm, forms.Form): form_label = _("Preventive informations - diagnostic") - form_admin_name = _(u"Operation - Preventive - Diagnostic") - form_slug = "operation-preventive-diagnostic" + form_admin_name = _(u"Operation - 037 - Preventive - Diagnostic") + form_slug = "operation-037-preventive-diagnostic" if settings.COUNTRY == 'fr': zoning_prescription = forms.NullBooleanField( @@ -1080,7 +1080,13 @@ class SelectedTownForm(forms.Form): SelectedTownFormset = formset_factory(SelectedTownForm, can_delete=True, formset=TownFormSet) SelectedTownFormset.form_label = _(u"Towns") -SelectedTownFormset.form_slug = "towns" +SelectedTownFormset.form_admin_name = _(u"Operation - 040 - Towns") +SelectedTownFormset.form_slug = "operation-040-towns" + +TownFormset = formset_factory(TownForm, can_delete=True, formset=TownFormSet) +TownFormset.form_label = _("Towns") +TownFormset.form_admin_name = _(u"Operation - 040 - Towns (2)") +TownFormset.form_slug = "operation-040-towns-2" class SelectedParcelForm(forms.Form): @@ -1101,13 +1107,15 @@ class SelectedParcelForm(forms.Form): SelectedParcelFormSet = formset_factory(SelectedParcelForm, can_delete=True, formset=ParcelFormSet) SelectedParcelFormSet.form_label = _("Parcels") -SelectedParcelFormSet.form_admin_name = _(u"Operations - Parcels") -SelectedParcelFormSet.form_slug = "operation-parcels" +SelectedParcelFormSet.form_admin_name = _(u"Operation - 050 - Parcels") +SelectedParcelFormSet.form_slug = "operation-050-parcels" SelectedParcelGeneralFormSet = formset_factory(ParcelForm, can_delete=True, formset=ParcelFormSet) -SelectedParcelGeneralFormSet.form_admin_name = _("Parcels") -SelectedParcelGeneralFormSet.form_slug = "operation-parcels" +SelectedParcelGeneralFormSet.form_label = _("Parcels") +SelectedParcelGeneralFormSet.form_admin_name = _( + u"Operation - 050 - Parcels (2)") +SelectedParcelGeneralFormSet.form_slug = "operation-050-parcels-2" """ class SelectedParcelFormSet(forms.Form): @@ -1136,9 +1144,9 @@ class SelectedParcelFormSet(forms.Form): class RemainForm(CustomForm, ManageOldType, forms.Form): - form_label = _("Remain types") - form_admin_name = _("Operations - Remains") - form_slug = "operation-remains" + form_label = _(u"Remain types") + form_admin_name = _(u"Operation - 060 - Remains") + form_slug = "operation-060-remains" base_model = 'remain' associated_models = {'remain': models.RemainType} @@ -1152,9 +1160,9 @@ class RemainForm(CustomForm, ManageOldType, forms.Form): class PeriodForm(CustomForm, ManageOldType, forms.Form): - form_label = _("Periods") - form_admin_name = _("Operations - Periods") - form_slug = "operation-periods" + form_label = _(u"Periods") + form_admin_name = _(u"Operation - 070 - Periods") + form_slug = "operation-070-periods" base_model = 'period' associated_models = {'period': models.Period} @@ -1222,12 +1230,12 @@ class ArchaeologicalSiteBasicForm(forms.Form): required=False) -ArchaeologicalSiteFormSet = formset_factory(ArchaeologicalSiteBasicForm, - can_delete=True, formset=FormSet) -ArchaeologicalSiteFormSet.form_label = _("Archaeological sites") -ArchaeologicalSiteFormSet.form_admin_name = _("Operation - Archaeological " - "sites") -ArchaeologicalSiteFormSet.form_slug = "operation-archaeological-sites" +ArchaeologicalSiteFormSet = formset_factory( + ArchaeologicalSiteBasicForm, can_delete=True, formset=FormSet) +ArchaeologicalSiteFormSet.form_label = _(u"Archaeological sites") +ArchaeologicalSiteFormSet.form_admin_name = _( + u"Operation - 030 - Archaeological sites") +ArchaeologicalSiteFormSet.form_slug = "operation-030-archaeological-sites" class ArchaeologicalSiteSelectionForm(forms.Form): @@ -1255,7 +1263,7 @@ class OperationDeletionForm(FinalForm): class OperationSourceForm(SourceForm): - form_admin_name = _("Operation Sources - Main") + form_admin_name = _("Operation source - General") form_slug = "operation-source-relations" pk = forms.IntegerField(required=False, widget=forms.HiddenInput) @@ -1407,7 +1415,7 @@ class AdministrativeActOpeFormSelection(forms.Form): class AdministrativeActOpeForm(CustomForm, ManageOldType, forms.Form): form_label = _("General") - form_admin_name = _("Operations - Administrative act - General") + form_admin_name = _(u"Operation - Administrative act - General") form_slug = "operation-adminact-general" associated_models = {'act_type': models.ActType, } diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py index f295e0f9d..a4cb1f673 100644 --- a/archaeological_operations/views.py +++ b/archaeological_operations/views.py @@ -28,8 +28,7 @@ from django.utils.translation import ugettext_lazy as _, pgettext_lazy from ishtar_common.views import get_item, show_item, revert_item, new_item from ishtar_common.wizards import SearchWizard, check_rights_condition from ishtar_common.forms import ClosingDateFormSelection -from ishtar_common.forms_common import AuthorFormset, TownFormset, \ - SourceDeletionForm +from ishtar_common.forms_common import AuthorFormset, SourceDeletionForm from ishtar_common.models import get_current_profile from wizards import * from forms import * |