Merge pull request #237 from DFE-Digital/mvp3-appeals-content-changes

Update remaining appeals screens
DFE-Digital · Nov 14, 2024 · 6e167a0 · 6e167a0
2 parents ff1f73d + 7b37102
commit 6e167a0
Show file tree

Hide file tree

Showing 9 changed files with 220 additions and 56 deletions.
diff --git a/app/views/mvp3/_family/account/appeal/add-child/child-details-1.html b/app/views/mvp3/_family/account/appeal/add-child/child-details-1.html
@@ -1,5 +1,5 @@
 {% extends "/layouts/mvp3/layout-dfe.html" %}
-{% set pageName="Add child details" %}
+{% set pageName="Add a child's details" %}
 
 {%block content %}
 
@@ -84,7 +84,7 @@
 
 
   {{ govukButton({
-  text: "Add your child's school"
+  text: "Continue to add a school"
   }) }}
 
 </div>

diff --git a/app/views/mvp3/_family/account/appeal/add-child/child-details-blank.html b/app/views/mvp3/_family/account/appeal/add-child/child-details-blank.html
@@ -1,5 +1,5 @@
 {% extends "/layouts/mvp3/layout-dfe.html" %}
-{% set pageName="Child and school details" %}
+{% set pageName="Add your children's details" %}
 
 {%block content %}
 
@@ -9,12 +9,8 @@
         {{pageName}}
       </div>
 
-    <p class="govuk-body"><b>Need to follow the flow in the https://github.com/DFE-Digital/apply-for-teacher-training-prototype</b> </p>
-
-      <p class="govuk-body">
-        Enter all your children that you want to add to the free school meals application including the schools that
-        they attend. Include all children even if they are at different schools.
-      </p>
+    <p class="govuk-body">Add all children you want to include in your application, even if they go to different schools.</p>
+    <p class="govuk-body">You'll be asked to add their school after you've added their personal details.</p>
 
 
     {{ govukButton({

diff --git a/app/views/mvp3/_family/account/appeal/add-child/child-details-complete-1.html b/app/views/mvp3/_family/account/appeal/add-child/child-details-complete-1.html
@@ -1,16 +1,15 @@
 {% extends "/layouts/mvp3/layout-dfe.html" %}
-{% set pageName="Child and school details" %}
+{% set pageName="Add your children's details" %}
 {%block content %}
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
     <div class="govuk-heading-l">
       {{pageName}}
     </div>
-    <p class="govuk-body">
-      Enter all your children that you want to add to the free school meals application including the schools that
-      they attend. Include all children even if they are at different schools.
-    </p>
+    <p class="govuk-body">Add all children you want to include in your application, even if they go to different schools.</p>
+    <p class="govuk-body">You'll be asked to add their school after you've added their personal details.</p>
+
 
 
     <button type="submit" class="govuk-button govuk-button--secondary" data-module="govuk-button">
@@ -31,7 +30,7 @@ <h2 class="govuk-summary-card__title">Child 1</h2>
         <dl class="govuk-summary-list">
           <div class="govuk-summary-list__row"></div>
           <div class="govuk-summary-list__row">
-            <dt class="govuk-summary-list__key">Child's name</dt>
+            <dt class="govuk-summary-list__key">Name</dt>
             <dd class="govuk-summary-list__value">
               {{ data["ch1-first-name"] }} {{ data["ch1-surname"] }}
             </dd>
@@ -44,7 +43,7 @@ <h2 class="govuk-summary-card__title">Child 1</h2>
           </div>
 
           <div class="govuk-summary-list__row">
-            <dt class="govuk-summary-list__key">Child's date of birth</dt>
+            <dt class="govuk-summary-list__key">Date of birth</dt>
             <dd class="govuk-summary-list__value">
               {{ data["ch1-day"] }} {{ data["ch1-month"] }} {{ data["ch1-year"]
               }}
@@ -54,10 +53,70 @@ <h2 class="govuk-summary-card__title">Child 1</h2>
       </div>
     </div>
 
+    <div class="govuk-summary-card">
+      <div class="govuk-summary-card__title-wrapper">
+        <h2 class="govuk-summary-card__title">Evidence</h2>
+        <ul class="govuk-summary-card__actions">
+          <li class="govuk-summary-card__action">
+            <a class="govuk-link" href="#">Change<span class="govuk-visually-hidden">Child details</span></a>
+          </li>
+        </ul>
+      </div>
+
+      <div class="govuk-summary-card__content">
+        <dl class="govuk-summary-list">
+          <div class="govuk-summary-list__row"></div>
+          <div class="govuk-summary-list__row">
+            <dt class="govuk-summary-list__key">Evidence 1</dt>
+            <dd class="govuk-summary-list__value">
+              <a href="#">eden_tesfay_ucstatement.pdf</a>
+            </dd>
+          </div>
+          <div class="govuk-summary-list__row">
+            <dt class="govuk-summary-list__key">Evidence 2</dt>
+            <dd class="govuk-summary-list__value">
+             <a href="#">edentesfay_bank_statement.doc</a>
+            </dd>
+          </div>
+        </dl>
+      </div>
+    </div>
+
+    <div class="govuk-form-group">
+      <fieldset class="govuk-fieldset" aria-describedby="waste-hint">
+        <legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
+          <h2 class="govuk-heading-m">
+            Have you finished adding children?
+          </h2>
+        </legend>
+        <div class="govuk-warning-text">
+          <span class="govuk-warning-text__icon" aria-hidden="true">!</span>
+          <strong class="govuk-warning-text__text">
+            <span class="govuk-visually-hidden">Warning</span>
+            You will not be able to add more children after you have appealed.
+          </strong>
+        </div>
+
+
+        <div class="govuk-checkboxes" data-module="govuk-checkboxes">
+          <div class="govuk-checkboxes__item">
+            <input class="govuk-checkboxes__input" id="waste" name="waste" type="checkbox" value="carcasses">
+            <label class="govuk-label govuk-checkboxes__label" for="waste">
+              I have finished adding children
+            </label>
+          </div>
+        </div>
+
+
+      </fieldset>
+
+
+
+    </div>
 
     {{ govukButton({
-    text: "Add a child"
-    }) }}
+      text: "Confirm details and send appeal"
+      }) }}
 
   </div>
   {% endblock %}
