From 41dfa3dfb602a88e9f654d3e27fb9af1d9cacc2e Mon Sep 17 00:00:00 2001 From: Charles Shin Date: Mon, 27 Mar 2017 14:14:18 -0700 Subject: [PATCH] Updated prequalification steps contents and clean up un-used placeholder question --- edivorce/apps/core/templates/incomplete.html | 2 +- edivorce/apps/core/templates/pdf/form35.html | 23 +-- .../templates/prequalification/step_01.html | 7 +- .../templates/prequalification/step_02.html | 4 +- .../templates/prequalification/step_03.html | 18 ++- .../templates/prequalification/step_04.html | 20 ++- .../templates/prequalification/step_05.html | 24 ++-- .../templates/prequalification/step_06.html | 14 +- .../templates/question/12_uncategorized.html | 135 ------------------ edivorce/apps/core/utils/step_completeness.py | 5 +- edivorce/fixtures/Question.json | 48 ------- 11 files changed, 52 insertions(+), 248 deletions(-) delete mode 100644 edivorce/apps/core/templates/question/12_uncategorized.html diff --git a/edivorce/apps/core/templates/incomplete.html b/edivorce/apps/core/templates/incomplete.html index f100fbe5..79318634 100644 --- a/edivorce/apps/core/templates/incomplete.html +++ b/edivorce/apps/core/templates/incomplete.html @@ -4,7 +4,7 @@ {% block content %} -

Do you qualify for a divorce in B.C.?

+

Do You Qualify for a Divorce in B.C.?

diff --git a/edivorce/apps/core/templates/pdf/form35.html b/edivorce/apps/core/templates/pdf/form35.html index d3554c32..45087bbd 100644 --- a/edivorce/apps/core/templates/pdf/form35.html +++ b/edivorce/apps/core/templates/pdf/form35.html @@ -57,26 +57,20 @@ FILED WITH THIS REQUISITION ARE:

- {% check_list source=responses.form35_dummy_requisition value='option1' as dummy_option %}

- draft of the order sought; + draft of the order sought;

- {% check_list source=responses.form35_dummy_requisition value='option2' as dummy_option %}

- proof that the case is an undefended family law case; + proof that the case is an undefended family law case;

- {% check_list source=responses.form35_dummy_requisition value='option3' as dummy_option %}

- certificate of the registrar in Form F36; + certificate of the registrar in Form F36;

- {% check_list source=responses.form35_dummy_requisition value='option4' as dummy_option %}

- filing fee. + filing fee.

- - {% check_list source=responses.form35_dummy_additional value='option1' as dummy_option %}

- proof of service of the notice of family claim or counterclaim, as the case may be. + proof of service of the notice of family claim or counterclaim, as the case may be.

@@ -87,14 +81,11 @@

(b) the family law case includes a claim for child support.]

- {% check_list source=responses.form35_dummy_additional value='option2' as dummy_option %}

- Child Support Affidavit in Form F37. + Child Support Affidavit in Form F37.

- - {% check_list source=responses.form35_dummy_additional value='option3' as dummy_option %}

- affidavit in Form F38. + affidavit in Form F38.

diff --git a/edivorce/apps/core/templates/prequalification/step_01.html b/edivorce/apps/core/templates/prequalification/step_01.html index 42185715..9a715bd9 100644 --- a/edivorce/apps/core/templates/prequalification/step_01.html +++ b/edivorce/apps/core/templates/prequalification/step_01.html @@ -10,7 +10,7 @@ {% endblock %} {% block content %} -

Do you qualify for a divorce in B.C.?

+

Do You Qualify for a Divorce in B.C.?

Let's start off with a few questions about your situation to make sure that this online divorce tool can work for you.

@@ -33,8 +33,7 @@ Living together in a marriage like + usually one or two years." >marriage like (also known as common law) relationship
@@ -50,7 +49,7 @@ information refer to the booklet called Living Together or Living Apart: Common-Law Relationships, Marriage, Separation and Divorce, - on the Family Law website.

+ on the Family Law in B.C. website.

