Skip to content

Commit b91a58a

Browse files
authored
Merge pull request #2567 from TechnologyEnhancedLearning/Develop/Fixes/TD-3878-DifferentiatingRealAndTestCertificate
TD-3878 Differentiating Real And Test Certificate
2 parents c621897 + b4c26bc commit b91a58a

File tree

4 files changed

+30
-1
lines changed

4 files changed

+30
-1
lines changed

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,8 +348,10 @@ public CompetencySelfAssessmentCertificate GetCompetencySelfAssessmentCertificat
348348
LearnerDetails.SelfAssessmentID,
349349
LearnerDetails.Vocabulary,
350350
LearnerDetails.SupervisorDelegateId,
351-
LearnerDetails.FormattedDate
351+
LearnerDetails.FormattedDate,
352+
LearnerDetails.NonReportable
352353
FROM(SELECT casv.ID,
354+
ca.NonReportable,
353355
sa.Name AS SelfAssessment,
354356
Learner.FirstName + ' ' + Learner.LastName AS LearnerName,
355357
Learner.ProfessionalRegistrationNumber AS LearnerPRN,

DigitalLearningSolutions.Data/Models/SelfAssessments/CompetencySelfAssessmentCertificate.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,6 @@ public class CompetencySelfAssessmentCertificate
2626
public string? Vocabulary { get; set; }
2727
public int SupervisorDelegateId { get; set; }
2828
public string FormattedDate { get; set; } = string.Empty;
29+
public bool NonReportable { get; set; }
2930
}
3031
}

DigitalLearningSolutions.Web/Views/LearningPortal/Current/CompetencySelfAssessmentCertificate.cshtml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,15 @@
159159
}
160160
</div>
161161

162+
@if (Model.CompetencySelfAssessmentCertificates.NonReportable)
163+
{
164+
<div class="footer">
165+
<p class="nhsuk-body-l nhsuk-u-font-weight-bold">
166+
THIS IS AN EXAMPLE ONLY, GENERATED FROM A TEST SELF ASSESSMENT
167+
</p>
168+
</div>
169+
}
170+
162171
<div class="footer">
163172
<div class="text">
164173
<p class="blue">Certificate generated on @DateTime.Now.ToString("dd/MM/yyyy")</p>
@@ -186,6 +195,10 @@
186195
<div class="body">
187196
<h2>Activity summary report</h2>
188197
<br />
198+
@if (Model.CompetencySelfAssessmentCertificates.NonReportable)
199+
{
200+
<h3>THIS IS AN EXAMPLE ONLY, GENERATED FROM A TEST SELF ASSESSMENT</h3>
201+
}
189202
<div class="activity">
190203
<p><b>Activity: </b>@Model.CompetencySelfAssessmentCertificates.SelfAssessment</p>
191204
</div>

DigitalLearningSolutions.Web/Views/LearningPortal/Current/DownloadCompetencySelfAssessmentCertificate.cshtml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,15 @@
468468
}
469469
</div>
470470

471+
@if (Model.CompetencySelfAssessmentCertificates.NonReportable)
472+
{
473+
<div class="footer">
474+
<p class="nhsuk-body-l nhsuk-u-font-weight-bold">
475+
<b>THIS IS AN EXAMPLE ONLY, GENERATED FROM A TEST SELF ASSESSMENT</b>
476+
</p>
477+
</div>
478+
}
479+
471480
<div class="footer">
472481
<div class="text">
473482
<p class="blue">Certificate generated on @DateTime.Now.ToString("dd/MM/yyyy")</p>
@@ -497,6 +506,10 @@
497506
<div class="body">
498507
<h2>Activity summary report</h2>
499508
<br />
509+
@if (Model.CompetencySelfAssessmentCertificates.NonReportable)
510+
{
511+
<h3>THIS IS AN EXAMPLE ONLY, GENERATED FROM A TEST SELF ASSESSMENT</h3>
512+
}
500513
<div class="activity">
501514
<p><b>Activity: </b>@Model.CompetencySelfAssessmentCertificates.SelfAssessment</p>
502515
</div>

0 commit comments

Comments
 (0)