DIV-1247: Remove unused code

edivorce/apps/core/templates/dashboard/check_with_registry.html

@@ -1,42 +0,0 @@
-{% extends 'base.html' %}
-
-{% block title %}{{ block.super }}: Overview{% endblock %}
-
-{% block progress %}{% include "partials/dashnav.html" with active_page=active_page %}{% endblock %}
-
-{% block content %}
-
-<h1>Check with registry to find out the status of your divorce application</h1>
-
-<p>
-    Ask the registry staff when and how you should check in to find out if a judge has looked at your divorce document and has granted your divorce.
-</p>
-
-<p>
-    The divorce will become effective on the 31st day after the order has been signed by the judge.
-    <b>This doesn't mean the 31st day of that month</b>. It means that from the date the judge signed your order, you count 31 days.
-    On the 31st day, your divorce becomes final. For example, if your divorce was granted on September 15, your divorce will become effective on October 16.
-</p>
-
-<div class="bg-danger">
-    <p>
-        You can't remarry until your divorce has been granted (that is, not until 31 days after the divorce order has been signed by the judge).
-    </p>
-</div>
-
-{% endblock %}
-
-{% block backToDashboard %}
-<!-- no back to dashboard -->
-{% endblock %}
-
-{% block formbuttons %}
-<!-- no button -->
-{% endblock %}
-
-{% block sidebarNav %}
-<!-- no sidebar -->
-{% endblock %}
-{% block sidebarText %}
-    {% include "dashboard/partials/sidebar_help.html" %}
-{% endblock %}

edivorce/apps/core/templates/dashboard/file_documents.html

@@ -1,38 +0,0 @@
-{% extends 'base.html' %}
-
-{% block title %}{{ block.super }}: Overview{% endblock %}
-
-{% block progress %}{% include "partials/dashnav.html" with active_page=active_page %}{% endblock %}
-
-{% block content %}
-
-<h1>File documents at registry</h1>
-<h3>What happens at the registry?</h3>
-<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="https://familylaw.lss.bc.ca/help/who_LegalAdvice.php" target="_blank">legal advice</a> before you file your documents — from
-    <a href="https://familylaw.lss.bc.ca/help/who_FamilyDutyCounsel.php" target="_blank">family duty counsel</a>
-    or (in Vancouver) from the Vancouver
-    <a href="https://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>
-
-
-{% endblock %}
-
-{% block backToDashboard %}
-<!-- no back to dashboard -->
-{% endblock %}
-
-{% block formbuttons %}
-<!-- no button -->
-{% endblock %}
-
-{% block sidebarNav %}
-<!-- no sidebar -->
-{% endblock %}
-{% block sidebarText %}
-    {% include "dashboard/partials/sidebar_help.html" %}
-{% endblock %}

edivorce/apps/core/templates/dashboard/partials/sidebar_help.html

@@ -1,19 +0,0 @@
-<h3>How long does a divorce take?</h3>
-<p>
-    The time depends upon your individual circumstances (for example have you and your spouse agreed on how to divide
-    your property and debt). However, once you have completed the  required forms, and filed them at a Supreme Court
-    registry, it can take <b>3 to 4 months</b> to process your request. Please note times vary based on the registry.
-</p>
-<h3>How much will it cost?</h3>
-<p>
-    You will have to pay a $290 court fee to get a divorce.
-</p>
-<p>
-    You may also choose to pay another $40 for an optional Certificate of Divorce Form (F56).  If you ever want to
-    remarry, you'll need the Certificate of Divorce.
-</p>
-<p>
-    There are also some other costs involved in getting a divorce. If you choose to have your affidavits sworn at the
-    court registry, this will cost you $40 per affidavit. If you don't have a certified copy of your marriage
-    certificate or registration of marriage, you'll have to pay for this document as well.
-</p>

edivorce/apps/core/templates/dashboard/wait.html

