Browse Source

Fixed multiple issues

pull/160/head
Charles Shin 8 years ago
parent
commit
05714d5f36
7 changed files with 50 additions and 62 deletions
  1. +3
    -3
      edivorce/apps/core/templates/dashboard/file_documents.html
  2. +9
    -6
      edivorce/apps/core/templates/dashboard/print_form.html
  3. +23
    -19
      edivorce/apps/core/templates/pdf/form1.html
  4. +8
    -6
      edivorce/apps/core/templates/question/07_property.html
  5. +0
    -4
      edivorce/apps/core/templates/question/10_location.html
  6. +6
    -7
      edivorce/apps/core/utils/question_step_mapping.py
  7. +1
    -17
      edivorce/fixtures/Question.json

+ 3
- 3
edivorce/apps/core/templates/dashboard/file_documents.html View File

@ -11,10 +11,10 @@
<p>At the counter, the registry staff will check your documents to make sure they've been completed properly.</p>
<p>
If you're not sure whether you've filled out the documents correctly, get some
<a href="http://www.familylaw.lss.bc.ca/help/who_LegalAdvice.php">legal advice</a> before you file your documents — from
<a href="http://www.familylaw.lss.bc.ca/help/who_FamilyDutyCounsel.php">family duty counsel</a>
<a href="http://www.familylaw.lss.bc.ca/help/who_LegalAdvice.php" target="_blank">legal advice</a> before you file your documents — from
<a href="http://www.familylaw.lss.bc.ca/help/who_FamilyDutyCounsel.php" target="_blank">family duty counsel</a>
or (in Vancouver) from the Vancouver
<a href="http://www.familylaw.lss.bc.ca/help/jacSelfHelpAndInfoServices.php">Justice Access Centre</a> Self-Help and Information Services.
<a href="http://www.familylaw.lss.bc.ca/help/jacSelfHelpAndInfoServices.php" target="_blank">Justice Access Centre</a> Self-Help and Information Services.
</p>
<p>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.</p>
<p>You now have a divorce file open in the Supreme Court.</p>


+ 9
- 6
edivorce/apps/core/templates/dashboard/print_form.html View File

@ -58,9 +58,12 @@
<p>
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.
</p>
<p>
<a href="http://www.familylaw.lss.bc.ca/resources/fact_sheets/tipsForDraftingOrders.php" target="_blank">Write draft order</a> - List what orders you want the court to make.
</p>
<ul>
<li><a href="http://www.familylaw.lss.bc.ca/resources/fact_sheets/tipsForDraftingOrders.php" target="_blank">Write draft order</a> - List what orders you want the court to make.</li>
<li><b>File draft order</b> when you file the other forms and documents at the court registry</li>
<li>If the judge or master makes the order you ask for, they'll sign the draft order you filed and it becomes your court order.</li>
<li><b>If there's a problem</b> with your order and the judge or master doesn't approve it, the court registry will let you know. You might have to draft another version of the order or appear in court to give the judge or master more information about what you wrote in the order.</li>
</ul>
</div>
</div>
@ -88,7 +91,7 @@
<div>
Affidavit Desk Order Divorce Form (F38)) - signing together
</div>
<p><a href="{% url 'pdf_form' '38' %}?html" target="_blank">Preview</a> | <a href="{% url 'pdf_form' '38' %}" class="spinner">Print</a></p>
<p><a href="{% url 'pdf_form' '38_we' %}?html" target="_blank">Preview</a> | <a href="{% url 'pdf_form' '38' %}" class="spinner">Print</a></p>
</div>
<div class="collapse" id="collapseF38">
<div>
@ -116,11 +119,11 @@
<p>
Claimant 1
</p>
<a href="{% url 'pdf_form' '38_we' %}?html" target="_blank">Preview</a> | <a href="{% url 'pdf_form' '38_we' %}" class="spinner">Print</a>
<a href="{% url 'pdf_form' '38' %}?html" target="_blank">Preview</a> | <a href="{% url 'pdf_form' '38_we' %}" class="spinner">Print</a>
<p>
Claimant 2
</p>
<a href="{% url 'pdf_form' '38_we' %}?html" target="_blank">Preview</a> | <a href="{% url 'pdf_form' '38_we' %}" class="spinner">Print</a>
<a href="{% url 'pdf_form' '38' %}?html" target="_blank">Preview</a> | <a href="{% url 'pdf_form' '38_we' %}" class="spinner">Print</a>
</div>
<div class="question-well">


