diff --git a/edivorce/apps/core/templates/dashboard/file_documents.html b/edivorce/apps/core/templates/dashboard/file_documents.html index d7e70740..71aa08e4 100644 --- a/edivorce/apps/core/templates/dashboard/file_documents.html +++ b/edivorce/apps/core/templates/dashboard/file_documents.html @@ -11,10 +11,10 @@
At the counter, the registry staff will check your documents to make sure they've been completed properly.
If you're not sure whether you've filled out the documents correctly, get some - legal advice before you file your documents — from - family duty counsel + legal advice before you file your documents — from + family duty counsel or (in Vancouver) from the Vancouver - Justice Access Centre Self-Help and Information Services. + Justice Access Centre Self-Help and Information Services.
If the registry is satisfied that your documents are in order, they will stamp the documents with the date, the court seal, and a file number.
You now have a divorce file open in the Supreme Court.
diff --git a/edivorce/apps/core/templates/dashboard/print_form.html b/edivorce/apps/core/templates/dashboard/print_form.html index c8d81410..04f4d40a 100644 --- a/edivorce/apps/core/templates/dashboard/print_form.html +++ b/edivorce/apps/core/templates/dashboard/print_form.html @@ -58,9 +58,12 @@A draft Final Order sets out what orders (decision) you want the court to make. You and your spouse are responsible for writing out the order. The judge or master who reviews your case doesn't write the order. The final order you draft will become your divorce order, once the judge has signed it.
-- Write draft order - List what orders you want the court to make. -
+Claimant 1
- Preview | Print + Preview | PrintClaimant 2
- Preview | Print + Preview | Printfrom: {{period | first}}
- {% endfor %} -to: {{period | last }}
- {% endfor %} -From:
from: {{period | first}}
+ {% endfor %} +to: {{period | last }}
+ {% endfor %} +From:
To:
After you separate, the law says that all family property and +
After you separate, the law says that all family property and family debt @@ -121,10 +121,12 @@
You can ask for an interest in the property (part ownership) or compensation (money). If the property is real estate, provide the legal description.
-- Ok, we're almost done asking you questions. The last set of information that we need to know is where - you will be filing your divorce document. You will need to file your documents in person at a court registry. -
The only way to obtain an order for divorce is by starting a court proceeding in the B.C. Supreme Court; you must sue your spouse if you want to get divorced. To do this you will need to submit (file) your divorce application at a diff --git a/edivorce/apps/core/utils/question_step_mapping.py b/edivorce/apps/core/utils/question_step_mapping.py index 8957613b..95736261 100644 --- a/edivorce/apps/core/utils/question_step_mapping.py +++ b/edivorce/apps/core/utils/question_step_mapping.py @@ -36,6 +36,7 @@ question_step_mapping = {'prequalification': ['married_marriage_like', 'lived_in 'address_to_send_official_document_postal_code_spouse', 'address_to_send_official_document_fax_spouse', 'address_to_send_official_document_email_spouse', + 'divorce_take_effect_on', 'divorce_take_effect_on_specific_date',], 'filing_locations': ['court_registry_for_filing',], } @@ -61,7 +62,7 @@ complete_state_for_step = {'which_orders': {'required': ['want_which_orders']}, 'lived_in_bc_spouse': ['Moved to British Columbia on', 'moved_to_bc_date_spouse']},}, 'your_marriage': {'required': ['when_were_you_live_married_like', 'marital_status_before_you', 'marital_status_before_spouse'], 'conditional': {'married_marriage_like': ['Legally married', 'when_were_you_married']}}, - 'your_separation': {'required': ['no_reconciliation_possible']}, + 'your_separation': {'required': ['no_reconciliation_possible', 'no_collusion']}, 'spousal_support': {'required': ['spouse_support_details', 'spouse_support_act']}, 'property_and_debt': {'required': [], 'conditional': {'deal_with_property_debt': ['unequal division', 'how_to_divide_property_debt']}}, @@ -69,15 +70,13 @@ complete_state_for_step = {'which_orders': {'required': ['want_which_orders']}, 'other_questions': {'required': ['address_to_send_official_document_street_you', 'address_to_send_official_document_city_you', 'address_to_send_official_document_prov_you', - 'address_to_send_official_document_country_you', - 'address_to_send_official_document_other_country_you', 'address_to_send_official_document_postal_code_you', 'address_to_send_official_document_street_spouse', 'address_to_send_official_document_city_spouse', 'address_to_send_official_document_prov_spouse', - 'address_to_send_official_document_country_spouse', - 'address_to_send_official_document_other_country_spouse', - 'address_to_send_official_document_postal_code_spouse', - 'divorce_take_effect_on_specific_date']}, + 'address_to_send_official_document_postal_code_spouse'], + 'conditional': {'address_to_send_official_document_country_you': ['Other', 'address_to_send_official_document_other_country_you'], + 'address_to_send_official_document_country_spouse': ['Other', 'address_to_send_official_document_other_country_spouse'], + 'divorce_take_effect_on': ['specific date', 'divorce_take_effect_on_specific_date']}}, 'filing_locations': {'required': ['court_registry_for_filing']}, } \ No newline at end of file diff --git a/edivorce/fixtures/Question.json b/edivorce/fixtures/Question.json index 5fc61145..b733d9a7 100644 --- a/edivorce/fixtures/Question.json +++ b/edivorce/fixtures/Question.json @@ -545,7 +545,7 @@ }, { "fields": { - "name": "Divorce is to take effect on", + "name": "Divorce is to take effect on specific date", "description": "For step 9 - specific date, Form 52 This Court Orders that" }, "model": "core.question", @@ -559,22 +559,6 @@ "model": "core.question", "pk": "other_orders_detail" }, -{ - "fields": { - "name": "Form 35 requisition dummy question", - "description": "DUMMY QUESTION for form 35 first question" - }, - "model": "core.question", - "pk": "form35_dummy_requisition" -}, -{ - "fields": { - "name": "Form 35 additional dummy question", - "description": "DUMMY QUESTION for form 35 second question" - }, - "model": "core.question", - "pk": "form35_dummy_additional" -}, { "fields": { "name": "Will you be swearing/affirming your affidavit together at the registry? Or will you be doing this separately?",