Archaeological files: reference_number -> string - better layout for planning service form

3 files changed, 27 insertions, 5 deletions

diff --git a/archaeological_files_pdl/forms.py b/archaeological_files_pdl/forms.py
index 384a4e7aa..e511f091e 100644
--- a/archaeological_files_pdl/forms.py
+++ b/archaeological_files_pdl/forms.py
@@ -246,8 +246,8 @@ class FileFormPlanningService(forms.Form):
     associated_models = {'responsible_town_planning_service': models.Person,
                          'planning_service': models.Organization}
 
-    reference_number = forms.IntegerField(label=_(u"File reference"),
-                                          required=False)
+    reference_number = forms.CharField(label=_(u"File reference"),
+                                       required=False, max_length=200)
     planning_service = forms.IntegerField(
         label=_("Planning service"),
         required=False,
@@ -317,6 +317,8 @@ class FileFormInstruction(forms.Form):
         if 'year' in kwargs:
             c_year = kwargs.pop('year')
         if 'data' in kwargs:
+            if not kwargs['data']:
+                kwargs['data'] = {}
             kwargs['data'][kwargs.get('prefix', '') + '-year'] = c_year
 
         super(FileFormInstruction, self).__init__(*args, **kwargs)
diff --git a/archaeological_files_pdl/templates/ishtar/wizard/wizard_planningservice.html b/archaeological_files_pdl/templates/ishtar/wizard/wizard_planningservice.html
index 85a1156aa..987f4de59 100644
--- a/archaeological_files_pdl/templates/ishtar/wizard/wizard_planningservice.html
+++ b/archaeological_files_pdl/templates/ishtar/wizard/wizard_planningservice.html
@@ -11,7 +11,7 @@
     <td colspan='3'>{{wizard.form.non_field_errors}}</td>
   </tr>{%endif%}
 
-  <tr class='required'>
+  <tr>
     <th>{{ wizard.form.planning_service.label_tag }}</th>
     <td> {{ wizard.form.planning_service.errors }}{{wizard.form.planning_service|safe}}</td>
   </tr>
@@ -24,8 +24,12 @@
 
 <div>
 <table>
-  <tr class='required'>
-    <th>{{ wizard.form.reference_number.label_tag }}</th>
+  {% if permit_type %}
+  <tr>
+    <th colspan='3'>{{permit_type}}</th>
+  </tr>{% endif %}
+  <tr>
+    <th>{{ wizard.form.reference_number.label_tag }}{% if permit_type_code %} [{{permit_type_code}}]{% endif %}</th>
     <td> {{ wizard.form.reference_number.errors }}{{wizard.form.reference_number|safe}}</td>
   </tr>
 </table>
diff --git a/archaeological_files_pdl/wizards.py b/archaeological_files_pdl/wizards.py
index 666de8155..eb3611b26 100644
--- a/archaeological_files_pdl/wizards.py
+++ b/archaeological_files_pdl/wizards.py
@@ -18,6 +18,7 @@
 # See the file COPYING for details.
 
 from archaeological_files.wizards import FileWizard as BaseFileWizard
+from archaeological_files import models
 
 
 class FileWizard(BaseFileWizard):
@@ -49,6 +50,21 @@ class FileWizard(BaseFileWizard):
             returned['year'] = self.get_current_year()
         return returned
 
+    def get_context_data(self, form, **kwargs):
+        context = super(FileWizard, self).get_context_data(form)
+        formkey = "planningservice-" + self.url_name
+        if self.steps.current == formkey:
+            try:
+                idx = int(
+                    self.session_get_value(
+                        'preventivetype-' + self.url_name, 'permit_type'))
+                permit_type = models.PermitType.objects.get(pk=idx)
+                context['permit_type'] = unicode(permit_type)
+                context['permit_type_code'] = unicode(permit_type.txt_idx)
+            except (ValueError, models.PermitType.DoesNotExist):
+                pass
+        return context
+
 
 class FileModificationWizard(FileWizard):
     modification = True