diff --git a/app/views/mvp3/_family/account/appeal/add-child/children-added.html b/app/views/mvp3/_family/account/appeal/add-child/children-added.html
@@ -0,0 +1,90 @@
+{% extends "/layouts/mvp3/layout-dfe.html" %}
+{% set pageName="Add your children's details" %}
+{%block content %}
+
+<div class="govuk-width-container">
+  <div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds">
+      <div class="govuk-panel govuk-panel--confirmation">
+        <h1 class="govuk-panel__title">Appeal sent</h1>
+        <div class="govuk-panel__body">
+          Submitted on<br /><strong>6 July 2024, 13:12</strong>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <hr class="govuk-section-break govuk-section-break--m">
+  <div class="govuk-grid-row">
+  <div class="govuk-grid-column-two-thirds"><table class="govuk-table">
+    <caption class="govuk-table__caption govuk-table__caption--m">
+      We have sent appeal details for:
+    </caption>
+    <thead class="govuk-table__head">
+      <tr class="govuk-table__row">
+        <th scope="col" class="govuk-table__header app-custom-class">Name</th>
+        <th scope="col" class="govuk-table__header app-custom-class">School</th>
+        <th scope="col" class="govuk-table__header app-custom-class">
+          Reference
+        </th>
+      </tr>
+    </thead>
+    <tbody class="govuk-table__body">
+      <tr class="govuk-table__row">
+        <th scope="row" class="govuk-table__header">Samual Tesfay</th>
+        <td class="govuk-table__cell">St Kings Primary School</td>
+        <td class="govuk-table__cell">44455453</td>
+      </tr>
+      <tr class="govuk-table__row">
+        <th scope="row" class="govuk-table__header">Thomas Tesfay</th>
+        <td class="govuk-table__cell">St Kings Primary School</td>
+        <td class="govuk-table__cell">44455454</td>
+      </tr>
+      <tr class="govuk-table__row">
+        <th scope="row" class="govuk-table__header">Rachel Tesfay</th>
+        <td class="govuk-table__cell">Bramhope Primary School</td>
+        <td class="govuk-table__cell">44455455</td>
+      </tr>
+    </tbody>
+  </table>
+
+  <hr class="govuk-section-break govuk-section-break--m">
+  <table class="govuk-table">
+    <caption class="govuk-table__caption govuk-table__caption--m">
+      We have sent the following evidence:
+    </caption>
+    <thead class="govuk-table__head">
+      <tr class="govuk-table__row">
+        <th scope="col" class="govuk-table__header app-custom-class">Evidence</th>
+
+      </tr>
+    </thead>
+    <tbody class="govuk-table__body">
+      <tr class="govuk-table__row">
+        <td class="govuk-table__cell"><a href="#">eden_tesfay_ucstatement.pdf</a></td>
+      </tr>
+      <tr class="govuk-table__row">
+        <td class="govuk-table__cell"><a href="#">edentesfay_bank_statement.doc</a></td>
+      </tr>
+    </tbody>
+  </table>
+  </div>
+</div>
+
+
+  <h2 class="govuk-heading-m">What happens next</h2>
+
+  <p>
+    Each school will contact you with a decision when your evidence has been reviewed.</p>
+    <p>This usually takes about 1 week, but if you do not receive an update contact your school administrator.</p>
+
+  <p>
+    <a href="">What did you think about this service?</a> (takes 30 seconds)
+  </p>
+
+  {% from "govuk/components/button/macro.njk" import govukButton %} {{
+  govukButton({ text: "Finish and leave service", href: '../account/start-now'
+  }) }} {% endblock %} {% block pageScripts %}
+  <script type="text/javascript" src="/public/javascripts/moj/all.js"></script>
+</div>
+{% endblock %}
diff --git a/app/views/mvp3/_family/account/appeal/find-school/confirm-school-multiple.html b/app/views/mvp3/_family/account/appeal/find-school/confirm-school-multiple.html
@@ -1,30 +1,47 @@
 {% extends "/layouts/mvp3/layout-dfe.html" %}
