Merge pull request #3228 from TechnologyEnhancedLearning/Develop/Fixes/TD-5220-FixOrderComparison

kevwhitt-hee · web-flow · commit af36d8759c87 · 2025-04-22T09:53:19.000+01:00
TD-5220 excludes empty or null group names from order comparison
diff --git a/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs b/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs
@@ -74,11 +74,14 @@ private void PreProcessCompetencyRow(CompetencyTableRow competencyRow, List<int>
                     else
                     {
                         var groupName = (string)(competencyRow?.CompetencyGroup);
-                        originalIndex = existingGroups.IndexOf(groupName);
-                        newIndex = newGroups.IndexOf(groupName);
-                        if (originalIndex != newIndex)
+                        if (!string.IsNullOrWhiteSpace(groupName))
                         {
-                            competencyRow.Reordered = true;
+                            originalIndex = existingGroups.IndexOf(groupName);
+                            newIndex = newGroups.IndexOf(groupName);
+                            if (originalIndex != newIndex)
+                            {
+                                competencyRow.Reordered = true;
+                            }
                         }
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -74,11 +74,14 @@ private void PreProcessCompetencyRow(CompetencyTableRow competencyRow, List<int>`
`74`	`74`	`else`
`75`	`75`	`{`
`76`	`76`	`var groupName = (string)(competencyRow?.CompetencyGroup);`
`77`		`- originalIndex = existingGroups.IndexOf(groupName);`
`78`		`- newIndex = newGroups.IndexOf(groupName);`
`79`		`- if (originalIndex != newIndex)`
	`77`	`+ if (!string.IsNullOrWhiteSpace(groupName))`
`80`	`78`	`{`
`81`		`- competencyRow.Reordered = true;`
	`79`	`+ originalIndex = existingGroups.IndexOf(groupName);`
	`80`	`+ newIndex = newGroups.IndexOf(groupName);`
	`81`	`+ if (originalIndex != newIndex)`
	`82`	`+ {`
	`83`	`+ competencyRow.Reordered = true;`
	`84`	`+ }`
`82`	`85`	`}`
`83`	`86`	`}`
`84`	`87`	`}`