@@ -1,27 +0,0 @@
-{% extends 'base.html' %}
-
-{% block title %}{{ block.super }}: Overview{% endblock %}
-
-{% block progress %}{% include "partials/dashnav.html" with active_page=active_page %}{% endblock %}
-
-{% block content %}
-<h1>Wait while Judge reviews your request</h1>
-<p>
-    Once filed, forms will be passed to a judge. If the judge determines that you are entitled to a divorce, he or she will grant you a Divorce Order.
-</p>
-{% endblock %}
-
-{% block backToDashboard %}
-<!-- no back to dashboard -->
-{% endblock %}
-
-{% block formbuttons %}
-<!-- no button -->
-{% endblock %}
-
-{% block sidebarNav %}
-<!-- no sidebar -->
-{% endblock %}
-{% block sidebarText %}
-    {% include "dashboard/partials/sidebar_help.html" %}
-{% endblock %}

edivorce/apps/core/templates/overview.html

@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 {% load step_order %}
-{% load load_json %}
 
 {% block title %}{{ block.super }}: Overview{% endblock %}
 
@@ -124,5 +123,23 @@
 {% endblock %}
 
 {% block sidebarText %}
-    {% include "dashboard/partials/sidebar_help.html" %}
+    <h3>How long does a divorce take?</h3>
+    <p>
+        The time depends upon your individual circumstances (for example have you and your spouse agreed on how to divide
+        your property and debt). However, once you have completed the required forms, and filed them at a Supreme Court
+        registry, it can take <b>3 to 4 months</b> to process your request. Please note times vary based on the registry.
+    </p>
+    <h3>How much will it cost?</h3>
+    <p>
+        You will have to pay a $290 court fee to get a divorce.
+    </p>
+    <p>
+        You may also choose to pay another $40 for an optional Certificate of Divorce Form (F56). If you ever want to
+        remarry, you'll need the Certificate of Divorce.
+    </p>
+    <p>
+        There are also some other costs involved in getting a divorce. If you choose to have your affidavits sworn at the
+        court registry, this will cost you $40 per affidavit. If you don't have a certified copy of your marriage
+        certificate or registration of marriage, you'll have to pay for this document as well.
+    </p>
 {% endblock %}

edivorce/apps/core/templates/partials/fact_sheets/fact_sheet_e.html

@@ -92,12 +92,12 @@
             </thead>
             <tbody>
             <tr class="debt-group" hidden>
-                {% include "partials/fact_sheet_excessive_debt.html" with debt_monthly_amount=0 %}
+                {% include "partials/fact_sheets/fact_sheet_excessive_debt.html" with debt_monthly_amount=0 %}
             </tr>
             {% multiple_values_to_list source=claimant_debts as debts %}
             {% for debt in debts %}
                 <tr class="debt-item-row">
-                    {% include "partials/fact_sheet_excessive_debt.html" with debt_name=debt.debt_name debt_terms=debt.debt_terms debt_monthly_amount=debt.debt_monthly_amount %}
+                    {% include "partials/fact_sheets/fact_sheet_excessive_debt.html" with debt_name=debt.debt_name debt_terms=debt.debt_terms debt_monthly_amount=debt.debt_monthly_amount %}
                 </tr>
             {% endfor %}
             </tbody>
@@ -124,12 +124,12 @@
             </thead>
             <tbody>
             <tr class="expense-group" hidden>
-                {% include "partials/fact_sheet_expense.html" with expense_amount=0 %}
+                {% include "partials/fact_sheets/fact_sheet_expense.html" with expense_amount=0 %}
             </tr>
             {% multiple_values_to_list source=claimant_expenses as expenses %}
             {% for expense in expenses %}
                 <tr class="expense-item-row">
-                    {% include "partials/fact_sheet_expense.html" with expense_name=expense.expense_name expense_amount=expense.expense_amount %}
+                    {% include "partials/fact_sheets/fact_sheet_expense.html" with expense_name=expense.expense_name expense_amount=expense.expense_amount %}
                 </tr>
             {% endfor %}
             </tbody>
@@ -158,12 +158,12 @@
             </thead>
             <tbody>
             <tr class="supporting-non-dependent-group" hidden>
