Squashed commit of the following:

commit 4eb3383
Merge: e97a907 f0b75ff
Author: kevwhitt-hee <[email protected]>
Date:   Fri Nov 22 16:25:55 2024 +0000

    Merge pull request #2970 from TechnologyEnhancedLearning/Develop/Fixes/TD-5058-FixAddSimilarCompetency

    TD-5058 Fix add similar competency 500 error

commit f0b75ff
Author: kevwhitt-hee <[email protected]>
Date:   Fri Nov 22 16:23:37 2024 +0000

    TD-5058 Fixes setting of flag IDs property when no flags are selected

commit e97a907
Merge: 5fbbb4e b86b63a
Author: kevwhitt-hee <[email protected]>
Date:   Thu Nov 21 15:53:44 2024 +0000

    Merge pull request #2965 from TechnologyEnhancedLearning/Develop/Fixes/TD-4950-FixSubmitResultFoDupeCompetency

    TD-4950 Removes link to result self assessment ID from supervisor from supervisor query

commit b86b63a
Author: kevwhitt-hee <[email protected]>
Date:   Thu Nov 21 15:50:26 2024 +0000

    TD-4950 Removes link to result self assessment ID from supervisor from confirming supervisor query

commit 5fbbb4e
Merge: 47e887f 26874ef
Author: kevwhitt-hee <[email protected]>
Date:   Thu Nov 21 15:22:26 2024 +0000

    Merge pull request #2963 from TechnologyEnhancedLearning/Develop/Fixes/TD-4950-FixSubmitResultFoDupeCompetency

    TD-4950 Removes link to result self assessment ID from supervisor

commit 26874ef
Author: kevwhitt-hee <[email protected]>
Date:   Thu Nov 21 15:19:47 2024 +0000

    TD-4950 Removes link to result self assessment ID from supervisor from missed query

commit 47e887f
Merge: 3c5a367 4c381f1
Author: kevwhitt-hee <[email protected]>
Date:   Thu Nov 21 10:58:25 2024 +0000

    Merge pull request #2960 from TechnologyEnhancedLearning/Develop/Fixes/TD-4950-FixSubmitResultFoDupeCompetency

    TD-4950 Fix supersisor results summary query

commit 4c381f1
Author: kevwhitt-hee <[email protected]>
Date:   Thu Nov 21 10:48:18 2024 +0000

    TD-4950 Removes link to result self assessment ID from supervisor summary data query

commit 3c5a367
Merge: bdd85f1 8334311
Author: kevwhitt-hee <[email protected]>
Date:   Wed Nov 20 10:34:43 2024 +0000

    Merge pull request #2957 from TechnologyEnhancedLearning/Develop/Fixes/TD-4950-FixSubmitResultFoDupeCompetency

    TD-4950 Removes unnecessary join in export assessment summary query and renames field

commit 8334311
Author: kevwhitt-hee <[email protected]>
Date:   Wed Nov 20 10:26:05 2024 +0000

    TD-4950 Removes unnecessary join in export assessment summary data queries

commit bdd85f1
Merge: bfa9282 9496e79
Author: kevwhitt-hee <[email protected]>
Date:   Tue Nov 19 11:19:15 2024 +0000

    Merge pull request #2952 from TechnologyEnhancedLearning/Develop/Fixes/TD-4950-FixSubmitResultFoDupeCompetency

    TD-4950 Fix issue with verify m,ultiple competencies button being unavailable

commit 9496e79
Author: kevwhitt-hee <[email protected]>
Date:   Tue Nov 19 09:00:37 2024 +0000

    TD-4950 Corrects visibility of verify multiple results button

commit bfa9282
Merge: 2176314 5fc818f
Author: kevwhitt-hee <[email protected]>
Date:   Fri Nov 15 08:59:49 2024 +0000

    Merge pull request #2949 from TechnologyEnhancedLearning/Develop/Fixes/TD-4950-FixSubmitResultFoDupeCompetency

    TD-4950 Removes using DB name from scripts

commit 5fc818f
Author: kevwhitt-hee <[email protected]>
Date:   Fri Nov 15 08:58:33 2024 +0000

    Removes using DB name from scripts

commit 2176314
Merge: a0af08d bc6d132
Author: kevwhitt-hee <[email protected]>
Date:   Thu Nov 14 17:18:33 2024 +0000

    Merge pull request #2947 from TechnologyEnhancedLearning/Develop/Fixes/TD-4950-FixSubmitResultFoDupeCompetency

    TD-4950 Fixes get result by ID stored proc to avoid joining on result self assessment ID

commit bc6d132
Author: kevwhitt-hee <[email protected]>
Date:   Thu Nov 14 17:14:47 2024 +0000

    TD-4950 Fixes join in get results SP to avoid using result self assessment ID

commit a0af08d
Merge: 8c5d66e 5cf736a
Author: kevwhitt-hee <[email protected]>
Date:   Thu Nov 14 11:07:07 2024 +0000

    Merge pull request #2943 from TechnologyEnhancedLearning/Develop/Fixes/TD-4950-FixSubmitResultFoDupeCompetency

    TD-4950 Fixes to excel export and clear selection in self assessments

