TD-5154 Implements upload results page with validation errors

Author: kevwhitt-hee

DigitalLearningSolutions.Web/Controllers/FrameworksController/ImportCompetencies.cs

@@ -40,7 +40,8 @@ public IActionResult DownloadCompetencies(int frameworkId, int DownloadOption)
         }
         [HttpPost]
         [Route("/Framework/{frameworkId}/{tabname}/Import")]
-        public IActionResult StartImport(ImportCompetenciesViewModel model, string tabname)
+        [Route("/Framework/{frameworkId}/{tabname}/ImportCompleted")]
+        public IActionResult StartImport(ImportCompetenciesViewModel model, string tabname, bool isNotBlank)
         {
             if (!ModelState.IsValid)
                 return View("Developer/ImportCompetencies", model);
@@ -50,11 +51,11 @@ public IActionResult StartImport(ImportCompetenciesViewModel model, string tabna
                 var workbook = new XLWorkbook(model.ImportFile.OpenReadStream());
                 if (!workbook.Worksheets.Contains(ImportCompetenciesFromFileService.CompetenciesSheetName))
                 {
-                    ModelState.AddModelError("InvalidWorksheet", CommonValidationErrorMessages.InvalidCompetenciesUploadExcelFile);
+                    ModelState.AddModelError("ImportFile", CommonValidationErrorMessages.InvalidCompetenciesUploadExcelFile);
                     return View("Developer/ImportCompetencies", model);
                 }
                 var competenciesFileName = FileHelper.UploadFile(webHostEnvironment, model.ImportFile);
-                setupBulkUploadData(model.FrameworkId, adminUserID, competenciesFileName, tabname);
+                setupBulkUploadData(model.FrameworkId, adminUserID, competenciesFileName, tabname, isNotBlank);
 
                 return RedirectToAction("ImportCompleted", "Frameworks", new { frameworkId = model.FrameworkId, tabname });
             }
@@ -78,7 +79,7 @@ public IActionResult ImportCompleted()
             try
             {
                 var results = importCompetenciesFromFileService.PreProcessCompetenciesTable(workbook);
-                var resultsModel = new ImportCompetenciesPreProcessViewModel(results);
+                var resultsModel = new ImportCompetenciesPreProcessViewModel(results) { IsNotBlank = data.IsNotBlank, TabName = data.TabName };
                 data.CompetenciesToProcessCount = resultsModel.ToProcessCount;
                 data.CompetenciesToAddCount = resultsModel.CompetenciesToAddCount;
                 data.CompetenciesToUpdateCount = resultsModel.CompetenciesToUpdateCount;
@@ -92,12 +93,12 @@ public IActionResult ImportCompleted()
             }
         }
 
-        private void setupBulkUploadData(int frameworkId, int adminUserID, string competenciessFileName, string tabName)
+        private void setupBulkUploadData(int frameworkId, int adminUserID, string competenciessFileName, string tabName, bool isNotBlank)
         {
             TempData.Clear();
             multiPageFormService.ClearMultiPageFormData(MultiPageFormDataFeature.AddCustomWebForm("BulkCompetencyDataCWF"), TempData);
             var today = clockUtility.UtcToday;
-            var bulkUploadData = new BulkCompetenciesData(frameworkId, adminUserID, competenciessFileName, tabName);
+            var bulkUploadData = new BulkCompetenciesData(frameworkId, adminUserID, competenciessFileName, tabName, isNotBlank);
             setBulkUploadData(bulkUploadData);
         }
         private void setBulkUploadData(BulkCompetenciesData bulkUploadData)

DigitalLearningSolutions.Web/Helpers/CommonValidationErrorMessages.cs

@@ -36,7 +36,7 @@ public static class CommonValidationErrorMessages
         public const string CentreNameAlreadyExist = "The centre name you have entered already exists, please enter a different centre name";
         public const string MaxBulkUploadRowsLimit = "File must contain no more than {0} rows";
         public const string InvalidBulkUploadExcelFile = "The uploaded file must contain a \"DelegatesBulkUpload\" worksheet. Use the \"Download delegates\" button to generate a template.";
-        public const string InvalidCompetenciesUploadExcelFile = "The uploaded file must contain a \"CompetenciesBulkUpload\" worksheet. Use the \"Download competencies\" button to generate a template.";
+        public const string InvalidCompetenciesUploadExcelFile = "The uploaded file must contain a \"CompetenciesBulkUpload\" worksheet. Use the \"Download template\" button to generate a template.";
         public const string ReportFilterReturnsTooManyRows = "The report frequency is too high for the date range. Choose a lower report frequency (or shorten the date range)";
     }
 }