-{% set pageName="Confirm school" %}
+{% set pageName="Choose [firstname]'s school" %}
 
 {%block content %}
 
 <div class="govuk-grid-row">
-  <div class="govuk-width-container">
-    <div class="govuk-heading-l">
-      {{pageName}}
+    <div class="govuk-width-container">
+      <div class="govuk-heading-l">
+        {{pageName}}
+      </div>
+      <div class="govuk-form-group">
+      <fieldset class="govuk-fieldset">
+        <legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
+          <h1 class="govuk-fieldset__heading">
+            <div class="govuk-width-container">
+<div class="govuk-form-group">
+<fieldset class="govuk-fieldset">
+  <div class="govuk-radios govuk-radios--small" data-module="govuk-radios">
+    <p>2 school's found for <b>BD23 2SJ</b> and <b>Greatwood</b>.</p>
+    <div class="govuk-radios__item">
+      <input class="govuk-radios__input" id="select-an-address" name="select-an-address" type="radio" value="1 Washington Street, Worcester, WR1 1NL"
+        data-ga-question="Select an address" data-ga-answer="Answer 1">
+      <label class="govuk-label govuk-radios__label" for="select-an-address">
+        Greatwood Community Primary School, Pinhaw Rd, Skipton BD23 2SJ
+      </label>
     </div>
