Updated indicator to hightlight current step

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

@@ -324,7 +324,7 @@
             <tbody>
                 <tr>
                     {% check_list source=responses.want_which_orders value='Other orders' as order_wanted %}
-                    <td> <i class="fa {% if order_wanted %} fa-check-square-o {% else %} fa-square-o {% endif %}" aria-hidden="true"></i> Claimant 1 and Claimant 2 are asking for an order in the following terms: <span class="form-entry form-textarea not-complete">&nbsp;</span>
+                    <td> <i class="fa {% if order_wanted %} fa-check-square-o {% else %} fa-square-o {% endif %}" aria-hidden="true"></i> Claimant 1 and Claimant 2 are asking for an order in the following terms: <span class="form-entry form-textarea not-complete">{% if responses.other_orders_detail %} {{ responses.other_orders_detail }} {% else %} &nbsp; {% endif %}</span>
                         <p class="text-center">
                             [<em>set out terms of proposed order</em>]
                         </p>

edivorce/apps/core/templates/progress.html

@@ -6,57 +6,57 @@
         <span class="progress-content">Qualifying Questions</span>
         <span class="progress-status"><i class="fa fa-check" aria-hidden="true"></i></span>
     </a>
-    <a href="{% url 'question_steps' '01_orders' %}" class="progress-question complete">
+    <a href="{% url 'question_steps' '01_orders' %}" class="progress-question {% if step == '01_orders' %} active {% endif %}">
         <span class="progress-icon"><i class="fa fa-commenting" aria-hidden="true"></i></span>
         <span class="progress-content"><small>Step 1</small><br />What Are You Asking For?</span>
         {% if which_orders == 'Started' %}<span class="progress-status"><i class="fa fa-adjust" aria-hidden="true"></i></span> {% endif %}
     </a>
-    <a href="{% url 'question_steps' '02_claimant' %}" class="progress-question active">
+    <a href="{% url 'question_steps' '02_claimant' %}" class="progress-question {% if step == '02_claimant' %} active {% endif %}">
         <span class="progress-icon"><i class="fa fa-info" aria-hidden="true"></i></span>
         <span class="progress-content"><small>Step 2</small><br />Your information</span>
         {% if your_information == 'Started' %}<span class="progress-status"><i class="fa fa-adjust" aria-hidden="true"></i></span> {% endif %}
     </a>
-    <a href="{% url 'question_steps' '03_respondent' %}" class="progress-question">
+    <a href="{% url 'question_steps' '03_respondent' %}" class="progress-question {% if step == '03_respondent' %} active {% endif %}">
         <span class="progress-icon"><i class="fa fa-user" aria-hidden="true"></i></span>
         <span class="progress-content"><small>Step 3</small><br />Your spouse</span>
         {% if your_spouse == 'Started' %}<span class="progress-status"><i class="fa fa-adjust" aria-hidden="true"></i></span> {% endif %}
     </a>
-    <a href="{% url 'question_steps' '04_marriage' %}" class="progress-question">
+    <a href="{% url 'question_steps' '04_marriage' %}" class="progress-question {% if step == '04_marriage' %} active {% endif %}">
         <span class="progress-icon"><i class="fa fa-link" aria-hidden="true"></i></span>
         <span class="progress-content"><small>Step 4</small><br />Your marriage</span>
         {% if your_marriage == 'Started' %}<span class="progress-status"><i class="fa fa-adjust" aria-hidden="true"></i></span> {% endif %}
     </a>
-    <a href="{% url 'question_steps' '05_separation' %}" class="progress-question">
+    <a href="{% url 'question_steps' '05_separation' %}" class="progress-question {% if step == '05_separation' %} active {% endif %}">
         <span class="progress-icon"><i class="fa fa-chain-broken" aria-hidden="true"></i></span>
         <span class="progress-content"><small>Step 5</small><br />Your separation</span>
         {% if your_separation == 'Started' %}<span class="progress-status"><i class="fa fa-adjust" aria-hidden="true"></i></span> {% endif %}
     </a>
-    <a href="{% url 'question_steps' '06_support' %}" class="progress-question">
+    <a href="{% url 'question_steps' '06_support' %}" class="progress-question {% if step == '06_support' %} active {% endif %}">
         <span class="progress-icon"><i class="fa fa-life-ring" aria-hidden="true"></i></span>
         <span class="progress-content"><small>Step 6</small><br />Spousal support</span>
         {% if spousal_support == 'Started' %}<span class="progress-status"><i class="fa fa-adjust" aria-hidden="true"></i></span> {% endif %}
     </a>
-    <a href="{% url 'question_steps' '07_property' %}" class="progress-question">
+    <a href="{% url 'question_steps' '07_property' %}" class="progress-question {% if step == '07_property' %} active {% endif %}">
         <span class="progress-icon"><i class="fa fa-home" aria-hidden="true"></i></span>
         <span class="progress-content"><small>Step 7</small><br />Property and debt</span>
         {% if property_and_debt == 'Started' %}<span class="progress-status"><i class="fa fa-adjust" aria-hidden="true"></i></span> {% endif %}
     </a>
-    <a href="{% url 'question_steps' '08_other_orders' %}" class="progress-question">
+    <a href="{% url 'question_steps' '08_other_orders' %}" class="progress-question {% if step == '08_other_orders' %} active {% endif %}">
         <span class="progress-icon"><i class="fa fa-gavel" aria-hidden="true"></i></span>
         <span class="progress-content"><small>Step 8</small><br />Other orders</span>
         {% if other_orders == 'Started' %}<span class="progress-status"><i class="fa fa-adjust" aria-hidden="true"></i></span> {% endif %}
     </a>
