Skip to content

TD-5816 Issue clearing 'confirmation requests' of 'optional competencies' if removed/added some other 'optional' competencies #3325

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

Closed
wants to merge 2 commits into from
Closed

TD-5816 Issue clearing 'confirmation requests' of 'optional competencies' if removed/added some other 'optional' competencies #3325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efa225a
TD-5816 Issue clearing 'confirmation requests' of 'optional competenc…
sherif-olaboye Jul 17, 2025
e27c8fb
TD-5816 Issue clearing 'confirmation requests' of 'optional competenc…
sherif-olaboye Jul 17, 2025
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
10 changes: 1 addition & 9 deletions ...talLearningSolutions.Data/DataServices/SelfAssessmentDataService/CompetencyDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,15 +639,7 @@ FROM SelfAssessmentResults s inner join
new { selfAssessmentId, delegateUserId, competencyId }
);
}

public void RemoveReviewCandidateAssessmentOptionalCompetencies(int id)
{

connection.Execute(
@"delete from SelfAssessmentResultSupervisorVerifications WHERE SelfAssessmentResultId = @id", new { id });

}


private static string PrintResult(
int competencyId,
int selfAssessmentId,
Expand Down
1 change: 0 additions & 1 deletion ...earningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,6 @@ int GetSelfAssessmentActivityDelegatesExportCount(string searchString, string so
bool IsCentreSelfAssessment(int selfAssessmentId, int centreId);
bool HasMinimumOptionalCompetencies(int selfAssessmentId, int delegateUserId);
int GetSelfAssessmentCategoryId(int selfAssessmentId);
void RemoveReviewCandidateAssessmentOptionalCompetencies(int id);
public IEnumerable<SelfAssessmentResult> GetSelfAssessmentResultswithSupervisorVerificationsForDelegateSelfAssessmentCompetency(
int delegateUserId,
int selfAssessmentId,
Expand Down
16 changes: 0 additions & 16 deletions DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1532,22 +1532,6 @@ ManageOptionalCompetenciesViewModel model
);
}
}
var optionalCompetency =
(selfAssessmentService.GetCandidateAssessmentOptionalCompetencies(selfAssessmentId, delegateUserId)).Where(x => !x.IncludedInSelfAssessment);
if (optionalCompetency.Any())
{
foreach (var optinal in optionalCompetency)
{
var selfAssessmentResults = selfAssessmentService.GetSelfAssessmentResultswithSupervisorVerificationsForDelegateSelfAssessmentCompetency(delegateUserId, selfAssessmentId, optinal.Id);
if (selfAssessmentResults.Any())
{
foreach (var item in selfAssessmentResults)
{
selfAssessmentService.RemoveReviewCandidateAssessmentOptionalCompetencies(item.Id);
}
}
}
}
if (model.GroupOptionalCompetenciesChecked != null)
{
var optionalCompetencies =
Expand Down
5 changes: 0 additions & 5 deletions DigitalLearningSolutions.Web/Services/SelfAssessmentService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ public IEnumerable<SelfAssessmentResult> GetSelfAssessmentResultswithSupervisorV
int selfAssessmentId,
int competencyId
);
void RemoveReviewCandidateAssessmentOptionalCompetencies(int id);
}

public class SelfAssessmentService : ISelfAssessmentService
Expand Down Expand Up @@ -606,9 +605,5 @@ int competencyId
{
return selfAssessmentDataService.GetSelfAssessmentResultswithSupervisorVerificationsForDelegateSelfAssessmentCompetency(delegateUserId, selfAssessmentId, competencyId);
}
public void RemoveReviewCandidateAssessmentOptionalCompetencies(int id)
{
selfAssessmentDataService.RemoveReviewCandidateAssessmentOptionalCompetencies(id);
}
}
}
Loading