Workon alternate administrativ wizard

* reorganization of address fields
* add a main town field
* reorganize parcel wizard
* workon new administrativ wizard

1 files changed, 41 insertions, 3 deletions

diff --git a/archaeological_files_pdl/forms.py b/archaeological_files_pdl/forms.py
index 87221f24c..aedf60ba1 100644
--- a/archaeological_files_pdl/forms.py
+++ b/archaeological_files_pdl/forms.py
@@ -27,14 +27,13 @@ from ishtar_common.models import Person
 from archaeological_files import models
 
 from ishtar_common.forms import get_now
+from ishtar_common.forms_common import get_town_field
 
 from ishtar_common import widgets
 
 class FileFormGeneral(forms.Form):
     form_label = _("General")
-    associated_models = {'in_charge':Person,
-                         'related_file':models.File,
-                         'file_type':models.FileType}
+    associated_models = {'file_type':models.FileType}
     file_type = forms.ChoiceField(label=_("File type"), choices=[])
     year = forms.IntegerField(label=_("Year"),
                               initial=lambda:datetime.datetime.now().year,
@@ -49,3 +48,42 @@ class FileFormGeneral(forms.Form):
         super(FileFormGeneral, self).__init__(*args, **kwargs)
         self.fields['file_type'].choices = models.FileType.get_types()
         self.fields['file_type'].help_text = models.FileType.get_help()
+
+class FileFormPreventiveType(forms.Form):
+    form_label = u"Saisine"
+    associated_models = {'saisine_type':models.SaisineType,
+                         'permit_type':models.PermitType}
+    permit_type = forms.ChoiceField(label=_(u"Permit type"), required=False,
+                                    choices=[])
+    saisine_type = forms.ChoiceField(label=_(u"Saisine type"),
+                                         choices=[])
+    def __init__(self, *args, **kwargs):
+        super(FileFormPreventiveType, self).__init__(*args, **kwargs)
+        self.fields['saisine_type'].choices = models.SaisineType.get_types()
+        self.fields['saisine_type'].help_text = models.SaisineType.get_help()
+        self.fields['permit_type'].choices = models.PermitType.get_types(
+                                                              default='NP')
+        self.fields['permit_type'].help_text = models.PermitType.get_help()
+
+
+class FileFormPlanning(forms.Form):
+    form_label = _(u"Planning")
+    associated_models = {'town':models.Town}
+    name = forms.CharField(label=_(u"Planning name"), required=False,
+                           max_length=100)
+    main_town = get_town_field(required=False)
+    locality = forms.CharField(label=_(u"Locality"), max_length=100,
+                               required=False)
+    address = forms.CharField(label=_(u"Address (number/street)"),
+                              widget=forms.Textarea, required=False)
+    postal_code = forms.CharField(label=_(u"Postal code"), max_length=10,
+                                  required=False)
+    total_surface = forms.IntegerField(required=False,
+                           widget=widgets.AreaWidget,
+                           label=_(u"Total surface (m²)"),
+                           validators=[validators.MinValueValidator(0),
+                                       validators.MaxValueValidator(999999999)])
+    total_developed_surface = forms.IntegerField(widget=widgets.AreaWidget,
+           label=_(u"Total developed surface (m²)"),
+           required=False, validators=[validators.MinValueValidator(0),
+                                       validators.MaxValueValidator(999999999)])