diff --git a/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_basic_information.yml b/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_basic_information.yml index 4643b17..5ef46c0 100644 --- a/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_basic_information.yml +++ b/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_basic_information.yml @@ -32,6 +32,9 @@ objects: - requestor: ALIndividual - school: Person --- +code: | + AL_ORGANIZATION_TITLE = "Massachusetts Advocates for Children" +--- features: bootstrap theme: mac-bootstrap.css progress bar: True @@ -49,6 +52,9 @@ objects: - evaluations_list: DAList - evaluation: DAObject --- +objects: + - al_logo: DAStaticFile.using(filename="MAClogo.jpg") +--- default screen parts: post: | % if not user_logged_in(): @@ -180,7 +186,9 @@ subquestion: | Before you start, you will need: 1. The name and address of the special education coordinator or director for your child's school. + 2. Your child's full name and date of birth. + 3. Name and email of your child's school principal. If you need help finding any of this information, contact MAC’s helpline at diff --git a/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_independent_evaluation.yml b/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_independent_evaluation.yml index d3a3310..f970eb4 100644 --- a/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_independent_evaluation.yml +++ b/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_independent_evaluation.yml @@ -415,10 +415,7 @@ subquestion: | ${ al_recipient_bundle.as_pdf(key='preview') } - Click the image to open it in a new tab. Click the "Edit answers" button - to edit your answers. - - ${ action_button_html(url_action('review_independent_evaluation_request'), label='Edit answers', color='info') } + Click the image to open it in a new tab. Remember to come back to this window to continue and sign your form. continue button field: independent_evaluation_request_preview_question @@ -441,10 +438,7 @@ question: | subquestion: | Thank you. Your form is ready to download and deliver. - View, download and send your form below. Click the "Edit answers" button to fix any mistakes. - - ${ action_button_html(url_action('review_independent_evaluation_request'), label='Edit answers', color='info') } - + View, download and send your form below. ${ al_user_bundle.download_list_html() } @@ -512,7 +506,9 @@ subquestion: | Before you start, you will need: 1. The name and address of the special education coordinator or director for your child's school. + 2. Your child's full name and date of birth. + 3. Name and email of your child's school principal. If you need help finding any of this information, contact MAC’s helpline at diff --git a/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml b/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml index 7a156e6..fe3c25a 100644 --- a/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml +++ b/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml @@ -1,4 +1,3 @@ ---- modules: - docassemble.base.util - docassemble.base.legal @@ -117,6 +116,7 @@ code: | basic_questions_signature_flow requestor.signature initial_request_download + --- ###TODO add back email option ###initial_request_concatenated = pdf_concatenate(initial_request_variable) @@ -138,8 +138,11 @@ subquestion: | Before you start, you will need: 1. The name and address of the special education coordinator or director for your child’s school district. + 2. Your child's full name and date of birth. + 3. If your child ALREADY HAS an {IEP}: the name and email of the special education coordinator or director for your child’s school; OR + 4. If your child does NOT have an {IEP}: the name and email for your child’s school principal or teacher. If your child has an {IEP}, the name of your child’s special education coordinator should be listed on your child’s IEP. @@ -160,7 +163,7 @@ help: --- id: select initial evaluations question : | - What evaluations does ${ student.familiar() } need? + What evaluations does ${ student.familiar() } need? subquestion: | First, explain what you or a specialist have noticed about ${ student.familiar() } that you would like to be evaluated. @@ -664,10 +667,7 @@ subquestion: | ${ al_recipient_bundle.as_pdf(key='preview') } - Click the image to open it in a new tab. Click the "Edit answers" button - to edit your answers. - - ${ action_button_html(url_action('review_initial_request'), label='Edit answers', color='info') } + Click the image to open it in a new tab. Remember to come back to this window to continue and sign your form. continue button field: initial_request_preview_question @@ -687,31 +687,40 @@ id: download initial_request event: initial_request_download question: | All done -subquestion: | - Thank you. Your form is ready to download and deliver. - - View, download and send your form below. Click the "Edit answers" button to fix any mistakes. - - ${ action_button_html(url_action('review_initial_request'), label='Edit answers', color='info') } - +subquestion: | + Thank you. Your form is ready to download and deliver. + + View, download and send your form below. ${ al_user_bundle.download_list_html() } - ${ al_user_bundle.send_button_html(show_editable_checkbox=True) } - -progress: 100 + +progress: 100 --- # ALDocument objects specify the metadata for each template objects: - initial_request_attachment: ALDocument.using(title="Initial Request", filename="initial_request", enabled=True, has_addendum=False) - educational_evaluations_copy_request_attachment: ALDocument.using(title="Evaluation Copy Request", filename="educational_evaluations_copy_request", enabled=True, has_addendum=False) - - educational_evaluations_transition_assessment_request_attachment: ALDocument.using(title="Transition Assessment Request", filename="educational_evaluations_transition_assessment_request", enabled=True, has_addendum=False) + - educational_evaluations_transition_assessment_request_attachment: ALDocument.using(title="Transition Assessment Request", filename="educational_evaluations_transition_assessment_request", has_addendum=False) +--- +code: | + if student.age_in_years() >= 13: + educational_evaluations_transition_assessment_request_attachment.enabled = True + else: + educational_evaluations_transition_assessment_request_attachment.enabled = False --- +code: | + educational_evaluations_transition_assessment_request_attachment.initialize() +--- + # Bundles group the ALDocuments into separate downloads, such as for court and for the user objects: - - al_user_bundle: ALDocumentBundle.using(elements=[initial_request_attachment, educational_evaluations_copy_request_attachment, educational_evaluations_transition_assessment_request_attachment], filename="educational_evaluations_entire_record_request", title="All forms to download for your records", enabled=True) - - al_recipient_bundle: ALDocumentBundle.using(elements=[initial_request_attachment, educational_evaluations_copy_request_attachment, educational_evaluations_transition_assessment_request_attachment], filename="educational_evaluations_entire_record_request", title="All forms to file", enabled=True) + + - al_user_bundle: ALDocumentBundle.using(elements=[initial_request_attachment, educational_evaluations_transition_assessment_request_attachment], filename="educational_evaluations_entire_record_request", enabled=True, title="All forms to download for your records") + + - al_recipient_bundle: ALDocumentBundle.using(elements=[initial_request_attachment, educational_evaluations_transition_assessment_request_attachment], filename="educational_evaluations_entire_record_request", enabled=True, title="All forms to file", ) + --- # Each attachment defines a key in an ALDocument. We use `i` as the placeholder here so the same template is # used for "preview" and "final" keys, and logic in the template checks the value of diff --git a/docassemble/StudentEvaluations/data/questions/massachusetts_entire_student_record_request.yml b/docassemble/StudentEvaluations/data/questions/massachusetts_entire_student_record_request.yml index 75c9730..5bcc8e9 100644 --- a/docassemble/StudentEvaluations/data/questions/massachusetts_entire_student_record_request.yml +++ b/docassemble/StudentEvaluations/data/questions/massachusetts_entire_student_record_request.yml @@ -61,7 +61,6 @@ question: | subquestion: | Before you start, you will need: - 1. Your child’s full name and date of birth. 2. Name and email of your child’s school principal or special education contact (if your child has an IEP) @@ -114,6 +113,7 @@ code: | basic_questions_signature_flow requestor.signature educational_evaluations_entire_record_request_download + --- ## TODO add back in email feature to send directy to school # educational_evaluations_entire_record_request_concatenated = pdf_concatenate(educational_evaluations_entire_record_request_variable) @@ -139,6 +139,7 @@ continue button field: entire_record_request_intro_screen # - ${student.name.first}'s starting date: student.enrollment_date # datatype: date #--- +#mandatory: True #id: entire record request letter screen #question: | # Here is your letter @@ -186,11 +187,6 @@ subquestion: | Here is a preview of the form you will sign on the next page. ${ al_recipient_bundle.as_pdf(key='preview') } - - Click the image to open it in a new tab. Click the "Edit answers" button - to edit your answers. - - ${ action_button_html(url_action('review_educational_evaluations_entire_record_request'), label='Edit answers', color='info') } Remember to come back to this window to continue and sign your form. continue button field: educational_evaluations_entire_record_request_preview_question @@ -213,10 +209,7 @@ question: | subquestion: | Thank you. Your form is ready to download and deliver. - View, download and send your form below. Click the "Edit answers" button to fix any mistakes. - - ${ action_button_html(url_action('review_educational_evaluations_entire_record_request'), label='Edit answers', color='info') } - + View, download and send your form below. ${ al_user_bundle.download_list_html() } diff --git a/docassemble/StudentEvaluations/data/static/mac-bootstrap.css b/docassemble/StudentEvaluations/data/static/mac-bootstrap.css index bcae293..3d31693 100644 --- a/docassemble/StudentEvaluations/data/static/mac-bootstrap.css +++ b/docassemble/StudentEvaluations/data/static/mac-bootstrap.css @@ -158,6 +158,10 @@ h6, .h6 { font-size: 1rem; } +.al-logo img { + max-height: 40px; +} + p { margin-top: 0; margin-bottom: 1rem; diff --git a/setup.py b/setup.py index a0f0178..1a476af 100644 --- a/setup.py +++ b/setup.py @@ -54,7 +54,7 @@ def find_package_data(where='.', package='', exclude=standard_exclude, exclude_d url='https://www.massadvocates.org/', packages=find_packages(), namespace_packages=['docassemble'], - install_requires=['docassemble.AssemblyLine>=2.23.0', 'docassemble.MAPovertyScale>=2022.1.18', 'docassemble.MassAccess>=0.3.0'], + install_requires=['docassemble.AssemblyLine>=2.24.0', 'docassemble.MAPovertyScale>=2022.1.18', 'docassemble.MassAccess>=0.3.0'], zip_safe=False, package_data=find_package_data(where='docassemble/StudentEvaluations/', package='docassemble.StudentEvaluations'), )