From bf2b2cddc36ed4d1053884bcf30511fcd8f7d74d Mon Sep 17 00:00:00 2001 From: Charles Shin Date: Tue, 7 Mar 2017 15:57:15 -0800 Subject: [PATCH] DIV-179, DIV-180: Added placeholder pages and updated dashboard --- .../apps/core/static/svg/icon-certificate.svg | 7 ++ edivorce/apps/core/templates/dashnav.html | 37 +++++----- edivorce/apps/core/templates/overview.html | 52 +------------- .../templates/prequalification/step_06.html | 2 +- .../core/templates/question/01_orders.html | 4 +- .../core/templates/question/02_claimant.html | 2 +- .../templates/question/03_respondent.html | 2 +- .../core/templates/question/04_marriage.html | 2 +- .../templates/question/05_separation.html | 2 +- .../core/templates/question/06_support.html | 2 +- .../core/templates/question/07_property.html | 2 +- .../templates/question/08_other_orders.html | 2 +- .../question/09_other_questions.html | 2 +- .../core/templates/question/10_location.html | 2 +- .../core/templates/question/11_review.html | 10 ++- edivorce/apps/core/templates/savepdf.html | 70 +++++++++++++++++++ edivorce/apps/core/templates/success.html | 30 ++++++++ edivorce/apps/core/urls.py | 2 + edivorce/apps/core/views/main.py | 11 ++- 19 files changed, 156 insertions(+), 87 deletions(-) create mode 100644 edivorce/apps/core/static/svg/icon-certificate.svg create mode 100644 edivorce/apps/core/templates/savepdf.html create mode 100644 edivorce/apps/core/templates/success.html diff --git a/edivorce/apps/core/static/svg/icon-certificate.svg b/edivorce/apps/core/static/svg/icon-certificate.svg new file mode 100644 index 00000000..8747651a --- /dev/null +++ b/edivorce/apps/core/static/svg/icon-certificate.svg @@ -0,0 +1,7 @@ + + + \ No newline at end of file diff --git a/edivorce/apps/core/templates/dashnav.html b/edivorce/apps/core/templates/dashnav.html index 30a5d8e6..140aa2c9 100644 --- a/edivorce/apps/core/templates/dashnav.html +++ b/edivorce/apps/core/templates/dashnav.html @@ -1,28 +1,29 @@ +{% load static %}

Dashboard

- - - Qualifying Questions + + + Divorce Questionnaire - - - What Are You Asking For? + + + Review and Print Forms - - - Your information + + + File Documents - - - Your spouse + + + Wait - - - Your marriage + + + Check with Registry - - - Your separation + + + Order a Certificate of Divorce
\ No newline at end of file diff --git a/edivorce/apps/core/templates/overview.html b/edivorce/apps/core/templates/overview.html index e2e719d8..10f32a48 100644 --- a/edivorce/apps/core/templates/overview.html +++ b/edivorce/apps/core/templates/overview.html @@ -2,11 +2,11 @@ {% block title %}{{ block.super }}: Overview{% endblock %} -{% block progress %}{% include "dashnav.html" %}{% endblock %} +{% block progress %}{% include "dashnav.html" with active_page=active_page %}{% endblock %} {% block content %} -

Your Information

+

Answer the Questions Related to Your Divorce Questionnaire

-

Prepare your forms

- - - - {% endblock %} {% block formbuttons %} diff --git a/edivorce/apps/core/templates/prequalification/step_06.html b/edivorce/apps/core/templates/prequalification/step_06.html index 78bf3db6..ca8d71d4 100644 --- a/edivorce/apps/core/templates/prequalification/step_06.html +++ b/edivorce/apps/core/templates/prequalification/step_06.html @@ -117,7 +117,7 @@ {% block formbuttons %}
- Next    + Next   
{% endblock %} diff --git a/edivorce/apps/core/templates/question/01_orders.html b/edivorce/apps/core/templates/question/01_orders.html index 80f1cbf2..fd52e297 100644 --- a/edivorce/apps/core/templates/question/01_orders.html +++ b/edivorce/apps/core/templates/question/01_orders.html @@ -3,7 +3,7 @@ {% block title %}{{ block.super }}: Prequalification{% endblock %} -{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %} +{% block progress %}{% include "progress.html" with step=active_page %}{% endblock %} {% block content %} @@ -12,7 +12,7 @@

What are you asking for (Orders) ?

-

With an undefended divorce (aka desk order), you do not need to appear in court. However a judge needs to review and approve what you are asking for. Orders allow you to tell the court what you want (for example parenting support and property division).

+

With an undefended divorce (aka desk order), you do not need to appear in court. However, a judge needs to review and approve what you are asking for. Orders allow you to tell the court what you want (for example parenting support and property division).