-    <a href="{% url 'question_steps' '09_other_questions' %}" class="progress-question">
+    <a href="{% url 'question_steps' '09_other_questions' %}" class="progress-question {% if step == '09_other_questions' %} active {% endif %}">
         <span class="progress-icon"><i class="fa fa-question" aria-hidden="true"></i></span>
         <span class="progress-content"><small>Step 9</small><br />Other questions</span>
         {% if other_questions == 'Started' %}<span class="progress-status"><i class="fa fa-adjust" aria-hidden="true"></i></span> {% endif %}
     </a>
-    <a href="{% url 'question_steps' '10_location' %}" class="progress-question">
+    <a href="{% url 'question_steps' '10_location' %}" class="progress-question {% if step == '10_location' %} active {% endif %}">
         <span class="progress-icon"><i class="fa fa-location-arrow" aria-hidden="true"></i></span>
         <span class="progress-content"><small>Step 10</small><br />Filing locations</span>
         {% if filing_locations == 'Started' %}<span class="progress-status"><i class="fa fa-adjust" aria-hidden="true"></i></span> {% endif %}
     </a>
-    <a href="{% url 'question_steps' '11_review' %}" class="progress-question">
+    <a href="{% url 'question_steps' '11_review' %}" class="progress-question {% if step == '11_review' %} active {% endif %}">
         <span class="progress-icon"><i class="fa fa-file" aria-hidden="true"></i></span>
         <span class="progress-content"><small>Step 11</small><br />Review</span>
     </a>

edivorce/apps/core/templates/question/01_orders.html

@@ -3,7 +3,7 @@
 
 {% block title %}{{ block.super }}: Prequalification{% endblock %}
 
-{% block progress %}{% include "progress.html" %}{% endblock %}
+{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %}
 
 {% block content %}
 

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

@@ -3,7 +3,7 @@
 
 {% block title %}{{ block.super }}: Your Information{% endblock %}
 
-{% block progress %}{% include "progress.html" %}{% endblock %}
+{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %}
 
 {% block content %}
 

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

@@ -2,7 +2,7 @@
 
 {% block title %}{{ block.super }}: Your Spouse{% endblock %}
 
-{% block progress %}{% include "progress.html" %}{% endblock %}
+{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %}
 
 {% block content %}
 

edivorce/apps/core/templates/question/04_marriage.html

@@ -3,7 +3,7 @@
 
 {% block title %}{{ block.super }}: Your Marriage{% endblock %}
 
-{% block progress %}{% include "progress.html" %}{% endblock %}
+{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %}
 
 {% block content %}
 

edivorce/apps/core/templates/question/05_separation.html

@@ -3,7 +3,7 @@
 
 {% block title %}{{ block.super }}: Reason For Divorce{% endblock %}
 
-{% block progress %}{% include "progress.html" %}{% endblock %}
+{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %}
 
 {% block content %}
 

edivorce/apps/core/templates/question/06_support.html

@@ -3,7 +3,7 @@
 
 {% block title %}{{ block.super }}: Declarations{% endblock %}
 
-{% block progress %}{% include "progress.html" %}{% endblock %}
+{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %}
 
 {% block content %}
 

edivorce/apps/core/templates/question/07_property.html

@@ -2,7 +2,7 @@
 {% load input_field %}
 {% block title %}{{ block.super }}: Application Location{% endblock %}
 
-{% block progress %}{% include "progress.html" %}{% endblock %}
+{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %}
 
 {% block content %}
 

edivorce/apps/core/templates/question/08_other_orders.html

@@ -2,12 +2,14 @@
 
 {% block title %}{{ block.super }}: Other Orders{% endblock %}
 
-{% block progress %}{% include "progress.html" %}{% endblock %}
+{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %}
 
 {% block content %}
 
 
 <h1><small>Step 8:</small>Other Orders</h1>
+<h3>Want other orders as follows: </h3>
+{% input_field type="textarea" name="other_orders_detail" rows="8" cols="65" class="response-textarea" %}
 
 {% endblock %}
 

edivorce/apps/core/templates/question/09_other_questions.html

@@ -3,7 +3,7 @@
 
 {% block title %}{{ block.super }}: Spousal Support{% endblock %}
 
-{% block progress %}{% include "progress.html" %}{% endblock %}
+{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %}
 
 {% block content %}
 

edivorce/apps/core/templates/question/10_location.html

@@ -3,7 +3,7 @@
 
 {% block title %}{{ block.super }}: Property And Debts{% endblock %}
 
-{% block progress %}{% include "progress.html" %}{% endblock %}
+{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %}
 
 {% block content %}
 

edivorce/apps/core/templates/question/11_review.html

@@ -2,7 +2,7 @@
 
 {% block title %}{{ block.super }}: Review{% endblock %}
 
-{% block progress %}{% include "progress.html" %}{% endblock %}
+{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %}
 
 {% block content %}
 

edivorce/apps/core/views/main.py

@@ -79,6 +79,7 @@ def question(request, step):
         responses_dict = get_responses_from_db_grouped_by_steps(user)
     else:
         responses_dict = get_responses_from_db(user)
+    responses_dict['question_step'] = step
     # If page is filing location page, add registries dictionary for list of court registries
     if step == "10_location":
         responses_dict['registries'] = sorted(list_of_registries)

edivorce/fixtures/Question.json

@@ -511,6 +511,14 @@
     "model": "core.question",
     "pk": "address_to_send_official_document_email_spouse"
 },
+{
+    "fields": {
+        "name": "Step 8 other orders",
+        "description": "DUMMY QUESTION for step 8 other orders"
+    },
+    "model": "core.question",
+    "pk": "other_orders_detail"
+},
 {
     "fields": {
         "name": "Form 35 requisition dummy question",