From d2f56591690b2af5dbef3e5d3c9656b546eb927b Mon Sep 17 00:00:00 2001 From: Quinten Steenhuis Date: Wed, 13 Jul 2022 14:46:20 -0400 Subject: [PATCH 1/3] Add nice_county_name method --- docassemble/ALToolbox/misc.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/docassemble/ALToolbox/misc.py b/docassemble/ALToolbox/misc.py index 7e9ed4e6..2a4d3b22 100644 --- a/docassemble/ALToolbox/misc.py +++ b/docassemble/ALToolbox/misc.py @@ -1,5 +1,5 @@ import docassemble.base.functions -from docassemble.base.util import defined, value, showifdef, space_to_underscore +from docassemble.base.util import defined, value, showifdef, space_to_underscore, Address import re __all__ = [ @@ -15,6 +15,7 @@ "sum_if_defined", "add_records", "output_checkbox", + "nice_county_name", ] @@ -201,3 +202,16 @@ def output_checkbox( return checked_value else: return unchecked_value + + +def nice_county_name(address: Address)->str: + """ + If the county name contains the word "County", which Google Address + Autocomplete does by default, remove it. + """ + if not hasattr(address, "county"): + return "" + if address.county.endswith(" County"): + return address.county[:-len(" County")] + else: + return address.county \ No newline at end of file From 42616aefe48880f5550cf7fd3856e83b8ee29f63 Mon Sep 17 00:00:00 2001 From: nonprofittechy Date: Wed, 13 Jul 2022 18:59:07 +0000 Subject: [PATCH 2/3] :art: Format Python code with psf/black --- docassemble/ALToolbox/misc.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/docassemble/ALToolbox/misc.py b/docassemble/ALToolbox/misc.py index 2a4d3b22..ed4c2412 100644 --- a/docassemble/ALToolbox/misc.py +++ b/docassemble/ALToolbox/misc.py @@ -1,5 +1,11 @@ import docassemble.base.functions -from docassemble.base.util import defined, value, showifdef, space_to_underscore, Address +from docassemble.base.util import ( + defined, + value, + showifdef, + space_to_underscore, + Address, +) import re __all__ = [ @@ -204,7 +210,7 @@ def output_checkbox( return unchecked_value -def nice_county_name(address: Address)->str: +def nice_county_name(address: Address) -> str: """ If the county name contains the word "County", which Google Address Autocomplete does by default, remove it. @@ -212,6 +218,6 @@ def nice_county_name(address: Address)->str: if not hasattr(address, "county"): return "" if address.county.endswith(" County"): - return address.county[:-len(" County")] + return address.county[: -len(" County")] else: - return address.county \ No newline at end of file + return address.county From a3ff040b8d83f081fb0795721a65dcb1bf4407d6 Mon Sep 17 00:00:00 2001 From: Anonymous User <52798256+plocket@users.noreply.github.com> Date: Thu, 14 Jul 2022 07:33:03 -0400 Subject: [PATCH 3/3] Add demo of `nice_county_name()` --- .../data/questions/nice_county_name_demo.yml | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 docassemble/ALToolbox/data/questions/nice_county_name_demo.yml diff --git a/docassemble/ALToolbox/data/questions/nice_county_name_demo.yml b/docassemble/ALToolbox/data/questions/nice_county_name_demo.yml new file mode 100644 index 00000000..d0bd189b --- /dev/null +++ b/docassemble/ALToolbox/data/questions/nice_county_name_demo.yml @@ -0,0 +1,29 @@ +metadata: + Title: Nice county name demo +--- +modules: + - .misc +--- +objects: + - address: Address +--- +mandatory: True +code: | + address.county + print_county +--- +question: | + Address +subquestion: | + `nice_county_name`: If the county name contains the word "County", which Google Address Autocomplete does by default, remove it. +fields: + - Address: address.address + address autocomplete: True + - County: address.county +--- +event: print_county +question: | + County +subquestion: | + ${ nice_county_name( address ) } +--- \ No newline at end of file