DIV-1135 - Part 2 - Split up aliases (other_name_you, other_name_spouse)

edivorce/apps/core/static/css/main.scss

@@ -615,6 +615,30 @@ select.form-control {
 		width: 70%;
 	}
 }
+
+.form-group.name-group {
+
+	&--indented {
+		@media (min-width: 992px) {
+			padding-left: 24px;
+		}
+	}
+	
+	p {
+		margin-bottom: 3px;
+	}
+
+	input[type=text] {
+		width: 70% !important;
+		@media (min-width: 992px) and (max-width: 1199px) {
+			width: 55% !important;
+		}
+		@media (min-width: 1200px) {
+			width: 45% !important;
+		}		
+	}	
+}
+
 /* Buttons & Icons*/
 .btn {
 	line-height: initial;
@@ -847,13 +871,6 @@ input {
 		width: 70%;
 	}
 
-	&.input-medium {
-		width: 70%;
-		@media (min-width: 992px) {
-			width: 45%;
-		}
-	}	
-
 	&.input-narrow {
 		max-width: 100px;
 	}

edivorce/apps/core/static/js/functions.js

@@ -271,10 +271,12 @@ var getValue = function(el, question){
     // for adding other_name fields, create list of [aliasType, alias]
     else if (question === "other_name_you" || question === "other_name_spouse"){
         var aliasType = "also known as";
-        $('#other_names_fields').find("input[type=text]").each(function () {
-            // as per request, alias type will always be also known as for now
-            // aliasType = $(this).val() === '' ? '' : $(this).siblings(".alias-type").val();
-            value.push([aliasType, $(this).val().trim()]);
+        $('#other_names_fields').find('.alias-field-group').each(function () {
+            var lastName = $(this).find(".alias-last-name").val();
+            var given1 = $(this).find(".alias-given-1").val();
+            var given2 = $(this).find(".alias-given-2").val();
+            var given3 = $(this).find(".alias-given-3").val();
+            value.push([aliasType, lastName, given1, given2, given3]);
         });
         return JSON.stringify(value);
     }

edivorce/apps/core/static/js/main.js

@@ -225,7 +225,7 @@ $(function () {
     // Add name button adds new input field for adding other name
     // Maximum of two other name fields allowed
     $("#btn_add_other_names").on('click', function () {
-        if ($('#other_names_fields input[type=text]').length < 2) {
+        if ($('#other_names_fields .alias-field-group').length < 2) {
             $('#other_names_fields').append($('#other_names_group').children().clone(true));
         }
 
@@ -234,7 +234,7 @@ $(function () {
 
     // Show warning text when there are 2 other name fields
     var showWarningOtherName = function() {
-        if ($('#other_names_fields input[type=text]').length >= 2) {
+        if ($('#other_names_fields .alias-field-group').length >= 2) {
             $('#btn_add_other_names').hide();
             $('#other_name_warning_message').html("<p>Max 2 other names, please enter only the name variations to be shown on the order from the court</p>");
         }

edivorce/apps/core/templates/partials/alias_field.html

@@ -1,5 +1,5 @@
 {% load input_field %}
-<div class="form-inline clearfix">
+<div class="form-inline clearfix alias-field-group">
     {% comment As per request, alias type will fixed to "also know as" %}
         <select class="response-dropdown alias-type form-control" name={{name}}>
             <option value="also known as" {% if alias_type == 'also known as' %} selected {% endif %}>Also known as</option>
@@ -10,8 +10,15 @@
     {% endcomment %}
     
     <label>Also known as</label>
-        <span class="form-group">
-            {% input_field type="text" name=name value=value multiple="true" class="form-control response-textbox alias-names" %}
+        <span class="form-group name-group name-group--indented">
+            <p>Last name</p>
+            {% input_field type="text" name=name value=last_name multiple="true" class="form-block response-textbox alias-last-name" %}
+            <p>First name</p>
+            {% input_field type="text" name=name value=given_1 multiple="true" class="form-block response-textbox alias-given-1" %}
+            <p>Middle name <span class="optional inline">If applicable</span></p>
+            {% input_field type="text" name=name value=given_2 multiple="true" ignore_error=True class="form-block response-textbox alias-given-2" %}
+            <p>Middle name #2 <span class="optional inline">If applicable</span></p>        
+            {% input_field type="text" name=name value=given_3 multiple="true" ignore_error=True class="form-block response-textbox alias-given-3" %}
         </span>
 
         <input type="button" class="btn btn-danger btn-delete-name form-control" value="Delete" />

edivorce/apps/core/templates/partials/name_with_alias.html

@@ -1,2 +1,12 @@
 {% load input_field %}
-<span class="{{class_name}}">{{ name }}{% if other_names and use_other_name == 'YES' %}{% multiple_values_to_list source=other_names as values %}{% for alias_type, value in values %}{% if value != '' %} {{alias_type}} {{value}}{% endif %}{% endfor %}{% endif %}</span>
+<span class="{{class_name}}">
+    {{ name }}
+    {% if other_names and use_other_name == 'YES' %}
+        {% multiple_values_to_list source=other_names as values %}
+        {% for value in values %}
+            {% if value.1 != '' %} 
+                {{ value.0 }} {{ value.1 }} {{ value.2 }} {{ value.3 }} {{ value.4 }}
+            {% endif %}
+        {% endfor %}
+    {% endif %}
+</span>

edivorce/apps/core/templates/question/02_claimant.html

@@ -13,15 +13,15 @@
 <div class="question-well {% if last_name_you_error or first_name_you_error %}error{% endif %}">
     <h3>Please enter your name (as it appears on your marriage certificate or registration of marriage)
         {% if last_name_you_error or first_name_you_error %}{% include 'partials/required.html' %}{% endif %}</h3>
-    <span class="form-group name">
+    <span class="form-group name-group">
         <p>Last name</p>
-        {% input_field type="text" name="last_name_you" class="form-block input-medium response-textbox name" %}
+        {% input_field type="text" name="last_name_you" class="form-block response-textbox" %}
         <p>First name</p>
-        {% input_field type="text" name="given_name_1_you" class="form-block input-medium response-textbox name" %}
+        {% input_field type="text" name="given_name_1_you" class="form-block response-textbox" %}
         <p>Middle name <span class="optional inline">If applicable</span></p>
-        {% input_field type="text" name="given_name_2_you" class="form-block input-medium response-textbox name" %}
+        {% input_field type="text" name="given_name_2_you" class="form-block response-textbox" %}
         <p>Middle name #2 <span class="optional inline">If applicable</span></p>        
-        {% input_field type="text" name="given_name_3_you" class="form-block input-medium response-textbox name" %}
+        {% input_field type="text" name="given_name_3_you" class="form-block response-textbox" %}
     </span>
 
     <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapse_changed_name" aria-controls="collapse_changed_name">
@@ -88,9 +88,11 @@
         </div>
         <div id="other_names_fields">
 
-                    {% if other_name_you %}
+                {% if other_name_you %}
                     {% multiple_values_to_list source=other_name_you as values %}
-                    {% for alias_type, value in values %} {% include "partials/alias_field.html" with name="other_name_you" alias_type=alias_type value=value delete_button="true" %} {% endfor %}
+                    {% for value in values %}
+                        {% include "partials/alias_field.html" with name="other_name_you" alias_type=value.0 last_name=value.1 given_1=value.2 given_2=value.3 given_3=value.4 delete_button="true" %} 
+                    {% endfor %}
                 {% else %}
                     {% include "partials/alias_field.html" with name="other_name_you" %}
                 {% endif %}

edivorce/apps/core/templates/question/03_respondent.html

@@ -16,15 +16,15 @@
 <div class="question-well {% if last_name_spouse_error or first_name_spouse_error %}error{% endif %}">
     <h3>What is your spouse's name ( enter name as it appears on the marriage certificate or registration of marriage)?
         {% if last_name_spouse_error or first_name_spouse_error %}{% include 'partials/required.html' %}{% endif %}</h3>
-    <span class="form-group name">
+    <span class="form-group name-group">
         <p>Last name</p>
-        {% input_field type="text" name="last_name_spouse" class="form-block input-medium response-textbox name" %}
+        {% input_field type="text" name="last_name_spouse" class="form-block response-textbox" %}
         <p>First name</p>
-        {% input_field type="text" name="given_name_1_spouse" class="form-block input-medium response-textbox name" %}
+        {% input_field type="text" name="given_name_1_spouse" class="form-block response-textbox" %}
         <p>Middle name <span class="optional inline">If applicable</span></p>
-        {% input_field type="text" name="given_name_2_spouse" class="form-block input-medium response-textbox name" %}
+        {% input_field type="text" name="given_name_2_spouse" class="form-block response-textbox" %}
         <p>Middle name #2 <span class="optional inline">If applicable</span></p>        
-        {% input_field type="text" name="given_name_3_spouse" class="form-block input-medium response-textbox name" %}
+        {% input_field type="text" name="given_name_3_spouse" class="form-block response-textbox" %}
     </span>
     <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false"
          data-target="#collapse_legal_name" aria-controls="collapse_legal_name">
@@ -100,8 +100,8 @@
         <div id="other_names_fields">
             {% if other_name_spouse %}
                 {% multiple_values_to_list source=other_name_spouse as values %}
-                {% for alias_type, value in values %}
-                    {% include "partials/alias_field.html" with name="other_name_spouse" alias_type=alias_type value=value delete_button="true" %}
+                {% for value in values %}
+                    {% include "partials/alias_field.html" with name="other_name_spouse" alias_type=value.0 last_name=value.1 given_1=value.2 given_2=value.3 given_3=value.4 delete_button="true" %} 
                 {% endfor %}
             {% else %}
                  {% include "partials/alias_field.html" with name="other_name_spouse" value='' %}

edivorce/apps/core/templatetags/summary_format.py

@@ -73,11 +73,18 @@ def process_json_list(question_key, json_list):
 
 
 def get_other_name_tags(json_list):
-    list_items = format_html_join(
-        '\n',
-        '<li>{} {}</li>',
-        ((alias_type, value) for alias_type, value in json_list if value))
-    return list_items
+    if len(json_list) > 0 and len(json_list[0]) == 5:
+        # new json format with fielded names
+        return format_html_join(
+            '\n',
+            '<li>{} {} {} {} {}</li>',
+            ((alias_type, last_name, given1, given2, given3) for alias_type, last_name, given1, given2, given3 in json_list if last_name))
+    else:
+        # old json format with unfielded names
+        return format_html_join(
+            '\n',
+            '<li>{} {}</li>',
+            ((alias_type, value) for alias_type, value in json_list if value))
 
 
 def get_reconciliation_period_tags(json_list):

edivorce/apps/core/tests/test_step_completeness.py

@@ -149,11 +149,11 @@ class StepCompletenessTestCase(TestCase):
         self.assertEqual(self.check_completeness(step), False)
 
         # All required questions with all checking question with all hidden questions
-        self.create_response('other_name_you', '[["also known as","Smith"]]')
+        self.create_response('other_name_you', '[["also known as","Smith","James","Jerry","Joseph"]]')
         self.assertEqual(self.check_completeness(step), True)
 
         # Put empty response
-        UserResponse.objects.filter(question_id='other_name_you').update(value='[["",""]]')
+        UserResponse.objects.filter(question_id='other_name_you').update(value='[["","","","",""]]')
         self.assertEqual(self.check_completeness(step), False)
 
     def test_your_spouse(self):
@@ -191,7 +191,7 @@ class StepCompletenessTestCase(TestCase):
         self.assertEqual(self.check_completeness(step), False)
 
         # All required questions with two checking question with one hidden and one shown
-        self.create_response('other_name_spouse', '[["also known as","Smith"]]')
+        self.create_response('other_name_spouse', '[["also known as","Smith","James","Jerry","Joseph"]]')
         self.assertEqual(self.check_completeness(step), True)
         self.assertEqual(self.check_step_status(step), Status.COMPLETED)
 
@@ -208,7 +208,7 @@ class StepCompletenessTestCase(TestCase):
         self.assertEqual(self.check_completeness(step), False)
 
         # Put empty response
-        UserResponse.objects.filter(question_id='other_name_spouse').update(value='[["",""]]')
+        UserResponse.objects.filter(question_id='other_name_spouse').update(value='[["","","","",""]]')
         self.assertEqual(self.check_completeness(step), False)
 
     def test_your_marriage(self):