Added some placeholder questions related to rest of forms

edivorce/apps/core/static/js/controllers.js

@@ -83,7 +83,7 @@ var getValue = function(el, question){
         if (question == "children_financial_support"){
             childSupportCheckboxControl(el);
         }
-        $(".checkbox-group").find("input[type=checkbox]:checked").each(function(){
+        el.parents(".checkbox-group").find("input[type=checkbox]:checked").each(function(){
             value.push($(this).val());
         });
         // to remove last space and semi-colon

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

@@ -26,10 +26,18 @@ $(function () {
 
     // Delete button will remove field and update user responses
     $(".btn-delete").on('click', function () {
-        // store neighbour input text to trigger change event to update list after delete
-        var neighbour = $(this).parent('div').prev().find("input:text");
         $(this).parent('div').remove();
-        neighbour.triggerHandler('change');
+
+        // update by trigger change event on one of the text field
+        var textField = $('#other_names_fields').find('input:text');
+        textField.first().triggerHandler('change');
+
+        // when there is only one field left, clear it instead of delete it
+        if (textField.length < 1){
+            $("#btn_add_other_names").triggerHandler('click');
+            $('#other_names_fields').find('input:text').first().triggerHandler('change');
+        }
+
     });
 
     // Configuration for datepicker

edivorce/apps/core/templates/overview.html

@@ -18,6 +18,7 @@
     <li style="display: flex"><a href="{% url 'question_steps' '09_other_questions' %}">Step 9: Other questions</a><p style="margin-left: 90px">{{other_questions}}</p></li>
     <li style="display: flex"><a href="{% url 'question_steps' '10_location' %}">Step 10: Filing locations</a><p style="margin-left: 90px">{{filing_locations}}</p></li>
     <li style="display: flex"><a href="{% url 'question_steps' '11_review' %}">Step 11: Review</a></li>
+    <li style="display: flex"><a href="{% url 'question_steps' '12_uncategorized' %}">Step 12: Uncategorized</a></li>
 </ul>
 
 <h2>Prepare your forms</h2>

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

@@ -1,8 +1,10 @@
 {% load input_field %}
 <div style="display: inline-flex">
-    <select class="alias-type" name={{name}}>
+    <select class="response-dropdown alias-type" name={{name}}>
         <option value="also known as" {% if alias_type == 'also known as' %} selected {% endif %}>Also known as</option>
-        <option value="often called" {% if alias_type == 'often called' %} selected {% endif %}>Often called</option>
+        <option value="now known as" {% if alias_type == 'now known as' %} selected {% endif %}>Now known as</option>
+        <option value="otherwise known as" {% if alias_type == 'otherwise known as' %} selected {% endif %}>Otherwise known as</option>
+        <option value="with assumed name of" {% if alias_type == 'with assumed name of' %} selected {% endif %}>With assumed name of</option>
     </select>
     {% input_field type="text" name=name value=value class="form-block input-wide response-textbox" %}
     {% if delete_button == "true" %}

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

@@ -0,0 +1,11 @@
+{% load input_field %}
+<br />
+<span class="form-entry_claimant">
+    {{ name }}
+    {% if other_names %}
+        {% multiple_values_to_list source=other_names as values %}
+        {% for alias_type, value in values %}
+            {% if value != '' and value != ' ' %} {{alias_type}} {{value}} {% endif %}
+        {% endfor %}
+    {% endif %}
+</span>

edivorce/apps/core/templates/pdf/form1.html

@@ -31,10 +31,10 @@
             <em> In the Supreme Court of British Columbia </em>
         </p>
         <p>
-            Claimant 1:<br /> <span class="form-entry_claimant">{{ responses.name_you }}</span>
+            Claimant 1:{% include "partials/name_with_alias.html" with name=responses.name_you other_names=responses.other_name_you %}
         </p>
         <p>
-            Claimant 2:<br /> <span class="form-entry_claimant">{{ responses.name_spouse }}</span>
+            Claimant 2:{% include "partials/name_with_alias.html" with name=responses.name_spouse other_names=responses.other_name_spouse %}
         </p>
         <p>
             &nbsp;

edivorce/apps/core/templates/pdf/form35.html

@@ -1,4 +1,5 @@
 {% load static %}
+{% load input_field %}
 <!doctype html>
 <html class="no-js" lang="en">
 
@@ -31,10 +32,12 @@
             <em> In the Supreme Court of British Columbia </em>
         </p>
         <p>
-            Claimant 1: {% if responses.name_you %} {{ responses.name_you }} {% else %} <span class="form-entry not-complete">&nbsp;</span> {% endif %}
+            Claimant 1: {% if responses.name_you %} {% include "partials/name_with_alias.html" with name=responses.name_you other_names=responses.other_name_you %}
+                        {% else %} <span class="form-entry not-complete">&nbsp;</span> {% endif %}
         </p>
         <p>
-            Claimant 2: {% if responses.name_spouse %} {{ responses.name_spouse }} {% else %} <span class="form-entry not-complete">&nbsp;</span> {% endif %}
+            Claimant 2: {% if responses.name_spouse %} {% include "partials/name_with_alias.html" with name=responses.name_spouse other_names=responses.other_name_spouse %}
+                        {% else %} <span class="form-entry not-complete">&nbsp;</span> {% endif %}
         </p>
         <h2 class="text-center">
            REQUISITION
@@ -58,23 +61,28 @@
         <p>
             [<em>Check all of the following boxes and file the following with this requisition.</em>]
         </p>
+        {% check_list source=responses.form35_dummy_requisition value='option1' as dummy_option %}
         <p class="schIndent1">
-            <i class="fa fa-square-o" aria-hidden="true"></i> draft of the order sought;
+            <i class="fa {% if dummy_option %} fa-check-square-o {% else %} fa-square-o {% endif %}" aria-hidden="true"></i> draft of the order sought;
         </p>
+        {% check_list source=responses.form35_dummy_requisition value='option2' as dummy_option %}
         <p class="schIndent1">
-            <i class="fa fa-square-o" aria-hidden="true"></i> proof that the case is an undefended family law case;
+            <i class="fa {% if dummy_option %} fa-check-square-o {% else %} fa-square-o {% endif %}" aria-hidden="true"></i> proof that the case is an undefended family law case;
         </p>
+        {% check_list source=responses.form35_dummy_requisition value='option3' as dummy_option %}
         <p class="schIndent1">
-            <i class="fa fa-square-o" aria-hidden="true"></i> certificate of the registrar in Form F36;
+            <i class="fa {% if dummy_option %} fa-check-square-o {% else %} fa-square-o {% endif %}" aria-hidden="true"></i> certificate of the registrar in Form F36;
         </p>
+        {% check_list source=responses.form35_dummy_requisition value='option4' as dummy_option %}
         <p class="schIndent1">
-            <i class="fa fa-square-o" aria-hidden="true"></i> filing fee.
+            <i class="fa {% if dummy_option %} fa-check-square-o {% else %} fa-square-o {% endif %}" aria-hidden="true"></i> filing fee.
         </p>
         <p>
             [<em>Check the following box and file the following with this requisition unless a response to family claim or response to counterclaim has been filed or unless this case is a joint family law case within the meaning of Rule 2-2 of the Supreme Court Family Rules</em>.]
         </p>
+        {% check_list source=responses.form35_dummy_additional value='option1' as dummy_option %}
         <p class="schIndent1">
-            <i class="fa fa-square-o" aria-hidden="true"></i> proof of service of the notice of family claim or counterclaim, as the case may be.
+            <i class="fa {% if dummy_option %} fa-check-square-o {% else %} fa-square-o {% endif %}" aria-hidden="true"></i> proof of service of the notice of family claim or counterclaim, as the case may be.
         </p>
         <p>
             [<em>Check the following box and file the following document with this requisition if</em>
@@ -87,14 +95,16 @@
         <p class="schIndent1">
             <em>(b) the family law case includes a claim for child support.</em>]
         </p>
+        {% check_list source=responses.form35_dummy_additional value='option2' as dummy_option %}
         <p class="schIndent1">
-            <i class="fa fa-square-o" aria-hidden="true"></i> Child Support Affidavit in Form F37.
+            <i class="fa {% if dummy_option %} fa-check-square-o {% else %} fa-square-o {% endif %}" aria-hidden="true"></i> Child Support Affidavit in Form F37.
         </p>
         <p>
             [<em>Check the following box and file the following document with this requisition if a divorce is sought.</em>]
         </p>
+        {% check_list source=responses.form35_dummy_additional value='option3' as dummy_option %}
         <p class="schIndent1">
-            <i class="fa fa-square-o" aria-hidden="true"></i> affidavit in Form F38.
+            <i class="fa {% if dummy_option %} fa-check-square-o {% else %} fa-square-o {% endif %}" aria-hidden="true"></i> affidavit in Form F38.
         </p>
         <p>
         </p>

edivorce/apps/core/templates/pdf/form36.html

@@ -31,10 +31,12 @@
             <em> In the Supreme Court of British Columbia </em>
         </p>
         <p>
-            Claimant 1: {% if responses.name_you %} {{ responses.name_you }} {% else %} <span class="form-entry not-complete">&nbsp;</span> {% endif %}
+            Claimant 1: {% if responses.name_you %} {% include "partials/name_with_alias.html" with name=responses.name_you other_names=responses.other_name_you %}
+                        {% else %} <span class="form-entry not-complete">&nbsp;</span> {% endif %}
         </p>
         <p>
-            Claimant 2: {% if responses.name_spouse %} {{ responses.name_spouse }} {% else %} <span class="form-entry not-complete">&nbsp;</span> {% endif %}
+            Claimant 2: {% if responses.name_spouse %} {% include "partials/name_with_alias.html" with name=responses.name_spouse other_names=responses.other_name_spouse %}
+                        {% else %} <span class="form-entry not-complete">&nbsp;</span> {% endif %}
         </p>
         <h2 align="center">
            CERTIFICATE OF PLEADINGS

edivorce/apps/core/templates/question/12_uncategorized.html

@@ -0,0 +1,98 @@
+{% extends 'base.html' %}{% load input_field %}
+
+{% block title %}{{ block.super }}: Review{% endblock %}
+
+{% block content %}
+<div class="container-wrapper">
+    <div class="container">
+        <div class="row">
+            <div class="col-md-8 col-md-offset-2">
+                <div>
+                    <h1>FORM 35</h1>
+                    <h1>Filed with this requisition are: </h1>
+                    <div class="checkbox-group">
+                        <div class="checkbox">
+                            <label>
+                                {% input_field type="checkbox" name="form35_dummy_requisition" value="option1" %}a draft of the order sought
+                            </label>
+                        </div>
+                        <div class="checkbox">
+                            <label>
+                                {% input_field type="checkbox" name="form35_dummy_requisition" value="option2" %}proof that the case is an undefended family law case
+                            </label>
+                        </div>
+                        <div class="checkbox">
+                            <label>
+                                {% input_field type="checkbox" name="form35_dummy_requisition" value="option3" %}certificate of the registrar in Form F36
+                            </label>
+                        </div>
+                        <div class="checkbox">
+                            <label>
+                                {% input_field type="checkbox" name="form35_dummy_requisition" value="option4" %}filing fee
+                            </label>
+                        </div>
+                    </div>
+
+                    <h1>Additional request:</h1>
+                    <div class="checkbox-group">
+                        <div class="checkbox">
+                            <label>
+                                {% input_field type="checkbox" name="form35_dummy_additional" value="option1" %}proof of service of the Notice of Family Claim or Counterclaim, as the case may be.
+                            </label>
+                        </div>
+                        <div class="checkbox">
+                            <label>
+                                {% input_field type="checkbox" name="form35_dummy_additional" value="option2" %}a Child Support Affidavit in Form F37.
+                            </label>
+                        </div>
+                        <div class="checkbox">
+                            <label>
+                                {% input_field type="checkbox" name="form35_dummy_additional" value="option3" %}an Affidavit in Form F38.
+                            </label>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="container-wrapper">
+    <div class="container">
+        <div class="row">
+            <div class="col-md-8 col-md-offset-2">
+                <div>
+                    <h1>FORM 38</h1>
+                    <div>
+                        <h1>Will you be swearing/affirming your affidavit together at the registry? Or will you be doing this separately?</h1>
+                        <div class="btn-radio-group" data-toggle="buttons">
+                            <label class="btn btn-radio btn-radio-long">
+                                {% input_field type="radio" name="form38_dummy_together" autocomplete="off" value="option1" %} Together
+                            </label>
+                            <label class="btn btn-radio btn-radio-long">
+                                {% input_field type="radio" name="form38_dummy_together" autocomplete="off" value="option2" %} Separate
+                            </label>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="container-wrapper">
+    <div class="container">
+        <div class="row">
+            <div class="col-md-8 col-md-offset-2">
+                <div>
+                    <h1>FORM 52</h1>
+                </div>
+
+                <form action="{% url 'overview' %}">
+                    <input type="submit" value="Process overview" style="border: solid"/>
+                </form>
+            </div>
+        </div>
+    </div>
+</div>
+{% endblock %}

edivorce/fixtures/Question.json

@@ -502,5 +502,29 @@
     },
     "model": "core.question",
     "pk": "address_to_send_official_document_email_spouse"
+},
+{
+    "fields": {
+        "name": "Form 35 requisition dummy question",
+        "description": "DUMMY QUESTION for form 35 first question"
+    },
+    "model": "core.question",
+    "pk": "form35_dummy_requisition"
+},
+{
+    "fields": {
+        "name": "Form 35 additional dummy question",
+        "description": "DUMMY QUESTION for form 35 second question"
+    },
+    "model": "core.question",
+    "pk": "form35_dummy_additional"
+},
+{
+    "fields": {
+        "name": "Will you be swearing/affirming your affidavit together at the registry? Or will you be doing this separately?",
+        "description": "DUMMY QUESTION for form 38 first question"
+    },
+    "model": "core.question",
+    "pk": "form38_dummy_together"
 }
 ]