From d929e4e5245ec4c6d8d905baca087db95a5c8a41 Mon Sep 17 00:00:00 2001 From: Charles Shin Date: Tue, 21 Mar 2017 16:36:05 -0700 Subject: [PATCH] Get review orders --- edivorce/apps/core/models.py | 5 +- .../core/templates/question/02_claimant.html | 2 +- .../templates/question/03_respondent.html | 2 +- edivorce/apps/core/utils/user_response.py | 2 +- edivorce/fixtures/Question.json | 230 ++++++++++++------ 5 files changed, 157 insertions(+), 84 deletions(-) diff --git a/edivorce/apps/core/models.py b/edivorce/apps/core/models.py index 232b8495..60ee1ab0 100644 --- a/edivorce/apps/core/models.py +++ b/edivorce/apps/core/models.py @@ -43,8 +43,11 @@ class Question(models.Model): description = models.TextField(blank=True) """ Extended description (n.b., NOT content) """ + summary_order = models.PositiveIntegerField(default=0) + """ Convenience for listing these in the admin """ + class Meta: - ordering = ('key', ) + ordering = ('summary_order', ) def __str__(self): return '%s: %s' % (self.key, self.name) diff --git a/edivorce/apps/core/templates/question/02_claimant.html b/edivorce/apps/core/templates/question/02_claimant.html index a24d3f9b..38c49fe4 100644 --- a/edivorce/apps/core/templates/question/02_claimant.html +++ b/edivorce/apps/core/templates/question/02_claimant.html @@ -114,7 +114,7 @@

What is your occupation?

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

This refers to the type of work you do. For example, janitor, banker, homemaker, student, nurse etc.

+

This refers to the type of work you do. For example, janitor, banker, student, nurse etc.

diff --git a/edivorce/apps/core/templates/question/03_respondent.html b/edivorce/apps/core/templates/question/03_respondent.html index 3b4a807c..168025f6 100644 --- a/edivorce/apps/core/templates/question/03_respondent.html +++ b/edivorce/apps/core/templates/question/03_respondent.html @@ -128,7 +128,7 @@

What is your spouse's occupation?

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

This refers to the type of work you do. For example, janitor, banker, homemaker, student, nurse etc.

+

This refers to the type of work you do. For example, janitor, banker, student, nurse etc.

