From b81e60c45e27d6baaa838278ebc00b76a4f26b25 Mon Sep 17 00:00:00 2001
From: ariannedee <ariannedee@gmail.com>
Date: Wed, 2 Sep 2020 15:22:01 -0700
Subject: [PATCH] Change Complete status to Completed

---
 .../core/templates/partials/progress.html     | 22 +++++-----
 .../templates/partials/progress_icon.html     | 13 ++++--
 .../core/templates/question/12_review.html    | 44 +++++++++----------
 edivorce/apps/core/utils/step_completeness.py |  2 +-
 4 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/edivorce/apps/core/templates/partials/progress.html b/edivorce/apps/core/templates/partials/progress.html
index 75252335..e62a29f6 100644
--- a/edivorce/apps/core/templates/partials/progress.html
+++ b/edivorce/apps/core/templates/partials/progress.html
@@ -8,34 +8,34 @@
         <span class="progress-content">Qualifying Questions</span>
     {% include "partials/progress_icon.html" with step_status_string=step_status.prequalification %}
     </a>
-    <a href="{% url 'question_steps' 'orders' %}" class="progress-question {% if step_status.which_orders == 'Complete' %} complete {% endif %} {% if active_page == 'orders' %} active {% endif %}">
+    <a href="{% url 'question_steps' 'orders' %}" class="progress-question {% if step_status.which_orders == 'Completed' %} complete {% endif %} {% if active_page == '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>
         {% include "partials/progress_icon.html" with step_status_string=step_status.which_orders %}
     </a>
-    <a href="{% url 'question_steps' 'claimant' %}" class="progress-question {% if step_status.your_information == 'Complete' %} complete {% endif %} {% if active_page == 'claimant' %} active {% endif %}">
+    <a href="{% url 'question_steps' 'claimant' %}" class="progress-question {% if step_status.your_information == 'Completed' %} complete {% endif %} {% if active_page == '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 (Claimant 1)</span>
         {% include "partials/progress_icon.html" with step_status_string=step_status.your_information %}
     </a>
-    <a href="{% url 'question_steps' 'respondent' %}" class="progress-question {% if step_status.your_spouse == 'Complete' %} complete {% endif %} {% if active_page == 'respondent' %} active {% endif %}">
+    <a href="{% url 'question_steps' 'respondent' %}" class="progress-question {% if step_status.your_spouse == 'Completed' %} complete {% endif %} {% if active_page == '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 (Claimant 2)</span>
         {% include "partials/progress_icon.html" with step_status_string=step_status.your_spouse%}
     </a>
-    <a href="{% url 'question_steps' 'marriage' %}" class="progress-question {% if step_status.your_marriage == 'Complete' %} complete {% endif %} {% if active_page == 'marriage' %} active {% endif %}">
+    <a href="{% url 'question_steps' 'marriage' %}" class="progress-question {% if step_status.your_marriage == 'Completed' %} complete {% endif %} {% if active_page == '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>
         {% include "partials/progress_icon.html" with step_status_string=step_status.your_marriage%}
     </a>
-    <a href="{% url 'question_steps' 'separation' %}" class="progress-question {% if step_status.your_separation == 'Complete' %} complete {% endif %} {% if active_page == 'separation' %} active {% endif %}">
+    <a href="{% url 'question_steps' 'separation' %}" class="progress-question {% if step_status.your_separation == 'Completed' %} complete {% endif %} {% if active_page == '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>
         {% include "partials/progress_icon.html" with step_status_string=step_status.your_separation%}
     </a>
 
     {% if children_of_marriage == 'YES' or derived.has_children_of_marriage %}
-    <a href="{% url 'question_steps' 'children' 'your_children' %}" class="progress-question collapse-trigger {% if step_status.your_children == 'Complete' %} complete {% endif %} {% if active_page == 'children' %} active {% endif %}"
+    <a href="{% url 'question_steps' 'children' 'your_children' %}" class="progress-question collapse-trigger {% if step_status.your_children == 'Completed' %} complete {% endif %} {% if active_page == 'children' %} active {% endif %}"
        data-toggle="collapse" aria-expanded="false" data-target="#children_nav" aria-controls="children_nav">
         <span class="progress-icon"><i class="fa fa-users" aria-hidden="true"></i></span>
         <span class="progress-content"><small>Step {% step_order step="children" %}</small><br />Your children</span>
