From a4268715b59c0855186759e1c1b277c5354b53db Mon Sep 17 00:00:00 2001 From: ariannedee Date: Wed, 2 Sep 2020 13:15:08 -0700 Subject: [PATCH 1/7] Extract partial for step status indicator --- .../core/templates/partials/progress.html | 38 ++++++------------- .../templates/partials/progress_icon.html | 4 ++ 2 files changed, 16 insertions(+), 26 deletions(-) create mode 100644 edivorce/apps/core/templates/partials/progress_icon.html diff --git a/edivorce/apps/core/templates/partials/progress.html b/edivorce/apps/core/templates/partials/progress.html index 1eb46f68..75252335 100644 --- a/edivorce/apps/core/templates/partials/progress.html +++ b/edivorce/apps/core/templates/partials/progress.html @@ -6,38 +6,32 @@ Qualifying Questions - {% if step_status.prequalification == 'Started' %} - {% elif step_status.prequalification == 'Complete' %} {% endif %} + {% include "partials/progress_icon.html" with step_status_string=step_status.prequalification %} Step 1
What Are You Asking For?
- {% if step_status.which_orders == 'Started' %} - {% elif step_status.which_orders == 'Complete' %} {% endif %} + {% include "partials/progress_icon.html" with step_status_string=step_status.which_orders %}
Step 2
Your information (Claimant 1)
- {% if step_status.your_information == 'Started' %} - {% elif step_status.your_information == 'Complete' %} {% endif %} + {% include "partials/progress_icon.html" with step_status_string=step_status.your_information %}
Step 3
Your spouse (Claimant 2)
- {% if step_status.your_spouse == 'Started' %} - {% elif step_status.your_spouse == 'Complete' %} {% endif %} + {% include "partials/progress_icon.html" with step_status_string=step_status.your_spouse%}
Step 4
Your marriage
- {% if step_status.your_marriage == 'Started' %} - {% elif step_status.your_marriage == 'Complete' %} {% endif %} + {% include "partials/progress_icon.html" with step_status_string=step_status.your_marriage%}
Step 5
Your separation
- {% if step_status.your_separation == 'Started' %} - {% elif step_status.your_separation == 'Complete' %} {% endif %} + {% include "partials/progress_icon.html" with step_status_string=step_status.your_separation%}
{% if children_of_marriage == 'YES' or derived.has_children_of_marriage %} @@ -45,8 +39,7 @@ data-toggle="collapse" aria-expanded="false" data-target="#children_nav" aria-controls="children_nav"> Step {% step_order step="children" %}
Your children
- {% if step_status.your_children == 'Started' %} - {% elif step_status.your_children == 'Complete' %} {% endif %} + {% include "partials/progress_icon.html" with step_status_string=step_status.your_children%}