commit 5cf736a
Author: kevwhitt-hee <[email protected]>
Date:   Thu Nov 14 09:04:24 2024 +0000

    TD-4950 Fixes excel export query and reinstates clear selection JS

commit 8c5d66e
Merge: caa3510 568ed09
Author: kevwhitt-hee <[email protected]>
Date:   Wed Nov 13 07:58:58 2024 +0000

    Merge pull request #2938 from TechnologyEnhancedLearning/DLS-Release-v0.0.1

    Dls release v0.0.1

commit caa3510
Merge: 4de14a8 09ac5a7
Author: kevwhitt-hee <[email protected]>
Date:   Tue Nov 12 14:49:01 2024 +0000

    Merge pull request #2935 from TechnologyEnhancedLearning/Develop/Fixes/TD-4950-FixSubmitResultFoDupeCompetency

    TD-4950 Limits result sets by self assessment structure rather than self assessment ID in results table

commit 09ac5a7
Author: kevwhitt-hee <[email protected]>
Date:   Tue Nov 12 14:37:57 2024 +0000

    Removes join on result self assessment ID from GetSupervisorComments method query

commit 6b93697
Author: kevwhitt-hee <[email protected]>
Date:   Tue Nov 12 09:26:15 2024 +0000

    Removes query joins on result self assessment ID from candidate assessment data service

commit c910b99
Author: kevwhitt-hee <[email protected]>
Date:   Tue Nov 12 09:21:08 2024 +0000

    Removes join on result self assessment ID from candidate assessment data service

commit 5df757d
Author: kevwhitt-hee <[email protected]>
Date:   Tue Nov 12 09:11:08 2024 +0000

    Makes similar changes to the report queries and adds missing function migration

commit ea9a4bf
Author: kevwhitt-hee <[email protected]>
Date:   Mon Nov 11 15:58:03 2024 +0000

    TD-4950 Uses a join to self assessment structure to limit result sets

    Avoids filtering result sets by the SelfAssessmentResults.SelfAssessmentID

commit 4de14a8
Merge: f2e0e88 2f57f43
Author: kevwhitt-hee <[email protected]>
Date:   Mon Nov 11 13:58:58 2024 +0000

    Merge pull request #2932 from TechnologyEnhancedLearning/Develop/Fixes/TD-4950-FixSubmitResultFoDupeCompetency

    TD-4950 Updates self assessment ID when updating results

commit 2f57f43
Author: kevwhitt-hee <[email protected]>
Date:   Mon Nov 11 13:55:17 2024 +0000

    Update CompetencyDataService.cs

commit 00dd1f3
Author: kevwhitt-hee <[email protected]>
Date:   Mon Nov 11 13:48:48 2024 +0000

    Updates SelfAssessmentID when updating a self assessment result

commit f2e0e88
Merge: 6b72e4a 7a480d3
Author: kevwhitt-hee <[email protected]>
Date:   Mon Nov 11 13:35:45 2024 +0000

    Merge pull request #2930 from TechnologyEnhancedLearning/Develop/Fixes/TD-4950-FixSubmitResultFoDupeCompetency

    TD-4950 Fix submit result fo duplicated competency

commit 7a480d3
Author: kevwhitt-hee <[email protected]>
Date:   Mon Nov 11 12:03:30 2024 +0000

    TD-4950 Removes self assessment ID clause from existing result check

commit 6b72e4a
Merge: 4e46fa6 94c92fc
Author: kevwhitt-hee <[email protected]>
Date:   Mon Nov 11 08:21:56 2024 +0000

    Merge pull request #2927 from TechnologyEnhancedLearning/Develop/Fixes/TD-4950-ChangedStoredProcToIncludeResultsOfProficienciesFromAnyAssessment

    TD-4950 Changed Stored Proc To Include Results Of Proficiencies From Any Assessment

commit 568ed09
Merge: 920fe6b f43f51f
Author: rshrirohit <[email protected]>
Date:   Fri Nov 8 16:50:19 2024 +0000

    Merge pull request #2925 from TechnologyEnhancedLearning/TD-4773-GitHubActionsTargetToDotNet8

    TD-4773 GitHub Actions Target To Dot Net 8

commit 4e46fa6
Merge: a5a0c3a 90dd9e1
Author: rshrirohit <[email protected]>
Date:   Fri Nov 8 16:49:26 2024 +0000

    Merge pull request #2871 from TechnologyEnhancedLearning/Develop/Fixes/TD-3656-Supervise-Addmyselftotryselfassessmentstaffdoesntexistwhentheeducatorisremovedfromthelearningportalself-assessment

    TD-3656 Supervise - "Add myself to try self assessment" staff doesn't exist when the educator is removed from the learning portal self-assessment

commit 94c92fc
Author: Rohit Shrivastava <[email protected]>
Date:   Fri Nov 8 15:05:36 2024 +0000

    TD-4950 Changed Stored Proc To Include Results Of Proficiencies From Any Assessment

commit f43f51f
Author: Rohit Shrivastava <[email protected]>
Date:   Thu Nov 7 17:40:05 2024 +0000

    TD-4773 GitHub Actions Target To Dot Net 8