Please select what you are asking for. Later on you will be asked to provide details for each request.

diff --git a/edivorce/apps/core/templates/question/02_claimant.html b/edivorce/apps/core/templates/question/02_claimant.html index a72204ad..9f530486 100644 --- a/edivorce/apps/core/templates/question/02_claimant.html +++ b/edivorce/apps/core/templates/question/02_claimant.html @@ -3,7 +3,7 @@ {% block title %}{{ block.super }}: Your Information{% endblock %} -{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %} +{% block progress %}{% include "progress.html" with step=active_page %}{% endblock %} {% block content %} diff --git a/edivorce/apps/core/templates/question/03_respondent.html b/edivorce/apps/core/templates/question/03_respondent.html index c018a792..df1790b9 100644 --- a/edivorce/apps/core/templates/question/03_respondent.html +++ b/edivorce/apps/core/templates/question/03_respondent.html @@ -2,7 +2,7 @@ {% block title %}{{ block.super }}: Your Spouse{% endblock %} -{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %} +{% block progress %}{% include "progress.html" with step=active_page %}{% endblock %} {% block content %} diff --git a/edivorce/apps/core/templates/question/04_marriage.html b/edivorce/apps/core/templates/question/04_marriage.html index b748a261..f4531432 100644 --- a/edivorce/apps/core/templates/question/04_marriage.html +++ b/edivorce/apps/core/templates/question/04_marriage.html @@ -3,7 +3,7 @@ {% block title %}{{ block.super }}: Your Marriage{% endblock %} -{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %} +{% block progress %}{% include "progress.html" with step=active_page %}{% endblock %} {% block content %} diff --git a/edivorce/apps/core/templates/question/05_separation.html b/edivorce/apps/core/templates/question/05_separation.html index 0679d603..071e841b 100644 --- a/edivorce/apps/core/templates/question/05_separation.html +++ b/edivorce/apps/core/templates/question/05_separation.html @@ -3,7 +3,7 @@ {% block title %}{{ block.super }}: Reason For Divorce{% endblock %} -{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %} +{% block progress %}{% include "progress.html" with step=active_page %}{% endblock %} {% block content %} diff --git a/edivorce/apps/core/templates/question/06_support.html b/edivorce/apps/core/templates/question/06_support.html index 4a62a3dd..1aeeb1e7 100644 --- a/edivorce/apps/core/templates/question/06_support.html +++ b/edivorce/apps/core/templates/question/06_support.html @@ -3,7 +3,7 @@ {% block title %}{{ block.super }}: Declarations{% endblock %} -{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %} +{% block progress %}{% include "progress.html" with step=active_page %}{% endblock %} {% block content %} diff --git a/edivorce/apps/core/templates/question/07_property.html b/edivorce/apps/core/templates/question/07_property.html index 4da3adfb..a2d3a303 100644 --- a/edivorce/apps/core/templates/question/07_property.html +++ b/edivorce/apps/core/templates/question/07_property.html @@ -2,7 +2,7 @@ {% load input_field %} {% block title %}{{ block.super }}: Application Location{% endblock %} -{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %} +{% block progress %}{% include "progress.html" with step=active_page %}{% endblock %} {% block content %} diff --git a/edivorce/apps/core/templates/question/08_other_orders.html b/edivorce/apps/core/templates/question/08_other_orders.html index f71e42d4..2569ca28 100644 --- a/edivorce/apps/core/templates/question/08_other_orders.html +++ b/edivorce/apps/core/templates/question/08_other_orders.html @@ -2,7 +2,7 @@ {% block title %}{{ block.super }}: Other Orders{% endblock %} -{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %} +{% block progress %}{% include "progress.html" with step=active_page %}{% endblock %} {% block content %} diff --git a/edivorce/apps/core/templates/question/09_other_questions.html b/edivorce/apps/core/templates/question/09_other_questions.html index e6823be6..62c8b60d 100644 --- a/edivorce/apps/core/templates/question/09_other_questions.html +++ b/edivorce/apps/core/templates/question/09_other_questions.html @@ -3,7 +3,7 @@ {% block title %}{{ block.super }}: Spousal Support{% endblock %} -{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %} +{% block progress %}{% include "progress.html" with step=active_page %}{% endblock %} {% block content %} diff --git a/edivorce/apps/core/templates/question/10_location.html b/edivorce/apps/core/templates/question/10_location.html index 66e2ab11..aaf0086c 100644 --- a/edivorce/apps/core/templates/question/10_location.html +++ b/edivorce/apps/core/templates/question/10_location.html @@ -3,7 +3,7 @@ {% block title %}{{ block.super }}: Property And Debts{% endblock %} -{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %} +{% block progress %}{% include "progress.html" with step=active_page %}{% endblock %} {% block content %} diff --git a/edivorce/apps/core/templates/question/11_review.html b/edivorce/apps/core/templates/question/11_review.html index 32a6c146..303a83af 100644 --- a/edivorce/apps/core/templates/question/11_review.html +++ b/edivorce/apps/core/templates/question/11_review.html @@ -2,7 +2,7 @@ {% block title %}{{ block.super }}: Review{% endblock %} -{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %} +{% block progress %}{% include "progress.html" with step=active_page %}{% endblock %} {% block content %} @@ -53,14 +53,12 @@ {% include "partials/review_user_responses.html" with questions=filing_locations %} -
- -
- {% endblock %} {% block formbuttons %} - +
+ Next    +
{% endblock %} {% block sidebar %} diff --git a/edivorce/apps/core/templates/savepdf.html b/edivorce/apps/core/templates/savepdf.html new file mode 100644 index 00000000..4a418801 --- /dev/null +++ b/edivorce/apps/core/templates/savepdf.html @@ -0,0 +1,70 @@ +{% extends 'base.html' %} + +{% block title %}{{ block.super }}: Overview{% endblock %} + +{% block progress %}{% include "dashnav.html" with active_page=active_page %}{% endblock %} + +{% block content %} +

