Fix land planning service form (refs #2999)

4 files changed, 31 insertions, 3 deletions

diff --git a/archaeological_files_pdl/forms.py b/archaeological_files_pdl/forms.py
index 3ae35d065..1a260541f 100644
--- a/archaeological_files_pdl/forms.py
+++ b/archaeological_files_pdl/forms.py
@@ -271,7 +271,7 @@ class FileFormGeneralContractor(PersonOrgaForm):
         current_status = ''
         if 'data' in kwargs:
             # the order is important: PERSON can have an ORGA
-            for field in [self.ORGA_FIELD, self.PERSON_FIELD]:
+            for field in [self.PERSON_FIELD, self.ORGA_FIELD]:
                 current_item_key = (
                     (kwargs['prefix'] + '-')
                     if kwargs.get('prefix') else '') + field
@@ -331,6 +331,7 @@ class FileFormGeneralContractor(PersonOrgaForm):
                     js_template='ishtar/blocks/JQueryNaturalPerson.js',
                     new=True),
                 validators=[valid_id(Person)])
+            self.fields.pop(self.ORGA_FIELD)
         """
         else:
             self.fields[self.ORGA_FIELD] = forms.IntegerField(
diff --git a/archaeological_files_pdl/templates/ishtar/blocks/JQueryPersonOrga.js b/archaeological_files_pdl/templates/ishtar/blocks/JQueryPersonOrga.js
index 4a3943d3c..1877e4579 100644
--- a/archaeological_files_pdl/templates/ishtar/blocks/JQueryPersonOrga.js
+++ b/archaeological_files_pdl/templates/ishtar/blocks/JQueryPersonOrga.js
@@ -43,7 +43,7 @@ $(function() {
                 } else {
                     $('#id_{{field_id}}').val(null);
                 }
-                $.get(url , function( data ) {
+                $.get(url, function( data ) {
                     $( "#div-{{field_id}}" ).html( data );
                 });
             },
diff --git a/archaeological_files_pdl/templates/ishtar/wizard/wizard_generalcontractor.html b/archaeological_files_pdl/templates/ishtar/wizard/wizard_generalcontractor.html
index 4fca7aa5e..169b2757e 100644
--- a/archaeological_files_pdl/templates/ishtar/wizard/wizard_generalcontractor.html
+++ b/archaeological_files_pdl/templates/ishtar/wizard/wizard_generalcontractor.html
@@ -1,4 +1,5 @@
 {% extends "ishtar/wizard/wizard_person_orga.html" %}
+{% load replace_underscore %}
 
 {% block corporation %}
   <tr class='required'>
@@ -13,3 +14,26 @@
     <td> {{ wizard.form.general_contractor.errors }}{{wizard.form.general_contractor|safe}}</td>
   </tr>
 {% endblock %}
+{% block extra_head_po %}
+<script type='text/javascript'>
+$(function() {
+var corp_id = '#id_{{wizard.form.prefix}}-corporation_general_contractor';
+var pers_id = "#id_select_{{wizard.form.prefix}}-general_contractor" ;
+var pers_select_id = "#id_select_{{wizard.form.prefix}}-general_contractor" ;
+$(corp_id).change(
+  function(){
+    $(pers_select_id).autocomplete(
+        "option", "source",
+        source_{{wizard.form.prefix|replace_underscore}}_general_contractor
+            + $(corp_id).val() + '/');
+    $(pers_select_id).val("");
+    $(pers_id).val("");
+    if ($(corp_id).val()){
+        $(pers_select_id).prop("disabled", false);
+    } else {
+        $(pers_select_id).prop("disabled", true);
+    }
+});
+});
+</script>
+{% endblock %}
diff --git a/archaeological_files_pdl/templates/ishtar/wizard/wizard_person_orga.html b/archaeological_files_pdl/templates/ishtar/wizard/wizard_person_orga.html
index d69e1e0d3..d520c1ec8 100644
--- a/archaeological_files_pdl/templates/ishtar/wizard/wizard_person_orga.html
+++ b/archaeological_files_pdl/templates/ishtar/wizard/wizard_person_orga.html
@@ -6,9 +6,11 @@ function update_form(){
     if ($('input[name="person_type"]:radio:checked').val() == 'corporation'){
         $('#natural_div').hide();
         $('#corporation_div').show();
+        $('#orga-form').show();
     } else {
         $('#natural_div').show();
         $('#corporation_div').hide();
+        $('#orga-form').hide();
     }
 }
 $(function() {
@@ -40,7 +42,6 @@ $(function() {
 {% block corporation %}
 {% endblock %}
 </table>
-
 <div id='natural_div'>
 <table>
   {% if wizard.form.non_field_errors %}<tr class='errors'>
@@ -56,6 +57,8 @@ $(function() {
 {% block otherfields %}
 {% endblock %}
 </div>
+{% block extra_head_po %}
+{% endblock %}
 
 <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
 {{ previous_fields|safe }}