Skip to content

Commit 5523551

Browse files
committed
Adds update status checkbox and wiring
1 parent 7f085e9 commit 5523551

File tree

4 files changed

+41
-5
lines changed

4 files changed

+41
-5
lines changed

DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,8 @@ public IActionResult ViewSelectedCompetencies(int competencyAssessmentId)
498498
{
499499
return StatusCode(403);
500500
}
501-
var model = new ViewSelectedCompetenciesViewModel(competencyAssessmentBase, competencies, linkedFrameworks);
501+
var competencyAssessmentTaskStatus = competencyAssessmentService.GetCompetencyAssessmentTaskStatus(competencyAssessmentId, null);
502+
var model = new ViewSelectedCompetenciesViewModel(competencyAssessmentBase, competencies, linkedFrameworks, competencyAssessmentTaskStatus.SelectCompetenciesTaskStatus);
502503
return View(model);
503504
}
504505
[Route("/CompetencyAssessments/{competencyAssessmentId}/Competencies/Add/SelectFramework")]
@@ -628,5 +629,16 @@ public IActionResult MoveCompetencyGroupInSelfAssessment(int competencyAssessmen
628629
competencyAssessmentService.MoveCompetencyGroupInSelfAssessment(competencyAssessmentId, groupId, direction);
629630
return new RedirectResult(Url.Action("ViewSelectedCompetencies", new { competencyAssessmentId }) + "#group-" + groupId.ToString());
630631
}
632+
[HttpPost]
633+
[Route("/CompetencyAssessments/{competencyAssessmentId}/Competencies")]
634+
public IActionResult ViewSelectedCompetencies(ViewSelectedCompetenciesFormData model)
635+
{
636+
if (model.TaskStatus == null)
637+
{
638+
model.TaskStatus = false;
639+
}
640+
competencyAssessmentService.UpdateSelectCompetenciesTaskStatus(model.ID, model.TaskStatus.Value, null);
641+
return RedirectToAction("ManageCompetencyAssessment", new { competencyAssessmentId = model.ID });
642+
}
631643
}
632644
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
namespace DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments
2+
{
3+
public class ViewSelectedCompetenciesFormData
4+
{
5+
public int ID { get; set; }
6+
public bool? TaskStatus { get; set; }
7+
}
8+
}

DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/ViewSelectedCompetenciesViewModel.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66
namespace DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments
77
{
88

9-
public class ViewSelectedCompetenciesViewModel
9+
public class ViewSelectedCompetenciesViewModel : ViewSelectedCompetenciesFormData
1010
{
1111
public ViewSelectedCompetenciesViewModel() { }
12-
public ViewSelectedCompetenciesViewModel(CompetencyAssessmentBase competencyAssessmentBase, IEnumerable<Competency> competencies, IEnumerable<LinkedFramework> linkedFrameworks)
12+
public ViewSelectedCompetenciesViewModel(CompetencyAssessmentBase competencyAssessmentBase, IEnumerable<Competency> competencies, IEnumerable<LinkedFramework> linkedFrameworks, bool? taskStatus)
1313
{
1414
ID = competencyAssessmentBase.ID;
15+
TaskStatus = taskStatus;
1516
CompetencyAssessmentName = competencyAssessmentBase.CompetencyAssessmentName;
1617
UserRole = competencyAssessmentBase.UserRole;
1718
Competencies = competencies;
@@ -34,7 +35,6 @@ public ViewSelectedCompetenciesViewModel(CompetencyAssessmentBase competencyAsse
3435
}
3536
LinkedFrameworks = linkedFrameworks;
3637
}
37-
public int ID { get; set; }
3838

3939
public string CompetencyAssessmentName { get; set; }
4040
public int UserRole { get; set; }

DigitalLearningSolutions.Web/Views/CompetencyAssessments/ViewSelectedCompetencies.cshtml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,4 +128,20 @@
128128
</details>
129129
groupNum++;
130130
}
131-
131+
<form method="post">
132+
<input name="ID" type="hidden" asp-for="ID" />
133+
<nhs-form-group>
134+
<vc:single-checkbox asp-for="@nameof(Model.TaskStatus)" label="Mark this task as complete" hint-text="You will still be able to make changes after marking this task as complete."></vc:single-checkbox>
135+
</nhs-form-group>
136+
<button class="nhsuk-button" type="submit">
137+
Submit
138+
</button>
139+
<div class="nhsuk-back-link">
140+
<a class="nhsuk-back-link__link" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">
141+
<svg class="nhsuk-icon nhsuk-icon__chevron-left" focusable='false' xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
142+
<path d="M13.41 12l5.3-5.29a1 1 0 1 0-1.42-1.42L12 10.59l-5.29-5.3a1 1 0 0 0-1.42 1.42l5.3 5.29-5.3 5.29a1 1 0 0 0 0 1.42 1 1 0 0 0 1.42 0l5.29-5.3 5.29 5.3a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42z"></path>
143+
</svg>
144+
Cancel
145+
</a>
146+
</div>
147+
</form>

0 commit comments

Comments
 (0)