-    {% from "govuk/components/button/macro.njk" import govukButton %}
-    {% from "govuk/components/inset-text/macro.njk" import govukInsetText %}
-
-
-    <p>2 schools found for <b>wr11nl</b> and <b>St Mary's</b>. <a href="find-school-1.html">Search again</a></p>
-
-    {{ govukInsetText({
-    html: "St Mary's Primary school<br>Manchester<br>M24 1NL"
-    }) }}
-
-    {{ govukButton({
-    text: "Use this address"
-    }) }}
-
-    <p class="govuk-body"><a href="#" class="govuk-link">Select a different address</a></p>
-    <p class="govuk-body govuk-!-margin-bottom-0"><a href="#" class="govuk-link">Enter address manually</a></p>
+    <div class="govuk-radios__item">
+      <input class="govuk-radios__input" id="select-an-address" name="select-an-address" type="radio" value="1 Washington Street, Worcester, WR1 1NL"
+        data-ga-question="Select an address" data-ga-answer="Answer 1">
+      <label class="govuk-label govuk-radios__label" for="select-an-address">
+        Greatwood Community Nursery School, Pinhaw Rd, Skipton BD23 2SJ
+      </label>
     </div>
+  </div>
+  </div>
+</fieldset>
+</div>
+<button type="submit" class="govuk-button" data-module="govuk-button">
+Add this school
+</button>
+
+<p class="govuk-body"><a href="find-school-1.html">Search again</a></p>
+<p class="govuk-body govuk-!-margin-bottom-0"><a href="#" class="govuk-link">Enter school address manually</a></p>
+</div>
 
 
 </div>

diff --git a/app/views/mvp3/_family/account/appeal/find-school/confirm-school.html b/app/views/mvp3/_family/account/appeal/find-school/confirm-school.html
@@ -1,5 +1,5 @@
 {% extends "/layouts/mvp3/layout-dfe.html" %}
-{% set pageName="Confirm school" %}
+{% set pageName="Is this [firstname]'s school?" %}
 
 {%block content %}
 
@@ -11,19 +11,17 @@
     {% from "govuk/components/button/macro.njk" import govukButton %}
     {% from "govuk/components/inset-text/macro.njk" import govukInsetText %}
 
-
-    <p>1 school found for <b>wr11nl</b> and <b>St Mary's</b>. <a href="find-school-1.html">Search again</a></p>
-
     {{ govukInsetText({
     html: "St Mary's Primary school<br>Manchester<br>M24 1NL"
     }) }}
 
     {{ govukButton({
-    text: "Use this address"
+    text: "Yes, add this school"
     }) }}
 
     <!-- <p class="govuk-body"><a href="#" class="govuk-link">Select a different address</a></p> -->
-    <p class="govuk-body govuk-!-margin-bottom-0"><a href="#" class="govuk-link">Enter address manually</a></p>
+    <p class="govuk-body"><a href="find-school-1.html">Search again</a></p>
+    <p class="govuk-body govuk-!-margin-bottom-0"><a href="#" class="govuk-link">Enter school address manually</a></p>
     </div>
 
 

diff --git a/app/views/mvp3/_family/account/appeal/find-school/find-school-1.html b/app/views/mvp3/_family/account/appeal/find-school/find-school-1.html
@@ -1,5 +1,5 @@
 {% extends "/layouts/mvp3/layout-dfe.html" %}
-{% set pageName="Find school" %}
+{% set pageName="Find [firstname]'s school" %}
 
 {%block content %}
 
@@ -22,12 +22,12 @@
 
 {{ govukInput({
   label: {
-    text: "Postcode",
+    text: "School postcode",
     classes: "govuk-label--s"
 
   },
   hint: {
-    text: "You can find this on any letters from the school or their website"
+    text: "You can find this on any letters from the school or on their website"
   },
   classes: "govuk-input--width-10",
   id: "address-postcode",
@@ -75,7 +75,7 @@
 
 
   {{ govukButton({
-  text: "Find your child's school"
+  text: "Find this child's school"
   }) }}
 
 </div>