commit a5a0c3a
Merge: 84ed4ae 5d3e3b4
Author: rshrirohit <[email protected]>
Date:   Thu Nov 7 14:43:42 2024 +0000

    Merge pull request #2921 from TechnologyEnhancedLearning/Develop/Features/TD-4792-Warncentreadminsthatactiveadminaccountexistswheninactivatingdelegateaccount

    TD-4792 Write unit tests for filter added on optional competencies in  the supervisor view

commit 5d3e3b4
Author: Sherif Olaboye <[email protected]>
Date:   Wed Nov 6 16:39:46 2024 +0000

    TD-4792 Write unit tests for filter added on optional competencies in the supervisor view

commit 67a9b11
Author: Sherif Olaboye <[email protected]>
Date:   Wed Nov 6 16:21:59 2024 +0000

    TD-4792 Write unit tests for filter added on optional competencies in the supervisor view

commit 12676b9
Author: Sherif Olaboye <[email protected]>
Date:   Wed Nov 6 16:08:49 2024 +0000

    TD-4792 Write unit tests for filter added on optional competencies in the supervisor view

commit 84ed4ae
Merge: d3d98e7 b277e24
Author: rshrirohit <[email protected]>
Date:   Wed Nov 6 08:53:37 2024 +0000

    Merge pull request #2918 from TechnologyEnhancedLearning/Develop/Fix/TD-4495-Issue-with-adding-the-filters

    TD-4495-Issue with adding the filters on 'Centre administrators' screen for 'Bedfordshire Hospitals NHS Trust' centre

commit d3d98e7
Merge: 25f0913 23c3b6e
Author: rshrirohit <[email protected]>
Date:   Wed Nov 6 08:43:22 2024 +0000

    Merge pull request #2888 from TechnologyEnhancedLearning/Develop/Features/TD-4790-Writeunittestsfortagsaddedonoptionalcompetenciesinthesupervisorview

    TD-4790 Write unit tests for tags added on optional competencies in the supervisor view

commit 25f0913
Merge: 4b268cb f8ca071
Author: rshrirohit <[email protected]>
Date:   Wed Nov 6 08:42:25 2024 +0000

    Merge pull request #2885 from TechnologyEnhancedLearning/Develop/Features/TD-4632-Asacentremanageratanewcentre,Ishouldbeabletoregisterusingapredeterminedemailaddresswithoutadditionalapprovalsteps

    TD-4632 As a centre manager at a new centre, I should be able to register using a predetermined email address without additional approval steps

commit b277e24
Author: Auldrin Possa <[email protected]>
Date:   Tue Nov 5 12:21:52 2024 +0000

    TD-4495-filter value text trimmed

commit f8ca071
Author: Sherif Olaboye <[email protected]>
Date:   Tue Nov 5 09:26:50 2024 +0000

    TD-4632 Resolved git action warning

commit 78b6e4a
Merge: 69c5f3a 4b268cb
Author: Sherif Olaboye <[email protected]>
Date:   Tue Nov 5 09:14:38 2024 +0000

    Merge remote-tracking branch 'origin/release-v1.0.0' into Develop/Features/TD-4632-Asacentremanageratanewcentre,Ishouldbeabletoregisterusingapredeterminedemailaddresswithoutadditionalapprovalsteps

commit 920fe6b
Merge: f11e883 025fed6
Author: rshrirohit <[email protected]>
Date:   Mon Nov 4 16:38:29 2024 +0000

    Merge pull request #2915 from TechnologyEnhancedLearning/Develop/Fixes/TD-4771-UpgradingFramework

    TD-4771 Upgrading framework

commit 69c5f3a
Author: Sherif Olaboye <[email protected]>
Date:   Fri Nov 1 10:13:12 2024 +0000

    TD-4632 Using of AppRootPath to replace the url of the email invite

commit 4e48778
Merge: d0ed56b 3098eaa
Author: Sherif Olaboye <[email protected]>
Date:   Fri Nov 1 10:01:39 2024 +0000

    Merge remote-tracking branch 'origin/release-v1.0.0' into Develop/Features/TD-4632-Asacentremanageratanewcentre,Ishouldbeabletoregisterusingapredeterminedemailaddresswithoutadditionalapprovalsteps

commit 025fed6
Author: Rohit Shrivastava <[email protected]>
Date:   Fri Nov 1 09:28:32 2024 +0000

    TD-4771 Upgrading framework

commit 23c3b6e
Author: Sherif Olaboye <[email protected]>
Date:   Thu Oct 31 17:22:13 2024 +0000

    TD-4790 Write unit tests for tags added on optional competencies in the supervisor view

commit 4b268cb
Merge: 3098eaa 0b93535
Author: rshrirohit <[email protected]>
Date:   Thu Oct 31 16:34:37 2024 +0000

    Merge pull request #2908 from TechnologyEnhancedLearning/Develop/Fix/TD-4946-email-address-displayed-twice

    TD-4946-Name property initialized from UserAccount entity

commit 24a7b7b
Author: Sherif Olaboye <[email protected]>
Date:   Thu Oct 31 16:32:03 2024 +0000

    TD-4790 Write unit tests for tags added on optional competencies in the supervisor view

