From 56f05803249decc87fbfc209f6b564f0cd7c84d0 Mon Sep 17 00:00:00 2001
From: Stavros Constantinou <123116833+stavros-0@users.noreply.github.com>
Date: Mon, 31 Jul 2023 14:37:55 -0400
Subject: [PATCH 01/11] added the logo to the interview but text next to the
 logo is removed

---
 ...ssachusetts_educational_evaluations_basic_information.yml | 5 +++++
 1 file changed, 5 insertions(+)

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..1bcafb9 100644
--- a/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_basic_information.yml
+++ b/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_basic_information.yml
@@ -49,7 +49,12 @@ objects:
   - evaluations_list: DAList
   - evaluation: DAObject
 ---
+objects:
+  - MAClogo_logomark: DAStaticFile.using(filename="MAClogo.jpg")
+---
 default screen parts:
+  logo: |
+      <img style="max-height: 40px;" src="${ MAClogo_logomark.url_for() }" />
   post: |
     % if not user_logged_in():
     [:sign-in-alt: Sign-in](${url_of('login', next=interview_url())}) or [register](${url_of('register', next=interview_url())}) to save your progress.

From 7c3cdf51c9deeecbb0fb74d5afd780de8017d6b1 Mon Sep 17 00:00:00 2001
From: Stavros Constantinou <123116833+stavros-0@users.noreply.github.com>
Date: Mon, 31 Jul 2023 15:06:47 -0400
Subject: [PATCH 02/11] Broke up the text #70

---
 ...chusetts_educational_evaluations_independent_evaluation.yml | 2 ++
 .../massachusetts_educational_evaluations_request.yml          | 3 +++
 2 files changed, 5 insertions(+)

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..bcf56d0 100644
--- a/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_independent_evaluation.yml
+++ b/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_independent_evaluation.yml
@@ -512,7 +512,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..6b765a8 100644
--- a/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml
+++ b/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml
@@ -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. 

From 65ffd290bd724f5d87ed3fb6e07ad99243bc52bd Mon Sep 17 00:00:00 2001
From: Stavros Constantinou <123116833+stavros-0@users.noreply.github.com>
Date: Tue, 1 Aug 2023 07:40:13 -0400
Subject: [PATCH 03/11] #71 removed eval copy request

---
 ...ts_educational_evaluations_basic_information.yml | 13 +++++++++++--
 ...assachusetts_educational_evaluations_request.yml |  3 +--
 2 files changed, 12 insertions(+), 4 deletions(-)

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 1bcafb9..07e0b2c 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 = "Legal Services of Eastern Missouri"
+---
 features:
   bootstrap theme: mac-bootstrap.css
   progress bar: True
@@ -50,11 +53,17 @@ objects:
   - evaluation: DAObject
 ---
 objects:
-  - MAClogo_logomark: DAStaticFile.using(filename="MAClogo.jpg")
+  - al_logo: DAStaticFile.using(filename="MAClogo.jpg")
 ---
 default screen parts:
   logo: |
-      <img style="max-height: 40px;" src="${ MAClogo_logomark.url_for() }" />
+
+      <img style="max-height: 40px;" src="${ al_logo.url_for() }" />
+
+  short logo: |
+
+      <img style="max-height: 40px;" src="${ al_logo.url_for() }" />
+
   post: |
     % if not user_logged_in():
     [:sign-in-alt: Sign-in](${url_of('login', next=interview_url())}) or [register](${url_of('register', next=interview_url())}) to save your progress.
diff --git a/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml b/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml
index 6b765a8..ec66a4b 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
@@ -713,7 +712,7 @@ objects:
 ---
 # 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_user_bundle: ALDocumentBundle.using(elements=[initial_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)
 ---
 # Each attachment defines a key in an ALDocument. We use `i` as the placeholder here so the same template is 

From a22ff78161e3e5a1990dc93dbfb0e2fff765cc23 Mon Sep 17 00:00:00 2001
From: Stavros Constantinou <123116833+stavros-0@users.noreply.github.com>
Date: Tue, 1 Aug 2023 11:43:43 -0400
Subject: [PATCH 04/11] #72. Made it so that the Transition Assessment Eval
 only shows up if the student is 13+

---
 ...usetts_educational_evaluations_request.yml | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml b/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml
