Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
489 commits
Select commit Hold shift + click to select a range
e9a8a13
Merge pull request #3243 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit May 8, 2025
6e68df7
Merge pull request #3249 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit May 8, 2025
7be11c2
Merge pull request #3255 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit May 8, 2025
3f0ed28
TD-5487 Issue showing multiple comments when clicked the back link af…
sherif-olaboye May 9, 2025
f71e85e
TD-5453-Code added/updated to remove Wave, axe DevTools and Lighthous…
May 9, 2025
7246e0d
TD-5568 Add 'Last accessed date' to 'sort' filter on 'Tracking system…
sherif-olaboye May 12, 2025
e364763
TD-5451-empty competency description check added in Supervise section.
May 12, 2025
85abefa
TD-3714 Display the DelegateAccounts.LastAccessed date on the Trackin…
sherif-olaboye May 12, 2025
e2ec325
TD-3716 Display the AdminAccounts.LastAccessed date in the Tracking S…
sherif-olaboye May 12, 2025
8d82452
TD-5443-Validation summary field name corrected
May 12, 2025
746cf00
Merge pull request #3251 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit May 13, 2025
b740bf7
Merge pull request #3258 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit May 13, 2025
a7e04ca
Merge pull request #3261 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit May 13, 2025
9a764c0
Merge pull request #3262 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit May 13, 2025
39e3925
Merge pull request #3263 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit May 13, 2025
0d3242c
Merge pull request #3264 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit May 13, 2025
6a7ddec
TD-5547 : Rewrote the Self Assessment report code to incorporate and …
ABSinhaa May 15, 2025
b5ab440
TD-5439-Added empty competency description check. Increased competenc…
May 15, 2025
6d07122
TD-5511-Displaying View/Review based on framework review
May 16, 2025
267ac46
Merge pull request #3266 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit May 19, 2025
b395ce1
Merge pull request #3267 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit May 19, 2025
6f9fb33
TD-5568 changing to Last Accessed Date to Last accessed date
sherif-olaboye May 19, 2025
aaf8d95
TD-5511-GetAdminUserRoleForFrameworkId(+) query modified to get admin…
May 19, 2025
d4c4924
DLS-Release-v1.2.0-Hotfix
rshrirohit May 20, 2025
c26d12a
TD_3718_ adding the text 'Last accessed date' to the administrators c…
ABSinhaa May 20, 2025
fd66a08
TD_3719_added the phrase 'Last accessed date' to the delegates card.
ABSinhaa May 20, 2025
ab8492c
TD_5583_ Added Last accessed date field to the view delegates section…
ABSinhaa May 20, 2025
2d3dda8
TD-3715_Renamed the dataTable column name to 'Last accessed date'.
ABSinhaa May 20, 2025
1697508
TD-5620-Added code to check if the html editor is empty.
May 20, 2025
6dbd547
Bump webpack from 5.99.8 to 5.99.9 in /DigitalLearningSolutions.Web (…
dependabot[bot] May 20, 2025
97a7d8a
Bump @types/lodash in /DigitalLearningSolutions.Web (#3276)
dependabot[bot] May 20, 2025
74fdf25
Squashed commit of the following:
kevwhitt-hee May 21, 2025
a961e4d
Merge pull request #3198 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit May 21, 2025
9b11221
Merge pull request #3259 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit May 21, 2025
7fa0ed7
Merge pull request #3260 from TechnologyEnhancedLearning/Develop/Feat…
rshrirohit May 21, 2025
0a5d04e
Merge pull request #3265 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit May 21, 2025
e42945b
Merge pull request #3268 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit May 21, 2025
f6a25c8
Merge pull request #3270 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit May 21, 2025
fda2a45
Merge pull request #3271 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit May 21, 2025
c61de1b
Merge pull request #3272 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit May 21, 2025
55b7429
Merge pull request #3273 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit May 21, 2025
7cacd96
Merge pull request #3274 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit May 21, 2025
8fa1d92
Merge branch 'master' into DLS-Release-v1.3.0
kevwhitt-hee May 21, 2025
b890dad
Merge branch 'DLS-Release-v1.3.0' of https://github.com/TechnologyEnh…
kevwhitt-hee May 21, 2025
3641122
Squashed commit of the following:
kevwhitt-hee May 21, 2025
79ab922
TD-5581 Issue showing multiple comments on 'Frameworks' - 'Comments' …
sherif-olaboye May 21, 2025
430d824
TD-5581 Issue showing multiple comments on 'Frameworks' - 'Comments' …
sherif-olaboye May 21, 2025
0c0f356
TD-5581 Issue showing multiple comments on 'Frameworks' - 'Comments' …
sherif-olaboye May 21, 2025
9befbce
Merge branch 'DLS-Release-v1.2.1' into DLS-Release-v1.3.0
kevwhitt-hee May 21, 2025
74261da
Merge pull request #3269 from TechnologyEnhancedLearning/DLS-Release-…
rshrirohit May 22, 2025
0bc1d19
Merge branch 'master' into DLS-Release-v1.2.1
rshrirohit May 22, 2025
13e7f36
Merge branch 'DLS-Release-v1.2.1' into DLS-Release-v1.3.0
rshrirohit May 22, 2025
40a60d8
TD-5443-Bulk-upload- flags comparision modified by adding Trim and To…
May 22, 2025
c4b4739
Fixes caused by merge conflicts from 1.2.1
kevwhitt-hee May 22, 2025
744a9ce
Merge pull request #3277 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit May 28, 2025
aa02953
Merge pull request #3278 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit May 28, 2025
2ee09c1
TD-5581 Issue showing multiple comments on 'Frameworks' - 'Comments' …
sherif-olaboye May 29, 2025
79c3e65
TD-5511-Sql modified to show FrameworkReviewID for admin logged in fr…
May 29, 2025
69dfe66
TD-3712 Updating LastAccessed For Unverified Users Login
rshrirohit May 29, 2025
f5ae3b1
Bump @babel/core from 7.26.10 to 7.27.4 in /DigitalLearningSolutions.…
dependabot[bot] May 30, 2025
cfd8bad
Merge pull request #3280 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jun 2, 2025
d3d67cd
Merge pull request #3282 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jun 2, 2025
3b4c166
Merge pull request #3281 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Jun 2, 2025
0403feb
Merge branch 'DLS-Release-v1.2.1' into DLS-Release-v1.3.0
rshrirohit Jun 2, 2025
0c4351d
TD-5636 Issue allowing to add duplicate resources on 'Competence Reso…
sherif-olaboye Jun 3, 2025
5da1a6f
updated scss and layout files to rationalise .nhsuk overrides
frank-hee Jun 3, 2025
0a8cbba
Revert "updated scss and layout files to rationalise .nhsuk overrides"
frank-hee Jun 3, 2025
b571998
Reapply "updated scss and layout files to rationalise .nhsuk overrides"
frank-hee Jun 3, 2025
f91f260
Revert "Reapply "updated scss and layout files to rationalise .nhsuk …
frank-hee Jun 3, 2025
60e2c62
Reapply "updated scss and layout files to rationalise .nhsuk overrides"
frank-hee Jun 3, 2025
dcc3290
TD-483 Adds model, data service methods and controller for select com…
kevwhitt-hee Jun 4, 2025
8c02dde
replacing accidental deletion of web.config
frank-hee Jun 4, 2025
8e2920b
TD-483 Begins to implement interface and redirect to add competencies…
kevwhitt-hee Jun 5, 2025
5387096
Fix horizontal spacing issues on breadcrumbs and maincontentwrapper
frank-hee Jun 6, 2025
3baa32e
Fixed horizontal spacing around breadcrumbs and main content.
frank-hee Jun 6, 2025
0409d61
Replacing accidentally deleted files
frank-hee Jun 9, 2025
556f965
Restoring appsettings.Test.json
frank-hee Jun 9, 2025
63a4e27
restoring appsettings.Development.json
frank-hee Jun 9, 2025
196fc68
Bump core-js from 3.42.0 to 3.43.0 in /DigitalLearningSolutions.Web (…
dependabot[bot] Jun 9, 2025
5ccec6d
TD-5547_Test failed for DSAT code changes.
ABSinhaa Jun 11, 2025
df18089
TD-5583_Test Failed for last accessed information not showing on the …
ABSinhaa Jun 11, 2025
32c2bf6
Merge pull request #3289 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jun 12, 2025
d7e07a6
Merge pull request #3290 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jun 12, 2025
30439cf
Merge branch 'DLS-Release-v1.2.1' into DLS-Release-v1.3.0
rshrirohit Jun 12, 2025
fbe2e26
TD-5667-Group/Competency name is trimmed
auldrinpossa Jun 16, 2025
5beabf1
TD-5683 Issue showing self assessment reports on Tracking system whic…
sherif-olaboye Jun 18, 2025
34c67ca
TD-5683 Issue showing self assessment reports on Tracking system whic…
sherif-olaboye Jun 18, 2025
3c39d1b
Bump @types/lodash in /DigitalLearningSolutions.Web (#3294)
dependabot[bot] Jun 18, 2025
5d0610c
Merge pull request #3292 from TechnologyEnhancedLearning/DLS-Release-…
rshrirohit Jun 19, 2025
f5e7b41
Merge branch 'DLS-Release-v1.2.2' into DLS-Release-v1.3.0
rshrirohit Jun 19, 2025
b36bc8c
Merge pull request #3165 from TechnologyEnhancedLearning/dependabot/n…
rshrirohit Jun 19, 2025
2125cad
Merge pull request #3237 from TechnologyEnhancedLearning/dependabot/n…
rshrirohit Jun 19, 2025
95a3da4
Merge branch 'master' into Automatic_version_update_dependabot
rshrirohit Jun 19, 2025
a2a5da9
TD-5657-Required validation added to review comment
auldrinpossa Jun 19, 2025
ec592c3
TD-5658-Empty framework/group validation added to show/hide buttons
auldrinpossa Jun 20, 2025
caacce6
TD-483 Begins implementation of add competencies functionality
kevwhitt-hee Jun 20, 2025
339307f
TD-5670 Adds migrations for DB maintenance scripts
kevwhitt-hee Jun 20, 2025
9ecac9d
TD-5658 - Added group capability existence check.
auldrinpossa Jun 20, 2025
d456967
TD-483 Begins to implement the select framework page
kevwhitt-hee Jun 20, 2025
052a0b0
TD-483 Begins to implement add competencies MVC view
kevwhitt-hee Jun 23, 2025
6bdddeb
Merge pull request #3287 from TechnologyEnhancedLearning/Develop/Fixe…
frank-hee Jun 23, 2025
15214bf
TD-5709 fixes subquery returns multiple results error
kevwhitt-hee Jun 24, 2025
04054db
TD_5410_Adding config to the rate limiter so that we can conpare the …
ABSinhaa Jun 24, 2025
dfbaebe
TD-483 Wires up the choose framework post and begins to wire up the a…
kevwhitt-hee Jun 25, 2025
6ae3e59
TD-483 Adds select linked framework source form validation
kevwhitt-hee Jun 26, 2025
e0823ed
TD-5659-Sql query modified to return distinct records.
auldrinpossa Jun 27, 2025
45313c8
TD-5621 Issue with the font/size showing for the headings/sub heading…
sherif-olaboye Jun 30, 2025
a092b18
TD-3223 Showing console '404' error when removing the delegate from a…
sherif-olaboye Jul 1, 2025
ce1d59c
TD-3223 Showing console '404' error when removing the delegate from …
sherif-olaboye Jul 1, 2025
daad7ed
Continues progress with loading data into select competencies views
kevwhitt-hee Jul 3, 2025
4efaeda
TD-5759 Refactors self assessment report sql to use SP, CTE and TVF
kevwhitt-hee Jul 3, 2025
d22f00a
Merge pull request #3309 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 3, 2025
dd8e58a
TD-5548 Issue showing 'some existing competency records changed order…
sherif-olaboye Jul 3, 2025
89fa017
TD-5759 Fixes incorrect column names in sp return table
kevwhitt-hee Jul 4, 2025
202431b
Merge pull request #3311 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 4, 2025
d1f2f0c
Fixes "Learner" column name
kevwhitt-hee Jul 4, 2025
63b8659
Merge pull request #3312 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 4, 2025
87c4db7
Applies design based on Framework developer structure interface
kevwhitt-hee Jul 7, 2025
5547046
TD-5551-Sql modified - Requested date removed from the group by
auldrinpossa Jul 7, 2025
6661295
TD_5666_Framework Competency Group Description showing on Learning Po…
ABSinhaa Jul 7, 2025
b12fa66
Merge pull request #3316 from TechnologyEnhancedLearning/DLS-Release-…
kevwhitt-hee Jul 8, 2025
09f0560
Increase query command timeout
kevwhitt-hee Jul 8, 2025
7a10644
Merge pull request #3317 from TechnologyEnhancedLearning/DLS-Release-…
kevwhitt-hee Jul 8, 2025
753d6bc
Merge branch 'master' into DLS-Release-v1.2.2
rshrirohit Jul 8, 2025
ab8b9f9
Merge pull request #3285 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 8, 2025
61c9136
Merge pull request #3291 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Jul 8, 2025
96776cf
Merge pull request #3295 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Jul 8, 2025
003f4b5
Merge pull request #3296 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Jul 8, 2025
310d905
Merge pull request #3303 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Jul 8, 2025
fe3cceb
Merge pull request #3305 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 8, 2025
d3a6ec1
Merge pull request #3313 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Jul 8, 2025
271f4d1
TD-5709 Added where clause to limit the results to active admin records
rshrirohit Jul 8, 2025
add29f3
TD-5775 Sets up a new readonly DB connection factory and uses it for …
kevwhitt-hee Jul 8, 2025
da11b43
Merge pull request #3318 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 9, 2025
a17a7cd
Merge branch 'DLS-Release-v1.2.1-Hotfix' into DLS-Release-v1.2.2
rshrirohit Jul 9, 2025
1327415
TD-5771 Issue showing 'LearchingLaunched' field showing blank for all…
sherif-olaboye Jul 9, 2025
c864d26
Merge branch 'DLS-Release-v1.2.2' into Develop/Features/TD-5670-DBMai…
rshrirohit Jul 9, 2025
b7fc082
TD_5666 Made code changes after discussion and showed thee descriptio…
ABSinhaa Jul 10, 2025
1569e57
Implements frameworks summary to view selected competencies and selec…
kevwhitt-hee Jul 14, 2025
6e73fc2
Merge pull request #3323 from TechnologyEnhancedLearning/DLS-Release-…
rshrirohit Jul 16, 2025
0da58cd
Merge branch 'master' into DLS-Release-v1.2.2
rshrirohit Jul 16, 2025
2f63a9c
TD-5555-Html tags have been updated to address accessibility issues.
Auldrin-Possa Jul 16, 2025
596c1a1
Merge pull request #3297 from TechnologyEnhancedLearning/Develop/Feat…
rshrirohit Jul 21, 2025
52eb0a2
Merge pull request #3299 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 21, 2025
819f1b7
Merge pull request #3310 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 21, 2025
b36f6f8
Merge pull request #3315 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 21, 2025
180fa56
Merge pull request #3319 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 21, 2025
d76cfb6
Merge pull request #3324 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Jul 21, 2025
0508cdb
Merge pull request #3304 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 21, 2025
602a065
TD-5759-The CentreEmail and RegistrationEmail fields in the SQL query…
Auldrin-Possa Jul 21, 2025
d41fdb4
TD-5621 Align expander component on Review and Self-Assessment pages
sherif-olaboye Jul 22, 2025
4fdce60
TD-5837-Added a script to add columns to the SelfAssessments table.
Auldrin-Possa Jul 22, 2025
629f2e0
TD-5535-Modified SQL query/stored procedure to hide retired self-asse…
Auldrin-Possa Jul 24, 2025
af1c9d4
TD-5666_Test failed for View For Print functionality on the framework…
ABSinhaa Jul 24, 2025
332b079
Merge pull request #3326 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Jul 25, 2025
0655558
Merge pull request #3329 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit Jul 25, 2025
bfac183
Merge pull request #3331 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 25, 2025
b9e2b5b
Merge branch 'DLS-Release-v1.2.2' into DLS-Release-v1.2.3
rshrirohit Jul 25, 2025
3820011
TD-5611-Modified SQL query to hide retired self-assessment role profiles
Auldrin-Possa Jul 25, 2025
a317639
begins to implement post method
kevwhitt-hee Jul 28, 2025
2a71931
Implements url parameter flag override for tableau dashboard link fea…
kevwhitt-hee Jul 28, 2025
50702e9
sets UAT appsetting default to false, IDE format changes for index.cs…
kevwhitt-hee Jul 28, 2025
9929793
Merge pull request #3333 from TechnologyEnhancedLearning/Develop/Feat…
rshrirohit Jul 28, 2025
87fdb14
Merge branch 'master' into Develop/Features/TD-483-AddComptenciesToAs…
kevwhitt-hee Jul 28, 2025
6f2e711
Remove unused using directives
kevwhitt-hee Jul 28, 2025
176fb31
Implements persistence of url param to dashboard page and handling
kevwhitt-hee Jul 28, 2025
c5cd891
formatter changes
kevwhitt-hee Jul 28, 2025
3ea181e
Merge pull request #3334 from TechnologyEnhancedLearning/Develop/Feat…
rshrirohit Jul 28, 2025
badab53
More prep work on posting the add competencies page
kevwhitt-hee Jul 30, 2025
b805ae6
Merge pull request #3336 from TechnologyEnhancedLearning/DLS-Release-…
rshrirohit Jul 30, 2025
4b05347
TD_5535_Undoing not showing retired self assessments across current a…
ABSinhaa Jul 30, 2025
de59eae
Merge pull request #3330 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit Jul 30, 2025
7d97c7c
TD_5535_Undid the retirement date logic to display all the self asses…
ABSinhaa Jul 30, 2025
740b4d9
Merge branch 'DLS-Release-v1.2.1-Hotfix' into DLS-Release-v1.2.2
rshrirohit Jul 31, 2025
92e3547
Merge branch 'DLS-Release-v1.2.2' into DLS-Release-v1.2.3
rshrirohit Jul 31, 2025
6176a03
Merge branch 'DLS-Release-v1.2.3' into DLS-Release-v1.3.0
rshrirohit Jul 31, 2025
f1a555e
Includes only competencies that are not already added to the assessme…
kevwhitt-hee Jul 31, 2025
b2322ba
Merge pull request #3337 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 31, 2025
186b7fe
TD-4088 Implements supervisor launch tableau dashboard mechanism with…
kevwhitt-hee Jul 31, 2025
e63a596
TD-5669 Learners enrolling onto a retiring self assessment
sherif-olaboye Jul 31, 2025
23f7100
Merge branch 'DLS-Release-v1.2.3' into Develop/Features/TD-5669-Learn…
sherif-olaboye Jul 31, 2025
8bebdc6
Update SupervisorControllerTests.cs
kevwhitt-hee Jul 31, 2025
4fc772c
TD-Added confirmation screen and related change in controller
Auldrin-Possa Aug 1, 2025
42f12df
Merge branch 'master' into Develop/Features/TD-483-AddComptenciesToAs…
kevwhitt-hee Aug 1, 2025
048acfd
Merge pull request #3328 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Aug 4, 2025
b9c0a9f
Merge pull request #3332 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit Aug 4, 2025
dcc033d
Merge pull request #3338 from TechnologyEnhancedLearning/Develop/Feat…
rshrirohit Aug 4, 2025
040b6af
Merge branch 'DLS-Release-v1.2.2' into DLS-Release-v1.2.3
rshrirohit Aug 4, 2025
ff83f6a
Merge branch 'DLS-Release-v1.2.3' into DLS-Release-v1.3.0
rshrirohit Aug 4, 2025
b5d1f4c
Fixes loading of data into add competencies from framework view and u…
kevwhitt-hee Aug 5, 2025
ab57052
TD-3237 Multiple spaces on 'Contact number' field should be trimmed o…
sherif-olaboye Aug 6, 2025
d55f09d
Begins to implement remove competency from assessment functionality
kevwhitt-hee Aug 6, 2025
cadb115
Merge pull request #3339 from TechnologyEnhancedLearning/Develop/Feat…
rshrirohit Aug 12, 2025
b36f76c
Merge branch 'DLS-Release-v1.2.3' into Develop/feature/TD-5616-Enroll…
rshrirohit Aug 12, 2025
7166042
Merge pull request #3342 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Aug 12, 2025
4008ae6
Merge pull request #3340 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit Aug 12, 2025
22a9fa2
TD_5410 Changes after discussion over moving the changs from class fi…
ABSinhaa Aug 12, 2025
195dfef
TD_5410 Changes after discussion, removing IConfiguration and Extra j…
ABSinhaa Aug 12, 2025
3745b6e
TD_5410 Reoving unwanted nuget packages, variable declarations and em…
ABSinhaa Aug 12, 2025
225b6ae
TD_5410_removing unwanted System from the namespace section.
ABSinhaa Aug 12, 2025
289a732
TD-5816-Moved ‘competencies update’ code before ‘competencies remove’…
Auldrin-Possa Aug 13, 2025
2733024
Merge pull request #3300 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Aug 14, 2025
a1d4f31
Merge pull request #3346 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Aug 14, 2025
5d7d524
Merge branch 'DLS-Release-v1.2.2' into DLS-Release-v1.2.3
rshrirohit Aug 14, 2025
f763ced
Merge branch 'DLS-Release-v1.2.3' into DLS-Release-v1.3.0
rshrirohit Aug 14, 2025
324f869
Migrations for move competency and competency groups stored procedure
kevwhitt-hee Aug 18, 2025
aa7cb46
TD-5884- Managed header div positions and CSS classes to align the logo.
Auldrin-Possa Aug 18, 2025
1983c15
Reworks the reordering groups sproc to include a RenumberSelfAssessme…
kevwhitt-hee Aug 18, 2025
4603e92
TD-5339 Self Assessment Process Agreement
rshrirohit Aug 19, 2025
378b7b6
TD-5339 Added migration nr a addiding DB column.
rshrirohit Aug 19, 2025
846b784
Improves group moving and adds url anchors for scrolling to moved com…
kevwhitt-hee Aug 19, 2025
c4b040b
TD-5339 Changing text to pick up dynamic vocabulary
rshrirohit Aug 19, 2025
7f085e9
Implements conditional logic for move up and move down buttons
kevwhitt-hee Aug 20, 2025
5523551
Adds update status checkbox and wiring
kevwhitt-hee Aug 20, 2025
88d3659
Merge pull request #3350 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Aug 21, 2025
618ee37
Merge pull request #3352 from TechnologyEnhancedLearning/Develop/Feat…
rshrirohit Aug 21, 2025
80e70ea
Merge branch 'DLS-Release-v1.2.2' into DLS-Release-v1.2.3
rshrirohit Aug 21, 2025
d4b6252
Merge branch 'DLS-Release-v1.2.3' into DLS-Release-v1.3.0
rshrirohit Aug 21, 2025
762467a
Fixes linked framework labelling
kevwhitt-hee Aug 21, 2025
254d3ab
Develop/Fixes/TD-5399-CorrectingRoutingAndAddingServiceFilter
rshrirohit Aug 22, 2025
c06bf2e
Adds select and deselect all buttons to competency groups in add comp…
kevwhitt-hee Aug 22, 2025
dbe0d3c
Update AddCompetenciesSelectFramework.cshtml
kevwhitt-hee Aug 22, 2025
0edfa30
Update AddCompetenciesSelectFramework.cshtml
kevwhitt-hee Aug 22, 2025
788fe39
Merge branch 'DLS-Release-v1.3.0' into Develop/Features/TD-483-AddCom…
kevwhitt-hee Aug 22, 2025
70b7d6f
TD-6095- Modified CSS to fix certificate view.
Auldrin-Possa Aug 26, 2025
a97b036
TD-5339 CorrectingUnitTests
rshrirohit Aug 26, 2025
a0bc0ee
Fix build error relating to unclosed node in resources.resx
kevwhitt-hee Aug 26, 2025
20b5f0b
TD-5339 Removing Unnecessary Code
rshrirohit Aug 26, 2025
f60486c
TD-5339 Removing unit test since related code is now removed
rshrirohit Aug 26, 2025
e181cfe
Fixes build error relating to renamed class
kevwhitt-hee Aug 26, 2025
cfb2eb8
Merge pull request #3356 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Aug 26, 2025
3b9a326
Merge pull request #3358 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Aug 26, 2025
bab82ad
Merge branch 'DLS-Release-v1.2.2' into DLS-Release-v1.2.3
rshrirohit Aug 26, 2025
d0bb3e4
Revert "TD-5548 Issue showing 'some existing competency records chang…
rshrirohit Aug 27, 2025
e8073c7
Merge pull request #3359 from TechnologyEnhancedLearning/revert-3310-…
rshrirohit Aug 28, 2025
7b25b16
TD-6108 Updating ServiceFilter Logic To Exclude Other Areas
rshrirohit Aug 28, 2025
6c81af8
Merge pull request #3360 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Aug 28, 2025
25fa3e0
Merge pull request #3357 from TechnologyEnhancedLearning/Develop/Feat…
rshrirohit Aug 29, 2025
56fa4e1
Merge branch 'DLS-Release-v1.2.2' into DLS-Release-v1.2.3
rshrirohit Sep 1, 2025
80b0aa8
Merge pull request #3362 from TechnologyEnhancedLearning/DLS-Release-…
rshrirohit Sep 2, 2025
58002c9
Merge branch 'master' into DLS-Release-v1.2.3
rshrirohit Sep 2, 2025
5f706f6
Merge branch 'DLS-Release-v1.2.4' into DLS-Release-v1.3.0
rshrirohit Sep 2, 2025
47d551e
TD-5562 Prompt users to ask which features of the framework they want…
sherif-olaboye Sep 4, 2025
5e32b13
TD-5562 introduce the multipage form service
sherif-olaboye Sep 9, 2025
accd0ae
Merge pull request #3364 from TechnologyEnhancedLearning/Develop/Feat…
kevwhitt-hee Sep 15, 2025
21bd1c8
Merge branch 'DLS-Release-v1.3.0' into Develop/Fixes/TD-5683-Issuesho…
sherif-olaboye Sep 15, 2025
7221ade
TD-5683 Resolving PR conflicts
sherif-olaboye Sep 15, 2025
35c8e07
Merge pull request #3293 from TechnologyEnhancedLearning/Develop/Fixe…
kevwhitt-hee Sep 22, 2025
169719e
Squashed commit of the following:
kevwhitt-hee Sep 24, 2025
9603879
Fixes following merge conflict problems.
kevwhitt-hee Sep 25, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -512,3 +512,5 @@ DigitalLearningSolutions.Web/Views/Shared/Components/SelectList/Default.cshtml
DigitalLearningSolutions.Web/Views/Shared/Components/SingleCheckbox/Default.cshtml
DigitalLearningSolutions.Web/Views/Shared/Components/TextArea/Default.cshtml
DigitalLearningSolutions.Web/Views/Shared/Components/TextInput/Default.cshtml
/DigitalLearningSolutions.Web/appsettings.Test.json
/DigitalLearningSolutions.Web/web.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
namespace DigitalLearningSolutions.Data.Migrations
{
using FluentMigrator;

[Migration(202503111500)]
public class AddLastAccessedColumn : Migration
{
public override void Up()
{
Alter.Table("Users").AddColumn("LastAccessed").AsDateTime().Nullable();
Alter.Table("DelegateAccounts").AddColumn("LastAccessed").AsDateTime().Nullable();
Alter.Table("AdminAccounts").AddColumn("LastAccessed").AsDateTime().Nullable();

Execute.Sql("UPDATE u SET LastAccessed = (SELECT MAX(s.LoginTime) FROM DelegateAccounts da JOIN Sessions s ON da.ID = s.CandidateId WHERE da.UserID = u.ID) FROM users u;");
Execute.Sql("UPDATE da SET LastAccessed = (SELECT MAX(s.LoginTime) FROM Sessions s WHERE s.CandidateId = da.ID) FROM DelegateAccounts da;");
Execute.Sql("UPDATE da SET LastAccessed = (SELECT ca.LastAccessed FROM CandidateAssessments ca WHERE ca.ID = da.ID) FROM DelegateAccounts da where da.LastAccessed IS NULL;");
Execute.Sql("UPDATE AA SET LastAccessed = (SELECT MAX(AdS.LoginTime) FROM AdminSessions AdS WHERE AdS.AdminID = AA.ID) FROM AdminAccounts AA;");
}
public override void Down()
{
Delete.Column("LastAccessed").FromTable("Users");
Delete.Column("LastAccessed").FromTable("DelegateAccounts");
Delete.Column("LastAccessed").FromTable("AdminAccounts");
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@


namespace DigitalLearningSolutions.Data.Migrations
{
using FluentMigrator;

[Migration(202503121538)]
public class Alter_SendExpiredTBCReminders : Migration
{
public override void Up()
{
Execute.Sql(Properties.Resources.TD_5412_Alter_SendExpiredTBCReminders_Up);
}
public override void Down()
{
Execute.Sql(Properties.Resources.TD_5412_Alter_SendExpiredTBCReminders_Down);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@


namespace DigitalLearningSolutions.Data.Migrations
{
using FluentMigrator;

[Migration(2025041161520)]
public class Alter_SendExpiredTBCReminders_AppendCourseName : Migration
{
public override void Up()
{
Execute.Sql(Properties.Resources.TD_5514_Alter_SendExpiredTBCReminders_Up);
}
public override void Down()
{
Execute.Sql(Properties.Resources.TD_5514_Alter_SendExpiredTBCReminders_Down);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
namespace DigitalLearningSolutions.Data.Migrations
{
using FluentMigrator;
[Migration(202504241517)]
public class AddFieldIsPrimaryToSelfAssessmentFrameworksTable : AutoReversingMigration
{
public override void Up()
{
Alter.Table("SelfAssessmentFrameworks").AddColumn("IsPrimary").AsBoolean().NotNullable().WithDefaultValue(1);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@


namespace DigitalLearningSolutions.Data.Migrations
{
using FluentMigrator;

[Migration(202504281045)]
public class Alter_ReorderFrameworkCompetency : Migration
{
public override void Up()
{
Execute.Sql(Properties.Resources.TD_5447_Alter_ReorderFrameworkCompetency_Up);
}
public override void Down()
{
Execute.Sql(Properties.Resources.TD_5447_Alter_ReorderFrameworkCompetency_Down);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
namespace DigitalLearningSolutions.Data.Migrations
{
using FluentMigrator;
[Migration(202504281115)]
public class UpdateFrameworkCompetenciesOrdering : ForwardOnlyMigration
{
public override void Up()
{
Execute.Sql(@"WITH Ranked AS (
    SELECT ID,
            ROW_NUMBER() OVER (PARTITION BY FrameworkID ORDER BY SysStartTime) AS NewOrder
    FROM FrameworkCompetencies
Where FrameworkCompetencyGroupID is null
)
UPDATE fc
SET fc.Ordering = r.NewOrder
FROM FrameworkCompetencies fc
JOIN Ranked r ON fc.ID = r.ID;");
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
namespace DigitalLearningSolutions.Data.Migrations
{
using FluentMigrator;

[Migration(202504290900)]
public class UpdateNotifications : ForwardOnlyMigration
{
public override void Up()
{
Execute.Sql(@$"UPDATE Notifications SET NotificationName = 'Completed course follow-up feedback requests' where NotificationID = 13");
}

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
namespace DigitalLearningSolutions.Data.Migrations
{
using FluentMigrator;
[Migration(202506110906)]
public class AddSqlMaintenanceSolution : Migration
{

public override void Up()
{
Execute.Sql(Properties.Resources.TD_5670_MaintenanceScripts_UP);
}
public override void Down()
{
Execute.Sql(Properties.Resources.TD_5670_MaintenanceScripts_DOWN);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
namespace DigitalLearningSolutions.Data.Migrations
{
using FluentMigrator;
[Migration(20250703091)]
public class CreateOrAlterGetSelfAssessmentReport : Migration
{
public override void Up()
{
Execute.Sql(Properties.Resources.TD_5759_CreateOrAlterSelfAssessmentReportSPandTVF_UP);
}
public override void Down()
{
Execute.Sql("DROP PROCEDURE IF EXISTS [dbo].[usp_GetSelfAssessmentReport]");
Execute.Sql("DROP FUNCTION IF EXISTS [dbo].[GetOtherCentresForSelfAssessmentTVF]");
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
namespace DigitalLearningSolutions.Data.Migrations
{
using FluentMigrator;
[Migration(202507040803)]
public class FixCreateOrAlterGetSelfAssessmentReport : ForwardOnlyMigration
{
public override void Up()
{
Execute.Sql(Properties.Resources.TD_5759_CreateOrAlterSelfAssessmentReportSPandTVF_Fix_UP);
}
}
}

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
namespace DigitalLearningSolutions.Data.Migrations
{
using FluentMigrator;
[Migration(202507221424)]
public class AddNewColumnsInSelfAssessments : Migration
{
public override void Up()
{
Alter.Table("SelfAssessments")
.AddColumn("RetirementDate").AsDateTime().Nullable()
.AddColumn("EnrolmentCutoffDate").AsDateTime().Nullable()
.AddColumn("RetirementReason").AsString(2000).Nullable();
}

public override void Down()
{
Delete.Column("RetirementDate").FromTable("SelfAssessments");
Delete.Column("EnrolmentCutoffDate").FromTable("SelfAssessments");
Delete.Column("RetirementReason").FromTable("SelfAssessments");
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
using FluentMigrator;

namespace DigitalLearningSolutions.Data.Migrations
{
[Migration(202507240953)]
public class Alter_GetActivitiesForDelegateEnrolment_Retired_SA : Migration
{
public override void Up()
{
Execute.Sql(Properties.Resources.TD_5535_Alter_GetActivitiesForDelegateEnrolment_Up);
}
public override void Down()
{
Execute.Sql(Properties.Resources.TD_5535_Alter_GetActivitiesForDelegateEnrolment_Down);
}
}
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
namespace DigitalLearningSolutions.Data.Migrations
{
using FluentMigrator;
[Migration(202508181154)]
public class CreateOrAlterMoveCompetenciesAndGroups : Migration
{
public override void Up()
{
Execute.Sql(Properties.Resources.TD_483_uspMoveCompetencyInSelfAssessmentCreateOrAlter_UP);
Execute.Sql(Properties.Resources.TD_483_uspMoveCompetencyGroupInSelfAssessmentCreateOrAlter_UP);
}
public override void Down()
{
Execute.Sql("DROP PROCEDURE IF EXISTS [dbo].[usp_MoveCompetencyGroupInSelfAssessment]");
Execute.Sql("DROP PROCEDURE IF EXISTS [dbo].[usp_MoveCompetencyInSelfAssessment]");
Execute.Sql("DROP PROCEDURE IF EXISTS [dbo].[usp_RenumberSelfAssessmentStructure]");
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
namespace DigitalLearningSolutions.Data.Migrations
{
using FluentMigrator;

[Migration(202508190845)]
public class AddSelfAssessmentProcessAgreed : Migration
{
public override void Up()
{
Alter.Table("CandidateAssessments").AddColumn("SelfAssessmentProcessAgreed").AsDateTime().Nullable();
}

public override void Down()
{
Delete.Column("SelfAssessmentProcessAgreed").FromTable("CandidateAssessments");
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
namespace DigitalLearningSolutions.Data.Migrations
{
using FluentMigrator;
[Migration(202508191440)]
public class CreateSendRetiringSelfAssessmentNotificationSP : Migration
{
public override void Up()
{
string generalTELTeam =
@"[
{ ""FirstName"":"""", ""LastName"":"""", ""Email"":""[email protected]"" },
{ ""FirstName"":""Anna"", ""LastName"":""Athanasopoulou"", ""Email"":""[email protected]"" },
{ ""FirstName"":""Benjamin"", ""LastName"":""Witton"", ""Email"":""[email protected]"" }
]";

Execute.Sql(@$"IF NOT EXISTS (SELECT ConfigID FROM Config WHERE ConfigName = 'GeneralTELTeam')
BEGIN
INSERT INTO Config VALUES ('GeneralTELTeam', '{generalTELTeam}', 0,GETDATE(), GETDATE())
END"
);

Execute.Sql(Properties.Resources.TD_5552_SendRetiringNotification);
}
public override void Down()
{
Execute.Sql(@"DELETE FROM Config WHERE ConfigName = N'GeneralTELTeam'");

Execute.Sql("DROP PROCEDURE [dbo].[SendRetiringSelfAssessmentNotification]");
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@


namespace DigitalLearningSolutions.Data.Migrations
{
using FluentMigrator;

[Migration(202509180915)]
public class Alter_SendRetiringSelfAssessmentNotification : Migration
{
public override void Up()
{
Execute.Sql(Properties.Resources.TD_5552_Alter_SendRetiringSelfAssessmentNotification_Up);
}
public override void Down()
{
Execute.Sql(Properties.Resources.TD_5552_Alter_SendRetiringSelfAssessmentNotification_Down);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<PackageReference Include="Dapper" Version="2.1.35" />
<PackageReference Include="FluentMigrator" Version="6.2.0" />
<PackageReference Include="FluentMigrator.Extensions.SqlServer" Version="6.2.0" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading
Loading