Merge pull request #265 from DFE-Digital/mvp3-batch-check-content-rev…

…iew-continued

Update batch check pages

app/views/mvp3/_school/school-manage/batch-checking/batch-removed-errors.html

@@ -1,5 +1,5 @@
 {% extends "../../../../layouts/layout-dfe-schoolnav.html" %}
-{% set pageName="Common File Transfer (CTF) errors removed" %}
+{% set pageName="Errors removed from import" %}
 
 {% block content %}
 
@@ -16,10 +16,13 @@ <h2 class="govuk-notification-banner__title" id="govuk-notification-banner-title
           <h3 class="govuk-notification-banner__heading">
             {{pageName}}
           </h3>
-          <p class="govuk-body">4 records with errors have been successfully removed. <br> Download the XML file with the updated records and import them again or run batch check with the remaining records.</p>
-          <p class="govuk-body">
-          <a href="upload" class="govuk-link">Run a batch check</a> for multiple parents or guardians.
-          </p>
+          <p class="govuk-body">4 records with errors have been removed from the Common File Transfer (CTF) import.</p>
+          <p class="govuk-body">You can now download the XML file with the updated records and <a href="upload" class="govuk-link">upload it again</a> or run a batch check with the remaining records.</p>
+          {{ govukButton({
+            text: "Check remaining records",
+            classes: "govuk-button--primary",
+            href: '../batch-checking/batch-checking-loader'
+            }) }}
         </div>
       </div>
     </article>

app/views/mvp3/_school/school-manage/batch-checking/imported-errors.html

@@ -1,5 +1,5 @@
 {% extends "../../../../layouts/layout-dfe-schoolnav.html" %}
-{% set pageName="Imported CTF records: Errors" %}
+{% set pageName="Fix or remove records with errors" %}
 
 {% block content %}
 
@@ -11,12 +11,18 @@ <h1 class="govuk-heading-l">{{pageName}}</h1>
     <article class="moj-ticket-panel" aria-label="Sub navigation 1">
 
       <section class="moj-ticket-panel__content  moj-ticket-panel__content--red" aria-label="Section 1">
-        <h2 class="govuk-heading-m govuk-!-margin-bottom-2">You have 4 errors</h2>
-        <p class="govuk-body">Return to your MIS to fix the listed errors. Once the errors are fixed, download a new XML
-          file with the specified records and upload it again.</p>
-          <a href="batch-removed-errors.html" class="govuk-button govuk-!-margin-bottom-1" data-module="govuk-button">
-            Remove files with errors
-          </a>
+        <h2 class="govuk-heading-m govuk-!-margin-bottom-2">You have 4 errors to fix</h2>
+        <p class="govuk-body">Select and remove files from the import below, then:</p>
+
+<ol class="govuk-list govuk-list--number">
+  <li>Return to your MIS</li>
+  <li>Fix the errors</li>
+  <li>Download a new XML</li>
+  <li>Upload it again</li>
+</ol>
+
+
+
       </section>
 
     </article>
@@ -152,7 +158,9 @@ <h2 class="govuk-heading-m govuk-!-margin-bottom-2">You have 4 errors</h2>
     </table>
   </div>
 
-
+  <a href="batch-removed-errors.html" class="govuk-button govuk-!-margin-bottom-1" data-module="govuk-button">
+    Remove selected records from import
+  </a>
 
   </table>
 </div>

app/views/mvp3/_school/school-manage/batch-checking/imported-records.html

@@ -17,7 +17,7 @@ <h2 class="govuk-notification-banner__title" id="govuk-notification-banner-title
       </div>
       <div class="govuk-notification-banner__content">
         <p class="govuk-notification-banner__heading">
-          46 records have successfully been added </p>
+          46 records have been imported </p>
 
         <!-- <p class="govuk-notification-banner__heading">
             There are 7 errors that need your attention.
@@ -26,14 +26,14 @@ <h2 class="govuk-notification-banner__title" id="govuk-notification-banner-title
       </div>
     </div>
 
-    <div class="govuk-warning-text">
+    <!--<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>
-        There are errors in your file. <a href="imported-errors" class="govuk-link">View and fix errors</a> before
+        You must <a href="imported-errors" class="govuk-link">view and fix these errors</a> before
         continuing with the batch check.
       </strong>
-    </div>
+    </div> -->
 
 
   </div>
@@ -163,13 +163,12 @@ <h2 class="govuk-notification-banner__title" id="govuk-notification-banner-title
   </table>
 </div>
 
+<h2 class="govuk-heading-m">This import contains errors</h2>
 
-<p class="govuk-body">You can run a batch check using the records that were successfully uploaded. These won't include
-  the records that contain errors.</p>
-
+<p class="govuk-body">You can <a href="imported-errors" class="govuk-link">view and fix the errors before running a check</a> or just run a check on the records without errors.</p>
 
 {{ govukButton({
-text: "Run batch check",
+text: "Check records without errors",
 classes: "govuk-button--primary",
 href: '../batch-checking/batch-checking-loader'
 }) }}