commit 691fbe8
Merge: 419faa7 3098eaa
Author: Sherif Olaboye <[email protected]>
Date:   Thu Oct 31 15:20:56 2024 +0000

    Merge remote-tracking branch 'origin/release-v1.0.0' into Develop/Features/TD-4790-Writeunittestsfortagsaddedonoptionalcompetenciesinthesupervisorview

commit 0b93535
Author: Auldrin Possa <[email protected]>
Date:   Tue Oct 29 15:49:45 2024 +0000

    TD-4946-Name property initialized from UserAccount entity

commit 3098eaa
Merge: edfca62 3e6bbbd
Author: rshrirohit <[email protected]>
Date:   Mon Oct 28 17:07:03 2024 +0000

    Merge pull request #2893 from TechnologyEnhancedLearning/Develop/Features/TD-4751-FlagSelfAssessmentNonReportable

    Mark the Non Reportable flag as true when the user Id of the delegate matches the user Id of the admin record of the supervisor being selected.

commit edfca62
Merge: dea1766 f88475b
Author: rshrirohit <[email protected]>
Date:   Mon Oct 28 16:29:41 2024 +0000

    Merge pull request #2889 from TechnologyEnhancedLearning/Develop/feature/TD-4791-unit-tests-filter-added-on-optional-competencies-learner-view

    TD-4791-Unit tests added for filter on optional competencies in the learner view.

commit 3e6bbbd
Author: Abhimanu Sinha <[email protected]>
Date:   Mon Oct 28 12:41:08 2024 +0000

    TD-4751-Resolving the code comments obtained on the existing PR

commit dea1766
Merge: 7629b85 fa0fe0d
Author: rshrirohit <[email protected]>
Date:   Mon Oct 28 10:26:55 2024 +0000

    Merge pull request #2891 from TechnologyEnhancedLearning/Develop/fixes/TD-4920-Fix-optional-competency-frontend

    TD-4920 Fix optional competency frontend

commit 7629b85
Merge: 841fb5f 000d7df
Author: rshrirohit <[email protected]>
Date:   Fri Oct 25 11:07:07 2024 +0100

    Merge pull request #2900 from TechnologyEnhancedLearning/testRohitXFrameRevert

    Reverting the X-Frame-Options change

commit 000d7df
Author: Rohit Shrivastava <[email protected]>
Date:   Fri Oct 25 10:48:30 2024 +0100

    reverting the change.

commit 841fb5f
Merge: de21044 d103940
Author: rshrirohit <[email protected]>
Date:   Fri Oct 25 10:32:35 2024 +0100

    Merge pull request #2899 from TechnologyEnhancedLearning/testRohitXFrame

    Xframe settings test

commit d103940
Author: Rohit Shrivastava <[email protected]>
Date:   Fri Oct 25 10:19:45 2024 +0100

    Xframe settings test

commit e4eba69
Author: ABSINHAA <[email protected]>
Date:   Tue Oct 22 11:34:43 2024 +0100

    TD-4751 Mark the Non Reportable flag as true when the user Id of the delegate matches the user Id of the admin record of the supervisor being selected.

commit fa0fe0d
Author: kevwhitt-hee <[email protected]>
Date:   Mon Oct 21 16:06:24 2024 +0100

    Fixes accessibility issues with use of multiple fieldsets for single question

commit e952060
Author: kevwhitt-hee <[email protected]>
Date:   Mon Oct 21 15:15:17 2024 +0100

    Fixes optional competencies page markup and styling

commit 39c6442
Author: kevwhitt-hee <[email protected]>
Date:   Fri Oct 18 16:09:35 2024 +0100

    TD-4920 Removes the select all/deselect all checkboxes

commit f88475b
Author: Auldrin Possa <[email protected]>
Date:   Thu Oct 17 17:16:03 2024 +0100

    TD-4791-Unit tests added

commit de21044
Merge: c95e20d c4cf94d
Author: rshrirohit <[email protected]>
Date:   Thu Oct 17 11:12:16 2024 +0100

    Merge pull request #2887 from TechnologyEnhancedLearning/Develop/feature/TD-4789-unit-tests-tags-added-on-optional-competencies-learner-view

    TD-4789-Unit tests added for ManageOptionalCompetencies with flags and SelfAssessmentOverview with optional competencies

commit c95e20d
Merge: 297c56e 2fca155
Author: rshrirohit <[email protected]>
Date:   Thu Oct 17 11:10:16 2024 +0100

    Merge pull request #2883 from TechnologyEnhancedLearning/Develop/feature/TD-4793-unit-tests-to-deactivate-adminaccount-ifexists

    TD-4793-Unit tests added for deactivate delegate controller

commit 297c56e
Merge: 7e308b0 2134fd9
Author: rshrirohit <[email protected]>
Date:   Thu Oct 17 11:09:20 2024 +0100

    Merge pull request #2878 from TechnologyEnhancedLearning/Develop/Fix/TD-4785-Duplicates-in-Supervisor-dashboard

    TD-4785-Set the Removed date as the current date for old duplicate rows in the table

