TD-5153 Fixes update of competency description and import failed navigation

Author: kevwhitt-hee

DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs

@@ -62,6 +62,7 @@ public interface IFrameworkDataService
         int GetMaxFrameworkCompetencyID();
 
         int GetMaxFrameworkCompetencyGroupID();
+        int GetFrameworkCompetencyGroupId(int frameworkId, int competencyGroupId);
 
         //  Assessment questions:
         IEnumerable<AssessmentQuestion> GetAllCompetencyQuestions(int adminId);
@@ -581,7 +582,7 @@ OUTPUT INSERTED.Id
                     VALUES (@groupName, @groupDescription, @adminId)",
                 new { groupName, groupDescription, adminId }
             );
-            
+
             return existingId;
         }
 
@@ -613,7 +614,7 @@ FROM            [FrameworkCompetencyGroups]
                                  WHERE        ([FrameworkID] = @frameworkId)), 0)+1, @frameworkId)",
                 new { groupId, adminId, frameworkId }
             );
-           
+
             return existingId;
         }
 
@@ -1005,7 +1006,7 @@ int adminId
                             SET CompetencyGroupID = @newCompetencyGroupId, UpdatedByAdminID = @adminId
                             WHERE ID = @frameworkCompetencyGroupId",
                         new { newCompetencyGroupId, adminId, frameworkCompetencyGroupId }
-                        
+
                     );
                     if (numberOfAffectedRows < 1)
                     {
@@ -1058,7 +1059,7 @@ public void UpdateFrameworkCompetency(int frameworkCompetencyId, string name, st
                 @"UPDATE Competencies SET Name = @name, Description = @description, UpdatedByAdminID = @adminId, AlwaysShowDescription = CASE WHEN @alwaysShowDescription IS NULL THEN AlwaysShowDescription ELSE @alwaysShowDescription END
                     FROM   Competencies INNER JOIN FrameworkCompetencies AS fc ON Competencies.ID = fc.CompetencyID
                     WHERE (fc.Id = @frameworkCompetencyId)",
-                new { name, description, adminId, frameworkCompetencyId, alwaysShowDescription}
+                new { name, description, adminId, frameworkCompetencyId, alwaysShowDescription }
             );
             if (numberOfAffectedRows < 1)
             {
@@ -2448,5 +2449,14 @@ FROM   FrameworkCompetencies AS fc INNER JOIN
                                 new { frameworkId, frameworkCompetencyIds }
                             ).ToList();
         }
+
+        public int GetFrameworkCompetencyGroupId(int frameworkId, int competencyGroupId)
+        {
+            return connection.Query<int>(
+                @"SELECT MAX(ID) FROM FrameworkCompetencyGroups 
+                 WHERE FrameworkID = @frameworkId AND CompetencyGroupID = @competencyGroupId",
+                                new { frameworkId, competencyGroupId }
+                                ).Single();
+        }
     }
 }

DigitalLearningSolutions.Web/Controllers/FrameworksController/Frameworks.cs

@@ -718,7 +718,8 @@ public IActionResult ViewFramework(string tabname, int frameworkId, int? framewo
         }
 
         [Route("/Framework/{frameworkId}/Structure/PrintLayout")]
-        public IActionResult PrintLayout(int frameworkId) {
+        public IActionResult PrintLayout(int frameworkId)
+        {
             var adminId = GetAdminId();
             var detailFramework = frameworkService.GetFrameworkDetailByFrameworkId(frameworkId, adminId);
             var routeData = new Dictionary<string, string> { { "frameworkId", detailFramework?.ID.ToString() } };

DigitalLearningSolutions.Web/Controllers/FrameworksController/ImportCompetencies.cs

@@ -79,7 +79,7 @@ public IActionResult StartImport(ImportCompetenciesFormData model, int framework
             }
             catch (InvalidHeadersException)
             {
-                return View("Developer/Import/ImportFailed");
+                return RedirectToAction("ImportFailed", "Frameworks", new { frameworkId, tabname, isNotBlank });
             }
         }
         [Route("/Framework/{frameworkId}/{tabname}/Import/Uploaded")]
@@ -103,9 +103,18 @@ public IActionResult ImportCompleted()
             catch (InvalidHeadersException)
             {
                 FileHelper.DeleteFile(webHostEnvironment, data.CompetenciesFileName);
-                return View("Developer/Import/ImportFailed");
+                return RedirectToAction("ImportFailed", "Frameworks", new { data.FrameworkId, tabname = "Structure", data.IsNotBlank });
             }
         }