-                {% include "partials/fact_sheet_supporting_person.html" with name_field="non_dependent_name" relationship_field="non_dependent_relationship" reason_field="non_dependent_reason" input_field_class="supporting-non-dependent-input-field" save_selector=".supporting-non-dependent-input-field" delete_button_class="btn-delete-supporting-non-dependent" %}
+                {% include "partials/fact_sheets/fact_sheet_supporting_person.html" with name_field="non_dependent_name" relationship_field="non_dependent_relationship" reason_field="non_dependent_reason" input_field_class="supporting-non-dependent-input-field" save_selector=".supporting-non-dependent-input-field" delete_button_class="btn-delete-supporting-non-dependent" %}
             </tr>
             {% multiple_values_to_list source=supporting_non_dependents as non_dependents %}
             {% for non_dependent in non_dependents %}
                 <tr class="supporting-non-dependent-item-row">
-                    {% include "partials/fact_sheet_supporting_person.html" with name_field="non_dependent_name" relationship_field="non_dependent_relationship" reason_field="non_dependent_reason" input_field_class="supporting-non-dependent-input-field" save_selector=".supporting-non-dependent-input-field" delete_button_class="btn-delete-supporting-non-dependent" name=non_dependent.non_dependent_name relationship=non_dependent.non_dependent_relationship reason=non_dependent.non_dependent_reason %}
+                    {% include "partials/fact_sheets/fact_sheet_supporting_person.html" with name_field="non_dependent_name" relationship_field="non_dependent_relationship" reason_field="non_dependent_reason" input_field_class="supporting-non-dependent-input-field" save_selector=".supporting-non-dependent-input-field" delete_button_class="btn-delete-supporting-non-dependent" name=non_dependent.non_dependent_name relationship=non_dependent.non_dependent_relationship reason=non_dependent.non_dependent_reason %}
                 </tr>
             {% endfor %}
             </tbody>
@@ -193,12 +193,12 @@
             </thead>
             <tbody>
             <tr class="supporting-dependent-group" hidden>
-                {% include "partials/fact_sheet_supporting_person.html" with name_field="supporting_dependent_name" relationship_field="supporting_dependent_relationship" reason_field="supporting_dependent_reason" input_field_class="supporting-dependent-input-field" delete_button_class="btn-delete-supporting-dependent" save_selector=".supporting-dependent-input-field" %}
+                {% include "partials/fact_sheets/fact_sheet_supporting_person.html" with name_field="supporting_dependent_name" relationship_field="supporting_dependent_relationship" reason_field="supporting_dependent_reason" input_field_class="supporting-dependent-input-field" delete_button_class="btn-delete-supporting-dependent" save_selector=".supporting-dependent-input-field" %}
             </tr>
             {% multiple_values_to_list source=supporting_dependents as dependents %}
             {% for dependent in dependents %}
                 <tr class="supporting-dependent-item-row">
-                    {% include "partials/fact_sheet_supporting_person.html" with name_field="supporting_dependent_name" relationship_field="supporting_dependent_relationship" reason_field="supporting_dependent_reason" input_field_class="supporting-dependent-input-field" delete_button_class="btn-delete-supporting-dependent" save_selector=".supporting-dependent-input-field" name=dependent.supporting_dependent_name relationship=dependent.supporting_dependent_relationship reason=dependent.supporting_dependent_reason %}
+                    {% include "partials/fact_sheets/fact_sheet_supporting_person.html" with name_field="supporting_dependent_name" relationship_field="supporting_dependent_relationship" reason_field="supporting_dependent_reason" input_field_class="supporting-dependent-input-field" delete_button_class="btn-delete-supporting-dependent" save_selector=".supporting-dependent-input-field" name=dependent.supporting_dependent_name relationship=dependent.supporting_dependent_relationship reason=dependent.supporting_dependent_reason %}
                 </tr>
             {% endfor %}
             </tbody>
@@ -223,12 +223,12 @@
             </thead>
             <tbody>
             <tr class="supporting-disabled-group" hidden>
