From 5c2ef8f041106fb3360855452f5c834c810b1d07 Mon Sep 17 00:00:00 2001 From: Justin Johnson Date: Fri, 2 Mar 2018 14:56:47 -0800 Subject: [PATCH] DIV-827 --- edivorce/apps/core/static/css/weasyprint.css | 5 + .../core/templates/dashboard/print_form.html | 2 +- edivorce/apps/core/templates/pdf/form37.html | 93 ++++--- edivorce/apps/core/templates/pdf/form38.html | 180 +++++++----- .../apps/core/templates/pdf/form38_we.html | 262 ------------------ edivorce/apps/core/views/pdf.py | 13 +- 6 files changed, 176 insertions(+), 379 deletions(-) delete mode 100644 edivorce/apps/core/templates/pdf/form38_we.html diff --git a/edivorce/apps/core/static/css/weasyprint.css b/edivorce/apps/core/static/css/weasyprint.css index 141a6fbb..bfb934d1 100644 --- a/edivorce/apps/core/static/css/weasyprint.css +++ b/edivorce/apps/core/static/css/weasyprint.css @@ -234,6 +234,10 @@ ol.parens-list { ol.parens-list > li { list-style: none; position: relative; + padding-left: 0; +} +ol.parens-list > li > ul > li { + padding-left: 0; } ol.parens-list > li:before { @@ -243,6 +247,7 @@ ol.parens-list > li:before { left: -2.5em; } + .th-left { text-align: left !important; } diff --git a/edivorce/apps/core/templates/dashboard/print_form.html b/edivorce/apps/core/templates/dashboard/print_form.html index dfcb8711..8af55b43 100644 --- a/edivorce/apps/core/templates/dashboard/print_form.html +++ b/edivorce/apps/core/templates/dashboard/print_form.html @@ -273,7 +273,7 @@

- diff --git a/edivorce/apps/core/templates/pdf/form37.html b/edivorce/apps/core/templates/pdf/form37.html index 44428aa8..d0375c97 100644 --- a/edivorce/apps/core/templates/pdf/form37.html +++ b/edivorce/apps/core/templates/pdf/form37.html @@ -119,49 +119,55 @@

  • The following is true to the best of my information and belief.

    -

    (a) Parties:

    - - - - - - - - - - - - - - - - - - -
    Claimant 1's nameProvince of residence
    {% response responses.name_you %}{% response responses.address_to_send_official_document_prov_you %}
    Claimant 2's nameProvince of residence
    {% response responses.name_spouse %}{% response responses.address_to_send_official_document_prov_spouse %}
    - -

    (b) Children:

    - - - - - - - - - - +
      +
    1. +

      Parties:

      + +
    Child's nameBirthdateAgeChild now living withRelationship to claimant 1Relationship to claimant 2
    + + + + + + + + + + + + + + + + +
    Claimant 1's nameProvince of residence
    {% response responses.name_you %}{% response responses.address_to_send_official_document_prov_you %}
    Claimant 2's nameProvince of residence
    {% response responses.name_spouse %}{% response responses.address_to_send_official_document_prov_spouse %}
    +
    • + +
  • +

    Children:

    + + + + + + + + + + {% for child in responses.children %} - - - - - - - - + + + + + + + + {% endfor %} -
    Child's nameBirthdateAgeChild now living withRelationship to claimant 1Relationship to claimant 2
    {{ child.child_name }}{{ child.child_birth_date|date_formatter }}  {{ child.child_birth_date|age }}{{ child.child_live_with|claimantize }}{{ child.child_relationship_to_you }}{{ child.child_relationship_to_spouse }}
    {{ child.child_name }}{{ child.child_birth_date|date_formatter }}  {{ child.child_birth_date|age }}{{ child.child_live_with|claimantize }}{{ child.child_relationship_to_you }}{{ child.child_relationship_to_spouse }}
    + +
    • + @@ -177,7 +183,7 @@
  • {% if responses.how_will_calculate_income == 'using specific rules' %} -
      +
      1. Claimant 1's annual income as determined under sections 15 to 20 of the Guidelines: {{ responses.annual_gross_income|money }} @@ -318,7 +324,8 @@ {% if responses.which_claimant == 'both' or responses.which_claimant == 'Claimant 1' %} {% include 'pdf/partials/notary_signature.html' with name=responses.name_you %} - {% elif responses.which_claimant == 'both' or responses.which_claimant == 'Claimant 2' %} + {% endif %} + {% if responses.which_claimant == 'both' or responses.which_claimant == 'Claimant 2' %} {% include 'pdf/partials/notary_signature.html' with name=responses.name_spouse %} {% endif %} {% include 'pdf/partials/fact_sheet_a.html' %} diff --git a/edivorce/apps/core/templates/pdf/form38.html b/edivorce/apps/core/templates/pdf/form38.html index d5bc80e5..93c45493 100644 --- a/edivorce/apps/core/templates/pdf/form38.html +++ b/edivorce/apps/core/templates/pdf/form38.html @@ -22,7 +22,6 @@ -

        Form F38
        (Rule 10-10 (2))

        @@ -63,38 +62,65 @@

        - I, - {% if responses.name_claimant %} - {% include "partials/name_with_alias.html" with name=responses.name_claimant use_other_name=responses.any_other_name_claimant other_names=responses.other_name_claimant %} + {% if responses.which_claimant == 'both' %}We{% else %}I{% endif %}, + {% if responses.which_claimant == 'both' or responses.which_claimant == 'Claimant 1' %} + {% if responses.name_you %} + {% include "partials/name_with_alias.html" with name=responses.name_you use_other_name=responses.any_other_name_you other_names=responses.other_name_you %} {% else %}{% endif %}, of - {% required responses.address_to_send_official_document_street_claimant trail=',' %} - {% required responses.address_to_send_official_document_city_claimant size=100 trail=',' %} - {% if responses.address_to_send_official_document_prov_claimant %} - {{ responses.address_to_send_official_document_prov_claimant }}, + {% required responses.address_to_send_official_document_street_you trail=',' %} + {% required responses.address_to_send_official_document_city_you size=100 trail=',' %} + {% if responses.address_to_send_official_document_prov_you %} + {{ responses.address_to_send_official_document_prov_you }}, + {% endif %} + {% if responses.address_to_send_official_document_country_you == 'Other' %} + {% required responses.address_to_send_official_document_other_country_you size=100 trail=',' %} + {% else %} + {% required responses.address_to_send_official_document_country_you size=100 trail=',' %} + {% endif %} + {% required responses.address_to_send_official_document_postal_code_you size=100 trail=',' %} + + {% required responses.occupation_you %},
        + {% endif %} + {% if responses.which_claimant == 'both' %}and
        {% endif %} + + {% if responses.which_claimant == 'both' or responses.which_claimant == 'Claimant 2' %} + {% if responses.name_spouse %} + {% include "partials/name_with_alias.html" with name=responses.name_spouse use_other_name=responses.any_other_name_spouse other_names=responses.other_name_spouse %} + {% else %}{% endif %}, of + + {% required responses.address_to_send_official_document_street_spouse trail=',' %} + {% required responses.address_to_send_official_document_city_spouse size=100 trail=',' %} + {% if responses.address_to_send_official_document_prov_spouse %} + {{ responses.address_to_send_official_document_prov_spouse }}, {% endif %} - {% if responses.address_to_send_official_document_country_claimant == 'Other' %} - {% required responses.address_to_send_official_document_other_country_claimant size=100 trail=',' %} + {% if responses.address_to_send_official_document_country_spouse == 'Other' %} + {% required responses.address_to_send_official_document_other_country_spouse size=100 trail=',' %} {% else %} - {% required responses.address_to_send_official_document_country_claimant size=100 trail=',' %} + {% required responses.address_to_send_official_document_country_spouse size=100 trail=',' %} {% endif %} - {% required responses.address_to_send_official_document_postal_code_claimant size=100 trail=',' %} + {% required responses.address_to_send_official_document_postal_code_spouse size=100 trail=',' %} - {% required responses.occupation_claimant %} + {% endif %}
        SWEAR (OR AFFIRM) THAT:

        1. - I am {% required responses.which_claimant %}. + {% if responses.which_claimant == 'both' %} + We are claimant 1 and claimant 2. + {% else %} + I am {{ responses.which_claimant }}. + {% endif %}
        2. There is no possibility of reconciliation between my spouse and me.
        3. - I believe that the facts set out in the notice of family claim are true. + {% if responses.which_claimant == 'both' %}We{% else %}I{% endif %} + believe that the facts set out in the notice of family claim are true.
          4. {% if responses.original_marriage_certificate == 'YES' %} @@ -108,15 +134,24 @@ It is impossible to obtain a certificate of marriage or a certified copy of the registration of marriage and instead, in accordance with section 52 (1) (a) of the Evidence - Act, I refer to the affidavit of , a person who was present at the marriage ceremony, which affidavit is filed in this family law case. {% endif %}
        4. - I was living separate and apart from my spouse at the start of this - family law case and I have lived separate and apart from my spouse + {% if responses.which_claimant == 'both' %} + Claimant 1 and Claimant 2 were + {% else %} + I was + {% endif %} + living separate and apart from my spouse at the start of this + family law case and + {% if responses.which_claimant == 'both' %}we{% else %}I{% endif %} + have lived separate and apart from my spouse since {% required responses.separation_date|date_formatter %}, except: {% multiple_values_to_list source=responses.reconciliation_period as periods %} {% if periods != '[]' and responses.try_reconcile_after_separated == 'YES' %} @@ -128,78 +163,87 @@
        5. - I am neither directly nor indirectly a party to an agreement or + {% if responses.which_claimant == 'both' %}We are{% else %}I am{% endif %} + neither directly nor indirectly a party to an agreement or conspiracy for the purpose of subverting the administration of justice, or to any agreement, understanding or arrangement to fabricate or suppress evidence or to deceive the court.
        6. - There are no children of the marriage as defined by the Divorce - Act (Canada). + {% if responses.children_of_marriage == 'YES' %} +

          + There are children of the marriage as defined by + {{ responses.child_support_act }}, and +

          + +
            +

          1. those children are

            + + + + + + + {% for child in responses.children %} + + + + + + {% endfor %} +
            NameAgeBirthdate [dd/mmm/yyyy]
            {{ child.child_name }} {{ child.child_birth_date|age }}{{ child.child_birth_date|date_formatter }}
            +
            2. + +
          2. + {% if responses.which_claimant == 'both' %}We{% else %}I{% endif %} + have sworn/affirmed a child support affidavit in Form F37, and +
            3. + +
          3. +

            the following arrangements for parenting have been made:

            + {% if responses.order_respecting_arrangement %} +
              {{ responses.order_respecting_arrangement|striptags|linebreaksli }}
            + {% else %} +
            + {% endif %} +
            4. +
          + {% else %} + There are no children of the marriage as defined by the + Divorce Act (Canada). + {% endif %}
          7. - {% if responses.which_claimant == 'Claimant 1' and responses.name_change_you == 'YES' %} + {% if responses.which_claimant == 'both' or responses.which_claimant == 'Claimant 1' %} + {% if responses.name_change_you == 'YES' %}
        7. Pursuant to Section 5 of the Name Act, Claimant 1 shall bear the name of {{ responses.name_change_you_fullname }} to take effect on {% effective_date %}.
          8. - {% endif %} + {% endif %} + {% endif %} - {% if responses.which_claimant == 'Claimant 2' and responses.name_change_spouse == 'YES' %} + {% if responses.which_claimant == 'both' or responses.which_claimant == 'Claimant 2' %} + {% if responses.name_change_spouse == 'YES' %}
        8. Pursuant to Section 5 of the Name Act, Claimant 2 shall bear the name of {{ responses.name_change_spouse_fullname }} to take effect on {% effective_date %}.
          9. - {% endif %} + {% endif %} + {% endif %}
        -


        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        SWORN (OR AFFIRMED) BEFORE )
        ME at  , British Columbia )
        on    . )  
        )
          )
        A commissioner for taking )
        affidavits for British Columbia )
        -

        -    -

        + {% if responses.which_claimant == 'both' or responses.which_claimant == 'Claimant 1' %} + {% include 'pdf/partials/notary_signature.html' with name=responses.name_you %} + {% endif %} + {% if responses.which_claimant == 'both' or responses.which_claimant == 'Claimant 2' %} + {% include 'pdf/partials/notary_signature.html' with name=responses.name_spouse %} + {% endif %} +
        Printed on {% now "F jS, Y" %} from https://justice.gov.bc.ca/divorce
        diff --git a/edivorce/apps/core/templates/pdf/form38_we.html b/edivorce/apps/core/templates/pdf/form38_we.html deleted file mode 100644 index b419126e..00000000 --- a/edivorce/apps/core/templates/pdf/form38_we.html +++ /dev/null @@ -1,262 +0,0 @@ -{% load static %} -{% load composites %} -{% load input_field %} -{% load format_utils %} - - - - - - - - Form 38 - - - - - - - - - {% include 'partials/gtm_head.html' %} - - - -
        -

        Form F38
        (Rule 10-10 (2))

        - -

        - Court File No.:   -

        - -

        - Court Registry: {% required responses.court_registry_for_filing %} -

        - -

        - This is the affidavit -

        - -

        - of {% required responses.name_you %} - and {% required responses.name_spouse %} - in this case -

        - -

        - and was made on -

        - -

        - In the Supreme Court of British Columbia -

        - -

        - Claimant 1: {% include "partials/name_with_alias.html" with name=responses.name_you use_other_name=responses.any_other_name_you other_names=responses.other_name_you class_name='form-entry_claimant' %} -

        - -

        - Claimant 2: {% include "partials/name_with_alias.html" with name=responses.name_spouse use_other_name=responses.any_other_name_spouse other_names=responses.other_name_spouse class_name='form-entry_claimant' %} -

        - -

        - AFFIDAVIT - DESK ORDER DIVORCE -

        - -

        - We, - {% if responses.name_you %} - {% include "partials/name_with_alias.html" with name=responses.name_you use_other_name=responses.any_other_name_you other_names=responses.other_name_you %} - {% else %}{% endif %}, - of - - {% required responses.address_to_send_official_document_street_you trail=',' %} - {% required responses.address_to_send_official_document_city_you size=100 trail=',' %} - {% if responses.address_to_send_official_document_prov_you %} - {{ responses.address_to_send_official_document_prov_you }}, - {% endif %} - {% if responses.address_to_send_official_document_country_you == 'Other' %} - {% required responses.address_to_send_official_document_other_country_you size=100 trail=',' %} - {% else %} - {% required responses.address_to_send_official_document_country_you size=100 trail=',' %} - {% endif %} - {% required responses.address_to_send_official_document_postal_code_you size=100 trail=',' %} - - {% required responses.occupation_you %},
        - - and
        - - {% if responses.name_spouse %} - {% include "partials/name_with_alias.html" with name=responses.name_spouse use_other_name=responses.any_other_name_spouse other_names=responses.other_name_spouse %} - {% else %}{% endif %}, of - - {% required responses.address_to_send_official_document_street_spouse trail=',' %} - {% required responses.address_to_send_official_document_city_spouse size=100 trail=',' %} - {% if responses.address_to_send_official_document_prov_spouse %} - {{ responses.address_to_send_official_document_prov_spouse }}, - {% endif %} - {% if responses.address_to_send_official_document_country_spouse == 'Other' %} - {% required responses.address_to_send_official_document_other_country_spouse size=100 trail=',' %} - {% else %} - {% required responses.address_to_send_official_document_country_spouse size=100 trail=',' %} - {% endif %} - {% required responses.address_to_send_official_document_postal_code_spouse size=100 trail=',' %} - - {% required responses.occupation_spouse %},
        - SWEAR (OR AFFIRM) THAT: -

        - -
          -
        1. We are claimant 1 and claimant 2.
          2. -
        2. There is no possibility of reconciliation between my spouse and me.
          3. -
        3. We believe that the facts set out in the notice of family claim are true.
          4. - {% if responses.original_marriage_certificate == 'YES' %} -
        4. The certificate of marriage or certified copy of the registration - of marriage filed in this family law case fully and correctly - describes the true particulars of the marriage.
          5. - {% else %} -
        5. It is impossible to obtain a certificate of marriage or a - certified copy of the registration of marriage and instead, in - accordance with section 52 (1) (a) of the Evidence Act, we - refer to the affidavit of , a person who was present at the marriage - ceremony, which affidavit is filed in this family law case.
          6. - {% endif %} -
        6. - Claimant 1 and claimant 2 were living separate and apart from each - other at the start of this family law case and claimant 1 and - claimant 2 have lived separate and apart from each other since - {% if responses.separation_date %} - {{ responses.separation_date|date_formatter }} - {% else %} - - {% endif %}, - except: - {% multiple_values_to_list source=responses.reconciliation_period as periods %} - {% if periods != '[]' and responses.try_reconcile_after_separated == 'YES' %} - {% for period in periods %} - from {{ period | first|date_formatter }} to {{ period | last|date_formatter }}{% if not forloop.last %}, {% endif %} - {% endfor %}. - {% else %}{% endif %} -
          7. - -
        7. We are neither directly nor indirectly a party to an agreement or - conspiracy for the purpose of subverting the administration of - justice, or to any agreement, understanding or arrangement to - fabricate or suppress evidence or to deceive the court.
          8. - -
        8. - There are no children of the marriage as defined by the - Divorce Act (Canada).
          9. - - {% if responses.name_change_you == 'YES' %} -
        9. - Pursuant to Section 5 of the Name Act, Claimant 1 shall - bear the name of {{ responses.name_change_you_fullname }} - to take effect on {% effective_date %}. -
          10. - {% endif %} - - {% if responses.name_change_spouse == 'YES' %} -
        10. - Pursuant to Section 5 of the Name Act, Claimant 2 shall - bear the name of {{ responses.name_change_spouse_fullname }} - to take effect on {% effective_date %}. -
          11. - {% endif %} - -
        - -


        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        SWORN (OR AFFIRMED) BEFORE )
        ME at  , British Columbia )
        on    . )  
        )
          )
        A commissioner for taking )
        affidavits for British Columbia )
        -

        -    -

        -
        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        SWORN (OR AFFIRMED) BEFORE )
        ME at  , British Columbia )
        on    . )  
        )
          )
        A commissioner for taking )
        affidavits for British Columbia )
        -

        -    -

        -
        - Printed on {% now "F jS, Y" %} from https://justice.gov.bc.ca/divorce -
        - - - diff --git a/edivorce/apps/core/views/pdf.py b/edivorce/apps/core/views/pdf.py index 60c82410..e5942b9f 100644 --- a/edivorce/apps/core/views/pdf.py +++ b/edivorce/apps/core/views/pdf.py @@ -12,8 +12,8 @@ from ..decorators import bceid_required from ..utils.derived import get_derived_data from ..utils.user_response import get_responses_from_db -letters = 'abcdefghijklmnopqrstuvwxyz' -exhibits = list(letters.upper()[::-1]) +EXHIBITS = list('ABCDEFGHIJKLMNOPQRSTUVWXYZ'[::-1]) + @bceid_required def form(request, form_number): @@ -21,7 +21,8 @@ def form(request, form_number): responses = get_responses_from_db(request.user) - if form_number == '1' or form_number.startswith('37'): + if (form_number == '1' or form_number.startswith('37') or + form_number.startswith('38')): # Add an array of children that includes blanks for possible children under = int(responses.get('number_children_under_19') or 0) over = int(responses.get('number_children_under_19') or 0) @@ -41,7 +42,9 @@ def form(request, form_number): responses = __add_claimant_info(responses, '_spouse') responses['which_claimant'] = 'Claimant 2' - if form_number == '38_claimant1': + if form_number == "38": + responses["which_claimant"] = 'both' + elif form_number == '38_claimant1': form_number = '38' responses = __add_claimant_info(responses, '_you') responses['which_claimant'] = 'Claimant 1' @@ -54,7 +57,7 @@ def form(request, form_number): 'css_root': settings.WEASYPRINT_CSS_LOOPBACK, 'responses': responses, 'derived': get_derived_data(responses), - 'exhibits': exhibits[:], + 'exhibits': EXHIBITS[:], })