commit 7e308b0
Merge: 1c6b8bd 1987b1e
Author: rshrirohit <[email protected]>
Date:   Thu Oct 17 11:07:26 2024 +0100

    Merge pull request #2874 from TechnologyEnhancedLearning/Develop/Fix/TD-4787-NominatedSupervisors-change-role-Assessor

    TD-4787-Changed role from Educator/Manager to Assessor for nominated supervisors.

commit 1c6b8bd
Merge: 7eef360 c611e00
Author: rshrirohit <[email protected]>
Date:   Thu Oct 17 10:13:09 2024 +0100

    Merge pull request #2862 from TechnologyEnhancedLearning/Develop/Fixes/TD-4471-Issueswith'Search'functionalitywhenJSturnedoffon'Trackingsystem-Centreadministrators'screen

    TD-4471 Issues with 'Search' functionality when JS turned off on 'Tracking system - Centre administrators' screen

commit 419faa7
Author: Sherif Olaboye <[email protected]>
Date:   Thu Oct 17 09:23:01 2024 +0100

    TD-4790 Write unit tests for tags added on optional competencies in the supervisor view

commit c4cf94d
Author: Auldrin Possa <[email protected]>
Date:   Tue Oct 15 14:31:34 2024 +0100

    TD-4789-Unit tests added for ManageOptionalCompetencies with flags and SelfAssessmentOverview with optional competencies

commit 7eef360
Merge: a8682c5 f11e883
Author: rshrirohit <[email protected]>
Date:   Tue Oct 15 08:44:37 2024 +0100

    Merge branch 'master' into release-v1.0.0

commit d0ed56b
Author: Sherif Olaboye <[email protected]>
Date:   Mon Oct 14 11:34:36 2024 +0100

    TD-4632 As a centre manager at a new centre, I should be able to register using a predetermined email address without additional approval steps

commit 7d77546
Author: Sherif Olaboye <[email protected]>
Date:   Mon Oct 14 11:26:47 2024 +0100

    TD-4632 As a centre manager at a new centre, I should be able to register using a predetermined email address without additional approval steps

commit 2fca155
Author: Auldrin Possa <[email protected]>
Date:   Fri Oct 11 20:57:24 2024 +0100

    test cases updated

commit c0546aa
Author: Auldrin Possa <[email protected]>
Date:   Fri Oct 11 15:46:44 2024 +0100

    TD-4793-unit tests added for deactivate delegate controller

commit 1987b1e
Author: Auldrin Possa <[email protected]>
Date:   Thu Oct 10 10:28:01 2024 +0100

    ForwardOnlyMigration added

commit ed4d1d7
Merge: 7da62dd a8682c5
Author: Auldrin Possa <[email protected]>
Date:   Thu Oct 10 10:07:58 2024 +0100

    Merge branch 'release-v1.0.0' into Develop/Fix/TD-4787-NominatedSupervisors-change-role-Assessor

commit 2134fd9
Author: Auldrin Possa <[email protected]>
Date:   Wed Oct 9 16:04:34 2024 +0100

    TD-4785-Set the Removed date as the current date for old duplicate rows in the table

commit a8682c5
Merge: 08625bf 9ed7ca9
Author: rshrirohit <[email protected]>
Date:   Wed Oct 9 09:17:59 2024 +0100

    Merge pull request #2865 from TechnologyEnhancedLearning/Develop/Fix/TD-4785-Duplicates-in-Supervisor-dashboard

    TD-4785- Removed date updated to CandidateAssessmentSupervisors table.

commit 08625bf
Merge: d78d8dd ae399db
Author: rshrirohit <[email protected]>
Date:   Wed Oct 9 09:16:48 2024 +0100

    Merge pull request #2864 from TechnologyEnhancedLearning/Develop/Fixes/TD-4755-MyAccount-ActivevalueislistedasoneoftheAdminroles

    TD-4755 My Account - Active value is listed as one of the Admin roles

commit 7da62dd
Author: Auldrin Possa <[email protected]>
Date:   Mon Oct 7 14:22:56 2024 +0100

    TD-4787-Changed role from Educator/Manager to Assessor for nominated supervisors

commit 90dd9e1
Author: Sherif Olaboye <[email protected]>
Date:   Fri Oct 4 09:24:55 2024 +0100

    TD-3656 Supervise - "Add myself to try self assessment" staff doesn't exist when the educator is removed from the learning portal self-assessment

commit 9ed7ca9
Author: Auldrin Possa <[email protected]>
Date:   Tue Oct 1 16:35:22 2024 +0100

    TD-4785- Removed date updated to CandidateAssessmentSupervisors table.

commit ae399db
Author: Sherif Olaboye <[email protected]>
Date:   Tue Oct 1 16:06:48 2024 +0100

    TD-4755 My Account - Active value is listed as one of the Admin roles

commit c611e00
Author: Sherif Olaboye <[email protected]>
Date:   Tue Oct 1 11:48:55 2024 +0100

    TD-4471 Issues with 'Search' functionality when JS turned off on 'Tracking system - Centre administrators' screen

Author: kevwhitt-hee

DigitalLearningSolutions.Data.Migrations/Properties/Resources.Designer.cs

