From 881ec6d7fd57be73cee8ec6fb0bc16f890bb7d37 Mon Sep 17 00:00:00 2001
From: Charles Shin <charles@openroad.ca>
Date: Mon, 20 Mar 2017 13:13:39 -0700
Subject: [PATCH] Fixed DIV-262 and DIV-342

---
 edivorce/apps/core/static/js/main.js              | 1 -
 edivorce/apps/core/templates/pdf/form38.html      | 4 ++--
 edivorce/apps/core/templates/pdf/form38_we.html   | 4 ++--
 edivorce/apps/core/utils/question_step_mapping.py | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/edivorce/apps/core/static/js/main.js b/edivorce/apps/core/static/js/main.js
index 7bf1d175..0fa3a6cb 100755
--- a/edivorce/apps/core/static/js/main.js
+++ b/edivorce/apps/core/static/js/main.js
@@ -82,7 +82,6 @@ $(function () {
         var proceedNext = $(this).data('proceed');
         if (!showAlert) {
             $(".checkbox-group input:checkbox").not(":checked").each(function () {
-                console.log($(this).val());
                 if ($(this).val() == 'Division of property and debts' || $(this).val() == 'Spousal support') {
                     showAlert = true;
                 }
diff --git a/edivorce/apps/core/templates/pdf/form38.html b/edivorce/apps/core/templates/pdf/form38.html
index 63ff03ad..673c258b 100644
--- a/edivorce/apps/core/templates/pdf/form38.html
+++ b/edivorce/apps/core/templates/pdf/form38.html
@@ -83,8 +83,8 @@
             {% multiple_values_to_list source=responses.reconciliation_period as periods %}
             {% if periods != '[]' %}
                 {% for period in periods %}
-                    {{ period }}
-                {% endfor %}
+                    from {{ period | first }} to {{ period | last }}{% if not forloop.last %}, {% endif %}
+                {% endfor %}.
             {% else %}<span class="form-entry not-complete">[<em>provide dates of any periods of attempted reconciliation</em>]</span>.{% endif %}
         </p>
         {% comment "This section is out of scope" %}
diff --git a/edivorce/apps/core/templates/pdf/form38_we.html b/edivorce/apps/core/templates/pdf/form38_we.html
index e20c8a0d..32e7c375 100644
--- a/edivorce/apps/core/templates/pdf/form38_we.html
+++ b/edivorce/apps/core/templates/pdf/form38_we.html
@@ -93,8 +93,8 @@
             {% multiple_values_to_list source=responses.reconciliation_period as periods %}
             {% if periods != '[]' %}
                 {% for period in periods %}
-                    {{ period }}
-                {% endfor %}
+                    from {{ period | first }} to {{ period | last }}{% if not forloop.last %}, {% endif %}
+                {% endfor %}.
             {% else %}<span class="form-entry not-complete">[<em>provide dates of any periods of attempted reconciliation</em>]</span>.{% endif %}
         </p>
         {% comment "This section is out of scope" %}
diff --git a/edivorce/apps/core/utils/question_step_mapping.py b/edivorce/apps/core/utils/question_step_mapping.py
index 95736261..f34ba747 100644
--- a/edivorce/apps/core/utils/question_step_mapping.py
+++ b/edivorce/apps/core/utils/question_step_mapping.py
@@ -18,7 +18,7 @@ question_step_mapping = {'prequalification': ['married_marriage_like', 'lived_in
                                            'marital_status_before_spouse', 'when_were_you_live_married_like', ],
                          'your_separation': ['no_reconciliation_possible', 'no_collusion',],
                          'spousal_support': ['spouse_support_details', 'spouse_support_act',],
-                         'property_and_debt': ['deal_with_property_debt', 'how_to_divide_property_debt', 'other_property_claims',],
+                         'property_and_debt': ['deal_with_property_debt', 'how_to_divide_property_debt', 'other_property_claims', 'want_other_property_claims'],
                          'other_orders': ['other_orders_detail'],
                          'other_questions': ['address_to_send_official_document_street_you',
                                              'address_to_send_official_document_city_you',