Archaeological files: add departments to preventive forms - Wizards manage several many to many in one form

3 files changed, 13 insertions, 7 deletions

diff --git a/archaeological_files_pdl/forms.py b/archaeological_files_pdl/forms.py
index a0c5037e7..3b5ed4601 100644
--- a/archaeological_files_pdl/forms.py
+++ b/archaeological_files_pdl/forms.py
@@ -24,7 +24,7 @@ from django.core import validators
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext_lazy as _
 
-from ishtar_common.models import Person, PersonType, Town, valid_id
+from ishtar_common.models import Person, PersonType, Town, Department, valid_id
 from archaeological_files import models
 
 from ishtar_common.forms import get_now, reverse_lazy
@@ -74,12 +74,14 @@ class FileFormPreventiveType(forms.Form):
 
 class FileFormPlanning(forms.Form):
     form_label = _(u"Planning")
-    base_model = 'town'
-    associated_models = {'town': Town}
+    base_models = ['town', 'department']
+    associated_models = {'town': Town, 'department': Department}
     name = forms.CharField(label=_(u"Planning name"), required=False,
                            max_length=100)
     town = widgets.MultipleAutocompleteField(
         model=Town, label=_("Towns"), required=False)
+    department = widgets.MultipleAutocompleteField(
+        model=Department, label=_("Departments"), required=False)
     locality = forms.CharField(label=_(u"Locality"), max_length=100,
                                required=False)
     address = forms.CharField(
@@ -266,7 +268,6 @@ class FileFormPlanningService(forms.Form):
 
     def is_valid(self, *args, **kwargs):
         c = super(FileFormPlanningService, self).is_valid(*args, **kwargs)
-        print(self.cleaned_data)
         return c
 
 
@@ -283,7 +284,7 @@ class FileFormInstruction(forms.Form):
             limit={
                 'person_types': [
                     PersonType.objects.get(txt_idx='sra_agent').pk]
-                },
+            },
             associated_model=Person, new=True),
         validators=[valid_id(Person)])
     related_file = forms.IntegerField(
diff --git a/archaeological_files_pdl/models.py b/archaeological_files_pdl/models.py
index 71a836239..6b2021999 100644
--- a/archaeological_files_pdl/models.py
+++ b/archaeological_files_pdl/models.py
@@ -1,3 +1 @@
-from django.db import models
-
 # Create your models here.
diff --git a/archaeological_files_pdl/templates/ishtar/wizard/wizard_preventiveplanning.html b/archaeological_files_pdl/templates/ishtar/wizard/wizard_preventiveplanning.html
index 6bd5598b6..1be5b1b36 100644
--- a/archaeological_files_pdl/templates/ishtar/wizard/wizard_preventiveplanning.html
+++ b/archaeological_files_pdl/templates/ishtar/wizard/wizard_preventiveplanning.html
@@ -32,6 +32,13 @@
 </tr>
 
 <tr>
+  <th colspan='2'><label for="id_preventiveplanning-{{CURRENT_ACTION}}-department">{% trans "Departments" %}</label></th>
+</tr>
+<tr>
+  <td>{{wizard.form.department|safe}}</td>
+</tr>
+
+<tr>
   <th colspan='2'><label for="id_preventiveplanning-{{CURRENT_ACTION}}-locality">Lieu-dit</label></th>
 </tr>
 <tr>