From 159c72e29817b9b9baa4a45fcc162966f06450eb Mon Sep 17 00:00:00 2001
From: Justin Johnson <jjohnson@openroad.ca>
Date: Thu, 15 Feb 2018 09:39:02 -0800
Subject: [PATCH] DIV-758

---
 edivorce/apps/core/templates/pdf/form1.html  | 20 +++++++++++++-------
 edivorce/apps/core/templates/pdf/form52.html |  2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/edivorce/apps/core/templates/pdf/form1.html b/edivorce/apps/core/templates/pdf/form1.html
index 2a729ddd..a2b8d321 100644
--- a/edivorce/apps/core/templates/pdf/form1.html
+++ b/edivorce/apps/core/templates/pdf/form1.html
@@ -386,13 +386,15 @@
                                   <th align="center">Birth date<br />[<em>dd mmm yyyy</em>]</th>
                                   <th align="center">Resides with</th>
                               </tr
-      {% for child in responses.children %}
+      {% if responses.children_of_marriage == 'YES' %}
+          {% for child in responses.children %}
                               <tr>
                                   <td align="center">{{ child.child_name }}</td>
                                   <td align="center">{{ child.child_birth_date|date_formatter }} &nbsp;</td>
                                   <td align="center">{{ child.child_live_with|claimantize }}</td>
                               </tr>
-      {% endfor %}
+          {% endfor %}
+      {% endif %}
                               <tr>
                                   <td align="center"> <span class="form-entry not-complete">&nbsp;</span> </td>
                                   <td align="center"> <span class="form-entry not-complete">&nbsp;</span> </td>
@@ -416,14 +418,16 @@
                 <tr>
                   <td colname="c2">
                     <span class="td-list-item">
-                      A. {% checkbox responses.order_respecting_arrangement %}
+                      A. {% checkbox responses.order_respecting_arrangement children_of_marriage='YES' %}
                     </span>
                       <div class="td-list-text">
                           Claimant 1 and Claimant 2 are asking for the following
                           order respecting arrangements for parenting or
                           contact:
                           <span class="form-entry form-textarea not-complete form-list-textarea">
+    {% if responses.children_of_marriage == 'YES' %}
                             <ul>{{ responses.order_respecting_arrangement|striptags|linebreaksli }}</ul>
+    {% endif %}
                           </span>
                       </div>
                   </td>
@@ -431,13 +435,15 @@
                 <tr>
                     <td colname="c2">
                         <span class="td-list-item">
-                          B. {% checkbox responses.order_for_child_support %}
+                          B. {% checkbox responses.order_for_child_support children_of_marriage='YES' %}
                         </span>
                         <div class="td-list-text">
                             Claimant 1 and Claimant 2 are asking for an order for
                             child support as follows:
                             <span class="form-entry form-textarea not-complete form-list-textarea">
+    {% if responses.children_of_marriage == 'YES' %}
                               <ul>{{ responses.order_for_child_support|striptags|linebreaksli }}</ul>
+    {% endif %}
                             </span>
                         </div>
                     </td>
@@ -445,7 +451,7 @@
                 <tr>
                     <td colname="c2">
                         <span class="td-list-item">
-                          C. {% checkbox responses.child_support_act %}
+                          C. {% checkbox responses.child_support_act children_of_marriage='YES' %}
                         </span>
                         <div class="td-list-text">
                           Claimant 1 and Claimant 2 are asking for the orders
@@ -453,10 +459,10 @@
                           following statute(s):<br>
                           [<em>Check one or both of the following boxes, as
                             applicable.</em>]<br><br>
-                          {% checkbox child_support_act='the Divorce Act (Canada)' %}
+                          {% checkbox child_support_act='the Divorce Act (Canada)' children_of_marriage='YES' %}
                           the <em>Divorce Act</em> (Canada)
                           &nbsp;&nbsp;&nbsp;&nbsp;
-                          {% checkbox child_support_act='the Family Law Act' %}
+                          {% checkbox child_support_act='the Family Law Act' children_of_marriage='YES' %}
                           the <em>Family Law Act</em>
                         </div>
                     </td>
diff --git a/edivorce/apps/core/templates/pdf/form52.html b/edivorce/apps/core/templates/pdf/form52.html
index a80c074e..047f846a 100644
--- a/edivorce/apps/core/templates/pdf/form52.html
+++ b/edivorce/apps/core/templates/pdf/form52.html
@@ -110,7 +110,7 @@
                 </li>
     {% endif %}
 
-    {% if derived.wants_child_support %}
+    {% if responses.children_of_marriage == 'YES' and derived.wants_child_support %}
         {% for order in derived.pursuant_parenting_arrangement %}
                 <li>{{ order }}</li>
         {% endfor %}