Skip to content

Commit 33b426a

Browse files
rshrirohitrshrirohit
authored
Merge pull request #3529 from TechnologyEnhancedLearning/Develop/Features/TD-6956-Supervisionsettingscontentconsistency
TD-6956 Supervision settings content consistency
2 parents 1e03711 + 108b021 commit 33b426a

7 files changed

Lines changed: 53 additions & 79 deletions

File tree

‎DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs‎

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1254,6 +1254,7 @@ public IActionResult SupervisedSelfAssessmentSignoff(int competencyAssessmentId,
12541254
{
12551255
var data = GetManagesupervisionData();
12561256
data.Signoff.ActionName = actionName;
1257+
data.Signoff.CompetencyAssessmentName = data.CompetencyAssessmentName;
12571258
var models = new SupervisedSelfAssessmentSignoffViewModel(data.Signoff);
12581259
return View(models);
12591260
}
@@ -1271,16 +1272,6 @@ public IActionResult SupervisedSelfAssessmentSignoff(int competencyAssessmentId,
12711272
public IActionResult SupervisedSelfAssessmentSignoff(SupervisedSelfAssessmentSignoffViewModel supervisedSelf)
12721273
{
12731274
if (supervisedSelf == null) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 });
1274-
if (supervisedSelf.Signoff == null)
1275-
{
1276-
ModelState.AddModelError(nameof(supervisedSelf.Signoff), "Please select a Supervisor signs off self assessment option");
1277-
return View(supervisedSelf);
1278-
}
1279-
if (supervisedSelf.Confirm == null && supervisedSelf.SignoffText == "Yes")
1280-
{
1281-
ModelState.AddModelError(nameof(supervisedSelf.Confirm), "Please select a Supervisor or nominated supervisor confirm individual assessment option");
1282-
return View(supervisedSelf);
1283-
}
12841275
if (supervisedSelf.SignoffText == "No")
12851276
{
12861277
var model = new ManagesupervisionViewModel(supervisedSelf);
@@ -1325,6 +1316,7 @@ public IActionResult SupervisorSignoffDeclaration(int competencyAssessmentId, st
13251316
data.CompetencyAssessmentId = competencyAssessmentId;
13261317
data.SupervisorDeclaration.DefaultText = this.config.GetSupervisorDefaultText();
13271318
data.SupervisorDeclaration.ActionName = actionName;
1319+
data.SupervisorDeclaration.CompetencyAssessmentName = baseData.CompetencyAssessmentName;
13281320
var models = new SupervisorSignoffDeclarationViewModel(data.SupervisorDeclaration);
13291321
return View(models);
13301322
}
@@ -1340,12 +1332,7 @@ public IActionResult SupervisorSignoffDeclaration(int competencyAssessmentId, st
13401332
public IActionResult SupervisorSignoffDeclaration(SupervisorSignoffDeclarationViewModel viewModel)
13411333
{
13421334
if (viewModel == null) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 });
1343-
if (viewModel.DeclarationValue == null)
1344-
{
1345-
ModelState.AddModelError(nameof(viewModel.DeclarationValue), "Please select a declaration option");
1346-
return View(viewModel);
1347-
}
1348-
else if (viewModel.DeclarationValue == 1 && string.IsNullOrWhiteSpace(viewModel.CustomText))
1335+
if (viewModel.DeclarationValue == 1 && string.IsNullOrWhiteSpace(viewModel.CustomText))
13491336
{
13501337
ModelState.AddModelError(nameof(viewModel.CustomText), "Please enter the custom declaration text");
13511338
return View(viewModel);
@@ -1384,6 +1371,7 @@ public IActionResult LearnerSignoffDeclaration(int competencyAssessmentId, strin
13841371
data.CompetencyAssessmentId = competencyAssessmentId;
13851372
data.LearnerDeclaration.DefaultText = this.config.GetLearnerDefaultText();
13861373
data.LearnerDeclaration.ActionName = actionName;
1374+
data.LearnerDeclaration.CompetencyAssessmentName = baseData.CompetencyAssessmentName;
13871375
var models = new LearnerSignoffDeclarationViewModel(data.LearnerDeclaration);
13881376
models.CompetencyAssessmentId = competencyAssessmentId;
13891377
return View(models);
@@ -1400,12 +1388,7 @@ public IActionResult LearnerSignoffDeclaration(int competencyAssessmentId, strin
14001388
public IActionResult LearnerSignoffDeclaration(LearnerSignoffDeclarationViewModel viewModel)
14011389
{
14021390
if (viewModel == null) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 });
1403-
if (viewModel.DeclarationValue == null)
1404-
{
1405-
ModelState.AddModelError(nameof(viewModel.DeclarationValue), "Please select a declaration option");
1406-
return View(viewModel);
1407-
}
1408-
else if (viewModel.DeclarationValue == 1 && string.IsNullOrWhiteSpace(viewModel.CustomText))
1391+
if (viewModel.DeclarationValue == 1 && string.IsNullOrWhiteSpace(viewModel.CustomText))
14091392
{
14101393
ModelState.AddModelError(nameof(viewModel.CustomText), "Please enter the custom declaration text");
14111394
return View(viewModel);

‎DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/BaseSignoffDeclarationViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ protected BaseSignoffDeclarationViewModel(int id)
1010

1111
public int CompetencyAssessmentId { get; set; }
1212
public string? CompetencyAssessmentName { get; set; }
13-
public int? DeclarationValue { get; set; }
13+
public int DeclarationValue { get; set; } = 0;
1414
public string? ActionName { get; set; }
1515
public string? CustomText { get; set; }
1616
public string? DefaultText { get; set; }

‎DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/SupervisedSelfAssessmentSignoffViewModel.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@ public SupervisedSelfAssessmentSignoffViewModel(int id, string competencyAssessm
1313
public SupervisedSelfAssessmentSignoffViewModel(SupervisedSelfAssessmentSignoffViewModel model)
1414
{
1515
CompetencyAssessmentId = model.CompetencyAssessmentId;
16+
CompetencyAssessmentName = model.CompetencyAssessmentName;
1617
Confirm = model.Confirm;
1718
Signoff = model.Signoff;
1819
ActionName = model.ActionName;
1920
}
2021
public int CompetencyAssessmentId { get; set; }
2122
public string CompetencyAssessmentName { get; set; } = string.Empty;
22-
public int? Signoff { get; set; }
23-
public int? Confirm { get; set; }
23+
public int Signoff { get; set; } = 0;
24+
public int Confirm { get; set; } = 0;
2425
public string? ActionName { get; set; }
2526
public string SignoffText => Signoff == 1 ? "Yes" : "No";
2627
public string ConfirmText => Confirm == 1 ? "Yes" : "No";

‎DigitalLearningSolutions.Web/Views/CompetencyAssessments/LearnerSignoffDeclaration.cshtml‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,13 @@
3030
}
3131
<form method="post">
3232
<fieldset class="nhsuk-fieldset">
33-
<legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
34-
<h1 class="nhsuk-fieldset__heading">
35-
Learner sign off declaration
36-
</h1>
37-
</legend>
38-
33+
<h1 class="app-page-heading">
34+
<span class="nhsuk-caption-xl">
35+
@Model.CompetencyAssessmentName
36+
<span class="nhsuk-u-visually-hidden"> – </span>
37+
</span>
38+
Learner sign off declaration
39+
</h1>
3940
<p class="nhsuk-hint">
4041
This will be displayed to the learner is requesting supervisor signing off of their completed self-assessment
4142
</p>
@@ -92,14 +93,7 @@
9293
<button class="nhsuk-button" type="submit">
9394
Next
9495
</button>
95-
<div class="nhsuk-back-link">
96-
<a class="nhsuk-back-link__link" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentId">
97-
<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">
98-
<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>
99-
</svg>
100-
Cancel
101-
</a>
102-
</div>
96+
10397
</div>
10498
</form>
10599
</div>

‎DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageSupervisionSettings.cshtml‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,13 @@
3434
{
3535
<vc:error-summary order-of-property-names="@(new[] { nameof(Model.TaskCompleteChecked) })" />
3636
}
37-
<h1 class="nhsuk-heading-xl">Manage supervision settings</h1>
37+
<h1 class="app-page-heading">
38+
<span class="nhsuk-caption-xl">
39+
@Model.CompetencyAssessmentName
40+
<span class="nhsuk-u-visually-hidden"> – </span>
41+
</span>
42+
Manage supervision settings
43+
</h1>
3844
</div>
3945
</div>
4046
<div class="nhsuk-grid-row">
@@ -45,7 +51,7 @@
4551

4652
<div class="nhsuk-summary-list__row">
4753
<dt class="nhsuk-summary-list__key">
48-
Supervisor signs off self-assessment
54+
Will the self-assessment be supervised
4955
</dt>
5056
<dd class="nhsuk-summary-list__value">
5157
@Model.Signoff.SignoffText
@@ -67,7 +73,7 @@
6773
{
6874
<div class="nhsuk-summary-list__row">
6975
<dt class="nhsuk-summary-list__key">
70-
Supervisor sign off statement
76+
Supervisor sign off declaration
7177
</dt>
7278
<dd class="nhsuk-summary-list__value">
7379
<strong>@Model.SupervisorDeclaration.Declaration</strong>
@@ -77,7 +83,7 @@
7783
<details class="nhsuk-details__text">
7884
<summary class="nhsuk-details__summary">
7985
<span class="nhsuk-details__summary-text">
80-
View declaration text
86+
View supervisor sign off declaration text
8187
</span>
8288
</summary>
8389
<div class="nhsuk-body" id="default-declaration-text">
@@ -93,7 +99,7 @@
9399
<li class="nhsuk-summary-list__actions-list-item">
94100
<a asp-action="SupervisorSignoffDeclaration" asp-route-actionName="Supervisor" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">
95101

96-
Change<span class="nhsuk-u-visually-hidden"> Supervisor sign off statement</span>
102+
Change<span class="nhsuk-u-visually-hidden"> Supervisor sign off declaration</span>
97103
</a>
98104
</li>
99105
</ul>
@@ -102,7 +108,7 @@
102108
</div>
103109
<div class="nhsuk-summary-list__row">
104110
<dt class="nhsuk-summary-list__key">
105-
Learner sign off statement
111+
Learner sign off declaration
106112
</dt>
107113
<dd class="nhsuk-summary-list__value">
108114
<strong>@Model.LearnerDeclaration.Declaration</strong>
@@ -112,7 +118,7 @@
112118
<details class="nhsuk-details__text">
113119
<summary class="nhsuk-details__summary">
114120
<span class="nhsuk-details__summary-text">
115-
View declaration text
121+
View Learner sign off declaration text
116122
</span>
117123
</summary>
118124
<div class="nhsuk-body" id="default-declaration-text">
@@ -129,7 +135,7 @@
129135
<li class="nhsuk-summary-list__actions-list-item">
130136
<a asp-action="LearnerSignoffDeclaration" asp-route-actionName="Learner" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">
131137

132-
Change<span class="nhsuk-u-visually-hidden"> Learner sign off statement</span>
138+
Change<span class="nhsuk-u-visually-hidden"> Learner sign off declaration</span>
133139
</a>
134140
</li>
135141
</ul>
@@ -138,7 +144,7 @@
138144
</div>
139145
<div class="nhsuk-summary-list__row">
140146
<dt class="nhsuk-summary-list__key">
141-
Supervisor or nominated supervisor confirms individual assessment results
147+
Will supervisor or nominated supervisor confirms individual assessment results
142148
</dt>
143149
<dd class="nhsuk-summary-list__value">
144150
@Model.Signoff.ConfirmText

‎DigitalLearningSolutions.Web/Views/CompetencyAssessments/SupervisedSelfAssessmentSignoff.cshtml‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,13 @@
2727
}
2828
<form method="post">
2929
<fieldset class="nhsuk-fieldset" aria-describedby="signoff-error">
30-
<legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
31-
<h1 class="nhsuk-fieldset__heading">
32-
Supervisor roles
33-
</h1>
34-
</legend>
35-
30+
<h1 class="app-page-heading">
31+
<span class="nhsuk-caption-xl">
32+
@Model.CompetencyAssessmentName
33+
<span class="nhsuk-u-visually-hidden"> – </span>
34+
</span>
35+
Supervisor roles
36+
</h1>
3637
<div class="nhsuk-radios nhsuk-radios--conditional">
3738
<div class="nhsuk-form-group">
3839
@if (ViewData.ModelState.ContainsKey("Signoff") && ViewData.ModelState["Signoff"].Errors.Count > 0)
@@ -44,7 +45,7 @@
4445
}
4546
<div class="nhsuk-radios">
4647
<label class="nhsuk-label" for="signoff-yes">
47-
Supervisor signs off self-assessment?
48+
Will the self-assessment be supervised?
4849
</label>
4950
<div class="nhsuk-radios__item">
5051
<input class="nhsuk-radios__input"
@@ -77,11 +78,12 @@
7778
</span>
7879
}
7980
<label class="nhsuk-label" for="confirm-yes">
80-
Supervisor or nominated supervisor confirm individual assessment results?
81+
Will supervisor or nominated supervisor confirm individual assessment results?
8182
</label>
8283

8384
<div class="nhsuk-radios__item">
84-
<input class="nhsuk-radios__input" id="confirm-no" name="Confirm" type="radio" value="0" @(Model.Confirm == 0 ? "checked" : "")>
85+
<input class="nhsuk-radios__input" id="confirm-no" name="Confirm" type="radio" value="0"
86+
@(Model.Confirm == 0 ? "checked" : "")>
8587
<label class="nhsuk-label nhsuk-radios__label" for="confirm-no">
8688
No
8789
</label>
@@ -99,16 +101,11 @@
99101
</fieldset>
100102
<input type="hidden" asp-for="CompetencyAssessmentId" />
101103
<input type="hidden" asp-for="CompetencyAssessmentName" />
104+
<a class="nhsuk-button nhsuk-button--secondary nhsuk-u-margin-left-3" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentId">
102105

106+
Back
107+
</a>
103108
<button class="nhsuk-button" type="submit">Next</button>
104-
<div class="nhsuk-back-link">
105-
<a class="nhsuk-back-link__link" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentId">
106-
<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">
107-
<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>
108-
</svg>
109-
Cancel
110-
</a>
111-
</div>
112109
</form>
113110
</div>
114111
</div>

‎DigitalLearningSolutions.Web/Views/CompetencyAssessments/SupervisorSignoffDeclaration.cshtml‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,13 @@
2929
}
3030
<form method="post">
3131
<fieldset class="nhsuk-fieldset">
32-
<legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
33-
<h1 class="nhsuk-fieldset__heading">
34-
Supervisor sign off declaration
35-
</h1>
36-
</legend>
37-
32+
<h1 class="app-page-heading">
33+
<span class="nhsuk-caption-xl">
34+
@Model.CompetencyAssessmentName
35+
<span class="nhsuk-u-visually-hidden"> – </span>
36+
</span>
37+
Supervisor sign off declaration
38+
</h1>
3839
<p class="nhsuk-hint">
3940
This will be displayed to the supervisor when they are signing off a completed self-assessment.
4041
</p>
@@ -93,14 +94,6 @@
9394
<button class="nhsuk-button" type="submit">
9495
Next
9596
</button>
96-
<div class="nhsuk-back-link">
97-
<a class="nhsuk-back-link__link" asp-action="SupervisedSelfAssessmentSignoff" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentId">
98-
<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">
99-
<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>
100-
</svg>
101-
Cancel
102-
</a>
103-
</div>
10497
</div>
10598
</form>
10699
</div>

0 commit comments

Comments
 (0)