Skip to content

Commit 587a99f

Browse files
committed
TD-5220 Handles null scenario that was causing error in reordering competencies
1 parent fcaa737 commit 587a99f

File tree

1 file changed

+13
-10
lines changed

1 file changed

+13
-10
lines changed

DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -266,20 +266,23 @@ CompetencyTableRow competencyRow
266266
// Reorder competencies if required:
267267
if (reorderCompetenciesOption == 2)
268268
{
269-
var frameworkCompetencyId = (int)competencyRow.ID;
270-
var frameworkCompetency = frameworkService.GetFrameworkCompetencyById(frameworkCompetencyId);
271-
var placesToMove = Math.Abs(frameworkCompetency.Ordering - competencyRow.CompetencyOrderNumber);
272-
273-
if (placesToMove > 0)
269+
var frameworkCompetencyId = competencyRow.ID ?? 0;
270+
if (frameworkCompetencyId != 0)
274271
{
275-
var direction = frameworkCompetency.Ordering > competencyRow.CompetencyOrderNumber ? "UP" : "DOWN";
272+
var frameworkCompetency = frameworkService.GetFrameworkCompetencyById(frameworkCompetencyId);
273+
var placesToMove = Math.Abs(frameworkCompetency.Ordering - competencyRow.CompetencyOrderNumber);
276274

277-
for (int i = 0; i < placesToMove; i++)
275+
if (placesToMove > 0)
278276
{
279-
frameworkService.MoveFrameworkCompetency(frameworkCompetencyId, true, direction);
280-
}
277+
var direction = frameworkCompetency.Ordering > competencyRow.CompetencyOrderNumber ? "UP" : "DOWN";
278+
279+
for (int i = 0; i < placesToMove; i++)
280+
{
281+
frameworkService.MoveFrameworkCompetency(frameworkCompetencyId, true, direction);
282+
}
281283

282-
competencyRow.Reordered = true;
284+
competencyRow.Reordered = true;
285+
}
283286
}
284287
}
285288

0 commit comments

Comments
 (0)