@@ -448,25 +448,19 @@
   <data name="TD_4634_Alter_GetCompletedCoursesForCandidate_UP" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Scripts\TD_4634_Alter_GetCompletedCoursesForCandidate_UP.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
   </data>
-  <data name="TD-4950-dboGetOtherCentresForSelfAssessmentCreateOrAlter" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\TD-4950-dboGetOtherCentresForSelfAssessmentCreateOrAlter.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  <data name="TD_4950_Alter_GetAssessmentResultsByDelegate_DOWN" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Scripts\TD_4950_Alter_GetAssessmentResultsByDelegate_DOWN.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
   </data>
-  <data name="TD_4878_Alter_GetActivitiesForDelegateEnrolment_Down" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Scripts\TD-4878-Alter_GetActivitiesForDelegateEnrolment_Down.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
+  <data name="TD_4950_Alter_GetAssessmentResultsByDelegate_UP" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Scripts\TD_4950_Alter_GetAssessmentResultsByDelegate_UP.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
   </data>
-  <data name="TD_4878_Alter_GetActivitiesForDelegateEnrolment_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Scripts\TD-4878-Alter_GetActivitiesForDelegateEnrolment_Up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
+  <data name="TD-4950-dboGetOtherCentresForSelfAssessmentCreateOrAlter" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\TD-4950-dboGetOtherCentresForSelfAssessmentCreateOrAlter.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
   <data name="TD_4950_AlterGetCandidateAssessmentResultsById_DOWN" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\TD-4950-AlterGetCandidateAssessmentResultsById_DOWN.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
   </data>
   <data name="TD_4950_AlterGetCandidateAssessmentResultsById_UP" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\TD-4950-AlterGetCandidateAssessmentResultsById_UP.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
   </data>
-  <data name="TD_4950_Alter_GetAssessmentResultsByDelegate_DOWN" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Scripts\TD_4950_Alter_GetAssessmentResultsByDelegate_DOWN.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
-  </data>
-  <data name="TD_4950_Alter_GetAssessmentResultsByDelegate_UP" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Scripts\TD_4950_Alter_GetAssessmentResultsByDelegate_UP.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
-  </data>
 </root>

DigitalLearningSolutions.Data.Migrations/Properties/Resources.resx

@@ -542,7 +542,9 @@ LEFT OUTER JOIN UserCentreDetails AS UCD ON
                         new { candidateAssessmentId, enrolmentMethodId, completeByDateDynamic }
                     );
             }
+
             if (candidateAssessmentId > 1 && supervisorDelegateId !=0)
+
             {
                 string sqlQuery = $@"
                 BEGIN TRANSACTION

DigitalLearningSolutions.Data/DataServices/CourseDataService.cs

@@ -35,7 +35,7 @@ public interface ISupervisorDataService
         CandidateAssessmentSupervisor? GetCandidateAssessmentSupervisor(int candidateAssessmentID, int supervisorDelegateId, int selfAssessmentSupervisorRoleId);
         SelfAssessmentResultSummary? GetSelfAssessmentResultSummary(int candidateAssessmentId, int supervisorDelegateId);
         IEnumerable<CandidateAssessmentSupervisorVerificationSummary> GetCandidateAssessmentSupervisorVerificationSummaries(int candidateAssessmentId);
-        IEnumerable<SupervisorForEnrolDelegate> GetSupervisorForEnrolDelegate(int CentreID, int CategoryID);
+        IEnumerable<SupervisorForEnrolDelegate> GetSupervisorForEnrolDelegate(int CustomisationID, int CentreID);
         IEnumerable<SupervisorDelegateDetail> GetSupervisorDelegateDetailsForAdminIdWithoutRemovedClause(int adminId);
         SupervisorDelegateDetail GetSupervisorDelegateDetailsByIdWithoutRemoveClause(int supervisorDelegateId, int adminId, int delegateUserId);
         //UPDATE DATA
@@ -218,6 +218,62 @@ LEFT OUTER JOIN AdminAccounts AS au2
                 );
         }
 