+ 23
- 19
edivorce/apps/core/templates/pdf/form1.html View File

@ -158,18 +158,21 @@
</tr>
<tr>
{% multiple_values_to_list source=responses.reconciliation_period as periods %}
{% if periods != '[]' %}
<td>
{% for period in periods %}
<p>from: {{period | first}}</p>
{% endfor %}
</td>
<td>
{% for period in periods %}
<p>to: {{period | last }}</p>
{% endfor %}
</td>
{% else %}<td><p>From: <span class="form-entry not-complete">&nbsp;</span></p></td>{% endif %}
{% if periods and responses.try_reconcile_after_separated == 'YES' %}
<td>
{% for period in periods %}
<p>from: {{period | first}}</p>
{% endfor %}
</td>
<td>
{% for period in periods %}
<p>to: {{period | last }}</p>
{% endfor %}
</td>
{% else %}
<td><p>From: <span class="form-entry not-complete">&nbsp;</span></p></td>
<td><p>To: <span class="form-entry not-complete">&nbsp;</span></p></td>
{% endif %}
</tr>
<tr>
<td colspan="2"> (ii) <i class="fa fa-square-o" aria-hidden="true"></i> <strong> Other grounds </strong> , under section 8 (2) (b) of the <em> Divorce Act </em> (Canada): <span class="form-entry form-textarea not-complete">&nbsp;</span>
@ -224,13 +227,13 @@
</tr>
<tr>
{% check_list source=responses.children_financial_support value='No' as children_of_marriage %}
<td><i class="fa {% if responses.children_of_marriage == 'NO' %} fa-check-square-o" aria-hidden="true"></i>{% else %} fa-square-o" aria-hidden="true"></i> {% endif %} There are no children of the marriage, as defined by the <em> Divorce Act </em> (Canada), or children of whom Claimant 1 and Claimant 2 are parents within the meaning of the <em> Family Law Act </em> . </td>
<td><i class="fa {% if responses.children_of_marriage == 'NO' or children_of_marriage%} fa-check-square-o" aria-hidden="true"></i>{% else %} fa-square-o" aria-hidden="true"></i> {% endif %} There are no children of the marriage, as defined by the <em> Divorce Act </em> (Canada), or children of whom Claimant 1 and Claimant 2 are parents within the meaning of the <em> Family Law Act </em> . </td>
</tr>
<tr>
<td align="center"> [OR] </td>
</tr>
<tr>
<td> <i class="fa {% if responses.children_of_marriage == 'YES' and children_of_marriage %} fa-check-square-o" aria-hidden="true"></i>{% else %} fa-square-o" aria-hidden="true"></i> {% endif %} There are children of the marriage, as defined by the <em> Divorce Act </em> (Canada), or children of whom Claimant 1 and Claimant 2 are parents within the meaning of the <em> Family Law Act </em> , and those children are: </td>
<td> <i class="fa {% if responses.children_of_marriage == 'YES' and not children_of_marriage %} fa-check-square-o" aria-hidden="true"></i>{% else %} fa-square-o" aria-hidden="true"></i> {% endif %} There are children of the marriage, as defined by the <em> Divorce Act </em> (Canada), or children of whom Claimant 1 and Claimant 2 are parents within the meaning of the <em> Family Law Act </em> , and those children are: </td>
</tr>
<tr>
<td>
@ -318,19 +321,20 @@
<td> <i class="fa {% if order_wanted %} fa-check-square-o {% else %} fa-square-o {% endif %}" aria-hidden="true"></i> Claimant 1 and Claimant 2 are asking for an order for: <br /><em> </td>
</tr>
<tr>
<td> <i class="fa {% if responses.deal_with_property_debt == 'equal division' %} fa-check-square-o" aria-hidden="true"></i>{% else %} fa-square-o" aria-hidden="true"></i> {% endif %} an equal division of family property and family debt </td>
<td> <i class="fa {% if responses.deal_with_property_debt == 'equal division' %} fa-check-square-o {% else %} fa-square-o{% endif %}" aria-hidden="true"></i> an equal division of family property and family debt </td>
</tr>
<tr>
<td> <i class="fa {% if responses.deal_with_property_debt == 'unequal division' %} fa-check-square-o" aria-hidden="true"></i>{% else %} fa-square-o" aria-hidden="true"></i> {% endif %} an unequal division of family property and family debt as follows:
<span class="form-entry form-textarea not-complete">{% if responses.how_to_divide_property_debt %} {{ responses.how_to_divide_property_debt|linebreaksbr }} {% else %}&nbsp;{% endif %}</span>
<td> <i class="fa {% if responses.deal_with_property_debt == 'unequal division' %} fa-check-square-o {% else %} fa-square-o{% endif %}" aria-hidden="true"></i> an unequal division of family property and family debt as follows:
<span class="form-entry form-textarea not-complete">{% if responses.deal_with_property_debt == 'unequal division' and responses.how_to_divide_property_debt %} {{ responses.how_to_divide_property_debt|linebreaksbr }} {% else %}&nbsp;{% endif %}</span>
</td>
</tr>
<tr>
<td> <strong> B Other property claims </strong> </td>
</tr>
<tr>
<td> <i class="fa fa-square-o" aria-hidden="true"></i> 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:
<span class="form-entry form-textarea not-complete">{% if responses.other_property_claims %} {{ responses.other_property_claims|linebreaksbr }} {% else %}&nbsp;{% endif %}</span> </td>
{% check_list source=responses.want_other_property_claims value='Ask for other property claims' as other_wanted %}
<td> <i class="fa {% if other_wanted %} fa-check-square-o {% else %} fa-square-o{% endif %}" aria-hidden="true"></i> 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:
<span class="form-entry form-textarea not-complete">{% if other_wanted and responses.other_property_claims %} {{ responses.other_property_claims|linebreaksbr }} {% else %}&nbsp;{% endif %}</span> </td>
</tr>
</tbody>
</table>


