TD-5220 passes ids of uploaded competencies to get order of stored competencies

Author: kevwhitt-hee

DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs

@@ -100,6 +100,7 @@ bool zeroBased
 
         Competency? GetFrameworkCompetencyForPreview(int frameworkCompetencyId);
         IEnumerable<BulkCompetency> GetBulkCompetenciesForFramework(int frameworkId);
+        List<int> GetFrameworkCompetencyOrder(int frameworkId, List<int> frameworkCompetencyIds);
 
         //  Comments:
         IEnumerable<CommentReplies> GetCommentsForFrameworkId(int frameworkId, int adminId);
@@ -2429,5 +2430,16 @@ Competencies AS c INNER JOIN
             }
 
         }
+        public List<int> GetFrameworkCompetencyOrder(int frameworkId, List<int> frameworkCompetencyIds)
+        {
+            return connection.Query<int>(
+                @"SELECT fc.ID
+                    FROM   FrameworkCompetencies AS fc INNER JOIN
+                                 FrameworkCompetencyGroups AS fcg ON fc.FrameworkCompetencyGroupID = fcg.ID
+                    WHERE (fc.FrameworkID = @frameworkId) AND (fc.ID IN @frameworkCompetencyIds)
+                    ORDER BY fcg.Ordering, fc.Ordering",
+                                new { frameworkId, frameworkCompetencyIds }
+                            ).ToList();
+        }
     }
 }

DigitalLearningSolutions.Web/Services/FrameworkService.cs

@@ -57,6 +57,7 @@ public interface IFrameworkService
 
         int GetMaxFrameworkCompetencyGroupID();
         IEnumerable<BulkCompetency> GetBulkCompetenciesForFramework(int frameworkId);
+        List<int> GetFrameworkCompetencyOrder(int frameworkId, List<int> frameworkCompetencyIds);
 
         //  Assessment questions:
         IEnumerable<AssessmentQuestion> GetAllCompetencyQuestions(int adminId);
@@ -386,6 +387,11 @@ public IEnumerable<BulkCompetency> GetBulkCompetenciesForFramework(int framework
             return frameworkDataService.GetBulkCompetenciesForFramework(frameworkId);
         }
 
+        public List<int> GetFrameworkCompetencyOrder(int frameworkId, List<int> frameworkCompetencyIds)
+        {
+            return frameworkDataService.GetFrameworkCompetencyOrder(frameworkId, frameworkCompetencyIds);
+        }
+
         public CollaboratorNotification? GetCollaboratorNotification(int id, int invitedByAdminId)
         {
             return frameworkDataService.GetCollaboratorNotification(id, invitedByAdminId);

DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs

@@ -35,8 +35,7 @@ public ImportCompetenciesResult PreProcessCompetenciesTable(IXLWorkbook workbook
             var table = OpenCompetenciesTable(workbook, vocabulary);
             var competencyRows = table.Rows().Skip(1).Select(row => new CompetencyTableRow(table, row)).ToList();
             var newCompetencyIds = competencyRows.Select(row => row.ID ?? 0).ToList();
-            var existingCompetencies = frameworkService.GetBulkCompetenciesForFramework(frameworkId);
-            var existingIds = existingCompetencies.Select(bc => (int)bc.ID).ToList();
+            var existingIds = frameworkService.GetFrameworkCompetencyOrder(frameworkId, newCompetencyIds);
             foreach (var competencyRow in competencyRows)
             {
                 PreProcessCompetencyRow(competencyRow, newCompetencyIds, existingIds);

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

@@ -59,7 +59,7 @@
             }
             else
             {
-                <p class="nhsuk-body-l">Check the information below. You will need fix these errors before continuing or remove the rows with errors from your spreadsheet:</p>
+                <p class="nhsuk-body-l">Check the information below. You will need to fix these errors before continuing or remove the rows with errors from your spreadsheet:</p>
                 <div class="nhsuk-form-group nhsuk-form-group--error">
                     <span class="nhsuk-error-message" id="error-list">
                         <span class="nhsuk-u-visually-hidden">Error:</span> @Model.ErrorCount @Model.FrameworkVocabularySingular.ToLower() @(Model.ErrorCount == 1 ? "row" : "rows") contain errors and cannot be processed