From 40a60d847d8207fa10840c1b262d2bab865ea494 Mon Sep 17 00:00:00 2001 From: Auldrin Possa Date: Thu, 22 May 2025 14:17:25 +0100 Subject: [PATCH] TD-5443-Bulk-upload- flags comparision modified by adding Trim and ToLower functions --- .../Controllers/FrameworksController/Frameworks.cs | 8 ++++---- .../Services/ImportCompetenciesFromFileService.cs | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DigitalLearningSolutions.Web/Controllers/FrameworksController/Frameworks.cs b/DigitalLearningSolutions.Web/Controllers/FrameworksController/Frameworks.cs index 2070b7d74f..f78ef7a44f 100644 --- a/DigitalLearningSolutions.Web/Controllers/FrameworksController/Frameworks.cs +++ b/DigitalLearningSolutions.Web/Controllers/FrameworksController/Frameworks.cs @@ -583,9 +583,9 @@ public IActionResult EditFrameworkFlag(CustomFlagViewModel model, int frameworkI if (ModelState.IsValid) { var flags = frameworkService.GetCustomFlagsByFrameworkId(frameworkId, null) - .Where(fn => fn.FlagName.ToLower() == model.FlagName.ToLower()).ToList(); + .Where(fn => fn.FlagName?.Trim().ToLower() == model.FlagName?.Trim().ToLower()).ToList(); - bool nameExists = flags.Any(x => x.FlagName.ToLower() == model.FlagName.ToLower()); + bool nameExists = flags.Any(x => x.FlagName?.Trim().ToLower() == model.FlagName?.Trim().ToLower()); bool idExists = flags.Any(x => x.FlagId == flagId); if (actionname == "Edit") @@ -596,7 +596,7 @@ public IActionResult EditFrameworkFlag(CustomFlagViewModel model, int frameworkI return View("Developer/EditCustomFlag", model); } else - frameworkService.UpdateFrameworkCustomFlag(frameworkId, model.Id, model.FlagName, model.FlagGroup, model.FlagTagClass); + frameworkService.UpdateFrameworkCustomFlag(frameworkId, model.Id, model.FlagName?.Trim(), model.FlagGroup?.Trim(), model.FlagTagClass); } else { @@ -606,7 +606,7 @@ public IActionResult EditFrameworkFlag(CustomFlagViewModel model, int frameworkI return View("Developer/EditCustomFlag", model); } else - frameworkService.AddCustomFlagToFramework(frameworkId, model.FlagName, model.FlagGroup, model.FlagTagClass); + frameworkService.AddCustomFlagToFramework(frameworkId, model.FlagName?.Trim(), model.FlagGroup?.Trim(), model.FlagTagClass); } return RedirectToAction("EditFrameworkFlags", "Frameworks", new { frameworkId }); diff --git a/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs b/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs index dcb388f3ae..5ca64febc2 100644 --- a/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs +++ b/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs @@ -262,7 +262,7 @@ CompetencyTableRow competencyRow { foreach (var frameworkFlag in frameworkFlags) { - if (frameworkFlag.FlagName == flag) + if (frameworkFlag.FlagName?.Trim().ToLower() == flag?.Trim().ToLower()) { flagId = frameworkFlag.FlagId; break; @@ -271,7 +271,7 @@ CompetencyTableRow competencyRow } if (flagId == 0) { - flagId = frameworkService.AddCustomFlagToFramework(frameworkId, flag, "Flag", "nhsuk-tag--white"); + flagId = frameworkService.AddCustomFlagToFramework(frameworkId, flag?.Trim(), "Flag", "nhsuk-tag--white"); } flagIds.Add(flagId); }