From bc35ce4d52f7aceb6b4b25f0088a04e73eb6f92f Mon Sep 17 00:00:00 2001
From: Justin Johnson <jjohnson@openroad.ca>
Date: Thu, 15 Mar 2018 16:25:42 -0700
Subject: [PATCH] DIV-837

---
 edivorce/apps/core/templates/pdf/form1.html  |  6 ++--
 edivorce/apps/core/templates/pdf/form37.html | 11 ++++++--
 edivorce/apps/core/templates/pdf/form38.html | 29 +++++++++++---------
 3 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/edivorce/apps/core/templates/pdf/form1.html b/edivorce/apps/core/templates/pdf/form1.html
index 7661b148..d1208f48 100644
--- a/edivorce/apps/core/templates/pdf/form1.html
+++ b/edivorce/apps/core/templates/pdf/form1.html
@@ -37,10 +37,12 @@
             &nbsp;
         </p>
         <p>
-            Claimant 1:{% include "partials/name_with_alias.html" with name=responses.name_you use_other_name=responses.any_other_name_you other_names=responses.other_name_you class_name='form-entry_claimant' %}
+          <span class="claimant-label">Claimant 1:</span>
+            {% include "partials/name_with_alias.html" with name=responses.name_you use_other_name=responses.any_other_name_you other_names=responses.other_name_you class_name='form-entry_claimant' %}
         </p>
         <p>
-            Claimant 2:{% include "partials/name_with_alias.html" with name=responses.name_spouse use_other_name=responses.any_other_name_spouse other_names=responses.other_name_spouse class_name='form-entry_claimant' %}
+          <span class="claimant-label">Claimant 2:</span>
+            {% include "partials/name_with_alias.html" with name=responses.name_spouse use_other_name=responses.any_other_name_spouse other_names=responses.other_name_spouse class_name='form-entry_claimant' %}
         </p>
         <p>
             &nbsp;
diff --git a/edivorce/apps/core/templates/pdf/form37.html b/edivorce/apps/core/templates/pdf/form37.html
index d0375c97..6678a4d2 100644
--- a/edivorce/apps/core/templates/pdf/form37.html
+++ b/edivorce/apps/core/templates/pdf/form37.html
@@ -36,8 +36,15 @@
 
         <p class="text-right">
             This is the <span class="form-entry-sm not-complete form-underline"></span> affidavit<br>
-            of {% required responses.name_you %} and<br>
-            {% required responses.name_spouse %} in this case,<br>
+            of
+{% if responses.which_claimant == 'both' or responses.which_claimant == 'Claimant 1' %}
+            {% required responses.name_you %}
+{% endif %}
+{% if responses.which_claimant == 'both' %}and<br>{% endif %}
+{% if responses.which_claimant == 'both' or responses.which_claimant == 'Claimant 2' %}
+            {% required responses.name_spouse %}
+{% endif %}
+            in this case,<br>
             and was made on <span class="form-entry-md not-complete form-underline"></span>
         </p>
 
diff --git a/edivorce/apps/core/templates/pdf/form38.html b/edivorce/apps/core/templates/pdf/form38.html
index 87f2006f..fdbf5e40 100644
--- a/edivorce/apps/core/templates/pdf/form38.html
+++ b/edivorce/apps/core/templates/pdf/form38.html
@@ -34,15 +34,17 @@
         </p>
 
         <p class="text-right">
-            This is the <span class="form-entry-sm not-complete form-underline"></span> affidavit
-        </p>
-
-        <p class="text-right">
-            of {% required responses.name_claimant %} in this case
-        </p>
-
-        <p class="text-right">
-            and was made on <span class="form-entry not-complete form-underline"></span>
+            This is the <span class="form-entry-sm not-complete form-underline"></span> affidavit<br>
+            of
+{% if responses.which_claimant == 'both' or responses.which_claimant == 'Claimant 1' %}
+            {% required responses.name_you %}
+{% endif %}
+{% if responses.which_claimant == 'both' %}and<br>{% endif %}
+{% if responses.which_claimant == 'both' or responses.which_claimant == 'Claimant 2' %}
+            {% required responses.name_spouse %}
+{% endif %}
+            in this case,<br>
+            and was made on <span class="form-entry-md not-complete form-underline"></span>
         </p>
 
         <p class="text-center">
@@ -103,7 +105,7 @@
             {% required responses.address_to_send_official_document_postal_code_spouse size=100 trail=',' %}
 
     {% endif %}
-            <br />
+            {% required responses.occupation_spouse %},<br />
             SWEAR (OR AFFIRM) THAT:
         </p>
 
@@ -152,14 +154,15 @@
                 family law case and
                 {% if responses.which_claimant == 'both' %}we{% else %}I{% endif %}
                 have lived separate and apart from my spouse
-                since {% required responses.separation_date|date_formatter %}, except:
+                since {% required responses.separation_date|date_formatter %}
                 {% multiple_values_to_list source=responses.reconciliation_period as periods %}
                 {% if periods != '[]' and responses.try_reconcile_after_separated == 'YES' %}
+                    , except:
                     {% for period in periods %}
                         from {{ period | first |date_formatter }}
                         to {{ period | last |date_formatter }}{% if not forloop.last %}, {% endif %}
-                    {% endfor %}.
-                {% else %}<span class="form-entry not-complete"></span>{% endif %}
+                    {% endfor %}
+                {% endif %}.
             </li>
 
             <li>