+        public IEnumerable<SupervisorDelegateDetail> GetSupervisorDelegateDetailsForAdminIdWithoutRemovedClause(int adminId)
+        {
+            return connection.Query<SupervisorDelegateDetail>(
+                $@"SELECT sd.ID, 
+		                sd.SupervisorEmail, sd.SupervisorAdminID, sd.DelegateEmail, sd.DelegateUserID,da.Active,
+                        sd.Added, sd.AddedByDelegate, sd.NotificationSent, sd.Removed, sd.InviteHash, 
+		                u.FirstName, u.LastName, u.ProfessionalRegistrationNumber, u.PrimaryEmail AS CandidateEmail,
+		                jg.JobGroupName, 
+		                da.Answer1, da.Answer2, da.Answer3, da.Answer4, da.Answer5, da.Answer6, da.CandidateNumber, 
+		                cp1.CustomPrompt AS CustomPrompt1, cp2.CustomPrompt AS CustomPrompt2, 
+		                cp3.CustomPrompt AS CustomPrompt3, cp4.CustomPrompt AS CustomPrompt4,             
+		                cp5.CustomPrompt AS CustomPrompt5, cp6.CustomPrompt AS CustomPrompt6, 
+		                COALESCE (au.CentreID, da.CentreID) AS CentreID, 
+		                au.Forename + ' ' + au.Surname AS SupervisorName,                 
+		                (SELECT COUNT(ca.ID) AS Expr1
+                        FROM CandidateAssessments AS ca  LEFT JOIN
+                        CandidateAssessmentSupervisors AS cas ON cas.CandidateAssessmentID = ca.ID AND cas.Removed IS NULL AND cas.SupervisorDelegateId = sd.ID INNER JOIN
+                        SelfAssessments AS sa ON sa.ID = ca.SelfAssessmentID 
+                        WHERE (ca.RemovedDate IS NULL) AND (ca.DelegateUserID=sd.DelegateUserID) AND (cas.SupervisorDelegateId = sd.ID OR (cas.CandidateAssessmentID IS NULL)
+				        AND ((sa.SupervisorSelfAssessmentReview = 1) OR (sa.SupervisorResultsReview = 1)))) AS CandidateAssessmentCount, 
+		                CAST(COALESCE (au2.IsNominatedSupervisor, 0) AS Bit) AS DelegateIsNominatedSupervisor, 
+		                CAST(COALESCE (au2.IsSupervisor, 0) AS Bit) AS DelegateIsSupervisor,             
+		                da.ID AS Expr1
+                    FROM   CustomPrompts AS cp6 
+	                    RIGHT OUTER JOIN CustomPrompts AS cp5 
+	                    RIGHT OUTER JOIN DelegateAccounts AS da
+	                    RIGHT OUTER JOIN SupervisorDelegates AS sd 
+	                    INNER JOIN AdminUsers AS au 
+		                    ON sd.SupervisorAdminID = au.AdminID 
+	                    INNER JOIN Centres AS ct 
+		                    ON au.CentreID = ct.CentreID 
+	                    ON da.CentreID = ct.CentreID 
+		                    AND da.UserID = sd.DelegateUserID 
+	                    LEFT OUTER JOIN Users AS u 
+	                    LEFT OUTER JOIN JobGroups AS jg 
+		                    ON u.JobGroupID = jg.JobGroupID
+	                    ON da.UserID = u.ID 
+	                    LEFT OUTER JOIN CustomPrompts AS cp1 
+		                    ON ct.CustomField1PromptID = cp1.CustomPromptID 
+	                    LEFT OUTER JOIN CustomPrompts AS cp2 
+		                    ON ct.CustomField2PromptID = cp2.CustomPromptID 
+	                    LEFT OUTER JOIN CustomPrompts AS cp3 
+		                    ON ct.CustomField3PromptID = cp3.CustomPromptID 
+	                    LEFT OUTER JOIN CustomPrompts AS cp4 
+		                    ON ct.CustomField4PromptID = cp4.CustomPromptID 
+	                    ON cp5.CustomPromptID = ct.CustomField5PromptID 
+	                    ON cp6.CustomPromptID = ct.CustomField6PromptID 
+	                    LEFT OUTER JOIN AdminAccounts AS au2 
+		                    ON da.UserID = au2.UserID AND da.CentreID = au2.CentreID
+                    WHERE (sd.SupervisorAdminID = @adminId)  AND 
+                     (u.ID = da.UserID OR sd.DelegateUserID IS NULL)
+                    ORDER BY u.LastName, COALESCE (u.FirstName, sd.DelegateEmail)
+                    ", new { adminId }
+                );
+        }
+
         public IEnumerable<SupervisorDelegateDetail> GetSupervisorDelegateDetailsForAdminIdWithoutRemovedClause(int adminId)
         {
             return connection.Query<SupervisorDelegateDetail>(

DigitalLearningSolutions.Data/DataServices/SupervisorDataService.cs

@@ -48,7 +48,6 @@ public class SupervisorControllerTests
         private ICandidateAssessmentDownloadFileService candidateAssessmentDownloadFileService = null!;
         private IPdfService pdfService = null!;
         private SupervisorController controller = null!;
-        private  ICourseCategoriesService courseCategoriesService = null!;
 
         [SetUp]
         public void Setup()
@@ -107,8 +106,7 @@ public void Setup()
                emailService,
                candidateAssessmentDownloadFileService,
                clockUtility,
-               pdfService,
-               courseCategoriesService
+               pdfService
            );
             controller.ControllerContext = new ControllerContext
             { HttpContext = new DefaultHttpContext { User = user } };
@@ -162,7 +160,6 @@ public void ReviewDelegateSelfAssessment_Should_Return_View_With_Optional_Compet
             // Given
             int candidateAssessmentId = 1;
             int supervisorDelegateId = 2;
-            int? adminIdCategoryId = 0;
             var superviseDelegate = SupervisorTagTestHelper.CreateDefaultSupervisorDelegateDetail();
             var delegateSelfAssessment = SupervisorTagTestHelper.CreateDefaultDelegateSelfAssessment();
             var appliedFilterViewModel = new List<AppliedFilterViewModel>();
@@ -192,7 +189,7 @@ public void ReviewDelegateSelfAssessment_Should_Return_View_With_Optional_Compet
 
             A.CallTo(() => supervisorService.GetSupervisorDelegateDetailsById(supervisorDelegateId, AdminId, 0))
                 .Returns(superviseDelegate);
-            A.CallTo(() => supervisorService.GetSelfAssessmentByCandidateAssessmentId(candidateAssessmentId, AdminId, adminIdCategoryId))
+            A.CallTo(() => supervisorService.GetSelfAssessmentByCandidateAssessmentId(candidateAssessmentId, AdminId))
                  .Returns(delegateSelfAssessment);
             A.CallTo(() => selfAssessmentService.GetMostRecentResults(SelfAssessmentId, DelegateUserId))
                 .Returns(competencies);
@@ -218,7 +215,6 @@ public void ReviewDelegateSelfAssessment_Should_Return_View_With_Optional_Filter
             // Given
             int candidateAssessmentId = 1;
             int supervisorDelegateId = 2;
-            int? adminIdCategoryId = 0;
             var superviseDelegate = SupervisorTagTestHelper.CreateDefaultSupervisorDelegateDetail();
             var delegateSelfAssessment = SupervisorTagTestHelper.CreateDefaultDelegateSelfAssessment();
             SearchSupervisorCompetencyViewModel searchModel = null!;
@@ -254,7 +250,7 @@ public void ReviewDelegateSelfAssessment_Should_Return_View_With_Optional_Filter
 
             A.CallTo(() => supervisorService.GetSupervisorDelegateDetailsById(supervisorDelegateId, AdminId, 0))
                 .Returns(superviseDelegate);
-            A.CallTo(() => supervisorService.GetSelfAssessmentByCandidateAssessmentId(candidateAssessmentId, AdminId, adminIdCategoryId))
+            A.CallTo(() => supervisorService.GetSelfAssessmentByCandidateAssessmentId(candidateAssessmentId, AdminId))
                  .Returns(delegateSelfAssessment);
             A.CallTo(() => selfAssessmentService.GetMostRecentResults(SelfAssessmentId, DelegateUserId))
                 .Returns(competencies);

DigitalLearningSolutions.Web.Tests/Controllers/SupervisorController/SupervisorControllerTests.cs

@@ -59,7 +59,7 @@ public IActionResult MyStaffList(
             var supervisorEmail = GetUserEmail();
             var loggedInAdminUser = userService.GetAdminUserById(adminId);
             var centreRegistrationPrompts = centreRegistrationPromptsService.GetCentreRegistrationPromptsByCentreId(centreId);
-            var supervisorDelegateDetails = supervisorService.GetSupervisorDelegateDetailsForAdminId(adminId, loggedInAdminUser.CategoryId);
+            var supervisorDelegateDetails = supervisorService.GetSupervisorDelegateDetailsForAdminId(adminId);
             if (!supervisorDelegateDetails.Any())
             {
                 supervisorDelegateDetails = supervisorService.GetSupervisorDelegateDetailsForAdminIdWithoutRemovedClause(adminId);
@@ -1440,7 +1440,7 @@ public async Task<IActionResult> DownloadCertificate(int candidateAssessmentId)
             {
                 return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 });
             }
-            var supervisorDelegateDetails = supervisorService.GetSupervisorDelegateDetailsForAdminId(adminId.Value, loggedInAdminUser.CategoryId);
+            var supervisorDelegateDetails = supervisorService.GetSupervisorDelegateDetailsForAdminId(adminId.Value);
             var checkSupervisorDelegate = supervisorDelegateDetails.Where(x => x.DelegateUserID == competencymaindata.LearnerId).FirstOrDefault();
             if (checkSupervisorDelegate == null) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 });
             var delegateUserId = competencymaindata.LearnerId;

DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs

@@ -32,10 +32,9 @@ public interface ISupervisorService
         CandidateAssessmentSupervisor? GetCandidateAssessmentSupervisor(int candidateAssessmentID, int supervisorDelegateId, int selfAssessmentSupervisorRoleId);
         SelfAssessmentResultSummary? GetSelfAssessmentResultSummary(int candidateAssessmentId, int supervisorDelegateId);
         IEnumerable<CandidateAssessmentSupervisorVerificationSummary> GetCandidateAssessmentSupervisorVerificationSummaries(int candidateAssessmentId);
-        IEnumerable<SupervisorForEnrolDelegate> GetSupervisorForEnrolDelegate(int CentreID, int CategoryID);
+        IEnumerable<SupervisorForEnrolDelegate> GetSupervisorForEnrolDelegate(int CustomisationID, int CentreID);
         IEnumerable<SupervisorDelegateDetail> GetSupervisorDelegateDetailsForAdminIdWithoutRemovedClause(int adminId);
         SupervisorDelegateDetail GetSupervisorDelegateDetailsByIdWithoutRemoveClause(int supervisorDelegateId, int adminId, int delegateUserId);
-
         //UPDATE DATA
         bool ConfirmSupervisorDelegateById(int supervisorDelegateId, int candidateId, int adminId);
         bool RemoveSupervisorDelegateById(int supervisorDelegateId, int delegateUserId, int adminId);