-                {% include "partials/fact_sheet_supporting_person.html" with name_field="supporting_disabled_name" relationship_field="supporting_disabled_relationship" reason_field="supporting_disabled_reason" input_field_class="supporting-disabled-input-field" delete_button_class="btn-delete-supporting-disabled" save_selector=".supporting-disabled-input-field" %}
+                {% include "partials/fact_sheets/fact_sheet_supporting_person.html" with name_field="supporting_disabled_name" relationship_field="supporting_disabled_relationship" reason_field="supporting_disabled_reason" input_field_class="supporting-disabled-input-field" delete_button_class="btn-delete-supporting-disabled" save_selector=".supporting-disabled-input-field" %}
             </tr>
             {% multiple_values_to_list source=supporting_disabled as dependents %}
             {% for dependent in dependents %}
                 <tr class="supporting-disabled-item-row">
-                    {% include "partials/fact_sheet_supporting_person.html" with name_field="supporting_disabled_name" relationship_field="supporting_disabled_relationship" reason_field="supporting_disabled_reason" input_field_class="supporting-disabled-input-field" delete_button_class="btn-delete-supporting-disabled" name=dependent.supporting_disabled_name relationship=dependent.supporting_disabled_relationship reason=dependent.supporting_disabled_reason save_selector=".supporting-disabled-input-field" %}
+                    {% include "partials/fact_sheets/fact_sheet_supporting_person.html" with name_field="supporting_disabled_name" relationship_field="supporting_disabled_relationship" reason_field="supporting_disabled_reason" input_field_class="supporting-disabled-input-field" delete_button_class="btn-delete-supporting-disabled" name=dependent.supporting_disabled_name relationship=dependent.supporting_disabled_relationship reason=dependent.supporting_disabled_reason save_selector=".supporting-disabled-input-field" %}
                 </tr>
             {% endfor %}
             </tbody>
@@ -278,12 +278,12 @@
             </thead>
             <tbody>
             <tr class="income-others-group" hidden>
-                {% include "partials/fact_sheet_income_others.html" with income_others_amount=0 %}
+                {% include "partials/fact_sheets/fact_sheet_income_others.html" with income_others_amount=0 %}
             </tr>
             {% multiple_values_to_list source=income_others as incomes %}
             {% for income in incomes %}
                 <tr class="income-others-item-row">
-                    {% include "partials/fact_sheet_income_others.html" with income_others_name=income.income_others_name income_others_amount=income.income_others_amount %}
+                    {% include "partials/fact_sheets/fact_sheet_income_others.html" with income_others_name=income.income_others_name income_others_amount=income.income_others_amount %}
                 </tr>
             {% endfor %}
             </tbody>

edivorce/apps/core/templates/partials/progress.html

@@ -1,5 +1,4 @@
 {% load step_order %}
-{% load load_json %}
 
 <div class="col-flex progress-column">
     <h4>Questionnaire</h4>
@@ -77,7 +76,7 @@
     </ul>
     {% endif %}
 
-    {% if 'Spousal support' in want_which_orders|load_json or 'Spousal support' in which_orders.0.value|load_json %}
+    {% if derived.wants_spousal_support %}
     <a href="{% url 'question_steps' 'support' %}" class="progress-question {% if step_status.spousal_support == 'Completed' %} complete {% endif %} {% if active_page == 'support' %} active {% endif %}">
         <span class="progress-icon"><i class="fa fa-life-ring" aria-hidden="true"></i></span>
         <span class="progress-content"><small>Step {% step_order step="support" %}</small><br />Spousal support</span>
@@ -85,7 +84,7 @@
     </a>
     {% endif %}
 
-    {% if 'Division of property and debts' in want_which_orders|load_json or 'Division of property and debts' in which_orders.0.value|load_json %}
+    {% if derived.wants_property_division %}
     <a href="{% url 'question_steps' 'property' %}" class="progress-question {% if step_status.property_and_debt == 'Completed' %} complete {% endif %} {% if active_page == 'property' %} active {% endif %}">
         <span class="progress-icon"><i class="fa fa-home" aria-hidden="true"></i></span>
         <span class="progress-content"><small>Step {% step_order step="property" %}</small><br />Property and debt</span>