+        [Route("/Framework/{frameworkId}/{tabname}/Import/Failed")]
+        public IActionResult ImportFailed(int frameworkId, string tabname, bool isNotBlank)
+        {
+            var adminId = GetAdminId();
+            var framework = frameworkService.GetFrameworkDetailByFrameworkId(frameworkId, adminId);
+            var viewModel = new ImportCompetenciesViewModel(framework, isNotBlank);
+            return View("Developer/Import/ImportFailed", viewModel);
+        }
+
         [Route("/Framework/{frameworkId}/{tabname}/Import/Ordering")]
         public IActionResult ApplyCompetencyOrdering()
         {
@@ -206,7 +215,7 @@ public IActionResult AddAssessmentQuestions(AddAssessmentQuestionsFormData model
         public IActionResult AddQuestionsToWhichCompetencies()
         {
             var data = GetBulkUploadData();
-            if (data.DefaultQuestionIDs.Count ==0 && data.CustomAssessmentQuestionID == null)
+            if (data.DefaultQuestionIDs.Count == 0 && data.CustomAssessmentQuestionID == null)
             {
                 return RedirectToAction("ImportSummary", "Frameworks", new { frameworkId = data.FrameworkId, tabname = data.TabName });
             }

DigitalLearningSolutions.Web/Services/FrameworkService.cs

@@ -675,7 +675,7 @@ public int UpdateCompetencyFlags(int frameworkId, int competencyId, int[] select
         }
 
         public void UpdateFrameworkCompetency(int frameworkCompetencyId, string name, string? description, int adminId, bool? alwaysShowDescription)
-        { 
+        {
             frameworkDataService.UpdateFrameworkCompetency(frameworkCompetencyId, name, description, adminId, alwaysShowDescription);
         }
 

DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs

@@ -11,15 +11,13 @@ namespace DigitalLearningSolutions.Web.Services
     using ClosedXML.Excel;
     using DigitalLearningSolutions.Data.Exceptions;
     using DigitalLearningSolutions.Data.Helpers;
-    using DigitalLearningSolutions.Data.Models.Frameworks;
     using DigitalLearningSolutions.Data.Models.Frameworks.Import;
-    using DocumentFormat.OpenXml.Office2010.Excel;
 
     public interface IImportCompetenciesFromFileService
     {
         byte[] GetCompetencyFileForFramework(int frameworkId, bool isBlank, string vocabulary);
         public ImportCompetenciesResult PreProcessCompetenciesTable(IXLWorkbook workbook, string vocabulary, int frameworkId);
-        public ImportCompetenciesResult ProcessCompetenciesFromFile(IXLWorkbook workbook, int adminUserId, int frameworkId, string vocabulary, int reorderCompetenciesOption, int addAssessmentQuestionsOption, int customAssessmentQuestionID, List<int> defaultQuestionIds);
+        public ImportCompetenciesResult ProcessCompetenciesFromFile(IXLWorkbook workbook, int adminId, int frameworkId, string vocabulary, int reorderCompetenciesOption, int addAssessmentQuestionsOption, int customAssessmentQuestionID, List<int> defaultQuestionIds);
     }
     public class ImportCompetenciesFromFileService : IImportCompetenciesFromFileService
     {
@@ -70,12 +68,12 @@ private void PreProcessCompetencyRow(CompetencyTableRow competencyRow, List<int>
             }
             competencyRow.Validate();
         }
-        public ImportCompetenciesResult ProcessCompetenciesFromFile(IXLWorkbook workbook, int adminUserId, int frameworkId, string vocabulary, int reorderCompetenciesOption, int addAssessmentQuestionsOption, int customAssessmentQuestionID, List<int> defaultQuestionIds)
+        public ImportCompetenciesResult ProcessCompetenciesFromFile(IXLWorkbook workbook, int adminId, int frameworkId, string vocabulary, int reorderCompetenciesOption, int addAssessmentQuestionsOption, int customAssessmentQuestionID, List<int> defaultQuestionIds)
         {
             int maxFrameworkCompetencyId = frameworkService.GetMaxFrameworkCompetencyID();
             int maxFrameworkCompetencyGroupId = frameworkService.GetMaxFrameworkCompetencyGroupID();
             var table = OpenCompetenciesTable(workbook, vocabulary);
-            return ProcessCompetenciesTable(table, adminUserId, frameworkId, maxFrameworkCompetencyId, maxFrameworkCompetencyGroupId, addAssessmentQuestionsOption, reorderCompetenciesOption, customAssessmentQuestionID, defaultQuestionIds);
+            return ProcessCompetenciesTable(table, adminId, frameworkId, maxFrameworkCompetencyId, maxFrameworkCompetencyGroupId, addAssessmentQuestionsOption, reorderCompetenciesOption, customAssessmentQuestionID, defaultQuestionIds);
         }
         internal IXLTable OpenCompetenciesTable(IXLWorkbook workbook, string vocabulary)
         {
@@ -92,7 +90,7 @@ internal IXLTable OpenCompetenciesTable(IXLWorkbook workbook, string vocabulary)
             }
             return table;
         }
-        internal ImportCompetenciesResult ProcessCompetenciesTable(IXLTable table, int adminUserId, int frameworkId, int maxFrameworkCompetencyId, int maxFrameworkCompetencyGroupId, int addAssessmentQuestionsOption, int reorderCompetenciesOption, int customAssessmentQuestionID, List<int> defaultQuestionIds)
+        internal ImportCompetenciesResult ProcessCompetenciesTable(IXLTable table, int adminId, int frameworkId, int maxFrameworkCompetencyId, int maxFrameworkCompetencyGroupId, int addAssessmentQuestionsOption, int reorderCompetenciesOption, int customAssessmentQuestionID, List<int> defaultQuestionIds)
         {
             var competenciesRows = table.Rows().Skip(1).Select(row => new CompetencyTableRow(table, row)).ToList();
             int rowCount = 0;
@@ -120,7 +118,7 @@ internal ImportCompetenciesResult ProcessCompetenciesTable(IXLTable table, int a
             .Count();
             foreach (var competencyRow in competenciesRows)
             {
-                maxFrameworkCompetencyGroupId = ProcessCompetencyRow(adminUserId, frameworkId, maxFrameworkCompetencyId, maxFrameworkCompetencyGroupId, addAssessmentQuestionsOption, reorderCompetenciesOption, customAssessmentQuestionID, defaultQuestionIds, competencyRow);
+                maxFrameworkCompetencyGroupId = ProcessCompetencyRow(adminId, frameworkId, maxFrameworkCompetencyId, maxFrameworkCompetencyGroupId, addAssessmentQuestionsOption, reorderCompetenciesOption, customAssessmentQuestionID, defaultQuestionIds, competencyRow);
             }
             // Check for changes to competency group order and apply them if appropriate:
             if (reorderCompetenciesOption == 2)
@@ -135,7 +133,7 @@ internal ImportCompetenciesResult ProcessCompetenciesTable(IXLTable table, int a
                     var existingGroups = frameworkService.GetFrameworkCompetencyGroups(frameworkId).Select(row => new { row.ID, row.Name })
                    .Distinct()
                    .ToList();
-                    var placesToMove = Math.Abs(existingGroups.FindIndex(group => group.Name == distinctCompetencyGroups[i])-i);
+                    var placesToMove = Math.Abs(existingGroups.FindIndex(group => group.Name == distinctCompetencyGroups[i]) - i);
                     if (placesToMove > 0)
                     {
                         var thisGroup = existingGroups.FirstOrDefault(group => group.Name == distinctCompetencyGroups[i]);
@@ -154,7 +152,7 @@ internal ImportCompetenciesResult ProcessCompetenciesTable(IXLTable table, int a
             return new ImportCompetenciesResult(competenciesRows);
         }
         private int ProcessCompetencyRow(
-            int adminUserId,
+            int adminId,
             int frameworkId,
             int maxFrameworkCompetencyId,
             int maxFrameworkCompetencyGroupId,
@@ -175,27 +173,22 @@ CompetencyTableRow competencyRow
             int? frameworkCompetencyGroupId = null;
             if (competencyRow.CompetencyGroup != null)
             {
-                int newCompetencyGroupId = frameworkService.InsertCompetencyGroup(competencyRow.CompetencyGroup, competencyRow.GroupDescription, adminUserId, frameworkId);
+                int newCompetencyGroupId = frameworkService.InsertCompetencyGroup(competencyRow.CompetencyGroup, competencyRow.GroupDescription, adminId, frameworkId);
                 if (newCompetencyGroupId > 0)
                 {
-                    frameworkCompetencyGroupId = frameworkService.InsertFrameworkCompetencyGroup(newCompetencyGroupId, frameworkId, adminUserId);
+                    frameworkCompetencyGroupId = frameworkService.InsertFrameworkCompetencyGroup(newCompetencyGroupId, frameworkId, adminId);
                     if (frameworkCompetencyGroupId > maxFrameworkCompetencyGroupId)
                     {
                         maxFrameworkCompetencyGroupId = (int)frameworkCompetencyGroupId;
                         competencyRow.RowStatus = RowStatus.CompetencyGroupInserted;
                     }
                     else
                     {
-                        //TO DO:  Need to get frameworkCompetencyGroupId and check admin ID
                         frameworkCompetencyGroupId = frameworkService.GetFrameworkCompetencyGroupId(frameworkId, newCompetencyGroupId);
-                        var isUpdated = frameworkService.UpdateFrameworkCompetencyGroup((int)frameworkCompetencyGroupId, newCompetencyGroupId, competencyRow.CompetencyGroup, competencyRow.GroupDescription, adminUserId);
+                        var isUpdated = frameworkService.UpdateFrameworkCompetencyGroup((int)frameworkCompetencyGroupId, newCompetencyGroupId, competencyRow.CompetencyGroup, competencyRow.GroupDescription, adminId);
                         competencyRow.RowStatus = RowStatus.CompetencyGroupUpdated;
                     }
                 }
-                else
-                {
-                   
-                }
             }
             // If FrameworkCompetency ID is supplied, update the competency
             if (competencyRow.ID != null)
@@ -206,7 +199,7 @@ CompetencyTableRow competencyRow
                     newCompetencyId = frameworkCompetency.CompetencyID;
                     if (frameworkCompetency.Name != competencyRow.Competency || frameworkCompetency.Description != competencyRow.CompetencyDescription || frameworkCompetency.AlwaysShowDescription != competencyRow.AlwaysShowDescription)
                     {
-                        frameworkService.UpdateFrameworkCompetency((int)competencyRow.ID, competencyRow.Competency, competencyRow.CompetencyDescription, adminUserId, competencyRow.AlwaysShowDescription ?? false);
+                        frameworkService.UpdateFrameworkCompetency((int)competencyRow.ID, competencyRow.Competency, competencyRow.CompetencyDescription, adminId, competencyRow.AlwaysShowDescription ?? false);
                         competencyRow.RowStatus = (competencyRow.RowStatus == RowStatus.CompetencyGroupInserted ? RowStatus.CompetencyGroupAndCompetencyUpdated : RowStatus.CompetencyUpdated);
                     }
                     else
@@ -218,10 +211,10 @@ CompetencyTableRow competencyRow
             else
             {
                 //Check if competency already exists in framework competency group and add if not
-                newCompetencyId = frameworkService.InsertCompetency(competencyRow.Competency, competencyRow.CompetencyDescription, adminUserId);
+                newCompetencyId = frameworkService.InsertCompetency(competencyRow.Competency, competencyRow.CompetencyDescription, adminId);
                 if (newCompetencyId > 0)
                 {
-                    newFrameworkCompetencyId = frameworkService.InsertFrameworkCompetency(newCompetencyId, frameworkCompetencyGroupId, adminUserId, frameworkId, competencyRow.AlwaysShowDescription ?? false); //including always show desc flag
+                    newFrameworkCompetencyId = frameworkService.InsertFrameworkCompetency(newCompetencyId, frameworkCompetencyGroupId, adminId, frameworkId, competencyRow.AlwaysShowDescription ?? false); //including always show desc flag
                     if (newFrameworkCompetencyId > maxFrameworkCompetencyId)
                     {
                         competencyRow.RowStatus = (competencyRow.RowStatus == RowStatus.CompetencyGroupInserted ? RowStatus.CompetencyGroupAndCompetencyInserted : RowStatus.CompetencyInserted);
@@ -297,16 +290,16 @@ CompetencyTableRow competencyRow
                 {
                     foreach (var id in defaultQuestionIds)
                     {
-                        frameworkService.AddCompetencyAssessmentQuestion(competencyRow.ID ?? newFrameworkCompetencyId, id, adminUserId);
+                        frameworkService.AddCompetencyAssessmentQuestion(competencyRow.ID ?? newFrameworkCompetencyId, id, adminId);
                     }
                     if (customAssessmentQuestionID > 0)
                     {
-                        frameworkService.AddCompetencyAssessmentQuestion(competencyRow.ID ?? newFrameworkCompetencyId, customAssessmentQuestionID, adminUserId);
+                        frameworkService.AddCompetencyAssessmentQuestion(competencyRow.ID ?? newFrameworkCompetencyId, customAssessmentQuestionID, adminId);
                     }
                 }
             }
 
-            
+
 
             return maxFrameworkCompetencyGroupId;
         }

DigitalLearningSolutions.Web/Views/Frameworks/Developer/Import/ImportFailed.cshtml

@@ -2,13 +2,14 @@
 @using DigitalLearningSolutions.Web.Extensions
 @using DigitalLearningSolutions.Web.ViewModels.Frameworks.Import
 @using Microsoft.Extensions.Configuration
-@model ImportCompetenciesResultsViewModel
+@model ImportCompetenciesViewModel
 @{
     ViewData["Title"] = "Framework - Import Failed";
     ViewData["Application"] = "Framework Service";
     ViewData["HeaderPathName"] = "Framework Service";
     var errorHasOccurred = !ViewData.ModelState.IsValid;
     var cancelLinkData = Html.GetRouteValues();
+    cancelLinkData.Add("IsNotBlank", Model.IsNotBlank.ToString());
 }
 <link rel="stylesheet" href="@Url.Content("~/css/frameworks/frameworksShared.css")" asp-append-version="true">
 @section NavMenuItems {
@@ -35,7 +36,7 @@
                 The file that you uploaded either does not have the correct column headers on the first row or is not formatted as a table.
             </p>
 
-            <p class="nhsuk-body-m">Refer to the instructions on the Import Competencies page to make sure your Excel file has the correct column headers.</p>
+            <p class="nhsuk-body-m">Refer to the instructions on the Import @Model.FrameworkVocabularyPlural page to make sure your Excel file has the correct column headers.</p>
 
             <vc:action-link asp-controller="Frameworks" asp-action="ViewFramework" asp-all-route-data="@cancelLinkData" link-text="Back to framework structure" />
 

DigitalLearningSolutions.Web/Views/Frameworks/Developer/Import/Index.cshtml

@@ -36,7 +36,7 @@
             {
                 <partial name="Shared/_PublishedWarning" />
             }
-            
+
             <div class="nhsuk-form-group">
                 @if (Model.IsNotBlank)
                 {
@@ -45,14 +45,14 @@
                         <p>
                             Bulk upload <strong>cannot</strong> be used to:
                         </p>
-                            <ul>
+                        <ul>
                             <li>Delete @Model.FrameworkVocabularyPlural.ToLower() or @Model.FrameworkVocabularySingular.ToLower() groups</li>
                             <li>Remove assessment questions from existing @Model.FrameworkVocabularyPlural.ToLower()</li>
                             <li>Add more than one custom assessment question to uploaded @Model.FrameworkVocabularyPlural.ToLower()</li>
                             <li>Remove flags from @Model.FrameworkVocabularyPlural.ToLower()</li>
                             <li>Add or edit empty @Model.FrameworkVocabularyPlural.ToLower() groups</li>
-                            </ul>
-                        
+                        </ul>
+
                     </div>
                     <p class="nhsuk-body-m">
                         To bulk add and/or update @Model.FrameworkVocabularyPlural.ToLower() in the framework, <strong>@Model.FrameworkName</strong>, download an Excel workbook using one of the options below.