Save PDF

+

Click 'Preview' for preview of the form

+

Click 'Print' to view PDF version of the form

+ +

Prepare your forms

+
    +
  • +

    + Notice of Joint Family Claim(F1) + Preview | + +

    +
    • +
  • +

    + Requisition (Form F35) + Preview | + +

    +
    • +
  • +

    + Draft Final Order (Form F52) + Preview | + +

    +
    • +
  • +

    + Certificate of Pleadings (F36) + Preview | + +

    +
    • +
  • +

    + Affidavit Desk Order Divorce (F38) + Preview | + +

    +
    • +
  • +

    + Original Marriage Certificate or Registration of Marriage + Preview | + Print +

    +
    • +
+ + + +{% endblock %} + +{% block formbuttons %} +
+ Overview    +
+{% endblock %} + +{% block sidebar %} + +{% endblock %} diff --git a/edivorce/apps/core/templates/success.html b/edivorce/apps/core/templates/success.html new file mode 100644 index 00000000..03587c13 --- /dev/null +++ b/edivorce/apps/core/templates/success.html @@ -0,0 +1,30 @@ +{% extends 'base.html' %} + +{% block title %}{{ block.super }}: Overview{% endblock %} + +{% block progress %}{% include "dashnav.html" %}{% endblock %} + +{% block content %} +
+

You have met the conditions for requesting a divorce in B.C.

+ +

Documents you will need to move forward with the divorce request.

+
    +
  • Marriag certificate
    • +
  • Separation agreement or court order
    • +
+
+ Returning User
Login with BCeID + New User
Register for BCeID +
+
+ +{% endblock %} + +{% block formbuttons %} + +{% endblock %} + +{% block sidebar %} + +{% endblock %} diff --git a/edivorce/apps/core/urls.py b/edivorce/apps/core/urls.py index aff64f0c..49268973 100644 --- a/edivorce/apps/core/urls.py +++ b/edivorce/apps/core/urls.py @@ -10,6 +10,8 @@ urlpatterns = [ url(r'^bceid', localdev.bceid, name="bceid"), url(r'^logout', main.logout, name="logout"), url(r'^overview', main.overview, name="overview"), + url(r'^success', main.success, name="success"), + url(r'^savepdf', main.savepdf, name="savepdf"), url(r'^health$', system.health), # todo: remove this line once BCeID is working diff --git a/edivorce/apps/core/views/main.py b/edivorce/apps/core/views/main.py index b92075a7..f8aac1fb 100644 --- a/edivorce/apps/core/views/main.py +++ b/edivorce/apps/core/views/main.py @@ -22,6 +22,14 @@ def intro(request): return render(request, 'intro.html', context={'hide_nav': True}) +def success(request): + return render(request, 'success.html') + + +def savepdf(request): + return render(request, 'savepdf.html', context={'active_page': 'savepdf'}) + + def login(request): if settings.DEPLOYMENT_TYPE == 'localdev' and not request.session.get('fake-bceid-guid'): @@ -79,7 +87,7 @@ def question(request, step): responses_dict = get_responses_from_db_grouped_by_steps(user) else: responses_dict = get_responses_from_db(user) - responses_dict['question_step'] = step + responses_dict['active_page'] = step # If page is filing location page, add registries dictionary for list of court registries if step == "10_location": responses_dict['registries'] = sorted(list_of_registries) @@ -102,6 +110,7 @@ def overview(request): started_dict[step] = "Not started" else: started_dict[step] = "Started" + started_dict['active_page'] = 'overview' return render(request, 'overview.html', context=started_dict)