@@ -93,7 +92,7 @@
     </a>
     {% endif %}
 
-    {% if 'Other orders' in want_which_orders|load_json or 'Other orders' in which_orders.0.value|load_json %}
+    {% if derived.wants_other_orders %}
     <a href="{% url 'question_steps' 'other_orders' %}" class="progress-question {% if step_status.other_orders == 'Completed' %} complete {% endif %} {% if active_page == 'other_orders' %} active {% endif %}">
         <span class="progress-icon"><i class="fa fa-gavel" aria-hidden="true"></i></span>
         <span class="progress-content"><small>Step {% step_order step="other_orders" %}</small><br />Other orders</span>

edivorce/apps/core/templates/pdf/form52.html

@@ -2,7 +2,6 @@
 {% load composites %}
 {% load input_field %}
 {% load format_utils %}
-{% load load_json %}
 <!doctype html>
 <html class="no-js" lang="en">
 

edivorce/apps/core/templates/question/06_children_facts.html

@@ -3,7 +3,6 @@
 {% load format_utils %}
 {% load step_order %}
 {% load format_utils %}
-{% load load_json %}
 
 {% block title %}{{ block.super }}: Your Children {% endblock %}
 

edivorce/apps/core/templates/question/06_children_what_for.html

@@ -2,7 +2,6 @@
 {% load static %}
 {% load input_field %}
 {% load step_order %}
-{% load load_json %}
 {% load format_utils %}
 
 {% block title %}{{ block.super }}: Your Children {% endblock %}
@@ -29,7 +28,7 @@
         </h3>
         <div class="radio">
             <label class="radio-with-textbox">
-                {% if 'Child support' in want_which_orders|load_json %}
+                {% if derived.wants_child_support %}
                     {% input_field type="radio" class="radio-centered radio-with-other radio_with_textbox" name="child_support_in_order" value="MATCH" data_target_id="child_support_in_order_detail" data_reveal_target="false" data_target_class="support-amount-match" data_reveal_class="false" %}
                 {% else %}
                     {% input_field type="radio" class="radio-centered radio-with-other radio_with_textbox" name="child_support_in_order" value="MATCH" data_target_id="child_support_in_order_detail" data_reveal_target="false" data_target_class="support-amount-match" data_reveal_class="false" disabled="" %}
@@ -55,13 +54,13 @@
         </div>
         <div class="radio">
             <label class="radio-with-textbox">
-                {% if 'Child support' in want_which_orders|load_json %}
+                {% if derived.wants_child_support %}
                     {% input_field type="radio" class="radio-centered radio-with-other radio_with_textbox" name="child_support_in_order" value="DIFF" data_target_class="support-amount-match" data_reveal_class="true" data_target_id="child_support_in_order_detail" data_reveal_target="false" %}
                 {% else %}
                     {% input_field type="radio" class="radio-centered radio-with-other radio_with_textbox" name="child_support_in_order" value="DIFF" data_target_class="support-amount-match" data_reveal_class="true" data_target_id="child_support_in_order_detail" data_reveal_target="false" disabled="" %}
                 {% endif %}
 
-                {% if 'Child support' in want_which_orders|load_json %}
+                {% if derived.wants_child_support %}
                     {% if child_support_in_order == 'DIFF' %}
                         <div class="dollar-prefix">
                             {% money_input_field name="order_monthly_child_support_amount" class="money positive-float form-block response-textbox children-input-block child-support-amount" data_ajax_only_radio_selected="true" %}
@@ -84,8 +83,8 @@
             </label>
         </div>
         <div class="radio">
-            
-            {% if 'Child support' in want_which_orders|load_json %}
+
+            {% if derived.wants_child_support %}
                 <label>{% input_field type="radio" class="radio-with-other radio_with_textbox" name="child_support_in_order" value="NO" data_target_id="child_support_in_order_detail" data_reveal_target="true" data_target_class="support-amount-match" data_reveal_class="false" %}
                     We are not asking for child support to be included in the order</label>
             {% else %}