DigitalLearningSolutions.Web/Models/BulkCompetenciesData.cs

@@ -6,16 +6,18 @@ namespace DigitalLearningSolutions.Web.Models
     public class BulkCompetenciesData
     {
         public BulkCompetenciesData() { }
-        public BulkCompetenciesData(int frameworkId, int adminUserId, string competenciesFileName, string tabName)
+        public BulkCompetenciesData(int frameworkId, int adminUserId, string competenciesFileName, string tabName, bool isNotBlank)
         {
             FrameworkId = frameworkId;
             AdminUserId = adminUserId;
             CompetenciesFileName = competenciesFileName;
             TabName = tabName;
+            IsNotBlank = isNotBlank;
         }
         public int FrameworkId { get; set; }
         public string TabName { get; set; }
         public int AdminUserId { get; set; }
+        public bool IsNotBlank { get; set; }
         public string CompetenciesFileName { get; set; }
         public List<int> AssessmentQuestionIDs { get; set; }
         public int? AddAssessmentQuestionOption { get; set; }

DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs

@@ -44,6 +44,7 @@ public ImportCompetenciesResult PreProcessCompetenciesTable(IXLWorkbook workbook
         }
         private void PreProcessCompetencyRow(CompetencyTableRow competencyRow)
         {
+            competencyRow.Validate();
             if (competencyRow.id == null)
             {
                 competencyRow.RowStatus = RowStatus.CompetencyInserted;

DigitalLearningSolutions.Web/ViewModels/Frameworks/ImportCompetenciesPreProcessViewModel.cs

@@ -26,7 +26,9 @@ public ImportCompetenciesPreProcessViewModel(ImportCompetenciesResult bulkCompet
         public int CompetencyGroupsToAddCount { get; set; }
         public int CompetencyGroupsToUpdateCount { get; set; }
         public int ToUpdateOrSkipCount { get; set; }
-        public string? CompetenciesFileName { get; set; }
+        public string? ImportFile { get; set; }
+        public bool IsNotBlank { get; set; }
+        public string TabName { get; set; }
 
         private static string MapReasonToErrorMessage(ImportCompetenciesResult.ErrorReason reason)
         {

DigitalLearningSolutions.Web/Views/Frameworks/Developer/ImportCompleted.cshtml

@@ -30,7 +30,7 @@
 <p class="nhsuk-body-l">@(Model.ErrorCount == 0 ? "Your file is error free and ready to be processed. Check the information below looks, correct before processing" : "Your file contains the following, including some errors:")</p>
 <ul>
     <li>@Model.ToProcessCount @(Model.ToProcessCount == 1 ? "row" : "rows") to process</li>
-    <li>@Model.CompetencyGroupsToAddCount new @(Model.CompetencyGroupsToAddCount == 1 ? "competency" : "competencies") to register</li>
+    <li>@Model.CompetenciesToAddCount new @(Model.CompetenciesToAddCount == 1 ? "competency" : "competencies") to add</li>
     <li>@Model.ToUpdateOrSkipCount delegate @(Model.ToUpdateOrSkipCount == 1 ? "record" : "records") to update (or skip if unchanged)</li>
     @if (Model.ErrorCount > 0)
     {
@@ -71,9 +71,11 @@ else
     <p class="nhsuk-body-m">
         Once you have made corrections to the Excel competency workbook to address the errors above, save and restart the upload process.
     </p>
-    <form class="nhsuk-u-margin-bottom-3" method="post" asp-action="StartUpload" enctype="multipart/form-data">
+    <form class="nhsuk-u-margin-bottom-3" method="post" enctype="multipart/form-data">
 
-        <vc:file-input asp-for="@nameof(Model.CompetenciesFileName)" label="File with corrected competencies information" hint-text="" css-class="nhsuk-u-width-one-half" />
+        <vc:file-input asp-for="@nameof(Model.ImportFile)" label="File with corrected competencies information" hint-text="" css-class="nhsuk-u-width-one-half" />
+        <input type="hidden" asp-for="IsNotBlank" />
+        <input type="hidden" asp-for="TabName"/>
 
         <button class="nhsuk-button" type="submit">Upload file</button>
     </form>