Custom form: archaeological files forms

2 files changed, 16 insertions, 6 deletions

diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py
index 7c254f936..cf8b8ea4b 100644
--- a/archaeological_files/forms.py
+++ b/archaeological_files/forms.py
@@ -25,6 +25,7 @@ import datetime
 from django import forms
 from django.conf import settings
 from django.core import validators
+from django.forms.formsets import formset_factory
 from django.utils.translation import ugettext_lazy as _
 from django.utils.safestring import mark_safe
 
@@ -34,12 +35,13 @@ from ishtar_common.models import Person, Organization, \
 from archaeological_operations.models import ActType, AdministrativeAct, \
     OperationType
 import models
+
 from ishtar_common.forms import FinalForm, get_now, reverse_lazy, TableSelect, \
     ManageOldType, CustomForm, FieldType
 from ishtar_common.forms_common import get_town_field
 from archaeological_operations.forms import AdministrativeActOpeForm, \
     AdministrativeActOpeFormSelection, \
-    ParcelField, SLICING, AdministrativeActModifForm
+    ParcelField, SLICING, AdministrativeActModifForm, ParcelForm, ParcelFormSet
 from ishtar_common import widgets
 
 
@@ -271,6 +273,13 @@ class FileFormGeneralRO(FileFormGeneral):
         return cleaned_data
 
 
+ParcelFormset = formset_factory(ParcelForm, can_delete=True,
+                                formset=ParcelFormSet)
+ParcelFormset.form_label = _(u"Parcels")
+ParcelFormset.form_admin_name = _("Archaeological file - 020 - Parcel")
+ParcelFormset.form_slug = "source-general"
+
+
 class FileFormPreventive(ManageOldType, forms.Form):
     form_label = _(u"Preventive informations")
     associated_models = {'general_contractor': Person,
@@ -329,8 +338,10 @@ class FileFormPreventive(ManageOldType, forms.Form):
         self.fields['permit_type'].help_text = models.PermitType.get_help()
 
 
-class FileFormResearch(ManageOldType, forms.Form):
+class FileFormResearch(CustomForm, ManageOldType, forms.Form):
     form_label = _("Research archaeology")
+    form_admin_name = _("Archaeological file - 045 - Research - General")
+    form_slug = "file-045-research-general"
     base_model = 'department'
     associated_models = {'scientist': Person,
                          'requested_operation_type': OperationType,
diff --git a/archaeological_files/views.py b/archaeological_files/views.py
index 0c0dac3f3..86fa83ee4 100644
--- a/archaeological_files/views.py
+++ b/archaeological_files/views.py
@@ -37,8 +37,7 @@ from archaeological_operations.wizards import AdministrativeActDeletionWizard, \
 from wizards import *
 
 from ishtar_common.forms_common import TownFormset
-from archaeological_operations.forms import ParcelFormSet, \
-    FinalAdministrativeActDeleteForm
+from archaeological_operations.forms import FinalAdministrativeActDeleteForm
 from ishtar_common.forms import ClosingDateFormSelection
 from forms import *
 
@@ -108,7 +107,7 @@ file_search_wizard = SearchWizard.as_view(
 file_creation_wizard = FileWizard.as_view(
     [('general-file_creation', FileFormGeneral),
      ('towns-file_creation', TownFormset),
-     ('parcels-file_creation', ParcelFormSet),
+     ('parcels-file_creation', ParcelFormset),
      ('preventive-file_creation', FileFormPreventive),
      ('research-file_creation', FileFormResearch),
      ('final-file_creation', FinalForm)],
@@ -127,7 +126,7 @@ file_modification_wizard = FileModificationWizard.as_view(
     [('selec-file_modification', FileFormSelection),
      ('general-file_modification', FileFormGeneralRO),
      ('towns-file_modification', TownFormset),
-     ('parcels-file_modification', ParcelFormSet),
+     ('parcels-file_modification', ParcelFormset),
      ('preventive-file_modification', FileFormPreventive),
      ('research-file_modification', FileFormResearch),
      ('final-file_modification', FinalForm)],