Skip to content

DLSV2-523 Fixes bug: flag checkboxes missing when user enters invalid competency name #1363

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 25, 2022
Merged

DLSV2-523 Fixes bug: flag checkboxes missing when user enters invalid competency name #1363

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09548d5
DLSV2-523 Fixes bug: flag checkboxes are missing when user enters inv…
daniel-manta-hee Aug 24, 2022
63d8467
Merge branch 'master' into Develop/Fixes/DLSV2-523-FlaggingOfCompeten…
kevwhitt-hee Aug 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions DigitalLearningSolutions.Web/Controllers/FrameworksController/Competencies.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
using Microsoft.AspNetCore.Mvc.ModelBinding;
using Microsoft.Extensions.Logging;
using System.Linq;

using System.Net;

namespace DigitalLearningSolutions.Web.Controllers.FrameworksController
{
public partial class FrameworksController
Expand Down Expand Up @@ -136,20 +137,24 @@ public IActionResult AddEditFrameworkCompetency(int frameworkId, FrameworkCompet
{
ModelState.Remove(nameof(FrameworkCompetency.Name));
ModelState.AddModelError(nameof(FrameworkCompetency.Name), "Please enter a valid competency statement (between 3 and 500 characters)");
// do something
var detailFramework = frameworkService.GetDetailFrameworkByFrameworkId(frameworkId, GetAdminId());
if (detailFramework == null) return StatusCode(404);
var detailFramework = frameworkService.GetDetailFrameworkByFrameworkId(frameworkId, GetAdminId());
var competencyFlags = frameworkService.GetCompetencyFlagsByFrameworkId(frameworkId, frameworkCompetency?.CompetencyID).ToList();
if(competencyFlags != null)
competencyFlags.ForEach(f => f.Selected = selectedFlagIds.Contains(f.FlagId));
if (detailFramework == null)
return StatusCode((int)HttpStatusCode.NotFound);
var model = new FrameworkCompetencyViewModel()
{
DetailFramework = detailFramework,
FrameworkCompetencyGroupId = frameworkCompetencyId,
FrameworkCompetency = frameworkCompetency,
};
FrameworkCompetency = frameworkCompetency,
CompetencyFlags = competencyFlags
};
return View("Developer/Competency", model);
}
var adminId = GetAdminId();
var userRole = frameworkService.GetAdminUserRoleForFrameworkId(adminId, frameworkId);
if (userRole < 2) return StatusCode(403);
if (userRole < 2) return StatusCode((int)HttpStatusCode.Forbidden);
if (frameworkCompetency.Id > 0)
{
frameworkService.UpdateFrameworkCompetency(frameworkCompetencyId, frameworkCompetency.Name, frameworkCompetency.Description, adminId);
Expand All @@ -164,7 +169,7 @@ public IActionResult AddEditFrameworkCompetency(int frameworkId, FrameworkCompet
return new RedirectResult(Url.Action("ViewFramework", new { tabname = "Structure", frameworkId, frameworkCompetencyGroupId, frameworkCompetencyId }) + "#fc-" + newFrameworkCompetencyId.ToString());
}
logger.LogWarning($"Attempt to add framework competency failed for admin {adminId}.");
return StatusCode(403);
return StatusCode((int)HttpStatusCode.Forbidden);
}
public IActionResult MoveFrameworkCompetency(int frameworkId, int frameworkCompetencyGroupId, int frameworkCompetencyId, bool step, string direction)
{
Expand Down