@@ -415,7 +414,7 @@
     {% endif %}
 
     {# DIV-963: Show/hide logic and text update will be handled by JavaScript function updateChildSupportActQuestion() #}
-    <div class="question-well {% if child_support_act_error %}error{% endif %}" id="child_support_act" {% if 'Child support' in want_which_orders|load_json %}data-want_child_order="true"{% endif %}>
+    <div class="question-well {% if child_support_act_error %}error{% endif %}" id="child_support_act" {% if derived.wants_child_support %}data-want_child_order="true"{% endif %}>
         <h3><span id="child_support_act_question">Please indicate which act(s) you are asking for child support under.</span>
             {% if child_support_act_error %}{% include 'partials/required.html' %}{% endif %}
         </h3>

edivorce/apps/core/templates/question/06_children_your_children.html

@@ -2,7 +2,6 @@
 {% load input_field %}
 {% load format_utils %}
 {% load step_order %}
-{% load load_json %}
 
 {% block title %}{{ block.super }}: Your Children{% endblock %}
 
@@ -41,7 +40,7 @@
     and <strong>are independent.</strong>
 </p>
 
-{% if 'Child support' not in want_which_orders|load_json %}
+{% if derived.wants_child_support %}
     <p><strong>Please note: Not asking for child support but have children</strong></p>
     <p>
         Even though you are not asking for an order for child support, you will still need to answer some questions

edivorce/apps/core/templates/question/12_review.html

@@ -1,7 +1,6 @@
 {% extends 'base.html' %}
 {% load input_field %}
 {% load step_order %}
-{% load load_json %}
 
 {% block title %}{{ block.super }}: Review{% endblock %}
 

edivorce/apps/core/templatetags/format_utils.py

@@ -175,16 +175,6 @@ def child_or_children(value):
     return '%d children'
 
 
-@register.filter
-def integer(value):
-    """ Return value as an int or nothing """
-
-    try:
-        return int(float(value))
-    except ValueError:
-        return ''
-
-
 @register.simple_tag()
 def lookup(obj, property):
     """ Return the value of a dynamic property within an object"""

edivorce/apps/core/templatetags/input_field.py

@@ -134,17 +134,6 @@ def additional_attributes(**kwargs):
     return attributes
 
 
-@register.simple_tag
-def check_list(source, value):
-    """
-    Check if given value is in the given source
-    """
-    try:
-        return value in json.loads(source)
-    except:
-        return False
-
-
 @register.simple_tag
 def multiple_values_to_list(source):
     try:

edivorce/apps/core/templatetags/load_json.py

@@ -1,9 +0,0 @@
-import json
-
-from django import template
-
-register = template.Library()
-
-@register.filter
-def load_json(data):
-    return json.loads(data)

edivorce/apps/poc/templates/hub.html

@@ -1,7 +1,6 @@
 {% extends 'base.html' %}
 {% load input_field %}
 {% load step_order %}
-{% load load_json %}
 
 {% block title %}{{ block.super }}: POC{% endblock %}
 

edivorce/apps/poc/templates/poc-sidebar.html

@@ -1,5 +1,4 @@
 {% load step_order %}
-{% load load_json %}
 
 <div class="col-flex progress-column">
     <h4>POC</h4>

edivorce/apps/poc/templates/poc/document_confirm_delete.html

@@ -1,7 +1,6 @@
 {% extends 'base.html' %}
 {% load input_field %}
 {% load step_order %}
-{% load load_json %}
 
 {% block title %}{{ block.super }}: POC{% endblock %}
 

edivorce/apps/poc/templates/scan.html

@@ -1,7 +1,6 @@
 {% extends 'base.html' %}
 {% load input_field %}
 {% load step_order %}
-{% load load_json %}
 
 {% block title %}{{ block.super }}: POC{% endblock %}
 

edivorce/apps/poc/templates/storage.html

@@ -1,7 +1,6 @@
 {% extends 'base.html' %}
 {% load input_field %}
 {% load step_order %}
-{% load load_json %}
 
 {% block title %}{{ block.super }}: POC{% endblock %}