diff --git a/src/backend/expungeservice/templates/expungement_analysis_report.md.j2 b/src/backend/expungeservice/templates/expungement_analysis_report.md.j2 index ac91820b8..b3825bdbd 100644 --- a/src/backend/expungeservice/templates/expungement_analysis_report.md.j2 +++ b/src/backend/expungeservice/templates/expungement_analysis_report.md.j2 @@ -19,7 +19,10 @@ Name: {{ name }} You have open charges. You are not eligible to expunge ANY records, including old charges, while you have open charges. {% endif %} -## Charges Eligible Now +## Charges +Excludes traffic violations + +### Charges Eligible Now {% if eligible_case_charges | count > 0 %} {% for case_info, charges_info in eligible_case_charges[0][1] %} {% include 'partials/case.md.j2' %} @@ -29,7 +32,7 @@ You are not currently eligible to expunge any charges. {% endif %} {% if ineligible_case_charges | count > 0 %} -## Ineligible Charges +### Ineligible Charges These convictions are not eligible for expungement at any time under the current law. {% for case_info, charges_info in ineligible_case_charges[0][1] %} @@ -37,7 +40,7 @@ These convictions are not eligible for expungement at any time under the current {% endfor %} {% endif %} {% if eligible_if_paid_case_charges | count > 0 %} -## Charges Eligible Now If Balance Paid +### Charges Eligible Now If Balance Paid These convictions are eligible as soon as the balance of fines on the case is paid. {% for case_info, charges_info in eligible_if_paid_case_charges[0][1] %} @@ -46,8 +49,8 @@ These convictions are eligible as soon as the balance of fines on the case is pa {% endif %} {% if future_eligible_charges | count > 0 %} -## Future Eligible Charges -The following charges (dismissed and convicted) are eligible at the designated dates. Convictions in the future will set your eligibility dates back until ten years from the date of conviction. +### Future Eligible Charges +The following charges (dismissed and convicted) are eligible at the designated dates. {% for label, section in future_eligible_charges %} ### {{ label }} @@ -59,7 +62,7 @@ The following charges (dismissed and convicted) are eligible at the designated d {% endif %} {% if needs_more_analysis_charges | count > 0 %} -## Charges Needing More Analysis +### Charges Needing More Analysis Additionally, you have charges for which the online records do not contain enough information to determine eligibility. If you are curious about the eligibility of these charges, please contact roe@qiu-qiulaw.com. {% for case_info, charges_info in needs_more_analysis_charges[0][1] %} @@ -68,7 +71,7 @@ Additionally, you have charges for which the online records do not contain enoug {% endif %} {% if county_fines | count > 0 %} -## Balance Due by County +### Balance Due by County {% for county in county_fines %} {% if county['case_fines'] | length > 0 %} {{county['county_name']}} @@ -80,10 +83,10 @@ Additionally, you have charges for which the online records do not contain enoug {% endfor %} {% endif %} -### Disclaimer: +#### Disclaimer: RecordSponge is not your lawyer. The results below should be used as a guide only. If you are relying on this information to expunge your record, please email roe@qiu-qiulaw.com for free consultation. -### Assumptions +#### Assumptions 1) Successful completion of court requirements   If you are currently on probation or conditional discharge, the analysis below assumes that you will successfully complete those requirements. 2) Court debt paid off   You must pay off all court debt on a case before you file for expungement on any case which you are otherwise eligible to expunge. diff --git a/src/backend/tests/pdf/expected/custom_header.md b/src/backend/tests/pdf/expected/custom_header.md index d81b99064..be12108bc 100644 --- a/src/backend/tests/pdf/expected/custom_header.md +++ b/src/backend/tests/pdf/expected/custom_header.md @@ -2,10 +2,13 @@ ## PLEASE READ THIS -## Charges Eligible Now +## Charges +Excludes traffic violations + +### Charges Eligible Now You are not currently eligible to expunge any charges. -## Charges Eligible Now If Balance Paid +### Charges Eligible Now If Balance Paid These convictions are eligible as soon as the balance of fines on the case is paid. - Multnomah CASEJD1 – $529.08 @@ -14,15 +17,15 @@ These convictions are eligible as soon as the balance of fines on the case is pa -## Balance Due by County +### Balance Due by County Multnomah CASEJD1 - $529.08 -### Disclaimer: +#### Disclaimer: RecordSponge is not your lawyer. The results below should be used as a guide only. If you are relying on this information to expunge your record, please email roe@qiu-qiulaw.com for free consultation. -### Assumptions +#### Assumptions 1) Successful completion of court requirements   If you are currently on probation or conditional discharge, the analysis below assumes that you will successfully complete those requirements. 2) Court debt paid off   You must pay off all court debt on a case before you file for expungement on any case which you are otherwise eligible to expunge. diff --git a/src/backend/tests/pdf/expected/default.md b/src/backend/tests/pdf/expected/default.md index 45e0a54d6..2046c7637 100644 --- a/src/backend/tests/pdf/expected/default.md +++ b/src/backend/tests/pdf/expected/default.md @@ -5,10 +5,13 @@ Name: JOHN DOE ## PLEASE READ THIS -## Charges Eligible Now +## Charges +Excludes traffic violations + +### Charges Eligible Now You are not currently eligible to expunge any charges. -## Charges Eligible Now If Balance Paid +### Charges Eligible Now If Balance Paid These convictions are eligible as soon as the balance of fines on the case is paid. - Multnomah CASEJD1 – $529.08 @@ -17,15 +20,15 @@ These convictions are eligible as soon as the balance of fines on the case is pa -## Balance Due by County +### Balance Due by County Multnomah CASEJD1 - $529.08 -### Disclaimer: +#### Disclaimer: RecordSponge is not your lawyer. The results below should be used as a guide only. If you are relying on this information to expunge your record, please email roe@qiu-qiulaw.com for free consultation. -### Assumptions +#### Assumptions 1) Successful completion of court requirements   If you are currently on probation or conditional discharge, the analysis below assumes that you will successfully complete those requirements. 2) Court debt paid off   You must pay off all court debt on a case before you file for expungement on any case which you are otherwise eligible to expunge. diff --git a/src/backend/tests/test_form_filling.py b/src/backend/tests/test_form_filling.py index 0da73b9d6..0137058c6 100644 --- a/src/backend/tests/test_form_filling.py +++ b/src/backend/tests/test_form_filling.py @@ -88,8 +88,8 @@ def test_normal_conviction_uses_multnomah_conviction_form(): ######################################### -''' -class TestJohnCommonBuildZip: + +'''class TestJohnCommonBuildZip: filename = "oregon.pdf" BASE_DIR = os.path.join(Path(__file__).parent.parent, "expungeservice", "files") expected_form_values = oregon_john_common_pdf_fields @@ -147,7 +147,7 @@ def test_form_fields_are_filled(self, mock_mkdtemp, MockZipFile, MockPdfWriter, "foo/COMMON A NAME_120000_baker.pdf", "foo/OSP_Form.pdf", "foo/COMPILED.pdf", - #"foo/JOHN_DOE_record_summary.pdf" + "foo/JOHN_DOE_record_summary.pdf" ] assert set(file_paths) == set(expected_file_paths) @@ -160,7 +160,7 @@ def test_form_fields_are_filled(self, mock_mkdtemp, MockZipFile, MockPdfWriter, ("foo/COMMON A NAME_120000_baker.pdf", "COMMON A NAME_120000_baker.pdf"), ("foo/OSP_Form.pdf", "OSP_Form.pdf"), ("foo/COMPILED.pdf", "COMPILED.pdf"), - #("foo/JOHN_DOE_record_summary.pdf", "JOHN_DOE_record_summary.pdf") + ("foo/JOHN_DOE_record_summary.pdf", "JOHN_DOE_record_summary.pdf") ] assert set(zip_write_args) == set(expected_zip_write_args) @@ -185,8 +185,8 @@ class TestJohnCommonMultnomahArrestBuildZip(TestJohnCommonBuildZip): class TestJohnCommonMultnomahConvictionBuildZip(TestJohnCommonBuildZip): filename = "multnomah_conviction.pdf" - expected_form_values: BuildZipResult = multnomah_conviction_john_common_pdf_fields''' - + expected_form_values: BuildZipResult = multnomah_conviction_john_common_pdf_fields +''' #########################################