@@ -73,7 +73,7 @@
     {% endif %}
 
     {% if 'Spousal support' in want_which_orders|load_json or 'Spousal support' in which_orders.0.value|load_json %}
-    <a href="{% url 'question_steps' 'support' %}" class="progress-question {% if step_status.spousal_support == 'Complete' %} complete {% endif %} {% if active_page == 'support' %} active {% endif %}">
+    <a href="{% url 'question_steps' 'support' %}" class="progress-question {% if step_status.spousal_support == 'Completed' %} complete {% endif %} {% if active_page == 'support' %} active {% endif %}">
         <span class="progress-icon"><i class="fa fa-life-ring" aria-hidden="true"></i></span>
         <span class="progress-content"><small>Step {% step_order step="support" %}</small><br />Spousal support</span>
         {% include "partials/progress_icon.html" with step_status_string=step_status.spousal_support%}
@@ -81,7 +81,7 @@
     {% endif %}
 
     {% if 'Division of property and debts' in want_which_orders|load_json or 'Division of property and debts' in which_orders.0.value|load_json %}
-    <a href="{% url 'question_steps' 'property' %}" class="progress-question {% if step_status.property_and_debt == 'Complete' %} complete {% endif %} {% if active_page == 'property' %} active {% endif %}">
+    <a href="{% url 'question_steps' 'property' %}" class="progress-question {% if step_status.property_and_debt == 'Completed' %} complete {% endif %} {% if active_page == 'property' %} active {% endif %}">
         <span class="progress-icon"><i class="fa fa-home" aria-hidden="true"></i></span>
         <span class="progress-content"><small>Step {% step_order step="property" %}</small><br />Property and debt</span>
         {% include "partials/progress_icon.html" with step_status_string=step_status.property_and_debt%}
@@ -89,19 +89,19 @@
     {% endif %}
 
     {% if 'Other orders' in want_which_orders|load_json or 'Other orders' in which_orders.0.value|load_json %}
-    <a href="{% url 'question_steps' 'other_orders' %}" class="progress-question {% if step_status.other_orders == 'Complete' %} complete {% endif %} {% if active_page == 'other_orders' %} active {% endif %}">
+    <a href="{% url 'question_steps' 'other_orders' %}" class="progress-question {% if step_status.other_orders == 'Completed' %} complete {% endif %} {% if active_page == 'other_orders' %} active {% endif %}">
         <span class="progress-icon"><i class="fa fa-gavel" aria-hidden="true"></i></span>
         <span class="progress-content"><small>Step {% step_order step="other_orders" %}</small><br />Other orders</span>
         {% include "partials/progress_icon.html" with step_status_string=step_status.other_orders%}
     </a>
     {% endif %}
 
-    <a href="{% url 'question_steps' 'other_questions' %}" class="progress-question {% if step_status.other_questions == 'Complete' %} complete {% endif %} {% if active_page == 'other_questions' %} active {% endif %}">
+    <a href="{% url 'question_steps' 'other_questions' %}" class="progress-question {% if step_status.other_questions == 'Completed' %} complete {% endif %} {% if active_page == 'other_questions' %} active {% endif %}">
         <span class="progress-icon"><i class="fa fa-question" aria-hidden="true"></i></span>
         <span class="progress-content"><small>Step {% step_order step="other_questions" %}</small><br />Other questions</span>
         {% include "partials/progress_icon.html" with step_status_string=step_status.other_questions%}
     </a>
-    <a href="{% url 'question_steps' 'location' %}" class="progress-question {% if step_status.filing_locations == 'Complete' %} complete {% endif %} {% if active_page == 'location' %} active {% endif %}">
+    <a href="{% url 'question_steps' 'location' %}" class="progress-question {% if step_status.filing_locations == 'Completed' %} complete {% endif %} {% if active_page == 'location' %} active {% endif %}">
         <span class="progress-icon"><i class="fa fa-location-arrow" aria-hidden="true"></i></span>
         <span class="progress-content"><small>Step {% step_order step="location" %}</small><br />Filing location</span>
         {% include "partials/progress_icon.html" with step_status_string=step_status.filing_locations%}