+ 8
- 6
edivorce/apps/core/templates/question/07_property.html View File

@ -10,8 +10,8 @@
<h1><small>Step {% step_order step="property" %}:</small>Property and Debt</h1>
<div class="intro">
<p>After you separate, the law says that all <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true" title="<b>Family property</b><br /><br />The assest acquired by either spouse during the course of the relationship,
plus any increase in the value of excluded property. The law assumes that you're both entitled to an equal share of family property unless an equal division would be significantly unfair."> family property<i class="fa fa-question-circle" aria-hidden="true"></i></span> and
<p>After you separate, the law says that all <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true" title="<b>Family property</b><br /><br />The asset acquired by either spouse during the course of the relationship,
plus any increase in the value of excluded properties. The law assumes that you're both entitled to an equal share of family property unless an equal division would be significantly unfair."> family property<i class="fa fa-question-circle" aria-hidden="true"></i></span> and
<span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true" title="<b>Family debt</b><br /><br />Money owed to others accumulated during a relationship or to maintain
family property after separation. The law assumes that both spouses are equally responsible for the debt
unless an equal division would be &quot;significantly unfair.&quot;"> family debt<i class="fa fa-question-circle" aria-hidden="true"></i></span>
@ -121,10 +121,12 @@
<p>
You can ask for an interest in the property (part ownership) or compensation (money). If the property is real estate, provide the legal description.
</p>
<div class="checkbox">
<label>
{% input_field type="checkbox" name="want_other_property_claims" value="Ask for other property claims" %} 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:
</label>
<div class="checkbox-group">
<div class="checkbox">
<label>
{% input_field type="checkbox" name="want_other_property_claims" value="Ask for other property claims" %} 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:
</label>
</div>
</div>
{% input_field type="textarea" name="other_property_claims" rows="8" cols="65" class="response-textarea" %}
</div>


+ 0
- 4
edivorce/apps/core/templates/question/10_location.html View File

@ -10,10 +10,6 @@
<h1><small>Step {% step_order step="location" %}:</small>Filing Location</h1>
<p>
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.
</p>
<p>
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


+ 6
- 7
edivorce/apps/core/utils/question_step_mapping.py View File

@ -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']},
}

+ 1
- 17
edivorce/fixtures/Question.json View File

@ -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?",


Loading…
Cancel
Save