Skip to content
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

Jump to bottom

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

Merged
merged 1 commit into from
Nov 14, 2024
Merged

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

merged 1 commit into from
Nov 14, 2024

Conversation

kevwhitt-hee
Copy link
Contributor

@kevwhitt-hee kevwhitt-hee commented Nov 14, 2024 •
edited by jira bot
Loading

JIRA link

TD-4950

Description

Fixes the query join in the export self assessment to Excel data method to ensure correct results are returned. Reinstates the clear selection JavaScript that was mistakenly removed in a previous PR. Other problems reported related to missing CompetencyAssessmentRolRequirements records for the duplicate self assessment which were addressed with a script run on UAT DB.

Screenshots

image

Developer checks

(Leave tasks unticked if they haven't been appropriate for your ticket.)

I have:

  • Run the formatter and made sure there are no IDE errors (see info on Text Editor settings to avoid whitespace changes)
  • Written tests for the changes (accessibility tests, unit tests for controller, data services, services, view models, etc)
  • Manually tested my work with and without JavaScript
  • Tested any Views or partials created or changed with Wave Chrome plugin and addressed any valid accessibility issues
  • Updated/added documentation in Confluence and/or GitHub Readme. List of documentation links added/changed:
  • Updated my Jira ticket with information about other parts of the system that were touched as part of the MR and have to be sanity tested to ensure nothing’s broken
  • Scanned over my pull request in GitHub and addressed any warnings from the GitHub Build and Test checks.

@kevwhitt-hee kevwhitt-hee merged commit a0af08d into release-v1.0.0 Nov 14, 2024
2 checks passed
@kevwhitt-hee kevwhitt-hee deleted the Develop/Fixes/TD-4950-FixSubmitResultFoDupeCompetency branch November 14, 2024 11:07
@kevwhitt-hee kevwhitt-hee restored the Develop/Fixes/TD-4950-FixSubmitResultFoDupeCompetency branch November 14, 2024 17:14
kevwhitt-hee added a commit that referenced this pull request Nov 25, 2024
@kevwhitt-hee
Squashed commit of the following:
b0c8abd 
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
kevwhitt-hee added a commit that referenced this pull request Nov 25, 2024
@kevwhitt-hee
Squashed commit of the following:
66d3ff2 
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
kevwhitt-hee added a commit that referenced this pull request Dec 3, 2024
@kevwhitt-hee
Squashed commit of the following:
ef382c3 
commit c3f420688b6618f978bb69bdb971342756f87f90
Merge: 2d8336dc3 8fcc3782d
Author: kevwhitt-hee <[email protected]>
Date:   Tue Dec 3 08:58:04 2024 +0000

    Merge branch 'DLS-Release-v1.1.0' into Automatic_version_update_dependabot

commit 2d8336dc387b0d479673337d191a3a15d36ae34a
Author: kevwhitt-hee <[email protected]>
Date:   Tue Dec 3 08:56:31 2024 +0000

    Squashed commit of the following:

    commit 8fcc3782d24173efab83bdc792a094657c7dce55
    Merge: b31b0f1d5 7a1b1485f
    Author: kevwhitt-hee <[email protected]>
    Date:   Tue Dec 3 07:33:34 2024 +0000

        Merge pull request #3011 from TechnologyEnhancedLearning/Automatic_version_update_dependabot

        Automatic version update dependabot to dev branch

    commit b31b0f1d5b42eb7bb1ebbd2c24c5c29668dac8c6
    Merge: a375ec91c fbeaa0a03
    Author: kevwhitt-hee <[email protected]>
    Date:   Tue Dec 3 07:22:11 2024 +0000

        Merge pull request #2981 from TechnologyEnhancedLearning/Develop/Features/TD-4889-WhenasupervisorpromotesalearnertotheNominatedsupervisorrole,assignthemtothesamecategoryasthesupervisors

        TD-4889 Resolving internal server error when nominating delegate to supervisor

    commit a375ec91cd909070b4c701ec219acec5fb50fd53
    Merge: 49d6df110 0a24e3a9d
    Author: kevwhitt-hee <[email protected]>
    Date:   Tue Dec 3 07:20:27 2024 +0000

        Merge pull request #2980 from TechnologyEnhancedLearning/Develop/Features/TD-4973-LimitthelistofsupervisorsintheRequestproficiencyconfirmationviewtosupervisorswithamatchingcategories

        TD-4973 Limit the list of supervisors in the Request proficiency confirmation view to supervisors with a matching category

    commit fbeaa0a030c6cd733150ed84134d0e2711c7ae19
    Author: Sherif Olaboye <[email protected]>
    Date:   Wed Nov 27 17:00:29 2024 +0000

        TD-4889 Resolving internal server error when nominating delegate to supervisor

    commit 3c09df35d8641f7a823f85cb195f52d414df2874
    Author: Sherif Olaboye <[email protected]>
    Date:   Wed Nov 27 16:35:24 2024 +0000

        TD-4889 Resolving internal server error when nominating delegate to supervisor

    commit 0a24e3a9dd759bb8e2d352cf326eda637d69f41f
    Author: Sherif Olaboye <[email protected]>
    Date:   Wed Nov 27 10:40:01 2024 +0000

        TD-4973 Limit the list of supervisors in the Request proficiency confirmation view to supervisors with a matching category

    commit 49d6df110509fe80eaeff4f6e1b9a7ad9f0a05ff
    Merge: d9c9b6b31 ec7910b42
    Author: kevwhitt-hee <[email protected]>
    Date:   Wed Nov 27 08:55:26 2024 +0000

        Merge branch 'master' into DLS-Release-v1.1.0

    commit d9c9b6b3112494c83e992ff187e5ecd0286f337b
    Author: kevwhitt-hee <[email protected]>
    Date:   Wed Nov 27 08:21:19 2024 +0000

        Removes migration causing an error in production data during deployment

commit c893b1071e9eb5da673b467802819a97117f73e0
Author: kevwhitt-hee <[email protected]>
Date:   Tue Dec 3 08:43:40 2024 +0000

    Revert "Squashed commit of the following:"

    This reverts commit 66d3ff25ef2ec34ad03962723a7cb4c6597a5ed7.

commit f4fa6d08a2dc35a6ce12ccc191947956b56dffb3
Author: kevwhitt-hee <[email protected]>
Date:   Tue Dec 3 08:42:27 2024 +0000

    Revert "Merge branch 'master' into Automatic_version_update_dependabot"

    This reverts commit 209b2b29fb0f50f574561edc426125f01b8a5cd4, reversing
    changes made to 66d3ff25ef2ec34ad03962723a7cb4c6597a5ed7.

commit f099adcb03d72e51ca79ef1bb9bfca6b16d44ef6
Merge: 209b2b29f 7a1b1485f
Author: kevwhitt-hee <[email protected]>
Date:   Tue Dec 3 08:39:59 2024 +0000

    Merge branch 'Automatic_version_update_dependabot' of https://github.com/TechnologyEnhancedLearning/DLSV2 into Automatic_version_update_dependabot

commit 8fcc3782d24173efab83bdc792a094657c7dce55
Merge: b31b0f1d5 7a1b1485f
Author: kevwhitt-hee <[email protected]>
Date:   Tue Dec 3 07:33:34 2024 +0000

    Merge pull request #3011 from TechnologyEnhancedLearning/Automatic_version_update_dependabot

    Automatic version update dependabot to dev branch

commit 7a1b1485f658a0455f2658fcbe9a2b875a416bb2
Merge: 9ac23c013 6405248d1
Author: kevwhitt-hee <[email protected]>
Date:   Tue Dec 3 07:22:36 2024 +0000

    Merge pull request #2998 from TechnologyEnhancedLearning/dependabot/nuget/Automatic_version_update_dependabot/Microsoft.AspNetCore.Mvc.Testing-7.0.0

    Bump Microsoft.AspNetCore.Mvc.Testing from 6.0.25 to 7.0.0

commit b31b0f1d5b42eb7bb1ebbd2c24c5c29668dac8c6
Merge: a375ec91c fbeaa0a03
Author: kevwhitt-hee <[email protected]>
Date:   Tue Dec 3 07:22:11 2024 +0000

    Merge pull request #2981 from TechnologyEnhancedLearning/Develop/Features/TD-4889-WhenasupervisorpromotesalearnertotheNominatedsupervisorrole,assignthemtothesamecategoryasthesupervisors

    TD-4889 Resolving internal server error when nominating delegate to supervisor

commit a375ec91cd909070b4c701ec219acec5fb50fd53
Merge: 49d6df110 0a24e3a9d
Author: kevwhitt-hee <[email protected]>
Date:   Tue Dec 3 07:20:27 2024 +0000

    Merge pull request #2980 from TechnologyEnhancedLearning/Develop/Features/TD-4973-LimitthelistofsupervisorsintheRequestproficiencyconfirmationviewtosupervisorswithamatchingcategories

    TD-4973 Limit the list of supervisors in the Request proficiency confirmation view to supervisors with a matching category

commit 9ac23c013563fba0b663a3fd0648d9de6363a5dc
Author: binon <[email protected]>
Date:   Fri Nov 29 22:29:11 2024 +0000

    Upgraded FluentMigrator and its dependencies manually

commit 7111af2a58de2ae2a0946dda6506e91892b1f041
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Nov 29 16:35:12 2024 +0000

    Bump regenerator-runtime in /DigitalLearningSolutions.Web (#3002)

    Bumps [regenerator-runtime](https://github.com/facebook/regenerator) from 0.13.9 to 0.14.1.
    - [Release notes](https://github.com/facebook/regenerator/releases)
    - [Commits](https://github.com/facebook/regenerator/compare/[email protected]@0.14.1)

    ---
    updated-dependencies:
    - dependency-name: regenerator-runtime
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit ada5b3a8b3007b967dd5ede049632de36b2519c3
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Nov 29 16:34:52 2024 +0000

    Bump @typescript-eslint/eslint-plugin in /DigitalLearningSolutions.Web (#3001)

    Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 5.25.0 to 5.62.0.
    - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
    - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
    - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.62.0/packages/eslint-plugin)

    ---
    updated-dependencies:
    - dependency-name: "@typescript-eslint/eslint-plugin"
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 10eb243c3f147d42fba9ec084f4ea0b0ffdba74c
Merge: 9d580712e 7e30e2c5c
Author: binon <[email protected]>
Date:   Fri Nov 29 16:33:49 2024 +0000

    Merge pull request #2828 from TechnologyEnhancedLearning/dependabot/npm_and_yarn/DigitalLearningSolutions.Web/braces-3.0.3

    Bump braces from 3.0.2 to 3.0.3 in /DigitalLearningSolutions.Web

commit 9d580712e83da97e50560426d3b2ec5f8dbc74c6
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Nov 29 16:27:28 2024 +0000

    Bump input-range-scss in /DigitalLearningSolutions.Web (#3006)

    Bumps [input-range-scss](https://github.com/darlanrod/input-range-scss) from 1.5.2 to 1.5.3.
    - [Release notes](https://github.com/darlanrod/input-range-scss/releases)
    - [Changelog](https://github.com/darlanrod/input-range-scss/blob/master/changelog.md)
    - [Commits](https://github.com/darlanrod/input-range-scss/compare/v1.5.2...v.1.5.3)

    ---
    updated-dependencies:
    - dependency-name: input-range-scss
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit be597defbbecb9cc8d685433bfc3f31bfd2ddfcd
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Nov 29 16:24:41 2024 +0000

    Bump eslint-plugin-jasmine in /DigitalLearningSolutions.Web (#3000)

    Bumps [eslint-plugin-jasmine](https://github.com/tlvince/eslint-plugin-jasmine) from 4.1.3 to 4.2.2.
    - [Release notes](https://github.com/tlvince/eslint-plugin-jasmine/releases)
    - [Commits](https://github.com/tlvince/eslint-plugin-jasmine/compare/v4.1.3...v4.2.2)

    ---
    updated-dependencies:
    - dependency-name: eslint-plugin-jasmine
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 2a8ec3b3e63d555123517320266a8d0b6707bed2
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Nov 29 16:23:11 2024 +0000

    Bump nhsuk-frontend from 6.1.0 to 6.2.0 in /DigitalLearningSolutions.Web (#3005)

    Bumps [nhsuk-frontend](https://github.com/nhsuk/nhsuk-frontend) from 6.1.0 to 6.2.0.
    - [Release notes](https://github.com/nhsuk/nhsuk-frontend/releases)
    - [Changelog](https://github.com/nhsuk/nhsuk-frontend/blob/main/CHANGELOG.md)
    - [Commits](https://github.com/nhsuk/nhsuk-frontend/compare/v6.1.0...v6.2.0)

    ---
    updated-dependencies:
    - dependency-name: nhsuk-frontend
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 7e30e2c5c5b1375034684e6449af4003881469e6
Merge: 32bcbb4bf faf17c75b
Author: binon <[email protected]>
Date:   Fri Nov 29 16:13:22 2024 +0000

    Merge branch 'Automatic_version_update_dependabot' into dependabot/npm_and_yarn/DigitalLearningSolutions.Web/braces-3.0.3

commit faf17c75b44d38dad045b90bec02b9337194147e
Merge: 767807a0b 3aa6c7cbd
Author: binon <[email protected]>
Date:   Fri Nov 29 16:00:17 2024 +0000

    Merge pull request #2996 from TechnologyEnhancedLearning/dependabot/nuget/Automatic_version_update_dependabot/HtmlAgilityPack-1.11.71

    Bump HtmlAgilityPack from 1.11.54 to 1.11.71

commit 3aa6c7cbd0f99355afa270e3f127f003e1d667d0
Merge: 85585fcbd 767807a0b
Author: binon <[email protected]>
Date:   Fri Nov 29 15:51:21 2024 +0000

    Merge branch 'Automatic_version_update_dependabot' into dependabot/nuget/Automatic_version_update_dependabot/HtmlAgilityPack-1.11.71

commit 767807a0b61385dd60b73400f0ef3240db01d03e
Merge: 81e9d14b0 1311590df
Author: binon <[email protected]>
Date:   Fri Nov 29 15:37:08 2024 +0000

    Merge pull request #2840 from TechnologyEnhancedLearning/dependabot/npm_and_yarn/DigitalLearningSolutions.Web/dompurify-2.5.4

    Bump dompurify from 2.4.7 to 2.5.4 in /DigitalLearningSolutions.Web

commit 6405248d1d9378ecbf02dd509a89f8edd10028e0
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Nov 29 15:30:14 2024 +0000

    Bump Microsoft.AspNetCore.Mvc.Testing from 6.0.25 to 7.0.0

    Bumps [Microsoft.AspNetCore.Mvc.Testing](https://github.com/dotnet/aspnetcore) from 6.0.25 to 7.0.0.
    - [Release notes](https://github.com/dotnet/aspnetcore/releases)
    - [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md)
    - [Commits](https://github.com/dotnet/aspnetcore/compare/v6.0.25...v7.0.0)

    ---
    updated-dependencies:
    - dependency-name: Microsoft.AspNetCore.Mvc.Testing
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 81e9d14b0a824418cfe1040bbc69a6f530bcb178
Merge: 45ee60a52 135c74012
Author: binon <[email protected]>
Date:   Fri Nov 29 15:27:55 2024 +0000

    Merge pull request #2997 from TechnologyEnhancedLearning/dependabot/nuget/Automatic_version_update_dependabot/multi-6e67ef2905

    Bump Selenium.Axe and Selenium.WebDriver

commit 45ee60a524fd481548d3c723eedcf17c83e1b8d6
Merge: db6eecb0b a8e74f6ba
Author: binon <[email protected]>
Date:   Fri Nov 29 15:27:03 2024 +0000

    Merge pull request #2819 from TechnologyEnhancedLearning/dependabot/npm_and_yarn/DigitalLearningSolutions.Web/webpack-5.94.0

    Bump webpack from 5.90.3 to 5.94.0 in /DigitalLearningSolutions.Web

commit db6eecb0b8fb4e0dac7993be0dc3cd5e0a125ad0
Merge: f9b3a6008 f32d5154d
Author: binon <[email protected]>
Date:   Fri Nov 29 15:21:07 2024 +0000

    Merge pull request #2826 from TechnologyEnhancedLearning/dependabot/npm_and_yarn/DigitalLearningSolutions.Web/micromatch-4.0.8

    Bump micromatch from 4.0.5 to 4.0.8 in /DigitalLearningSolutions.Web

commit f9b3a6008874d98719510cd36cce36f0b63d839d
Author: binon <[email protected]>
Date:   Fri Nov 29 15:00:27 2024 +0000

    Upgraded the SqlClient manulaly to 5.2.2

commit 135c740127756ad6cdc7b0a773fd47b1f69374cf
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Nov 29 14:14:12 2024 +0000

    Bump Selenium.Axe and Selenium.WebDriver

    Bumps [Selenium.Axe](https://github.com/TroyWalshProf/axe-selenium-csharp) and [Selenium.WebDriver](https://github.com/SeleniumHQ/selenium). These dependencies needed to be updated together.

    Updates `Selenium.Axe` from 4.0.14 to 4.0.21
    - [Release notes](https://github.com/TroyWalshProf/axe-selenium-csharp/releases)
    - [Commits](https://github.com/TroyWalshProf/axe-selenium-csharp/compare/v4.0.14...v4.0.21)

    Updates `Selenium.WebDriver` from 4.16.2 to 4.19.0
    - [Release notes](https://github.com/SeleniumHQ/selenium/releases)
    - [Commits](https://github.com/SeleniumHQ/selenium/commits/selenium-4.19.0)

    ---
    updated-dependencies:
    - dependency-name: Selenium.Axe
      dependency-type: direct:production
      update-type: version-update:semver-patch
    - dependency-name: Selenium.WebDriver
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 85585fcbd975365f29a1a26c84266bef59bc528a
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Nov 29 14:12:51 2024 +0000

    Bump HtmlAgilityPack from 1.11.54 to 1.11.71

    Bumps [HtmlAgilityPack](https://github.com/zzzprojects/html-agility-pack) from 1.11.54 to 1.11.71.
    - [Release notes](https://github.com/zzzprojects/html-agility-pack/releases)
    - [Commits](https://github.com/zzzprojects/html-agility-pack/compare/v1.11.54...v1.11.71)

    ---
    updated-dependencies:
    - dependency-name: HtmlAgilityPack
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 1311590dfe3e48a96ccec777a30a8b80e01f9d01
Merge: c333cf065 5f304d6cc
Author: binon <[email protected]>
Date:   Fri Nov 29 14:12:28 2024 +0000

    Merge branch 'Automatic_version_update_dependabot' into dependabot/npm_and_yarn/DigitalLearningSolutions.Web/dompurify-2.5.4

commit 5f304d6cc0a9c5b1547632cfc4f7783a872e861e
Merge: cec3d7513 3a8ce1ce6
Author: binon <[email protected]>
Date:   Fri Nov 29 14:11:39 2024 +0000

    Merge pull request #2829 from TechnologyEnhancedLearning/dependabot/nuget/DigitalLearningSolutions.Data.Tests/Microsoft.Data.SqlClient-5.1.3

    Bump Microsoft.Data.SqlClient from 5.1.2 to 5.1.3 in /DigitalLearningSolutions.Data.Tests

commit cec3d75130c6c80cb62517a9bdcd6ce4e0188b70
Merge: 96230a934 d816ad8b3
Author: binon <[email protected]>
Date:   Fri Nov 29 14:10:37 2024 +0000

    Merge pull request #2991 from TechnologyEnhancedLearning/dependabot/nuget/Automatic_version_update_dependabot/multi-bd4e373d75

    Bump Selenium.Support and Selenium.WebDriver

commit 32bcbb4bfbbc04feb56b4e564ed8af75d72bae7c
Merge: 56e3913ad 96230a934
Author: binon <[email protected]>
Date:   Fri Nov 29 14:10:07 2024 +0000

    Merge branch 'Automatic_version_update_dependabot' into dependabot/npm_and_yarn/DigitalLearningSolutions.Web/braces-3.0.3

commit f32d5154dc58475e3cd337ee56dece588adb6239
Merge: 67f605300 96230a934
Author: binon <[email protected]>
Date:   Fri Nov 29 14:06:50 2024 +0000

    Merge branch 'Automatic_version_update_dependabot' into dependabot/npm_and_yarn/DigitalLearningSolutions.Web/micromatch-4.0.8

commit a8e74f6ba71ff498f7909a26f43beef98e3f59f1
Merge: 75d36338e 96230a934
Author: binon <[email protected]>
Date:   Fri Nov 29 14:04:19 2024 +0000

    Merge branch 'Automatic_version_update_dependabot' into dependabot/npm_and_yarn/DigitalLearningSolutions.Web/webpack-5.94.0

commit 96230a934aeb488b2e405536e4985d076918162e
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Nov 29 13:49:41 2024 +0000

    Bump Microsoft.Data.SqlClient from 5.1.5 to 5.2.2 (#2992)

    Bumps [Microsoft.Data.SqlClient](https://github.com/dotnet/sqlclient) from 5.1.5 to 5.2.2.
    - [Release notes](https://github.com/dotnet/sqlclient/releases)
    - [Changelog](https://github.com/dotnet/SqlClient/blob/main/CHANGELOG.md)
    - [Commits](https://github.com/dotnet/sqlclient/compare/v5.1.5...v5.2.2)

    ---
    updated-dependencies:
    - dependency-name: Microsoft.Data.SqlClient
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit d816ad8b358f2a7c40c260ceb273a31d9a9f4994
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Nov 29 13:47:31 2024 +0000

    Bump Selenium.Support and Selenium.WebDriver

    Bumps [Selenium.Support](https://github.com/SeleniumHQ/selenium) and [Selenium.WebDriver](https://github.com/SeleniumHQ/selenium). These dependencies needed to be updated together.

    Updates `Selenium.Support` from 4.16.2 to 4.27.0
    - [Release notes](https://github.com/SeleniumHQ/selenium/releases)
    - [Commits](https://github.com/SeleniumHQ/selenium/commits/selenium-4.27.0)

    Updates `Selenium.WebDriver` from 4.16.2 to 4.27.0
    - [Release notes](https://github.com/SeleniumHQ/selenium/releases)
    - [Commits](https://github.com/SeleniumHQ/selenium/commits/selenium-4.27.0)

    ---
    updated-dependencies:
    - dependency-name: Selenium.Support
      dependency-type: direct:production
      update-type: version-update:semver-minor
    - dependency-name: Selenium.WebDriver
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 59628e794546f040d3afa41e1fab1378b60ba3b0
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Nov 29 13:45:38 2024 +0000

    Bump Dapper from 2.1.24 to 2.1.35 (#2995)

    Bumps [Dapper](https://github.com/DapperLib/Dapper) from 2.1.24 to 2.1.35.
    - [Release notes](https://github.com/DapperLib/Dapper/releases)
    - [Commits](https://github.com/DapperLib/Dapper/compare/2.1.24...2.1.35)

    ---
    updated-dependencies:
    - dependency-name: Dapper
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit f645616cbb3cba33837d9cd614784ff7fbbfc87d
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Nov 29 13:45:11 2024 +0000

    Bump xunit from 2.6.2 to 2.9.2 (#2993)

    Bumps [xunit](https://github.com/xunit/xunit) from 2.6.2 to 2.9.2.
    - [Commits](https://github.com/xunit/xunit/compare/v2-2.6.2...v2-2.9.2)

    ---
    updated-dependencies:
    - dependency-name: xunit
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 4bb395b24429ccd3b5922c88498453558eda3e17
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Nov 29 13:44:07 2024 +0000

    Bump babel-loader from 9.1.3 to 9.2.1 in /DigitalLearningSolutions.Web (#2987)

    Bumps [babel-loader](https://github.com/babel/babel-loader) from 9.1.3 to 9.2.1.
    - [Release notes](https://github.com/babel/babel-loader/releases)
    - [Changelog](https://github.com/babel/babel-loader/blob/main/CHANGELOG.md)
    - [Commits](https://github.com/babel/babel-loader/compare/v9.1.3...v9.2.1)

    ---
    updated-dependencies:
    - dependency-name: babel-loader
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit fbdb983f770b59118f7a5915caf1c05d8cf0cd45
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Nov 29 13:43:49 2024 +0000

    Bump rimraf from 5.0.5 to 5.0.10 in /DigitalLearningSolutions.Web (#2984)

    Bumps [rimraf](https://github.com/isaacs/rimraf) from 5.0.5 to 5.0.10.
    - [Changelog](https://github.com/isaacs/rimraf/blob/main/CHANGELOG.md)
    - [Commits](https://github.com/isaacs/rimraf/compare/v5.0.5...v5.0.10)

    ---
    updated-dependencies:
    - dependency-name: rimraf
      dependency-type: direct:development
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 2e76e69d17198c79d0385269be6ae16b5be92421
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Nov 29 13:42:32 2024 +0000

    Bump eslint-plugin-jasmine in /DigitalLearningSolutions.Web (#2986)

    Bumps [eslint-plugin-jasmine](https://github.com/tlvince/eslint-plugin-jasmine) from 4.1.3 to 4.2.2.
    - [Release notes](https://github.com/tlvince/eslint-plugin-jasmine/releases)
    - [Commits](https://github.com/tlvince/eslint-plugin-jasmine/compare/v4.1.3...v4.2.2)

    ---
    updated-dependencies:
    - dependency-name: eslint-plugin-jasmine
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 23e3623b203cb31247c6545e001c288c835eab9f
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Nov 29 13:42:20 2024 +0000

    Bump core-js from 3.36.0 to 3.39.0 in /DigitalLearningSolutions.Web (#2989)

    Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.36.0 to 3.39.0.
    - [Release notes](https://github.com/zloirock/core-js/releases)
    - [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
    - [Commits](https://github.com/zloirock/core-js/commits/v3.39.0/packages/core-js)

    ---
    updated-dependencies:
    - dependency-name: core-js
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 7ca7306604d6657ce46ac5cbb8b4d57f5a5ecf32
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Nov 29 13:41:51 2024 +0000

    Bump NUnit3TestAdapter from 4.5.0 to 4.6.0 (#2988)

    Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter) from 4.5.0 to 4.6.0.
    - [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases)
    - [Commits](https://github.com/nunit/nunit3-vs-adapter/compare/V4.5.0...V4.6.0)

    ---
    updated-dependencies:
    - dependency-name: NUnit3TestAdapter
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit dc5201cdcc9ae261531b5a7b69c23b9ee75bfe52
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Nov 29 13:38:52 2024 +0000

    Bump eslint-plugin-import in /DigitalLearningSolutions.Web (#2985)

    Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.29.1 to 2.31.0.
    - [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
    - [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md)
    - [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.29.1...v2.31.0)

    ---
    updated-dependencies:
    - dependency-name: eslint-plugin-import
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 79a7cc2aa54ba1c55aa0467c6d936f1d351114c3
Merge: ec7910b42 2d83b1705
Author: binon <[email protected]>
Date:   Fri Nov 29 13:27:21 2024 +0000

    Merge pull request #2983 from TechnologyEnhancedLearning/master

    Create auto-merge.yml

commit 2d83b1705a64e650d3dbbe0927d5e3e62bdc7886
Author: binon <[email protected]>
Date:   Fri Nov 29 13:17:05 2024 +0000

    Create auto-merge.yml

commit fbeaa0a030c6cd733150ed84134d0e2711c7ae19
Author: Sherif Olaboye <[email protected]>
Date:   Wed Nov 27 17:00:29 2024 +0000

    TD-4889 Resolving internal server error when nominating delegate to supervisor

commit 3c09df35d8641f7a823f85cb195f52d414df2874
Author: Sherif Olaboye <[email protected]>
Date:   Wed Nov 27 16:35:24 2024 +0000

    TD-4889 Resolving internal server error when nominating delegate to supervisor

commit 0a24e3a9dd759bb8e2d352cf326eda637d69f41f
Author: Sherif Olaboye <[email protected]>
Date:   Wed Nov 27 10:40:01 2024 +0000

    TD-4973 Limit the list of supervisors in the Request proficiency confirmation view to supervisors with a matching category

commit 209b2b29fb0f50f574561edc426125f01b8a5cd4
Merge: 66d3ff25e ec7910b42
Author: kevwhitt-hee <[email protected]>
Date:   Wed Nov 27 09:50:41 2024 +0000

    Merge branch 'master' into Automatic_version_update_dependabot

commit 49d6df110509fe80eaeff4f6e1b9a7ad9f0a05ff
Merge: d9c9b6b31 ec7910b42
Author: kevwhitt-hee <[email protected]>
Date:   Wed Nov 27 08:55:26 2024 +0000

    Merge branch 'master' into DLS-Release-v1.1.0

commit d9c9b6b3112494c83e992ff187e5ecd0286f337b
Author: kevwhitt-hee <[email protected]>
Date:   Wed Nov 27 08:21:19 2024 +0000

    Removes migration causing an error in production data during deployment

commit 66d3ff25ef2ec34ad03962723a7cb4c6597a5ed7
Author: kevwhitt-hee <[email protected]>
Date:   Mon Nov 25 10:55:01 2024 +0000

    Squashed commit of the following:

    commit 4eb3383e083ee184f46f3f2999d8e4739c9c90cf
    Merge: e97a907c5 f0b75fffa
    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 f0b75fffa921bbaf989c600ffd31b0cfc5124248
    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 e97a907c5d6d5eed2e22f27bbabaac4219db9dac
    Merge: 5fbbb4ecb b86b63aec
    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 b86b63aecc17437dab27d0b1ed1664cdddd049d3
    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 5fbbb4ecb10eed2a95e8a1fd32f71af77e2d02fa
    Merge: 47e887f63 26874ef11
    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 26874ef1130086054f22a95c1c934ce40f546be1
    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 47e887f63514e245b088aa01e8a44604545e9148
    Merge: 3c5a36776 4c381f10c
    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 4c381f10c2db5d44a3b1a2e5d2d8b1d13d1a8e1b
    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 3c5a367763b973c5be8b14dd4500c26e5b6d9827
    Merge: bdd85f1b9 833431125
    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 8334311251ea1dd29946498ce9d9980af79addb7
    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 bdd85f1b95d827c3490f465d36e90629c5a4e0a6
    Merge: bfa9282ee 9496e79e6
    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 9496e79e61df3831c3d3da5419cd6d0383d513c2
    Author: kevwhitt-hee <[email protected]>
    Date:   Tue Nov 19 09:00:37 2024 +0000

        TD-4950 Corrects visibility of verify multiple results button

    commit bfa9282eefd512912b873ecf9fd930a5681fba0f
    Merge: 217631462 5fc818fdd
    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 5fc818fddf1016ff9d073691d95435cb463f776d
    Author: kevwhitt-hee <[email protected]>
    Date:   Fri Nov 15 08:58:33 2024 +0000

        Removes using DB name from scripts

    commit 217631462e1b40dbaec473ae52ea11ef81105f98
    Merge: a0af08d7c bc6d1329e
    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 bc6d1329e7f346097f1c92ea0c93cbb4e5694646
    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 a0af08d7cdb8b1c6a3f4f47ebaabb48577f2f216
    Merge: 8c5d66e11 5cf736ae7
    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 5cf736ae774616af5f9640a3f78080fb665e3ac5
    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 8c5d66e114bab50fdebb47c3127ac3002d58bfca
    Merge: caa35100d 568ed0910
    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 caa35100d911fa86a289b607eab67b25fdf7409a
    Merge: 4de14a882 09ac5a7fe
    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 09ac5a7fe132c4f53b25d19f75d48105df09356f
    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 6b93697ae26716c30bd6d8cf6e02feb79061c9ef
    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 c910b996d7bdf778bdade9b740908210d52e97a3
    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 5df757daac2733b84412aeeed627d652f2c97d82
    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 ea9a4bfef074578f2bd1b115bcf69b6f3c68ebaf
    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 4de14a8823b1d32948e39885748ca2a50469998c
    Merge: f2e0e884f 2f57f4381
    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 2f57f4381308bbe9b4c380d38658e71c1ffed79b
    Author: kevwhitt-hee <[email protected]>
    Date:   Mon Nov 11 13:55:17 2024 +0000

        Update CompetencyDataService.cs

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

        Updates SelfAssessmentID when updating a self assessment result

    commit f2e0e884f7790cb7006a218639f1e39e57caea29
    Merge: 6b72e4aef 7a480d352
    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 7a480d35242d6a4b664858666c490b8fcd303454
    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 6b72e4aef5959845ac7f059313c1124b33b79e3c
    Merge: 4e46fa637 94c92fc11
    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 568ed091002407cc8b4a6d742ea333116f70ecf3
    Merge: 920fe6b83 f43f51fbc
    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 4e46fa6373ce6ca90cf496c9d92aada9ba16611e
    Merge: a5a0c3a9d 90dd9e187
    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 94c92fc111f34e53f52f5af8b36480dc0c7e4947
    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 f43f51fbc8a10233bb0484a68f5d79d6662156a9
    Author: Rohit Shrivastava <[email protected]>
    Date:   Thu Nov 7 17:40:05 2024 +0000

        TD-4773 GitHub Actions Target To Dot Net 8

    commit a5a0c3a9dd9465d99b9062a26c11dc755945dc8d
    Merge: 84ed4ae13 5d3e3b448
    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 5d3e3b44848957535d9f9aa69a0403cb6de5f253
    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 67a9b11a89b9703bd1fb51fcfb307471596fa0cf
    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 12676b978e9d1ae8babb6b1f8c977c4f08cedbc6
    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 84ed4ae1372754e9482f16083d5765efb9b04f1a
    Merge: d3d98e729 b277e24db
    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 d3d98e729b283564a1d213016fb23ded44869217
    Merge: 25f0913d7 23c3b6e95
    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 25f0913d7cf0c1b73203b8a08d3465dbb7dec31c
    Merge: 4b268cb84 f8ca071a8
    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 b277e24dba0344900cb6eb4cb17c9217008ac87b
    Author: Auldrin Possa <[email protected]>
    Date:   Tue Nov 5 12:21:52 2024 +0000

        TD-4495-filter value text trimmed

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

        TD-4632 Resolved git action warning

    commit 78b6e4a494a83c6465cb4cd76e766c2c077c7bb1
    Merge: 69c5f3ae6 4b268cb84
    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 920fe6b8361f51a8f56b464e22168d22b5d5f9b4
    Merge: f11e88325 025fed6da
    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 69c5f3ae687a921fb6170fb825c3b1d8ed63d2f7
    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 4e48778fb5af12d43b591912d294a8baea12a2fd
    Merge: d0ed56b5e 3098eaa32
    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 025fed6dae3af22cabf56d6b0ea8ccf9746c119a
    Author: Rohit Shrivastava <[email protected]>
    Date:   Fri Nov 1 09:28:32 2024 +0000

        TD-4771 Upgrading framework

    commit 23c3b6e957c587e44115af6f2e155d47d2de5840
    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 4b268cb8471b93da93fa3968537608058a563996
    Merge: 3098eaa32 0b9353579
    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 24a7b7bda426f48a11b1247970fa1a530fab347d
    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 691fbe8e07fdfffb8bad2c565b8832ebaa6c0d28
    Merge: 419faa7bc 3098eaa32
    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 0b93535797636781ae32eddd48460ea36b1f5bed
    Author: Auldrin Possa <[email protected]>
    Date:   Tue Oct 29 15:49:45 2024 +0000

        TD-4946-Name property initialized from UserAccount entity

    commit 3098eaa32e41933cfb8dcd59e43bd6a9ddb4937b
    Merge: edfca62dc 3e6bbbdab
    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 edfca62dcf788c8dc9308e37abcb298bfeb5d48b
    Merge: dea1766d4 f88475b4d
    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 3e6bbbdabebb7de2981741e5282561407a3d3201
    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 dea1766d48906a5554aef5417ff7b1fc45dccf54
    Merge: 7629b852f fa0fe0d9c
    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 7629b852f0a06f2626e12177a51544ab29bab03f
    Merge: 841fb5fe0 000d7df27
    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 000d7df27efd2f256c78f7807db0dab04b9b8ea6
    Author: Rohit Shrivastava <[email protected]>
    Date:   Fri Oct 25 10:48:30 2024 +0100

        reverting the change.

    commit 841fb5fe015b76ed7bbd509fcdd1ea7f91e3385e
    Merge: de21044c9 d10394047
    Author: rshrirohit <[email protected]>
    Date:   Fri Oct 25 10:32:35 2024 +0100

        Merge pull request #2899 from TechnologyEnhancedLearning/testRohitXFrame

        Xframe settings test

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

        Xframe settings test

    commit e4eba698c22b19f8974e195cdbedfa91b8fddc92
    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 fa0fe0d9ce327cd45c53b65841a0ea1ba4ce6784
    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 e952060d7fd18e73cfc3ecaa6eb746ec1708f28a
    Author: kevwhitt-hee <[email protected]>
    Date:   Mon Oct 21 15:15:17 2024 +0100

        Fixes optional competencies page markup and styling

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

        TD-4920 Removes the select all/deselect all checkboxes

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

        TD-4791-Unit tests added

    commit de21044c93fe0bee0ac256912aaaf6dd178934f5
    Merge: c95e20d76 c4cf94d84
    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 c95e20d762bcebfa3c9802cdb8535373fcbfc96b
    Merge: 297c56ed6 2fca1551f
    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 297c56ed62e18df043289bfc9cab2adbaf9b78f0
    Merge: 7e308b06c 2134fd996
    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 7e308b06ce589ed9436dfcef391c197d01f0c6a4
    Merge: 1c6b8bd9f 1987b1e29
    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 1c6b8bd9ff50f2d6ca282c4cfe6739a6c3a78392
    Merge: 7eef36083 c611e00e5
    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 419faa7bca44cfeec648e87324aa445439ca0f96
    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 c4cf94d848b7b7e03c2645de8d7bc056a7ec18e0
    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 7eef36083bbed8efd8ba693ade07e40a23ee3f7f
    Merge: a8682c5cd f11e88325
    Author: rshrirohit <[email protected]>
    Date:   Tue Oct 15 08:44:37 2024 +0100

        Merge branch 'master' into release-v1.0.0

    commit d0ed56b5ed5e060b47204d98a0235abfe2573674
    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 7d7754683d883ecb7f025ca93a949f716750f00e
    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 2fca1551fda4da1d237d334d816a75cf9cc8b3fe
    Author: Auldrin Possa <[email protected]>
    Date:   Fri Oct 11 20:57:24 2024 +0100

        test cases updated

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

        TD-4793-unit tests added for deactivate delegate controller

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

        ForwardOnlyMigration added

    commit ed4d1d7446176fa8d139702f7096205c16f91842
    Merge: 7da62dd3b a8682c5cd
    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 2134fd996770c3cb1ece20613d49293dcc36dbd8
    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 a8682c5cdd6d9f77b04667f403afd261a4d3f32c
    Merge: 08625bfc7 9ed7ca9fa
    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 08625bfc75c36eb80baec0ed4f736a9f22c67193
    Merge: d78d8dd60 ae399db28
    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 7da62dd3bf855aa74123be43e7cfd6f13a5853c6
    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 90dd9e18755ddd343059508c9dc912bbfbfea531
    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 9ed7ca9fa7d11ea3b305129761292137d708189d
    Author: Auldrin Possa <[email protected]>
    Date:   Tue Oct 1 16:35:22 2024 +0100

        TD-4785- Removed date updated to CandidateAssessmentSupervisors table.

    commit ae399db28a0dbc1e8c940caa6c50fa2037a84068
    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 c611e00e5edba0ccdcac00342d3c8d0632445dca
    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

commit 01259c3a411426535976a914cd2bab4d733d4e40
Author: kevwhitt-hee <[email protected]>
Date:   Mon Nov 25 10:26:53 2024 +0000

    Squashed commit of the following:

    commit 4eb3383e083ee184f46f3f2999d8e4739c9c90cf
    Merge: e97a907c5 f0b75fffa
    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 f0b75fffa921bbaf989c600ffd31b0cfc5124248
    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 c333cf065b5d053958fbeb1cdf1a5feea00f2009
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Sep 16 21:23:32 2024 +0000

    Bump dompurify from 2.4.7 to 2.5.4 in /DigitalLearningSolutions.Web

    Bumps [dompurify](https://github.com/cure53/DOMPurify) from 2.4.7 to 2.5.4.
    - [Release notes](https://github.com/cure53/DOMPurify/releases)
    - [Commits](https://github.com/cure53/DOMPurify/compare/2.4.7...2.5.4)

    ---
    updated-dependencies:
    - dependency-name: dompurify
      dependency-type: direct:production
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 3a8ce1ce6e05bc0b699cdab3971eb451d5c3d655
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Sep 9 07:02:49 2024 +0000

    Bump Microsoft.Data.SqlClient in /DigitalLearningSolutions.Data.Tests

    Bumps [Microsoft.Data.SqlClient](https://github.com/dotnet/sqlclient) from 5.1.2 to 5.1.3.
    - [Release notes](https://github.com/dotnet/sqlclient/releases)
    - [Changelog](https://github.com/dotnet/SqlClient/blob/main/CHANGELOG.md)
    - [Commits](https://github.com/dotnet/sqlclient/compare/v5.1.2...v5.1.3)

    ---
    updated-dependencies:
    - dependency-name: Microsoft.Data.SqlClient
      dependency-type: direct:production
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 56e3913ad7072baa7f448eb6535ddb81a07c1872
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Sep 9 07:01:24 2024 +0000

    Bump braces from 3.0.2 to 3.0.3 in /DigitalLearningSolutions.Web

    Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
    - [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
    - [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3)

    ---
    updated-dependencies:
    - dependency-name: braces
      dependency-type: indirect
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 67f605300ca805be26124de4b13605380a2fde25
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Sep 9 07:01:22 2024 +0000

    Bump micromatch from 4.0.5 to 4.0.8 in /DigitalLearningSolutions.Web

    Bumps [micromatch](https://github.com/micromatch/micromatch) from 4.0.5 to 4.0.8.
    - [Release notes](https://github.com/micromatch/micromatch/releases)
    - [Changelog](https://github.com/micromatch/micromatch/blob/master/CHANGELOG.md)
    - [Commits](https://github.com/micromatch/micromatch/compare/4.0.5...4.0.8)

    ---
    updated-dependencies:
    - dependency-name: micromatch
      dependency-type: indirect
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 75d36338e7aec4690a79bfbba27f7b75e792b6b6
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu Sep 5 10:28:42 2024 +0000

    Bump webpack from 5.90.3 to 5.94.0 in /DigitalLearningSolutions.Web

    Bumps [webpack](https://github.com/webpack/webpack) from 5.90.3 to 5.94.0.
    - [Release notes](https://github.com/webpack/webpack/releases)
    - [Commits](https://github.com/webpack/webpack/compare/v5.90.3...v5.94.0)

    ---
    updated-dependencies:
    - dependency-name: webpack
      dependency-type: direct:development
    ...

    Signed-off-by: dependabot[bot] <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Auldrin-Possa Auldrin-Possa Awaiting requested review from Auldrin-Possa

@ABSinhaa ABSinhaa Awaiting requested review from ABSinhaa

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@kevwhitt-hee