diff --git a/LICENSE b/LICENSE index d9e7d1c..e9ec9ed 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2022 Matt Newsted +Copyright (c) 2024 Matt Newsted Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/docassemble/AppearanceEfile/__init__.py b/docassemble/AppearanceEfile/__init__.py index bf66ffc..9b07695 100644 --- a/docassemble/AppearanceEfile/__init__.py +++ b/docassemble/AppearanceEfile/__init__.py @@ -1 +1 @@ -__version__ = '1.0.13' +__version__ = '1.0.15' diff --git a/docassemble/AppearanceEfile/data/questions/appearance.yml b/docassemble/AppearanceEfile/data/questions/appearance.yml index 64f10c1..e250792 100644 --- a/docassemble/AppearanceEfile/data/questions/appearance.yml +++ b/docassemble/AppearanceEfile/data/questions/appearance.yml @@ -1143,7 +1143,7 @@ under: | % endif   - ${ action_button_html(interview_url(i="docassemble.ILAOEfile:feedback.yml", easy_form_interview=ilao_easy_form_url, easy_form_title=ilao_easy_form_title, easy_form_page=user_info().question_id, easy_form_variable=user_info().variable, local=False,reset=1), label=':comment: Was this program helpful?', color="#181c36", size="md", new_window=True) } + ${ action_button_html(interview_url(i="docassemble.ILAOEfile:feedback.yml", easy_form_interview=ilao_easy_form_url, easy_form_title=ilao_easy_form_title, easy_form_page=current_context().question_id, easy_form_variable=current_context().variable, local=False,reset=1), label=':comment: Was this program helpful?', color="#181c36", size="md", new_window=True) } --- if: not ready_to_efile id: get docs screen @@ -1156,7 +1156,7 @@ subquestion: | ${ action_button_html(url_action('review_appearance'), label=':edit: Make changes', color='success', size="md") } - This program does not file your Appearance with the court or deliver it to other parties in your case. Learn about [**e-filing in Illinois**](https://www.illinoiscourts.gov/eservices/efileil/). + This program does not file your Appearance with the court or deliver it to other parties in your case. Learn about [**e-filing in Illinois**](https://www.illinoiscourts.gov/eservices/information-for-filers-without-lawyers). ${ al_user_bundle.download_list_html() } @@ -1164,7 +1164,7 @@ subquestion: | ${ al_user_bundle.send_button_html(show_editable_checkbox=False) } - **Note:** This program does not file your Appearance with the court or deliver it to other parties in your case. Learn about [e-filing in Illinois](https://www.illinoiscourts.gov/eservices/efileil/). + **Note:** This program does not file your Appearance with the court or deliver it to other parties in your case. Learn about [e-filing in Illinois](https://www.illinoiscourts.gov/eservices/information-for-filers-without-lawyers). Thank you for using ILAO Easy Forms! under: | @@ -1173,7 +1173,7 @@ under: | % endif   - ${ action_button_html(interview_url(i="docassemble.ILAOEfile:feedback.yml", easy_form_interview=ilao_easy_form_url, easy_form_title=ilao_easy_form_title, easy_form_page=user_info().question_id, easy_form_variable=user_info().variable, local=False,reset=1), label=':comment: Was this program helpful?', color="#181c36", size="md", new_window=True) } + ${ action_button_html(interview_url(i="docassemble.ILAOEfile:feedback.yml", easy_form_interview=ilao_easy_form_url, easy_form_title=ilao_easy_form_title, easy_form_page=current_context().question_id, easy_form_variable=current_context().variable, local=False,reset=1), label=':comment: Was this program helpful?', color="#181c36", size="md", new_window=True) } --- # old email forms functionality #id: email forms @@ -1216,7 +1216,7 @@ under: | # #   # -# ${ action_button_html(interview_url(i="docassemble.ILAOEfile:feedback.yml", easy_form_interview=ilao_easy_form_url, easy_form_title=ilao_easy_form_title, easy_form_page=user_info().question_id, easy_form_variable=user_info().variable, local=False,reset=1), label=':comment: Was this program helpful?', color="#181c36", size="md", new_window=True) } +# ${ action_button_html(interview_url(i="docassemble.ILAOEfile:feedback.yml", easy_form_interview=ilao_easy_form_url, easy_form_title=ilao_easy_form_title, easy_form_page=current_context().question_id, easy_form_variable=current_context().variable, local=False,reset=1), label=':comment: Was this program helpful?', color="#181c36", size="md", new_window=True) } --- generic object: ALDocumentBundle template: x.send_email_template @@ -1267,7 +1267,7 @@ under: |   - ${ action_button_html(interview_url(i="docassemble.ILAOEfile:feedback.yml", easy_form_interview=ilao_easy_form_url, easy_form_title=ilao_easy_form_title, easy_form_page=user_info().question_id, easy_form_variable=user_info().variable, local=False,reset=1), label=':comment: Was this program helpful?', color="#181c36", size="md", new_window=True) } + ${ action_button_html(interview_url(i="docassemble.ILAOEfile:feedback.yml", easy_form_interview=ilao_easy_form_url, easy_form_title=ilao_easy_form_title, easy_form_page=current_context().question_id, easy_form_variable=current_context().variable, local=False,reset=1), label=':comment: Was this program helpful?', color="#181c36", size="md", new_window=True) } --- objects: - illinois_appearance_attachment: ALDocument.using(title="Appearance Form", filename="appearance.pdf", has_addendum=False) @@ -1698,6 +1698,8 @@ review: **Do you want to add your e-signature?** ${ word(yesno(e_signature)) } show if: not can_check_efile + - note: | + [**Review your Fee waiver answers**](${url_action('review_IL_fee_waiver')}) - note: | If you want to change the court or case you are filing into, you will have to restart the interview from the beginning. diff --git a/docassemble/AppearanceEfile/data/questions/efile_ports.yml b/docassemble/AppearanceEfile/data/questions/efile_ports.yml index 9444dc2..d387064 100644 --- a/docassemble/AppearanceEfile/data/questions/efile_ports.yml +++ b/docassemble/AppearanceEfile/data/questions/efile_ports.yml @@ -311,7 +311,7 @@ subquestion: | % else: Here are the forms that we could not deliver. You should save and e-file them elsewhere. - Learn about [**e-filing in Illinois**](https://www.illinoiscourts.gov/eservices/efileil/). + Learn about [**e-filing in Illinois**](https://www.illinoiscourts.gov/eservices/information-for-filers-without-lawyers). % endif @@ -327,7 +327,7 @@ under: | % endif   - ${ action_button_html(interview_url(i="docassemble.ILAO:feedback.yml", easy_form_interview=ilao_easy_form_url, easy_form_title=ilao_easy_form_title, easy_form_page=user_info().question_id, easy_form_variable=user_info().variable, local=False,reset=1), label=':comment: Was this program helpful?', color="#181c36", size="md", new_window=True) } + ${ action_button_html(interview_url(i="docassemble.ILAO:feedback.yml", easy_form_interview=ilao_easy_form_url, easy_form_title=ilao_easy_form_title, easy_form_page=current_context().question_id, easy_form_variable=current_context().variable, local=False,reset=1), label=':comment: Was this program helpful?', color="#181c36", size="md", new_window=True) } --- code: | def yes_no_confidential(opts): @@ -382,7 +382,7 @@ subquestion: | **Keep track of this e-filing account.** You can use it to e-file other forms or make corrections. - % if hasattr(user_info(), 'email'): + % if hasattr(current_context(), 'email'): This might **not** be the same login information for ${ get_config('external hostname') } (that you are currently logged into). % endif fields: diff --git a/docassemble/__init__.py b/docassemble/__init__.py index ce5ab0d..8d17c21 100644 --- a/docassemble/__init__.py +++ b/docassemble/__init__.py @@ -1,5 +1,2 @@ -try: - __import__('pkg_resources').declare_namespace(__name__) -except ImportError: - __path__ = __import__('pkgutil').extend_path(__path__, __name__) +__import__('pkg_resources').declare_namespace(__name__) diff --git a/setup.cfg b/setup.cfg index b88034e..08aedd7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,2 +1,2 @@ [metadata] -description-file = README.md +description_file = README.md diff --git a/setup.py b/setup.py index 3896181..1cc4260 100644 --- a/setup.py +++ b/setup.py @@ -44,7 +44,7 @@ def find_package_data(where='.', package='', exclude=standard_exclude, exclude_d return out setup(name='docassemble.AppearanceEfile', - version='1.0.13', + version='1.0.15', description=('Appearance'), long_description='# docassemble.AppearanceEfile\r\n\r\nAppearance, with E-filing.\r\n\r\nA complete duplicate of https://github.com/IllinoisLegalAidOnline/docassemble-Appearance,\r\nbut with e-filing added. This is a pilot project, and separated so the original Appearance\r\ncan stay stable as experimental features are added to this e-filing version.\r\n\r\n## Author\r\n\r\nMatt Newsted, mnewsted@illinoislegalaid.org\r\nBryce Willey, bwilley@suffolk.edu\r\n', long_description_content_type='text/markdown', @@ -54,7 +54,7 @@ def find_package_data(where='.', package='', exclude=standard_exclude, exclude_d url='https://www.illinoislegalaid.org', packages=find_packages(), namespace_packages=['docassemble'], - install_requires=['docassemble.AssemblyLine>=2.19.0', 'docassemble.EFSPIntegration>=1.1.0', 'docassemble.ILAOEfile>=1.0.0'], + install_requires=['docassemble.AssemblyLine>=3.1.0', 'docassemble.EFSPIntegration>=1.5.0', 'docassemble.ILAOEfile>=1.0.4'], zip_safe=False, package_data=find_package_data(where='docassemble/AppearanceEfile/', package='docassemble.AppearanceEfile'), )