Added /select_table.html and edited /select_sheet.html in prototypes/basic/views

Author: OwainJones

prototypes/basic/app/routes.js

@@ -18,3 +18,6 @@ importer.Initialise(cfg.getConfig(), router, govukPrototypeKit);
 router.get("/download/:filename", function (req, res) {
     res.sendFile(req.params.filename, { root: path.join(process.cwd(), "samples") });
 });
+
+
+

prototypes/basic/app/views/select_sheet.html

@@ -3,45 +3,21 @@
 {% from "importer/macros/sheet_selector.njk" import dudkSheetSelector %}
 
 {% block pageTitle %} {{ serviceName }} – GOV.UK Prototype Kit {% endblock %}
-
 {% block beforeContent %}
-{{
-    govukBreadcrumbs({
-      items: [
-        {
-          text: "Home",
-          href: "/"
-        },
-        {
-            text: "Upload spreadsheet",
-            href: "/upload"
-        },
-        {
-          text: "Select sheet",
-          href: "/select_sheet"
-        }
-      ]
-    })
-  }}
+{{ govukBackLink({ text: "Back", href: "javascript:window.history.back()" }) }}
 {% endblock %}
 
 {% block content %}
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-full">
-    <form action="{{ importerSelectSheetPath('/select_header_row') }}" method="post">
+    <form action="{{ importerSelectSheetPath('/select_table', '/select_header_row') }}" method="post">
       <div class="govuk-form-group">
         <fieldset class="govuk-fieldset">
           <legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
             <h1 class="govuk-fieldset__heading">
               Which sheet do you wish to import?
             </h1>
           </legend>
-
-          <p class="govuk-body-l">
-            Select the name of the sheet below which will give you the opportunity to confirm that
-            it is the sheet containing the relevant data.
-          </p>
-
           <div class="govuk-radios" data-module="govuk-radios">
             {{ dudkSheetSelector({data: data}) }}
           </div>

prototypes/basic/app/views/select_table.html

@@ -0,0 +1,33 @@
+{% extends "layouts/main.html" %}
+
+{% from "importer/macros/table_selector.njk" import importerTableSelector %}
+
+{% block pageTitle %} {{ serviceName }} – GOV.UK Prototype Kit {% endblock %}
+{% block beforeContent %}
+{{ govukBackLink({ text: "Back", href: "javascript:window.history.back()" }) }}
+{% endblock %}
+
+{% block content %}
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-full">
+    <form action="{{ importerSelectTablePath('/select_header_row', '/select_footer_row') }}" method="post">
+      <div class="govuk-form-group">
+        <fieldset class="govuk-fieldset">
+          <legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
+            <h1 class="govuk-fieldset__heading">
+              Which table do you wish to import?
+            </h1>
+          </legend>
+          <div class="govuk-radios" data-module="govuk-radios">
+            {{ importerTableSelector(data) }}
+          </div>
+        </fieldset>
+      </div>
+
+      <div class="govuk-button-group">
+        {{ govukButton({ text: "Next" }) }}
+      </div>
+    </form>
+  </div>
+</div>
+{% endblock %}