index ec66a4b..d492440 100644
--- a/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml
+++ b/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml
@@ -162,7 +162,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.  
@@ -697,8 +697,15 @@ subquestion: |
   ${ action_button_html(url_action('review_initial_request'), label='Edit answers', color='info') }
   
   
-  ${ al_user_bundle.download_list_html() }
+  % if student.age_in_years() >= 13:
   
+    ${ al_user_bundle.download_list_html() }
+  
+  % else:
+    
+    ${ al_user_bundle_u13.download_list_html() }
+    
+  % endif
 
   ${ al_user_bundle.send_button_html(show_editable_checkbox=True) }
 
@@ -712,8 +719,21 @@ objects:
 ---
 # Bundles group the ALDocuments into separate downloads, such as for court and for the user
 objects:
+##  code: |
+##    if student.age_in_years() >= 13:
+    
   - al_user_bundle: ALDocumentBundle.using(elements=[initial_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_u13: ALDocumentBundle.using(elements=[initial_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)
+  
+      
+##    else:
+  - al_user_bundle: ALDocumentBundle.using(elements=[initial_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)
+    
 ---
 # 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 

From c884809be88b14411a5534cb8089ff0bc6576eeb Mon Sep 17 00:00:00 2001
From: Stavros Constantinou <123116833+stavros-0@users.noreply.github.com>
Date: Tue, 1 Aug 2023 14:00:03 -0400
Subject: [PATCH 05/11] Fixed the navigation bar so that the Title appears next
 to the logo

---
 ...chusetts_educational_evaluations_basic_information.yml | 8 --------
 .../StudentEvaluations/data/static/mac-bootstrap.css      | 4 ++++
 setup.py                                                  | 2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

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 07e0b2c..e036baf 100644
--- a/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_basic_information.yml
+++ b/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_basic_information.yml
@@ -56,14 +56,6 @@ objects:
   - al_logo: DAStaticFile.using(filename="MAClogo.jpg")
 ---
 default screen parts:
-  logo: |
-
-      <img style="max-height: 40px;" src="${ al_logo.url_for() }" />
-
-  short logo: |
-
-      <img style="max-height: 40px;" src="${ al_logo.url_for() }" />
-
   post: |
     % if not user_logged_in():
     [:sign-in-alt: Sign-in](${url_of('login', next=interview_url())}) or [register](${url_of('register', next=interview_url())}) to save your progress.
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'),
      )

From 7791cbfb1e61b937d846568fd465a27d96899b5a Mon Sep 17 00:00:00 2001
From: Stavros Constantinou <123116833+stavros-0@users.noreply.github.com>
Date: Wed, 2 Aug 2023 12:46:28 -0400
Subject: [PATCH 06/11] #73. An email with the Initial Request and Transition
 Assessment Request documents

---
 ...usetts_educational_evaluations_request.yml | 58 ++++++++++++++++++-
 1 file changed, 55 insertions(+), 3 deletions(-)

diff --git a/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml b/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml
index d492440..e762a4c 100644
--- a/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml
+++ b/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml
@@ -116,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)
@@ -445,6 +446,35 @@ fields:
     none of the above: |
       I don't know.
 ---
+id: special education director information
+question: |
+  Name of Special Education **Director or Coordinator**
+fields:
+  - "Do you know the name of your child's Special Education Director or Special Education Coordinator?": knows_special_education_director_or_coordinator_name 
+    datatype: yesnoradio
+  - First Name: school.special_education_director_or_coordinator.name.first
+    show if: knows_special_education_director_or_coordinator_name
+  - Last Name: school.special_education_director_or_coordinator.name.last
+    show if: knows_special_education_director_or_coordinator_name
+  - Email: school.special_education_director_or_coordinator.email
+    show if: knows_special_education_director_or_coordinator_name
+---
+id: requestor phone number and email
+question: |
+  How can the school reach you? 
+subquestion: | 
+  You need to tell us at least one way to get in contact with you.
+fields:
+  - Phone Number: requestor.phone_number
+    datatype: al_international_phone
+    required: False
+  - Email: requestor.email
+    datatype: email
+    required: True
+validation code: |
+  if not(requestor.phone_number) and not(requestor.email):
+    validation_error("You need to provide at least one contact method.",field="requestor.phone_number")
+---
 id: functional behavior assessment
 question: |
   % if requestor.right_to_send == 'Student':
@@ -685,12 +715,34 @@ event: review_initial_request
 question: |
   Review your answers
 ---
+mandatory: True
+code: |  
+  email_sent_ok = al_user_bundle.send_email(editable=True, to=school.special_education_director_or_coordinator.email, template=notification)
+  email_sent_ok_1 = al_user_bundle.send_email(editable=True, to=requestor.email, template=notification)
+
+---
+template: notification
+subject: |
+  Greetings, ${school.special_education_director_or_coordinator.name.first } ${school.special_education_director_or_coordinator.name.last}
+content: |
+  This is an e-mail sent from Massachusetts Advocates for Children.
+
+  Have a nice day!
+
+---
 id: download initial_request
 event: initial_request_download
 question: |
   All done
-subquestion: |
-  Thank you. Your form is ready to download and deliver.
+# not sure if an if statement is needed for the email to send 
+subquestion: | 
+  % if email_sent_ok and email_sent_ok_1:
+    Thank you. Your form is ready to download and deliver. A copy of the documents have been sent to you and the special education coordinator at the school. 
+    
+  % else: 
+    Thank you. Your form is ready to download and deliver. A copy of the documents was not sent to you and the special education coordinator. 
+  % endif
+  
   
   View, download and send your form below. Click the "Edit answers" button to fix any mistakes.
 
@@ -709,7 +761,7 @@ subquestion: |
 
   ${ al_user_bundle.send_button_html(show_editable_checkbox=True) }
 
-progress: 100
+progress: 100 
 ---
 # ALDocument objects specify the metadata for each template
 objects:

From 2f49d61dd91a2866f4e528e0c03f1166366705cc Mon Sep 17 00:00:00 2001
From: Stavros Constantinou <123116833+stavros-0@users.noreply.github.com>
Date: Wed, 2 Aug 2023 15:46:11 -0400
Subject: [PATCH 07/11] updated changes in pull request

---
 ...cational_evaluations_basic_information.yml |  4 +-
 ...nal_evaluations_independent_evaluation.yml |  5 --
 ...usetts_educational_evaluations_request.yml | 89 +++----------------
 ...chusetts_entire_student_record_request.yml |  7 +-
 4 files changed, 15 insertions(+), 90 deletions(-)

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 e036baf..5ef46c0 100644
--- a/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_basic_information.yml
+++ b/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_basic_information.yml
@@ -33,7 +33,7 @@ objects:
   - school: Person
 ---
 code: |
-  AL_ORGANIZATION_TITLE = "Legal Services of Eastern Missouri"
+  AL_ORGANIZATION_TITLE = "Massachusetts Advocates for Children"
 ---
 features:
   bootstrap theme: mac-bootstrap.css
@@ -186,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 bcf56d0..3f23287 100644
--- a/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_independent_evaluation.yml
+++ b/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_independent_evaluation.yml
@@ -417,8 +417,6 @@ subquestion: |
 
   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') }
   
   Remember to come back to this window to continue and sign your form.
 continue button field: independent_evaluation_request_preview_question    
@@ -442,9 +440,6 @@ 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') }
-  
   
   ${ al_user_bundle.download_list_html() }
   
diff --git a/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml b/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml
index e762a4c..58eac2c 100644
--- a/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml
+++ b/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml
@@ -446,35 +446,6 @@ fields:
     none of the above: |
       I don't know.
 ---
-id: special education director information
-question: |
-  Name of Special Education **Director or Coordinator**
-fields:
-  - "Do you know the name of your child's Special Education Director or Special Education Coordinator?": knows_special_education_director_or_coordinator_name 
-    datatype: yesnoradio
-  - First Name: school.special_education_director_or_coordinator.name.first
-    show if: knows_special_education_director_or_coordinator_name
-  - Last Name: school.special_education_director_or_coordinator.name.last
-    show if: knows_special_education_director_or_coordinator_name
-  - Email: school.special_education_director_or_coordinator.email
-    show if: knows_special_education_director_or_coordinator_name
----
-id: requestor phone number and email
-question: |
-  How can the school reach you? 
-subquestion: | 
-  You need to tell us at least one way to get in contact with you.
-fields:
-  - Phone Number: requestor.phone_number
-    datatype: al_international_phone
-    required: False
-  - Email: requestor.email
-    datatype: email
-    required: True
-validation code: |
-  if not(requestor.phone_number) and not(requestor.email):
-    validation_error("You need to provide at least one contact method.",field="requestor.phone_number")
----
 id: functional behavior assessment
 question: |
   % if requestor.right_to_send == 'Student':
@@ -698,8 +669,6 @@ subquestion: |
 
   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') }
   
   Remember to come back to this window to continue and sign your form.
 continue button field: initial_request_preview_question    
@@ -715,54 +684,28 @@ event: review_initial_request
 question: |
   Review your answers
 ---
-mandatory: True
-code: |  
-  email_sent_ok = al_user_bundle.send_email(editable=True, to=school.special_education_director_or_coordinator.email, template=notification)
-  email_sent_ok_1 = al_user_bundle.send_email(editable=True, to=requestor.email, template=notification)
-
----
-template: notification
-subject: |
-  Greetings, ${school.special_education_director_or_coordinator.name.first } ${school.special_education_director_or_coordinator.name.last}
-content: |
-  This is an e-mail sent from Massachusetts Advocates for Children.
-
-  Have a nice day!
-
----
 id: download initial_request
 event: initial_request_download
 question: |
   All done
-# not sure if an if statement is needed for the email to send 
 subquestion: | 
-  % if email_sent_ok and email_sent_ok_1:
-    Thank you. Your form is ready to download and deliver. A copy of the documents have been sent to you and the special education coordinator at the school. 
+  Thank you. Your form is ready to download and deliver. 
     
-  % else: 
-    Thank you. Your form is ready to download and deliver. A copy of the documents was not sent to you and the special education coordinator. 
-  % endif
-  
-  
   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') }
-  
   
-  % if student.age_in_years() >= 13:
+  ${ al_user_bundle.download_list_html() }
   
-    ${ al_user_bundle.download_list_html() }
-  
-  % else:
-    
-    ${ al_user_bundle_u13.download_list_html() }
-    
-  % endif
-
   ${ al_user_bundle.send_button_html(show_editable_checkbox=True) }
-
+   
 progress: 100 
 ---
+code: |
+  if student.age_in_years() >= 13:
+    educational_evaluations_transition_assessment_request_attachment.enabled = True 
+  
+  else:
+    educational_evaluations_transition_assessment_request_attachment.enabled = False 
+---
 # 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)
@@ -771,20 +714,10 @@ objects:
 ---
 # Bundles group the ALDocuments into separate downloads, such as for court and for the user
 objects:
-##  code: |
-##    if student.age_in_years() >= 13:
     
-  - al_user_bundle: ALDocumentBundle.using(elements=[initial_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_user_bundle_u13: ALDocumentBundle.using(elements=[initial_request_attachment], filename="educational_evaluations_entire_record_request", title="All forms to download for your records", 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", 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)
-  
-      
-##    else:
-  - al_user_bundle: ALDocumentBundle.using(elements=[initial_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)
     
 ---
 # Each attachment defines a key in an ALDocument. We use `i` as the placeholder here so the same template is 
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..635da5e 100644
--- a/docassemble/StudentEvaluations/data/questions/massachusetts_entire_student_record_request.yml
+++ b/docassemble/StudentEvaluations/data/questions/massachusetts_entire_student_record_request.yml
@@ -189,8 +189,6 @@ subquestion: |
 
   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 +211,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. Click the "Edit answers" button to fix any mistakes. 
   
   ${ al_user_bundle.download_list_html() }
   

From 8462d5a048a335f680e5d68efd7f6be5fa97f707 Mon Sep 17 00:00:00 2001
From: Stavros Constantinou <123116833+stavros-0@users.noreply.github.com>
Date: Thu, 3 Aug 2023 07:47:47 -0400
Subject: [PATCH 08/11] updated #72

---
 ...usetts_educational_evaluations_request.yml | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml b/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml
index 58eac2c..4f9595e 100644
--- a/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml
+++ b/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml
@@ -699,25 +699,28 @@ subquestion: |
    
 progress: 100 
 ---
-code: |
-  if student.age_in_years() >= 13:
-    educational_evaluations_transition_assessment_request_attachment.enabled = True 
-  
-  else:
-    educational_evaluations_transition_assessment_request_attachment.enabled = False 
----
 # 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_transition_assessment_request_attachment], filename="educational_evaluations_entire_record_request", enabled=True, title="All forms to download for your records", 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_copy_request_attachment, educational_evaluations_transition_assessment_request_attachment], filename="educational_evaluations_entire_record_request", title="All forms to file", 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", 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 

From 23754e614884a0d305dfc539af4b3be7baf4741b Mon Sep 17 00:00:00 2001
From: Stavros Constantinou <123116833+stavros-0@users.noreply.github.com>
Date: Thu, 3 Aug 2023 10:17:18 -0400
Subject: [PATCH 09/11] Made some minor updates

---
 ...chusetts_educational_evaluations_basic_information.yml | 1 +
 ...tts_educational_evaluations_independent_evaluation.yml | 5 ++---
 .../massachusetts_educational_evaluations_request.yml     | 5 ++---
 .../massachusetts_entire_student_record_request.yml       | 8 +++-----
 4 files changed, 8 insertions(+), 11 deletions(-)

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 5ef46c0..412e3e7 100644
--- a/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_basic_information.yml
+++ b/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_basic_information.yml
@@ -454,6 +454,7 @@ question: |
 fields:
   - "Do you know the name of your child's Special Education Director or Special Education Coordinator?": knows_special_education_director_or_coordinator_name 
     datatype: yesnoradio
+    required: True
   - First Name: school.special_education_director_or_coordinator.name.first
     show if: knows_special_education_director_or_coordinator_name
   - Last Name: school.special_education_director_or_coordinator.name.last
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 3f23287..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,8 +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.
+  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    
@@ -439,7 +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.
+  View, download and send your form below. 
   
   ${ al_user_bundle.download_list_html() }
   
diff --git a/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml b/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml
index 4f9595e..930c74e 100644
--- a/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml
+++ b/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml
@@ -667,8 +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.
+  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    
@@ -691,7 +690,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.
+  View, download and send your form below. 
   
   ${ al_user_bundle.download_list_html() }
   
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 635da5e..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,9 +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.
   
   Remember to come back to this window to continue and sign your form.
 continue button field: educational_evaluations_entire_record_request_preview_question    
@@ -211,7 +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. 
+  View, download and send your form below.  
   
   ${ al_user_bundle.download_list_html() }
   

From 3e0e49c56d4e7a4a54fb7729e1d27c80983cbc70 Mon Sep 17 00:00:00 2001
From: Stavros Constantinou <123116833+stavros-0@users.noreply.github.com>
Date: Thu, 3 Aug 2023 10:26:29 -0400
Subject: [PATCH 10/11] Made a minor change

---
 .../massachusetts_educational_evaluations_basic_information.yml  | 1 -
 1 file changed, 1 deletion(-)

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 412e3e7..5ef46c0 100644
--- a/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_basic_information.yml
+++ b/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_basic_information.yml
@@ -454,7 +454,6 @@ question: |
 fields:
   - "Do you know the name of your child's Special Education Director or Special Education Coordinator?": knows_special_education_director_or_coordinator_name 
     datatype: yesnoradio
-    required: True
   - First Name: school.special_education_director_or_coordinator.name.first
     show if: knows_special_education_director_or_coordinator_name
   - Last Name: school.special_education_director_or_coordinator.name.last

From bc04df33e0d28d9b192df6b2821df964c074163e Mon Sep 17 00:00:00 2001
From: Anonymous User <mia@lemmalegal.com>
Date: Thu, 3 Aug 2023 11:19:14 -0400
Subject: [PATCH 11/11] update recipient bundle

---
 .../questions/massachusetts_educational_evaluations_request.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml b/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml
index 930c74e..fe3c25a 100644
--- a/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml
+++ b/docassemble/StudentEvaluations/data/questions/massachusetts_educational_evaluations_request.yml
@@ -719,7 +719,7 @@ objects:
     
   - 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_copy_request_attachment, educational_evaluations_transition_assessment_request_attachment], filename="educational_evaluations_entire_record_request", enabled=True, title="All forms to file", )
+  - 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