diff --git a/edivorce/apps/core/templates/prequalification/step_02.html b/edivorce/apps/core/templates/prequalification/step_02.html index 7f0821b7..3a5781ef 100644 --- a/edivorce/apps/core/templates/prequalification/step_02.html +++ b/edivorce/apps/core/templates/prequalification/step_02.html @@ -11,7 +11,7 @@ {% block content %} -

Do you qualify for a divorce in B.C.?

+

Do You Qualify for a Divorce in B.C.?

Do you or your spouse live in B.C.?

@@ -74,7 +74,7 @@

diff --git a/edivorce/apps/core/templates/prequalification/step_03.html b/edivorce/apps/core/templates/prequalification/step_03.html index 0a14ac8f..5c7bd49a 100644 --- a/edivorce/apps/core/templates/prequalification/step_03.html +++ b/edivorce/apps/core/templates/prequalification/step_03.html @@ -11,7 +11,7 @@ {% block content %} -

Do you qualify for a divorce in B.C.?

+

Do You Qualify for a Divorce in B.C.?

When did you and your spouse separate (legally this is referred to as @@ -58,9 +58,7 @@

-

Starts when one spouse decides that things have come to an end/the relationship is over, and then act on the decision.

- -

There is no such thing as a "legal separation." If you're married or in a common-law relationship, you become separated as soon as you and your spouse start living apart with at least one of you wanting to separate. You don't need your spouse's permission to start living separately. You can tell others that you wish to separate, but you don't have to see a lawyer, sign a document, or go to court to be separated.

+

Separation starts when one spouse decides that things have come to an end/the relationship is over, and then acts on the decision.

You might even still live in the same house to save money, but you're usually still considered separated if you don't share things like meals, a bedroom, and social activities.

@@ -90,7 +88,7 @@
-

Did you and {% if name_spouse %} {{ name_spouse }} {% else %} your spouse {% endif %} try to reconcile after you separated {% if separation_date %} on {{ separation_date }}{% endif %}?

+

Did you and {% if name_spouse %} {{ name_spouse }} {% else %} your spouse {% endif %} attempt to reconcile after you separated {% if separation_date %} on {{ separation_date }}{% endif %}?

@@ -120,8 +118,7 @@
@@ -149,12 +146,12 @@ {% endblock %} {% block sidebarText%} - +

Am I separated?

When two people who have been living together in a marriage, or a marriage-like relationship (sometimes called a common-law relationship), decide not to live together any more, they are separated.

There is no such thing as a "legal" separation. If you are living apart, you are separated.

It is possible to be separated and still living in the same home where a clear intention of a permanent separation has been communicated and acted upon.

-

What happens if my spouse and I tried to work things out

+

What happens if my spouse and I tried to work things out?

If you apply for a divorce on the basis of a one-year separation, you can live together for up to 90 days (either before or after you file the application) to try to reconcile. If things do not work out, you can continue your action for @@ -163,5 +160,6 @@

Does being separated mean living at two different addresses?

Some couples choose to separate but still live in the same house. A lawyer can tell you what factors courts may consider when they are deciding if you are separated.

-

A list of activities and behaviours that the courts consider to be indicators of a couple being separated can be found on the Legal Services Society website

+

A list of activities and behaviours + that the courts consider to be indicators of a couple being separated can be found on the Family Law in B.C. website.

{% endblock %} diff --git a/edivorce/apps/core/templates/prequalification/step_04.html b/edivorce/apps/core/templates/prequalification/step_04.html index bf8a42e3..d609a83e 100644 --- a/edivorce/apps/core/templates/prequalification/step_04.html +++ b/edivorce/apps/core/templates/prequalification/step_04.html @@ -10,7 +10,7 @@ {% endblock %} {% block content %} -

Do you qualify for a divorce in B.C.?

+

Do You Qualify for a Divorce in B.C.?

Do you and your spouse have any children (includes step children, adopted children). The legal term is children of the marriage.

@@ -25,7 +25,15 @@
-

If you had children with your spouse, but the children are over +

Legally, the court is only concerned with + + children of the marriage. + If you had children with your spouse, but the children are over the age of majority (19 in B.C.) and independent, they are no longer considered ‘children of the marriage’ under the Divorce Act, and you do not need to include their information in your @@ -49,9 +57,9 @@

@@ -66,9 +74,9 @@
diff --git a/edivorce/apps/core/templates/prequalification/step_05.html b/edivorce/apps/core/templates/prequalification/step_05.html index fdaaa1f9..81763627 100644 --- a/edivorce/apps/core/templates/prequalification/step_05.html +++ b/edivorce/apps/core/templates/prequalification/step_05.html @@ -12,7 +12,7 @@ {% block content %} -

Do you qualify for a divorce in B.C.?

+

Do You Qualify for a Divorce in B.C.?

Will you be able to provide proof of your marriage (in the form of an original or certified Vital Statistics (an office run by the provincial government).

If You Were Married in Another Province
- If you were married in another province you need to get the official marriage certificate or registration of marriage from the office equivalent to the department of vital statistics in that province.

+ If you were married in another province you need to get the official marriage certificate or registration of marriage from the office equivalent to the Department of Vital Statistics in that province.

If You Were married in Another Country
Contact the office responsible for marriage records in the country where you were married.

@@ -96,21 +96,21 @@ Registries are located in courthouses around the province." >registry when you file the Notice of Joint Family Claim

This is the document that starts the court case. The Notice of + Joint Family Claim Form (F1) gives the court details about you and your spouse, about your marriage and separation, and about what you're asking the court for." >Notice of Joint Family Claim (form F1).

{% input_field type="textarea" class="response-textarea" name="provide_certificate_later_reason" rows="8" cols="65" %}

If the registrar - agrees with the reasons you provide, and accepts the Notice of Joint Family Claim (form F1), + agrees with the reasons you provide, and accepts the Notice of Joint Family Claim Form (F1), you will need to provide proof of marriage before your application for a divorce order will be reviewed by the court. Other matters can be pursued in the mean time.

-

If the registrar is dissatisfied with the reason (s) you provide, you will not be able to file - the Notice of Joint Family claim (form F1) until the proof of marriage can be produced.

+

If the registrar is dissatisfied with the reason(s) you provide, you will not be able to file + the Notice of Joint Family claim Form (F1) until the proof of marriage can be produced.

-

Usually the grounds for divorce are that you've been living separately and apart form your spouse for at least one year

@@ -84,7 +83,7 @@
@@ -136,13 +135,6 @@
  • Your spouse has been physically or mentally cruel to you.
  • Your spouse has committed adultery.
    • -

    If you apply for a divorce on the basis of a one-year separation, you can live together for up to 90 days (either before or after you file the application) to try to reconcile. If things do not work out, you can continue your action for divorce as if you had not spent the time together.

    -

    Some couples choose to separate but still live in the same house. A lawyer can tell you what factors courts may consider when they are deciding if you are separated.

    -

    You can also get a divorce if:

    -
      -
    • you or your spouse has committed adultery (been unfaithful) that hasn't been forgiven, or
      • -
    • your spouse treated you with physical or mental cruelty that you haven't forgiven, which makes it impossible for you to continue to live together.
      • -

    To get a divorce for these reasons you have to prove these things in court.

    The majority of divorces are uncontested or undefended divorces (about 80 percent). That means that the divorcing couple have settled on how they're going to settle their parenting, support, and property issues. But they still need a court order for the divorce.

    {% endblock %} \ No newline at end of file diff --git a/edivorce/apps/core/templates/question/12_uncategorized.html b/edivorce/apps/core/templates/question/12_uncategorized.html deleted file mode 100644 index 84315a4e..00000000 --- a/edivorce/apps/core/templates/question/12_uncategorized.html +++ /dev/null @@ -1,135 +0,0 @@ -{% extends 'base.html' %}{% load input_field %} - -{% block title %}{{ block.super }}: Review{% endblock %} - -{% block progress %}{% include "partials/progress.html" %}{% endblock %} - -{% block content %} - -{% comment "Not needed anymore" %} -
    -

    FORM 35

    -

    Filed with this requisition are:

    -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    - -

    Additional request:

    -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    -{% endcomment %} - - - -
    -

    FORM 38

    -
    - {% comment "Not needed anymore" %} -

    Will you be swearing/affirming your affidavit together at the registry? Or will you be doing this separately?

    -
    - - -
    - -
    -

    Your occupation

    -
    {% input_field type="text" name="form38_dummy_occupation_you" class="form-block input-wide response-textbox" %}
    -

    Your spouse's occupation

    -
    {% input_field type="text" name="form38_dummy_occupation_spouse" class="form-block input-wide response-textbox" %}
    -
    - - -
    -

    The facts set out in the: (show if separate is clicked)

    -
    - - -
    -
    - - - {% if original_marriage_certificate == 'NO' %} -
    -

    Name of a person who was present at the marriage ceremony(show if no to provide marriage certificate

    -
    {% input_field type="text" name="form38_dummy_witness" class="form-block input-wide response-textbox" %}
    -
    - {% endif %} - - {% endcomment %} - -
    -

    change to new name

    -
    {% input_field type="text" name="form38_dummy_new_name" class="form-block input-wide response-textbox" %}
    -

    For who? (for together)

    -
    - - -
    -
    -
    -
    - - -
    - -
    - -{% endblock %} - -{% block formbuttons %} - -{% endblock %} - -{% block sidebarNav %} - -{% endblock %} -{% block sidebar %} - -{% endblock %} \ 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 02896d7e..2140128f 100644 --- a/edivorce/apps/core/utils/step_completeness.py +++ b/edivorce/apps/core/utils/step_completeness.py @@ -19,8 +19,7 @@ def is_complete(step, lst): """ Check required field of question for complete state Required: question is always require user response to be complete - Conditional: question itself is required and depends on the response to this question, - optional question may be also required + Conditional: Optional question needed depends on reveal_response value of its conditional_target. """ if not lst: return False, [] @@ -60,7 +59,7 @@ def __condition_met(reveal_response, target, lst): if target['question__required'] != 'Conditional': return True else: - # if the target is Conitional and the condition was met, check the target next + # if the target is Conditional and the condition was met, check the target next reveal_response = target["question__reveal_response"] conditional_target = target["question__conditional_target"] for new_target in lst: diff --git a/edivorce/fixtures/Question.json b/edivorce/fixtures/Question.json index 9ca14a9b..e513a1ac 100644 --- a/edivorce/fixtures/Question.json +++ b/edivorce/fixtures/Question.json @@ -737,53 +737,5 @@ }, "model": "core.question", "pk": "court_registry_for_filing" -}, -{ - "fields": { - "name": "Will you be swearing/affirming your affidavit together at the registry? Or will you be doing this separately?", - "description": "DUMMY QUESTION for form 38 first question" - }, - "model": "core.question", - "pk": "form38_dummy_together" -}, -{ - "fields": { - "name": "Facts set out in the ", - "description": "DUMMY QUESTION for form 38 fourth question" - }, - "model": "core.question", - "pk": "form38_dummy_facts" -}, -{ - "fields": { - "name": "Name of a person who was present at the marriage ceremony", - "description": "DUMMY QUESTION for form 38 fifth question" - }, - "model": "core.question", - "pk": "form38_dummy_witness" -}, -{ - "fields": { - "name": "Want new name?", - "description": "DUMMY QUESTION for form 38 sixth question" - }, - "model": "core.question", - "pk": "form38_dummy_new_name" -}, -{ - "fields": { - "name": "For who to change name?", - "description": "DUMMY QUESTION for form 38 seventh question" - }, - "model": "core.question", - "pk": "form38_dummy_for_who" -}, -{ - "fields": { - "name": "Gender?", - "description": "DUMMY QUESTION for form 38 eighth question" - }, - "model": "core.question", - "pk": "form38_dummy_gender" } ]