Edits to ensure that header identification in tables is working correctly, and to ensure we preserve the new header range.

Author: OwainJones

fixtures/tables_test.xlsx

@@ -162,9 +162,16 @@ exports.GetTablePreview = (sid, sheet, table, count=10) => {
   const tableRange = tableRangeContainer.range 
   const tableRowCount = tableRange.end.row - tableRange.start.row
   const tableColumnCount = tableRange.end.column - tableRange.start.column + 1 //need to add 1 otherwise it will drop the last column
+  const headerRange = this.GetTableHeader(sid, sheet, table)
+  if (headerRange == null) {
+    tableStart = { row: tableRange.start.row, column: tableRange.start.column } //if 1st row not header include in table (preview) range
+  } else {
+    tableStart = { row: tableRange.start.row + 1, column: tableRange.start.column } //if 1st row is header, dont include in (preview) range
+  };
+
   const tablePreview = backend.SessionGetInputSampleRows(sid, {
     sheet: sheet,
-    start: { row: tableRange.start.row + 1, column: tableRange.start.column }, //skip first row assuming it is header
+    start: tableStart, 
     end: tableRange.end
   }, Math.min(count, tableRowCount), 0, 0)[0];
 
@@ -213,24 +220,38 @@ exports.GetTableHeader = (sid, sheet, table) => {
   const tableRangeContainer = backend.SessionGetInputTableRanges(sid, sheet).get(table);  
   assert(tableRangeContainer, `Table Range ${table} not found in ${sheet}` )
   const tableRange = tableRangeContainer.range 
+  const tableColumnCount = tableRange.end.column - tableRange.start.column + 1 //need to add 1 otherwise it will drop the last column
 
   const headerRange = { 
-    start: tableRange.start,
-    end: {row: tableRange.start.row, column: tableRange.end.column}
+    start: { row: tableRange.start.row, column: tableRange.start.column },
+    end: {row: tableRange.start.row, column: tableRange.end.column }
   }
-
   const headerPreview = backend.SessionGetInputSampleRows(sid, {
     sheet: sheet,
-    start: headerRange.start, 
-    end: headerRange.end
-  })
+    start: tableRange.start, 
+    end: tableRange.end
+  }, 1, 0, 0)[0];
+  headerRow = processMergedCells(tableColumnCount, headerPreview)
 
-  const headerList = headerPreview.row;
-  const columnList = tableRangeContainer.columns;
+  const headerList = [];
+  for (var i = 0; i < headerRow[0].row.length; i++) {
+    headerList.push(headerRow[0].row[i].value)
+  }
+  const columnRow = tableRangeContainer.columns;
+  const columnList = [];
+  for (var i = 0; i < columnRow.length; i++) {
+    columnList.push(columnRow[i].name)
+  }
 
-  if (headerList != columnList) {
+  if (headerList.length != columnList.length) {
     return null;
   }
+  for (var i = 0; i < headerList.length; i++) {
+    if (headerList[i] != columnList[i]) {
+      return null;
+    }
+  }
+  
 
   return headerRange;
 

lib/importer/src/dudk/sheets.js

@@ -99,8 +99,6 @@ exports.Initialise = (config, router, prototypeKit) => {
   for (let [key, value] of IMPORTER_ROUTE_MAP) {
     const k = key;
     const v = value;
-    console.debug(k)
-    console.debug(v)
 
     prototypeKit.views.addFunction(
       k,
@@ -276,7 +274,7 @@ exports.Initialise = (config, router, prototypeKit) => {
         return;
       }
 
-      
+      console.debug(session.footerRange)
 
       session.table = request.body.table;
 
@@ -291,15 +289,17 @@ exports.Initialise = (config, router, prototypeKit) => {
       // In some cases, the user will next select a header row which tells us where
       // the headers are. Sometimes, this will not be part of the flow, and so we
       // should default to the first row in the sheet.
-      session.headerRange = sheets_lib.GetTableHeader(session.backendSid, session.sheet, session.table)
-
-      if (session.headerRange == null) {
+      headerRange = sheets_lib.GetTableHeader(session.backendSid, session.sheet, session.table)
+      console.debug("header range", headerRange);
+      if (headerRange == null) {
         request.session.data[IMPORTER_ERROR_KEY] = 
           "Column names for table are not in the first row";
         response.redirect(request.get("Referrer"));
         return;
       }
 
+      session.headerRange = headerRange //overwrite assumed header range with table header range
+
       // The user
 
       // Ensure the session is persisted. Currently in session, eventually another way

lib/importer/src/index.js

@@ -10,7 +10,7 @@
 {% block content %}
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-full">
-    <form action="{{importerSelectTablePath('/select_header_row', '/select_footer_row')}}" method="post" enctype="multipart/form-data">
+    <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">

lib/importer/templates/select_table.html

@@ -1 +1 @@
-Subproject commit 167d4cfb1223ce10e5277b454167f62ba1dab0a2
+Subproject commit db84abc513e8daef7f03b366ad763c5c485a59a4