Skip to content

Commit 3f83888

Browse files
TD-6145 Backend and logic changes to support configurable self assessment declaration display
1 parent 2eaa6b2 commit 3f83888

File tree

5 files changed

+27
-5
lines changed

5 files changed

+27
-5
lines changed
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
namespace DigitalLearningSolutions.Data.Migrations
2+
{
3+
using FluentMigrator;
4+
5+
[Migration(202510221132)]
6+
public class AddIncludeLearnerDeclarationPromptToSelfAssessmentsTable : Migration
7+
{
8+
public override void Up()
9+
{
10+
Alter.Table("SelfAssessments").AddColumn("IncludeLearnerDeclarationPrompt").AsBoolean().WithDefaultValue(false);
11+
}
12+
13+
public override void Down()
14+
{
15+
Delete.Column("IncludeLearnerDeclarationPrompt").FromTable("SelfAssessments");
16+
}
17+
}
18+
}

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,8 @@ FROM SelfAssessmentSupervisorRoles AS SelfAssessmentSupervisorRoles_1
223223
SA.ManageSupervisorsDescription,
224224
CA.NonReportable,
225225
U.FirstName +' '+ U.LastName AS DelegateName,
226-
SA.MinimumOptionalCompetencies
226+
SA.MinimumOptionalCompetencies,
227+
SA.IncludeLearnerDeclarationPrompt
227228
FROM CandidateAssessments CA
228229
JOIN SelfAssessments SA
229230
ON CA.SelfAssessmentID = SA.ID
@@ -248,7 +249,7 @@ GROUP BY
248249
CA.LaunchCount, CA.SubmittedDate, SA.LinearNavigation, SA.UseDescriptionExpanders,
249250
SA.ManageOptionalCompetenciesPrompt, SA.SupervisorSelfAssessmentReview, SA.SupervisorResultsReview,
250251
SA.ReviewerCommentsLabel,SA.EnforceRoleRequirementsForSignOff, SA.ManageSupervisorsDescription,CA.NonReportable,
251-
U.FirstName , U.LastName,SA.MinimumOptionalCompetencies, CA.SelfAssessmentProcessAgreed",
252+
U.FirstName , U.LastName,SA.MinimumOptionalCompetencies, CA.SelfAssessmentProcessAgreed, SA.IncludeLearnerDeclarationPrompt",
252253
new { delegateUserId, selfAssessmentId }
253254
);
254255
}

DigitalLearningSolutions.Data/Models/SelfAssessments/SelfAssessment.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public class SelfAssessment : CurrentLearningItem
1717

1818
public DateTime? EnrolmentCutoffDate { get; set; }
1919
public string? RetirementReason { get; set; }
20+
public bool IncludeLearnerDeclarationPrompt { get; set; }
2021

2122
}
2223
}

DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,10 @@ public IActionResult SelfAssessment(int selfAssessmentId)
6767
);
6868
return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 });
6969
}
70-
71-
selfAssessmentService.IncrementLaunchCount(selfAssessmentId, delegateUserId);
70+
if (selfAssessment.IncludeLearnerDeclarationPrompt)
71+
{
72+
selfAssessmentService.IncrementLaunchCount(selfAssessmentId, delegateUserId);
73+
}
7274
selfAssessmentService.UpdateLastAccessed(selfAssessmentId, delegateUserId);
7375
var supervisors = selfAssessmentService.GetAllSupervisorsForSelfAssessmentId(
7476
selfAssessmentId,

DigitalLearningSolutions.Web/ServiceFilter/RequireProcessAgreementFilter .cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void OnActionExecuting(ActionExecutingContext context)
4949
context.Result = new RedirectToActionResult("StatusCode", "LearningSolutions", new { code = 403 });
5050
return;
5151
}
52-
52+
if (!selfAssessment.IncludeLearnerDeclarationPrompt) return;
5353
var actionName = context.RouteData.Values["action"]?.ToString();
5454
if (actionName == "AgreeSelfAssessmentProcess" || actionName == "ProcessAgreed")
5555
{

0 commit comments

Comments
 (0)