Merge pull request #3367 from TechnologyEnhancedLearning/Develop/Fix/TD-5548-competency-records-changed-order-message

TD-5548- Competency groups that have any competencies, were selected for old/new group comparison.

Author: kevwhitt-hee

DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs

@@ -37,11 +37,13 @@ public ImportCompetenciesResult PreProcessCompetenciesTable(IXLWorkbook workbook
             var newCompetencyIds = competencyRows.Select(row => row.ID ?? 0).ToList();
             var existingIds = frameworkService.GetFrameworkCompetencyOrder(frameworkId, newCompetencyIds);
             var existingGroups = frameworkService
-                .GetFrameworkCompetencyGroups(frameworkId)
+                .GetFrameworkCompetencyGroups(frameworkId).Where(x => x.FrameworkCompetencies.Any()).ToList()
                 .Select(row => row.Name)
                 .Distinct()
                 .ToList();
-            var newGroups = competencyRows.Select(row => row.CompetencyGroup ?? "").Distinct().ToList();
+            var newGroups = competencyRows.Select(row => row.CompetencyGroup)
+                .Where(g => !string.IsNullOrEmpty(g))
+                .Distinct().ToList();
             foreach (var competencyRow in competencyRows)
             {
                 PreProcessCompetencyRow(competencyRow, newCompetencyIds, existingIds, existingGroups, newGroups);