diff --git a/edivorce/apps/core/templates/partials/progress_icon.html b/edivorce/apps/core/templates/partials/progress_icon.html
index bb47b2dd..74049c91 100644
--- a/edivorce/apps/core/templates/partials/progress_icon.html
+++ b/edivorce/apps/core/templates/partials/progress_icon.html
@@ -1,4 +1,9 @@
-{% if step_status_string == 'Started' %}<span class="progress-status"><i class="fa fa-adjust incomplete" aria-hidden="true"></i></span>
-{% elif step_status_string == 'Complete' %}<span class="progress-status"><i class="fa fa-check" aria-hidden="true"></i></span>
-{% elif step_status_string == 'Skipped' %}<span class="progress-status"><i class="fa fa-circle-o skipped" aria-hidden="true"></i></span>
-{% endif %}
\ No newline at end of file
+<span class="progress-status">
+    {% if with_status and step_status_string != 'Not started' %}
+        {{ step_status_string }}
+    {% endif %}
+    {% if step_status_string == 'Started' %}<i class="fa fa-adjust incomplete" aria-hidden="true"></i>
+    {% elif step_status_string == 'Completed' %}<i class="fa fa-check" aria-hidden="true"></i>
+    {% elif step_status_string == 'Skipped' %}<i class="fa fa-circle-o skipped" aria-hidden="true"></i>
+    {% endif %}
+</span>
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/question/12_review.html b/edivorce/apps/core/templates/question/12_review.html
index 877036de..de26e178 100644
--- a/edivorce/apps/core/templates/question/12_review.html
+++ b/edivorce/apps/core/templates/question/12_review.html
@@ -31,13 +31,13 @@
     	</div>
     </div>
 </div>
-<div class="question-well step-review {% if step_status.which_orders != 'Complete' %}error{% endif %}">
+<div class="question-well step-review {% if step_status.which_orders != 'Completed' %}error{% endif %}">
 	<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_1" aria-controls="collapse_changed_name">
 		<div>
 			Step 1: What are you asking for
         </div>
     </div>