diff --git a/edivorce/apps/core/utils/user_response.py b/edivorce/apps/core/utils/user_response.py index ef9266dc..e9398e05 100644 --- a/edivorce/apps/core/utils/user_response.py +++ b/edivorce/apps/core/utils/user_response.py @@ -16,7 +16,7 @@ def get_responses_from_db_grouped_by_steps(bceid_user): responses = UserResponse.objects.filter(bceid_user=bceid_user) responses_dict = {} for step, questions in question_step_mapping.items(): - responses_dict[step] = responses.filter(question_id__in=questions).exclude(value__in=['', '[]']).values('question_id', 'value', 'question__name') + responses_dict[step] = responses.filter(question_id__in=questions).exclude(value__in=['', '[]']).order_by('question').values('question_id', 'value', 'question__name') return responses_dict diff --git a/edivorce/fixtures/Question.json b/edivorce/fixtures/Question.json index c8d3e0ce..299eb1dc 100644 --- a/edivorce/fixtures/Question.json +++ b/edivorce/fixtures/Question.json @@ -2,7 +2,8 @@ { "fields": { "name": "Are you legally married or living together in a marriage like (also known as common law) relationship?", - "description": "For pre-qualification step 1" + "description": "For pre-qualification step 1", + "summary_order": 1 }, "model": "core.question", "pk": "married_marriage_like" @@ -10,7 +11,8 @@ { "fields": { "name": "Do you or your spouse live in B.C.?", - "description": "For pre-qualification step 2" + "description": "For pre-qualification step 2", + "summary_order": 2 }, "model": "core.question", "pk": "lived_in_bc" @@ -18,7 +20,8 @@ { "fields": { "name": "Have you or your spouse lived in B.C. at least one year prior to starting your divorce?", - "description": "For pre-qualification step 2" + "description": "For pre-qualification step 2", + "summary_order": 3 }, "model": "core.question", "pk": "lived_in_bc_at_least_year" @@ -26,7 +29,8 @@ { "fields": { "name": "When did you and your spouse separate (legally this is referred to as living separate and apart)?", - "description": "For pre-qualification step 3, Form 1 1. Relationship history" + "description": "For pre-qualification step 3, Form 1 1. Relationship history", + "summary_order": 4 }, "model": "core.question", "pk": "separation_date" @@ -34,7 +38,8 @@ { "fields": { "name": "Did you and your spouse try to reconcile after you separated?", - "description": "For pre-qualification step 3, Form 1 2. Divorce section B" + "description": "For pre-qualification step 3, Form 1 2. Divorce section B", + "summary_order": 5 }, "model": "core.question", "pk": "try_reconcile_after_separated" @@ -42,7 +47,8 @@ { "fields": { "name": "Please enter the period(s) during which you attempted to reconcile.", - "description": "For pre-qualification step 3, Form 1 2. Divorce section B" + "description": "For pre-qualification step 3, Form 1 2. Divorce section B", + "summary_order": 6 }, "model": "core.question", "pk": "reconciliation_period" @@ -50,7 +56,8 @@ { "fields": { "name": "Do you and your spouse have any children (includes step children, adopted children). The legal term is children of the marriage.", - "description": "For pre-qualification step 4, Form 1 3. Info concerning children" + "description": "For pre-qualification step 4, Form 1 3. Info concerning children", + "summary_order": 7 }, "model": "core.question", "pk": "children_of_marriage" @@ -58,7 +65,8 @@ { "fields": { "name": "Are any of the children 19 years or younger?", - "description": "For pre-qualification step 4" + "description": "For pre-qualification step 4", + "summary_order": 8 }, "model": "core.question", "pk": "any_under_19" @@ -66,7 +74,8 @@ { "fields": { "name": "Are you financially supporting any of the children that are 19 years or older?", - "description": "For pre-qualification step 4" + "description": "For pre-qualification step 4", + "summary_order": 9 }, "model": "core.question", "pk": "children_financial_support" @@ -74,7 +83,8 @@ { "fields": { "name": "Will you be able to provide proof of your marriage (in the form of an original or certified marriage certificate or registration of marriage)?", - "description": "For pre-qualification step 5, Form 1 2. Divorce section D" + "description": "For pre-qualification step 5, Form 1 2. Divorce section D", + "summary_order": 10 }, "model": "core.question", "pk": "original_marriage_certificate" @@ -82,7 +92,8 @@ { "fields": { "name": "Will you be providing the marriage certificate or registration of marriage at a later date?", - "description": "For pre-qualification step 5, Form 1 2. Divorce section D" + "description": "For pre-qualification step 5, Form 1 2. Divorce section D", + "summary_order": 11 }, "model": "core.question", "pk": "provide_certificate_later" @@ -90,7 +101,8 @@ { "fields": { "name": "If you will be providing the marriage certificate or registration of marriage at a later date, please let us know why.", - "description": "For pre-qualification step 5, Form 1 2. Divorce section D" + "description": "For pre-qualification step 5, Form 1 2. Divorce section D", + "summary_order": 12 }, "model": "core.question", "pk": "provide_certificate_later_reason" @@ -98,15 +110,26 @@ { "fields": { "name": "Please tell us why it is impossible to obtain a marriage certificate or registration of marriage.", - "description": "For pre-qualification step 5, Form 1 2. Divorce section D" + "description": "For pre-qualification step 5, Form 1 2. Divorce section D", + "summary_order": 13 }, "model": "core.question", "pk": "not_provide_certificate_reason" }, +{ + "fields": { + "name": "Is your marriage certificate or registration of marriage in English?", + "description": "For pre-qualification step 5", + "summary_order": 14 + }, + "model": "core.question", + "pk": "marriage_certificate_in_english" +}, { "fields": { "name": "What is your reason (grounds) for asking for a divorce?", - "description": "For pre-qualification step 6" + "description": "For pre-qualification step 6", + "summary_order": 15 }, "model": "core.question", "pk": "divorce_reason" @@ -114,7 +137,8 @@ { "fields": { "name": "What are you asking for (Orders)?", - "description": "For step 1" + "description": "For step 1", + "summary_order": 16 }, "model": "core.question", "pk": "want_which_orders" @@ -122,7 +146,8 @@ { "fields": { "name": "Please enter your name (as it appears on the marriage certificate).", - "description": "For step 2, Form 1 Claimant 1" + "description": "For step 2, Form 1 Claimant 1", + "summary_order": 17 }, "model": "core.question", "pk": "name_you" @@ -130,7 +155,8 @@ { "fields": { "name": "Do you go by any other names?", - "description": "For step 2" + "description": "For step 2", + "summary_order": 18 }, "model": "core.question", "pk": "any_other_name_you" @@ -138,7 +164,8 @@ { "fields": { "name": "Please enter the name.", - "description": "For step 2" + "description": "For step 2", + "summary_order": 19 }, "model": "core.question", "pk": "other_name_you" @@ -146,7 +173,8 @@ { "fields": { "name": "What was your last name when you were born?", - "description": "For step 2, Form 1 2. Divorce section A" + "description": "For step 2, Form 1 2. Divorce section A", + "summary_order": 20 }, "model": "core.question", "pk": "last_name_born_you" @@ -154,7 +182,8 @@ { "fields": { "name": "What was your last name before you were married?", - "description": "For step 2, Form 1 2. Divorce section A" + "description": "For step 2, Form 1 2. Divorce section A", + "summary_order": 21 }, "model": "core.question", "pk": "last_name_before_married_you" @@ -162,7 +191,8 @@ { "fields": { "name": "What is your date of birth?", - "description": "For step 2, Form 1 2. Divorce section A" + "description": "For step 2, Form 1 2. Divorce section A", + "summary_order": 22 }, "model": "core.question", "pk": "birthday_you" @@ -170,7 +200,8 @@ { "fields": { "name": "What is your occupation?", - "description": "For step 2, Form 38 first question" + "description": "For step 2, Form 38 first question", + "summary_order": 23 }, "model": "core.question", "pk": "occupation_you" @@ -178,7 +209,8 @@ { "fields": { "name": "How long have you lived in B.C.?", - "description": "For step 2, Form 1 2. Divorce section A" + "description": "For step 2, Form 1 2. Divorce section A", + "summary_order": 24 }, "model": "core.question", "pk": "lived_in_bc_you" @@ -186,7 +218,8 @@ { "fields": { "name": "You moved to B.C. on", - "description": "For step 2, Form 1 2. Divorce section A" + "description": "For step 2, Form 1 2. Divorce section A", + "summary_order": 25 }, "model": "core.question", "pk": "moved_to_bc_date_you" @@ -194,7 +227,8 @@ { "fields": { "name": "Please enter your spouse's name (as it appears on the marriage certificate).", - "description": "For step 3, Form 1 Claimant 2" + "description": "For step 3, Form 1 Claimant 2", + "summary_order": 26 }, "model": "core.question", "pk": "name_spouse" @@ -202,7 +236,8 @@ { "fields": { "name": "Does your spouse go by any other names?", - "description": "For step 3" + "description": "For step 3", + "summary_order": 27 }, "model": "core.question", "pk": "any_other_name_spouse" @@ -210,7 +245,8 @@ { "fields": { "name": "Please enter the name.", - "description": "For step 3" + "description": "For step 3", + "summary_order": 28 }, "model": "core.question", "pk": "other_name_spouse" @@ -218,7 +254,8 @@ { "fields": { "name": "What was their last name at birth?", - "description": "For step 3, Form 1 2. Divorce section A" + "description": "For step 3, Form 1 2. Divorce section A", + "summary_order": 29 }, "model": "core.question", "pk": "last_name_born_spouse" @@ -226,7 +263,8 @@ { "fields": { "name": "What was their last name before you were married?", - "description": "For step 3, Form 1 2. Divorce section A" + "description": "For step 3, Form 1 2. Divorce section A", + "summary_order": 30 }, "model": "core.question", "pk": "last_name_before_married_spouse" @@ -234,7 +272,8 @@ { "fields": { "name": "What is your spouse's date of birth?", - "description": "For step 3, Form 1 2. Divorce section A" + "description": "For step 3, Form 1 2. Divorce section A", + "summary_order": 31 }, "model": "core.question", "pk": "birthday_spouse" @@ -242,7 +281,8 @@ { "fields": { "name": "What is your spouse's occupation?", - "description": "For step 3, Form 38 first question" + "description": "For step 3, Form 38 first question", + "summary_order": 33 }, "model": "core.question", "pk": "occupation_spouse" @@ -250,7 +290,8 @@ { "fields": { "name": "How long has your spouse lived in B.C.?", - "description": "For step 3, Form 1 2. Divorce section A" + "description": "For step 3, Form 1 2. Divorce section A", + "summary_order": 33 }, "model": "core.question", "pk": "lived_in_bc_spouse" @@ -258,7 +299,8 @@ { "fields": { "name": "Spouse moved to British Columbia on", - "description": "For step 3, Form 1 2. Divorce section A" + "description": "For step 3, Form 1 2. Divorce section A", + "summary_order": 34 }, "model": "core.question", "pk": "moved_to_bc_date_spouse" @@ -266,7 +308,8 @@ { "fields": { "name": "When were you married?", - "description": "For step 4, Form 1 1. Relationship history" + "description": "For step 4, Form 1 1. Relationship history", + "summary_order": 35 }, "model": "core.question", "pk": "when_were_you_married" @@ -274,7 +317,8 @@ { "fields": { "name": "When did you and your spouse begin to live together in a marriage-like relationship?", - "description": "For step 4, Form 1 1. Relationship history" + "description": "For step 4, Form 1 1. Relationship history", + "summary_order": 36 }, "model": "core.question", "pk": "when_were_you_live_married_like" @@ -282,7 +326,8 @@ { "fields": { "name": "Where were you married?", - "description": "For step 4, Form 1 2. Divorce section A" + "description": "For step 4, Form 1 2. Divorce section A", + "summary_order": 37 }, "model": "core.question", "pk": "where_were_you_married_city" @@ -290,7 +335,8 @@ { "fields": { "name": "Where were you married? Prov", - "description": "For step 4, Form 1 2. Divorce section A" + "description": "For step 4, Form 1 2. Divorce section A", + "summary_order": 38 }, "model": "core.question", "pk": "where_were_you_married_prov" @@ -298,7 +344,8 @@ { "fields": { "name": "Where were you married? Country", - "description": "For step 4, Form 1 2. Divorce section A" + "description": "For step 4, Form 1 2. Divorce section A", + "summary_order": 39 }, "model": "core.question", "pk": "where_were_you_married_country" @@ -306,7 +353,8 @@ { "fields": { "name": "Where were you married? Other Country", - "description": "For step 4, Form 1 2. Divorce section A" + "description": "For step 4, Form 1 2. Divorce section A", + "summary_order": 40 }, "model": "core.question", "pk": "where_were_you_married_other_country" @@ -314,7 +362,8 @@ { "fields": { "name": "Before you got married to your spouse, what was your marital status?", - "description": "For step 4, Form 1 2. Divorce section A" + "description": "For step 4, Form 1 2. Divorce section A", + "summary_order": 41 }, "model": "core.question", "pk": "marital_status_before_you" @@ -322,7 +371,8 @@ { "fields": { "name": "What was the marital status of your spouse before your marriage?", - "description": "For step 4, Form 1 2. Divorce section A" + "description": "For step 4, Form 1 2. Divorce section A", + "summary_order": 42 }, "model": "core.question", "pk": "marital_status_before_spouse" @@ -330,7 +380,8 @@ { "fields": { "name": "There is no possibility my spouse and I will get back together (reconciliation).", - "description": "For step 5, Form 1 2. Divorce section C" + "description": "For step 5, Form 1 2. Divorce section C", + "summary_order": 43 }, "model": "core.question", "pk": "no_reconciliation_possible" @@ -338,23 +389,17 @@ { "fields": { "name": "My spouse and I have not engaged in collusion to deceive the court in any way.", - "description": "For step 5, Form 1 2. Divorce section C" + "description": "For step 5, Form 1 2. Divorce section C", + "summary_order": 44 }, "model": "core.question", "pk": "no_collusion" }, -{ - "fields": { - "name": "Is your marriage certificate or registration of marriage in English?", - "description": "For pre-qualification step 5, For step 5" - }, - "model": "core.question", - "pk": "marriage_certificate_in_english" -}, { "fields": { "name": "You and your spouse are asking for an order for spousal support as follows", - "description": "For step 6, Form 1 5. Spousal support" + "description": "For step 6, Form 1 5. Spousal support", + "summary_order": 45 }, "model": "core.question", "pk": "spouse_support_details" @@ -362,7 +407,8 @@ { "fields": { "name": "Please indicate which act you are asking for support under.", - "description": "For step 6, Form 1 5. Spousal support" + "description": "For step 6, Form 1 5. Spousal support", + "summary_order": 46 }, "model": "core.question", "pk": "spouse_support_act" @@ -370,7 +416,8 @@ { "fields": { "name": "How have you and your spouse agreed to deal with your property and debt?", - "description": "For step 7, Form 1 6. Property and debt" + "description": "For step 7, Form 1 6. Property and debt", + "summary_order": 47 }, "model": "core.question", "pk": "deal_with_property_debt" @@ -378,7 +425,8 @@ { "fields": { "name": "Please describe how you and your spouse plan to divide your property, assets and your debts.", - "description": "For step 7, Form 1 6. Property and debt" + "description": "For step 7, Form 1 6. Property and debt", + "summary_order": 48 }, "model": "core.question", "pk": "how_to_divide_property_debt" @@ -386,7 +434,8 @@ { "fields": { "name": "Claimant 1 and Claimant 2 ask for an order respecting an interest in property or for compensation instead of an interest in that property, as follows", - "description": "For step 7, Form 1 6. Property and debt" + "description": "For step 7, Form 1 6. Property and debt", + "summary_order": 49 }, "model": "core.question", "pk": "want_other_property_claims" @@ -394,23 +443,26 @@ { "fields": { "name": "Please list any other property claims.", - "description": "For step 7, Form 1 6. Property and debt" + "description": "For step 7, Form 1 6. Property and debt", + "summary_order": 50 }, "model": "core.question", "pk": "other_property_claims" }, { "fields": { - "name": "Where will you be filing for divorce?", - "description": "For step 10, Form 1 court registry" + "name": "Please list any other orders", + "description": "For step 8 other orders", + "summary_order": 51 }, "model": "core.question", - "pk": "court_registry_for_filing" + "pk": "other_orders_detail" }, { "fields": { "name": "What is the best address to send you official court documents?", - "description": "For step 9, Form 1 8. Claimants' addresses for service" + "description": "For step 9, Form 1 8. Claimants' addresses for service", + "summary_order": 52 }, "model": "core.question", "pk": "address_to_send_official_document_street_you" @@ -418,7 +470,8 @@ { "fields": { "name": "City", - "description": "For step 9, Form 1 8. Claimants' addresses for service" + "description": "For step 9, Form 1 8. Claimants' addresses for service", + "summary_order": 53 }, "model": "core.question", "pk": "address_to_send_official_document_city_you" @@ -426,7 +479,8 @@ { "fields": { "name": "Prov", - "description": "For step 9, Form 1 8. Claimants' addresses for service" + "description": "For step 9, Form 1 8. Claimants' addresses for service", + "summary_order": 54 }, "model": "core.question", "pk": "address_to_send_official_document_prov_you" @@ -434,7 +488,8 @@ { "fields": { "name": "Country", - "description": "For step 9, Form 1 8. Claimants' addresses for service" + "description": "For step 9, Form 1 8. Claimants' addresses for service", + "summary_order": 55 }, "model": "core.question", "pk": "address_to_send_official_document_country_you" @@ -442,7 +497,8 @@ { "fields": { "name": "Other Country", - "description": "For step 9, Form 1 8. Claimants' addresses for service" + "description": "For step 9, Form 1 8. Claimants' addresses for service", + "summary_order": 56 }, "model": "core.question", "pk": "address_to_send_official_document_other_country_you" @@ -450,7 +506,8 @@ { "fields": { "name": "Postal code", - "description": "For step 9, Form 1 8. Claimants' addresses for service" + "description": "For step 9, Form 1 8. Claimants' addresses for service", + "summary_order": 57 }, "model": "core.question", "pk": "address_to_send_official_document_postal_code_you" @@ -458,7 +515,8 @@ { "fields": { "name": "Fax number", - "description": "For step 9, Form 1 8. Claimants' addresses for service" + "description": "For step 9, Form 1 8. Claimants' addresses for service", + "summary_order": 58 }, "model": "core.question", "pk": "address_to_send_official_document_fax_you" @@ -466,7 +524,8 @@ { "fields": { "name": "Email", - "description": "For step 9, Form 1 8. Claimants' addresses for service" + "description": "For step 9, Form 1 8. Claimants' addresses for service", + "summary_order": 59 }, "model": "core.question", "pk": "address_to_send_official_document_email_you" @@ -474,7 +533,8 @@ { "fields": { "name": "What is the best address to send your spouse official court documents?", - "description": "For step 9, Form 1 8. Claimants' addresses for service" + "description": "For step 9, Form 1 8. Claimants' addresses for service", + "summary_order": 60 }, "model": "core.question", "pk": "address_to_send_official_document_street_spouse" @@ -482,7 +542,8 @@ { "fields": { "name": "City", - "description": "For step 9, Form 1 8. Claimants' addresses for service" + "description": "For step 9, Form 1 8. Claimants' addresses for service", + "summary_order": 61 }, "model": "core.question", "pk": "address_to_send_official_document_city_spouse" @@ -490,7 +551,8 @@ { "fields": { "name": "Prov", - "description": "For step 9, Form 1 8. Claimants' addresses for service" + "description": "For step 9, Form 1 8. Claimants' addresses for service", + "summary_order": 62 }, "model": "core.question", "pk": "address_to_send_official_document_prov_spouse" @@ -498,7 +560,8 @@ { "fields": { "name": "Country", - "description": "For step 9, Form 1 8. Claimants' addresses for service" + "description": "For step 9, Form 1 8. Claimants' addresses for service", + "summary_order": 63 }, "model": "core.question", "pk": "address_to_send_official_document_country_spouse" @@ -506,7 +569,8 @@ { "fields": { "name": "Other Country", - "description": "For step 9, Form 1 8. Claimants' addresses for service" + "description": "For step 9, Form 1 8. Claimants' addresses for service", + "summary_order": 64 }, "model": "core.question", "pk": "address_to_send_official_document_other_country_spouse" @@ -514,7 +578,8 @@ { "fields": { "name": "Postal code", - "description": "For step 9, Form 1 8. Claimants' addresses for service" + "description": "For step 9, Form 1 8. Claimants' addresses for service", + "summary_order": 65 }, "model": "core.question", "pk": "address_to_send_official_document_postal_code_spouse" @@ -522,7 +587,8 @@ { "fields": { "name": "Fax number", - "description": "For step 9, Form 1 8. Claimants' addresses for service" + "description": "For step 9, Form 1 8. Claimants' addresses for service", + "summary_order": 66 }, "model": "core.question", "pk": "address_to_send_official_document_fax_spouse" @@ -530,7 +596,8 @@ { "fields": { "name": "Email", - "description": "For step 9, Form 1 8. Claimants' addresses for service" + "description": "For step 9, Form 1 8. Claimants' addresses for service", + "summary_order": 67 }, "model": "core.question", "pk": "address_to_send_official_document_email_spouse" @@ -538,7 +605,8 @@ { "fields": { "name": "Divorce is to take effect on", - "description": "For step 9, Form 52 This Court Orders that" + "description": "For step 9, Form 52 This Court Orders that", + "summary_order": 68 }, "model": "core.question", "pk": "divorce_take_effect_on" @@ -546,7 +614,8 @@ { "fields": { "name": "Divorce is to take effect on specific date", - "description": "For step 9 - specific date, Form 52 This Court Orders that" + "description": "For step 9 - specific date, Form 52 This Court Orders that", + "summary_order": 69 }, "model": "core.question", "pk": "divorce_take_effect_on_specific_date" @@ -554,10 +623,11 @@ { "fields": { "name": "Please enter the details for any other orders that you are asking for.", - "description": "DUMMY QUESTION for step 8 other orders" + "description": "For step 10, Form 1 court registry", + "summary_order": 70 }, "model": "core.question", - "pk": "other_orders_detail" + "pk": "court_registry_for_filing" }, { "fields": {