diff --git a/edivorce/apps/core/templates/partials/progress_icon.html b/edivorce/apps/core/templates/partials/progress_icon.html index 132df215..8dd8f5e9 100644 --- a/edivorce/apps/core/templates/partials/progress_icon.html +++ b/edivorce/apps/core/templates/partials/progress_icon.html @@ -1,4 +1,4 @@ {% if step_status_string == 'Started' %} {% elif step_status_string == 'Complete' %} -{% elif step_status_string == 'Skipped' %} +{% elif step_status_string == 'Skipped' %} {% endif %} \ No newline at end of file diff --git a/edivorce/apps/core/utils/step_completeness.py b/edivorce/apps/core/utils/step_completeness.py index ded8b269..e8d3e5a8 100644 --- a/edivorce/apps/core/utils/step_completeness.py +++ b/edivorce/apps/core/utils/step_completeness.py @@ -38,10 +38,17 @@ def get_step_completeness(questions_by_step): Returns {step: status}, {step: [missing_question_key]} """ status_dict = {} - for step, questions_dict in questions_by_step.items(): + has_responses = False + reversed_steps = list(question_step_mapping.keys())[::-1] + for step in reversed_steps: + questions_dict = questions_by_step[step] if not step_started(questions_dict): - status_dict[step] = "Not started" + if not has_responses: + status_dict[step] = "Not started" + else: + status_dict[step] = "Skipped" else: + has_responses = True complete = is_complete(questions_dict) if complete: status_dict[step] = "Complete"