-    {% if step_status.which_orders != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
+    {% if step_status.which_orders != 'Completed' %}{% 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="collapse in" id="review_step_1">
@@ -47,13 +47,13 @@
 	</div>
 </div>
 
-<div class="question-well step-review {% if step_status.your_information != 'Complete' %}error{% endif %}">
+<div class="question-well step-review {% if step_status.your_information != 'Completed' %}error{% endif %}">
 	<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_2" aria-controls="collapse_changed_name">
 		<div>
 			Step 2: Your information
         </div>
 	</div>
-    {% if step_status.your_information != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
+    {% if step_status.your_information != 'Completed' %}{% include 'partials/incomplete.html' %}{% endif %}
 	<p class="review-buttons"><a class="btn btn-success" href="{% url 'question_steps' 'claimant' %}">Edit</a> </p>
     <div class="clearfix"> </div>
 	<div class="collapse in" id="review_step_2">
@@ -63,13 +63,13 @@
 	</div>
 </div>
 
-<div class="question-well step-review {% if step_status.your_spouse != 'Complete' %}error{% endif %}">
+<div class="question-well step-review {% if step_status.your_spouse != 'Completed' %}error{% endif %}">
 	<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_3" aria-controls="collapse_changed_name">
 		<div>
 			Step 3: Your spouse
 		</div>
 	</div>
-    {% if step_status.your_spouse != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
+    {% if step_status.your_spouse != 'Completed' %}{% 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="collapse in" id="review_step_3">
@@ -79,13 +79,13 @@
 	</div>
 </div>
 
-<div class="question-well step-review {% if step_status.your_marriage != 'Complete' %}error{% endif %}">
+<div class="question-well step-review {% if step_status.your_marriage != 'Completed' %}error{% endif %}">
 	<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_4" aria-controls="collapse_changed_name">
 		<div>
 			Step 4: Your marriage
 		</div>
 	</div>
-    {% if step_status.your_marriage != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
+    {% if step_status.your_marriage != 'Completed' %}{% 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="collapse in" id="review_step_4">
@@ -95,13 +95,13 @@
 	</div>
 </div>
 
-<div class="question-well step-review {% if step_status.your_separation != 'Complete' %}error{% endif %}">
+<div class="question-well step-review {% if step_status.your_separation != 'Completed' %}error{% endif %}">
 	<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_5" aria-controls="collapse_changed_name">
 		<div>
 			Step 5: Your separation
 		</div>
 	</div>
-    {% if step_status.your_separation != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
+    {% if step_status.your_separation != 'Completed' %}{% 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="collapse in" id="review_step_5">
@@ -112,13 +112,13 @@
 </div>
 
 {% if derived.has_children_of_marriage %}
-<div class="question-well step-review {% if step_status.your_children != 'Complete' %}error{% endif %}">
+<div class="question-well step-review {% if step_status.your_children != 'Completed' %}error{% endif %}">
 	<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_6" aria-controls="collapse_changed_name">
 		<div>
 			Step {% step_order step="children" %}: Your children
 		</div>
 	</div>
-    {% if step_status.your_children != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
+    {% if step_status.your_children != 'Completed' %}{% 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="collapse in" id="review_step_6">
@@ -130,13 +130,13 @@
 {% endif %}
 
 {% if 'Spousal support' in which_orders.0.value|load_json %}
-<div class="question-well step-review {% if step_status.spousal_support != 'Complete' %}error{% endif %}">
+<div class="question-well step-review {% if step_status.spousal_support != 'Completed' %}error{% endif %}">
 	<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_7" aria-controls="collapse_changed_name">
 		<div>
 			Step {% step_order step="support" %}: Spousal support
 		</div>
 	</div>
-    {% if step_status.spousal_support != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
+    {% if step_status.spousal_support != 'Completed' %}{% 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="collapse in" id="review_step_7">
@@ -148,13 +148,13 @@
 {% endif %}
 
 {% if 'Division of property and debts' in which_orders.0.value|load_json %}
-<div class="question-well step-review {% if step_status.property_and_debt != 'Complete' %}error{% endif %}">
+<div class="question-well step-review {% if step_status.property_and_debt != 'Completed' %}error{% endif %}">
     <div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_8" aria-controls="collapse_changed_name">
     	<div>
     		Step {% step_order step="property" %}: Property and debt
     	</div>
     </div>
-    {% if step_status.property_and_debt != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
+    {% if step_status.property_and_debt != 'Completed' %}{% 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="collapse in" id="review_step_8">
@@ -166,13 +166,13 @@
 {% endif %}
 
 {% if 'Other orders' in which_orders.0.value|load_json %}
-<div class="question-well step-review {% if step_status.other_orders != 'Complete' %}error{% endif %}">
+<div class="question-well step-review {% if step_status.other_orders != 'Completed' %}error{% endif %}">
     <div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_9" aria-controls="collapse_changed_name">
     	<div>
     		Step {% step_order step="other_orders" %}: Other orders
     	</div>
     </div>
-    {% if step_status.other_orders != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
+    {% if step_status.other_orders != 'Completed' %}{% 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="collapse in" id="review_step_9">
@@ -183,13 +183,13 @@
 </div>
 {% endif %}
 
-<div class="question-well step-review {% if step_status.other_questions != 'Complete' %}error{% endif %}">
+<div class="question-well step-review {% if step_status.other_questions != 'Completed' %}error{% endif %}">
     <div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_10" aria-controls="collapse_changed_name">
     	<div>
     		Step {% step_order step="other_questions" %}: Other questions
     	</div>
     </div>
-    {% if step_status.other_questions != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
+    {% if step_status.other_questions != 'Completed' %}{% 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="collapse in" id="review_step_10">
@@ -199,13 +199,13 @@
     </div>
 </div>
 
-<div class="question-well step-review {% if step_status.filing_locations != 'Complete' %}error{% endif %}">
+<div class="question-well step-review {% if step_status.filing_locations != 'Completed' %}error{% endif %}">
     <div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_11" aria-controls="collapse_changed_name">
     	<div>
     		Step {% step_order step="location" %}: Filing location
     	</div>
     </div>
-    {% if step_status.filing_locations != 'Complete' %}{% include 'partials/incomplete.html' %}{% endif %}
+    {% if step_status.filing_locations != 'Completed' %}{% 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="collapse in" id="review_step_11">
diff --git a/edivorce/apps/core/utils/step_completeness.py b/edivorce/apps/core/utils/step_completeness.py
index e8d3e5a8..f8fdbe1c 100644
--- a/edivorce/apps/core/utils/step_completeness.py
+++ b/edivorce/apps/core/utils/step_completeness.py
@@ -51,7 +51,7 @@ def get_step_completeness(questions_by_step):
             has_responses = True
             complete = is_complete(questions_dict)
             if complete:
-                status_dict[step] = "Complete"
+                status_dict[step] = "Completed"
             else:
                 status_dict[step] = "Started"
     return status_dict