Merge pull request #103 from bcgov/DIV-1126

DIV-1126 and DIV-1133: Remove back button from first prequal page, fix inconsistent dashnav steps

edivorce/apps/core/templates/prequalification/step_01.html

@@ -112,17 +112,6 @@
 
 {% block formbuttons %}
 <div class="form-buttons clearfix not-disqualified">
-
-    {% if request.user.is_authenticated %}
-        <a class="btn btn-primary" href="{% url 'overview' %}">
-          <i class="fa fa-arrow-circle-o-left"></i>&nbsp;&nbsp;&nbsp;Back
-        </a>
-    {% else %}
-        <a class="btn btn-primary" href="{% url 'home' %}">
-          <i class="fa fa-arrow-circle-o-left"></i>&nbsp;&nbsp;&nbsp;Back
-        </a>
-    {% endif %}
-
     <a class="btn btn-success pull-right"
        href="{% url 'prequalification' '02' %}">
       Next&nbsp;&nbsp;&nbsp;<i class="fa fa-arrow-circle-o-right"></i>

edivorce/apps/core/utils/question_step_mapping.py

@@ -284,6 +284,13 @@ question_step_mapping = {
                         'divorce_take_effect_on',
                         'divorce_take_effect_on_specific_date'],
     'filing_locations': ['court_registry_for_filing'],
+    'signing_filing': ['how_to_sign',
+                       'how_to_file',
+                       'signing_location',
+                       'signing_location_you',
+                       'signing_location_spouse',
+                       'email_you',
+                       'email_spouse'],
 }
 
 page_step_mapping = {
@@ -299,6 +306,7 @@ page_step_mapping = {
     'other_orders': 'other_orders',
     'other_questions': 'other_questions',
     'location': 'filing_locations',
+    'signing_filing': 'signing_filing',
 }
 
 """ List of court registries """

edivorce/apps/core/views/main.py

@@ -179,6 +179,10 @@ def overview(request):
     responses_dict_by_step['active_page'] = 'overview'
     responses_dict_by_step['derived'] = get_derived_data(responses_dict)
 
+    # Dashnav needs filing option to determine which steps to show
+    for question in responses_dict_by_step['signing_filing']:
+        responses_dict_by_step[question['question_id']] = question['value']
+
     response = render(request, 'overview.html', context=responses_dict_by_step)
 
     # set this session variable after the page is already rendered