creylopez
/
django-ex
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 2 Wiki Activity
Browse Source

Add incomplete tag and error keyline for sections with errors

pull/163/head
ariannedee 5 years ago
parent
04e0d62f10
commit
74b206dd93
3 changed files with 37 additions and 26 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -0
      edivorce/apps/core/templates/partials/incomplete.html
  2. +35
    -25
      edivorce/apps/core/templates/question/12_review.html
  3. +1
    -1
      edivorce/apps/core/utils/question_step_mapping.py

+ 1
- 0
edivorce/apps/core/templates/partials/incomplete.html View File

@ -0,0 +1 @@
<span class="required">Incomplete</span>

+ 35
- 25
edivorce/apps/core/templates/question/12_review.html View File

@ -31,14 +31,14 @@
</div> </div>
</div> </div>
</div> </div>
<div class="question-well step-review">
<div class="question-well step-review {% if step_status.which_orders != 'Complete' %}error{% endif %}">
<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_1" aria-controls="collapse_changed_name"> <div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_1" aria-controls="collapse_changed_name">
<div> <div>
Step 1: What are you asking for Step 1: What are you asking for
</div>
</div>
<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'orders' %}">Edit</a> </p>
</div>
</div>
{% if step_status.which_orders != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'orders' %}">Edit</a> </p>
<div class="clearfix"> </div> <div class="clearfix"> </div>
<div class="collapse in" id="review_step_1"> <div class="collapse in" id="review_step_1">
<div> <div>
@ -47,12 +47,13 @@
</div> </div>
</div> </div>
<div class="question-well step-review">
<div class="question-well step-review {% if step_status.your_information != 'Complete' %}error{% endif %}">
<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_2" aria-controls="collapse_changed_name"> <div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_2" aria-controls="collapse_changed_name">
<div> <div>
Step 2: Your information Step 2: Your information
</div>
</div>
</div> </div>
{% if step_status.your_information != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'claimant' %}">Edit</a> </p> <p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'claimant' %}">Edit</a> </p>
<div class="clearfix"> </div> <div class="clearfix"> </div>
<div class="collapse in" id="review_step_2"> <div class="collapse in" id="review_step_2">
@ -62,13 +63,14 @@
</div> </div>
</div> </div>
<div class="question-well step-review">
<div class="question-well step-review {% if step_status.your_spouse != 'Complete' %}error{% endif %}">
<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_3" aria-controls="collapse_changed_name"> <div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_3" aria-controls="collapse_changed_name">
<div> <div>
Step 3: Your spouse Step 3: Your spouse
</div> </div>
</div> </div>
<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'respondent' %}">Edit</a> </p>
{% if step_status.your_spouse != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'respondent' %}">Edit</a> </p>
<div class="clearfix"> </div> <div class="clearfix"> </div>
<div class="collapse in" id="review_step_3"> <div class="collapse in" id="review_step_3">
<div> <div>
@ -77,13 +79,14 @@
</div> </div>
</div> </div>
<div class="question-well step-review">
<div class="question-well step-review {% if step_status.your_marriage != 'Complete' %}error{% endif %}">
<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_4" aria-controls="collapse_changed_name"> <div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_4" aria-controls="collapse_changed_name">
<div> <div>
Step 4: Your marriage Step 4: Your marriage
</div> </div>
</div> </div>
<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'marriage' %}">Edit</a> </p>
{% if step_status.your_marriage != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'marriage' %}">Edit</a> </p>
<div class="clearfix"> </div> <div class="clearfix"> </div>
<div class="collapse in" id="review_step_4"> <div class="collapse in" id="review_step_4">
<div> <div>
@ -92,13 +95,14 @@
</div> </div>
</div> </div>
<div class="question-well step-review">
<div class="question-well step-review {% if step_status.your_separation != 'Complete' %}error{% endif %}">
<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_5" aria-controls="collapse_changed_name"> <div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_5" aria-controls="collapse_changed_name">
<div> <div>
Step 5: Your separation Step 5: Your separation
</div> </div>
</div> </div>
<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'separation' %}">Edit</a> </p>
{% if step_status.your_separation != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'separation' %}">Edit</a> </p>
<div class="clearfix"> </div> <div class="clearfix"> </div>
<div class="collapse in" id="review_step_5"> <div class="collapse in" id="review_step_5">
<div> <div>
@ -108,13 +112,14 @@
</div> </div>
{% if derived.has_children_of_marriage %} {% if derived.has_children_of_marriage %}
<div class="question-well step-review">
<div class="question-well step-review {% if step_status.your_children != 'Complete' %}error{% endif %}">
<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_6" aria-controls="collapse_changed_name"> <div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_6" aria-controls="collapse_changed_name">
<div> <div>
Step {% step_order step="children" %}: Your children Step {% step_order step="children" %}: Your children
</div> </div>
</div> </div>
<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'children' 'your_children' %}">Edit</a> </p>
{% if step_status.your_children != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'children' 'your_children' %}">Edit</a> </p>
<div class="clearfix"> </div> <div class="clearfix"> </div>
<div class="collapse in" id="review_step_6"> <div class="collapse in" id="review_step_6">
<div> <div>
@ -125,13 +130,14 @@
{% endif %} {% endif %}
{% if 'Spousal support' in which_orders.0.value|load_json %} {% if 'Spousal support' in which_orders.0.value|load_json %}
<div class="question-well step-review">
<div class="question-well step-review {% if step_status.spousal_support != 'Complete' %}error{% endif %}">
<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_7" aria-controls="collapse_changed_name"> <div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_7" aria-controls="collapse_changed_name">
<div> <div>
Step {% step_order step="support" %}: Spousal support Step {% step_order step="support" %}: Spousal support
</div> </div>
</div> </div>
<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'support' %}">Edit</a> </p>
{% if step_status.spousal_support != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'support' %}">Edit</a> </p>
<div class="clearfix"> </div> <div class="clearfix"> </div>
<div class="collapse in" id="review_step_7"> <div class="collapse in" id="review_step_7">
<div> <div>
@ -142,13 +148,14 @@
{% endif %} {% endif %}
{% if 'Division of property and debts' in which_orders.0.value|load_json %} {% if 'Division of property and debts' in which_orders.0.value|load_json %}
<div class="question-well step-review">
<div class="question-well step-review {% if step_status.property_and_debt != 'Complete' %}error{% endif %}">
<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_8" aria-controls="collapse_changed_name"> <div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_8" aria-controls="collapse_changed_name">
<div> <div>
Step {% step_order step="property" %}: Property and debt Step {% step_order step="property" %}: Property and debt
</div> </div>
</div> </div>
<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'property' %}">Edit</a> </p>
{% if step_status.property_and_debt != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'property' %}">Edit</a> </p>
<div class="clearfix"> </div> <div class="clearfix"> </div>
<div class="collapse in" id="review_step_8"> <div class="collapse in" id="review_step_8">
<div> <div>
@ -159,13 +166,14 @@
{% endif %} {% endif %}
{% if 'Other orders' in which_orders.0.value|load_json %} {% if 'Other orders' in which_orders.0.value|load_json %}
<div class="question-well step-review">
<div class="question-well step-review {% if step_status.other_orders != 'Complete' %}error{% endif %}">
<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_9" aria-controls="collapse_changed_name"> <div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_9" aria-controls="collapse_changed_name">
<div> <div>
Step {% step_order step="other_orders" %}: Other orders Step {% step_order step="other_orders" %}: Other orders
</div> </div>
</div> </div>
<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'other_orders' %}">Edit</a> </p>
{% if step_status.other_orders != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'other_orders' %}">Edit</a> </p>
<div class="clearfix"> </div> <div class="clearfix"> </div>
<div class="collapse in" id="review_step_9"> <div class="collapse in" id="review_step_9">
<div> <div>
@ -175,13 +183,14 @@
</div> </div>
{% endif %} {% endif %}
<div class="question-well step-review">
<div class="question-well step-review {% if step_status.other_questions != 'Complete' %}error{% endif %}">
<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_10" aria-controls="collapse_changed_name"> <div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_10" aria-controls="collapse_changed_name">
<div> <div>
Step {% step_order step="other_questions" %}: Other questions Step {% step_order step="other_questions" %}: Other questions
</div> </div>
</div> </div>
<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'other_questions' %}">Edit</a> </p>
{% if step_status.other_questions != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'other_questions' %}">Edit</a> </p>
<div class="clearfix"> </div> <div class="clearfix"> </div>
<div class="collapse in" id="review_step_10"> <div class="collapse in" id="review_step_10">
<div> <div>
@ -190,13 +199,14 @@
</div> </div>
</div> </div>
<div class="question-well step-review">
<div class="question-well step-review {% if step_status.filing_locations != 'Complete' %}error{% endif %}">
<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_11" aria-controls="collapse_changed_name"> <div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_11" aria-controls="collapse_changed_name">
<div> <div>
Step {% step_order step="location" %}: Filing location Step {% step_order step="location" %}: Filing location
</div> </div>
</div> </div>
<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'location' %}">Edit</a> </p>
{% if step_status.filing_locations != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'location' %}">Edit</a> </p>
<div class="clearfix"> </div> <div class="clearfix"> </div>
<div class="collapse in" id="review_step_11"> <div class="collapse in" id="review_step_11">
<div> <div>


+ 1
- 1
edivorce/apps/core/utils/question_step_mapping.py View File

@ -295,7 +295,7 @@ page_step_mapping = {
'property': 'property_and_debt', 'property': 'property_and_debt',
'other_orders': 'other_orders', 'other_orders': 'other_orders',
'other_questions': 'other_questions', 'other_questions': 'other_questions',
'filing_locations': 'filing_locations',
'location': 'filing_locations',
} }
""" List of court registries """ """ List of court registries """


Write Preview
Loading…
Cancel
Save