Skip to content

Conversation

@kevwhitt-hee
Copy link
Contributor

@kevwhitt-hee kevwhitt-hee commented Mar 5, 2025

JIRA link

TD-5389

Description

Describe what has changed and how that will affect the app. If relevant, add links to any sources/documentation you used. Highlight anything unusual and give people context around particular decisions.

Screenshots

image
Wave:
image
(an error exists on the mark complete checkbox but this needs fixing in the ViewComponents library)


Developer checks

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

I have:

  • Run the IDE auto formatter on all files I’ve worked on and made sure there are no IDE errors relating to them
  • Written or updated tests for the changes (accessibility ui tests for views, tests for controller, data services, services, view models created or modified) and made sure all tests are passing
  • Manually tested my work with and without JavaScript (adding notes where functionality requires JavaScript)
  • Tested any Views or partials created or changed with Wave Chrome plugin. Addressed any valid accessibility issues and documented any invalid errors
  • Updated my Jira ticket with testing notes, including information about other parts of the system that were touched as part of the MR and need to be tested to ensure nothing is broken
  • Scanned over my pull request in GitHub and addressed any warnings from the GitHub Build and Test checks in the GitHub PR ‘Files Changed’ tab
    Either:
  • Documented my work in Confluence, updating any business rules applied or modified. Updated GitHub readme/documentation for the repository if appropriate. List of documentation links added/changed:
  • Confirmed that none of the work that I have undertaken requires any updates to documentation

commit 342740c
Author: kevwhitt-hee <kevin.whittaker@hee.nhs.uk>
Date:   Wed Mar 5 08:16:26 2025 +0000

    Squashed commit of the following:

    commit 63521f4
    Merge: f10e104 e90895c
    Author: rshrirohit <Rohit.Shrivastava@hee.nhs.uk>
    Date:   Wed Mar 5 07:53:00 2025 +0000

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

    commit e90895c
    Merge: 764d023 d77ec78
    Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com>
    Date:   Wed Mar 5 07:35:32 2025 +0000

        Merge pull request #3146 from TechnologyEnhancedLearning/DLS-Release-v1.1.2

        Dls release v1.1.2

    commit d77ec78
    Merge: aa5e3a9 fcdf44e
    Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com>
    Date:   Thu Feb 27 14:54:52 2025 +0000

        Merge pull request #3138 from TechnologyEnhancedLearning/Develop/Fix/TD-5370-Issue-showing-requested-sign-off

        TD-5370- Added code to remove a pending sign-off request if the self-assessment does not include the minimum optional competencies.

    commit fcdf44e
    Author: Auldrin Possa <Auldrin.Possa@hee.nhs.uk>
    Date:   Thu Feb 27 12:41:18 2025 +0000

        TD-5370- Added code to remove a pending sign-off request if the self-assessment does not include the minimum optional competencies.

    commit aa5e3a9
    Merge: 9ab2364 4e4f7a3
    Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com>
    Date:   Thu Feb 27 12:26:41 2025 +0000

        Merge pull request #3137 from TechnologyEnhancedLearning/Develop/Fixes/TD-5325-UpdatingFreshdeskApiNugetPackage

        TD-5325 Updating Freshdesk Api Nuget Package

    commit 4e4f7a3
    Author: Rohit Shrivastava <Rohit.Shrivastava@hee.nhs.uk>
    Date:   Thu Feb 27 09:49:53 2025 +0000

        TD-5325 Updating Freshdesk Api Nuget Package

    commit 9ab2364
    Merge: 9835d10 49be5f1
    Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com>
    Date:   Tue Feb 25 20:04:56 2025 +0000

        Merge pull request #3134 from TechnologyEnhancedLearning/Develop/Fix/TD-5367-duplicate-self-assessments-on-Supervisor-Dashboard

        TD-5367-Issue showing duplicate self assessments on 'Supervisor Dashboard - My staff' screen

    commit 9835d10
    Merge: 9d20e5c 57133cc
    Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com>
    Date:   Tue Feb 25 09:02:42 2025 +0000

        Merge pull request #3133 from TechnologyEnhancedLearning/Develop/Fixes/TD-5368-AddingCategoryToEmailContent

        TD-5368 Adding Category To Email Content

    commit 9d20e5c
    Merge: 2f1cdd4 bf29c8c
    Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com>
    Date:   Tue Feb 25 09:00:42 2025 +0000

        Merge pull request #3123 from TechnologyEnhancedLearning/Develop/Fixes/TD-3542-Console'500'errorisseeingonthe'Mystaff'screenwhenclicked'Supervise'linkfor'Version_2_Data_Professionsframework'assessment

        TD-3542 Console '500' error is seeing on the 'My staff' screen when clicked 'Supervise' link for 'Version_2_Data_Professions framework' assessment

    commit bf29c8c
    Author: Sherif Olaboye <Sherif.Olaboye@hee.nhs.uk>
    Date:   Mon Feb 24 13:15:36 2025 +0000

        TD-3542 putting the validations in the viewmodels

    commit b492564
    Merge: 7ef6456 0879dbf
    Author: Sherif Olaboye <Sherif.Olaboye@hee.nhs.uk>
    Date:   Mon Feb 24 13:07:56 2025 +0000

        Merge remote-tracking branch 'origin/DLS-Release-v1.1.2' into Develop/Fixes/TD-3542-Console'500'errorisseeingonthe'Mystaff'screenwhenclicked'Supervise'linkfor'Version_2_Data_Professionsframework'assessment

    commit 57133cc
    Author: Rohit Shrivastava <Rohit.Shrivastava@hee.nhs.uk>
    Date:   Mon Feb 24 12:13:26 2025 +0000

        TD-5368 removing commented code

    commit f32043e
    Author: Rohit Shrivastava <Rohit.Shrivastava@hee.nhs.uk>
    Date:   Mon Feb 24 12:12:34 2025 +0000

        TD-5368 Updating the Tracking system-centre-admin area and promote to admin area

    commit 49be5f1
    Author: Auldrin Possa <Auldrin.Possa@hee.nhs.uk>
    Date:   Mon Feb 24 11:02:33 2025 +0000

        TD-5367-Removed 'UPDATE CandidateAssessmentSupervisors..' while removing self assessment. Updated CandidateAssessmentSupervisors while enrolling self assessment.

    commit 2f1cdd4
    Merge: 252a582 28cf777
    Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com>
    Date:   Mon Feb 24 09:08:44 2025 +0000

        Merge pull request #3131 from TechnologyEnhancedLearning/Develop/Fixes/TD-5292-Issuewith'Goback'linkwhencreatingacourseandadding'Coursecontent'on'Coursesetup'screen

        TD-5292 Issue with 'Go back' link when creating a course and adding 'Course content' on 'Course set up' screen

    commit 252a582
    Merge: 0879dbf 25f6523
    Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com>
    Date:   Mon Feb 24 09:07:48 2025 +0000

        Merge pull request #3126 from TechnologyEnhancedLearning/Develop/Fixes/TD-5291-Issueon'Coursesetup'screenwhenselectedFewcoursecontentfirsttimeandchangedto'All'ofthemclicking'changelink'

        TD-5291 Issue on 'Course set up' screen when selected Few course content first time and changed to 'All' of them clicking 'change link'

    commit ac656d7
    Author: Rohit Shrivastava <Rohit.Shrivastava@hee.nhs.uk>
    Date:   Fri Feb 21 08:41:21 2025 +0000

        TD-5368 Adding Category To Email Content

    commit 28cf777
    Author: Sherif Olaboye <Sherif.Olaboye@hee.nhs.uk>
    Date:   Mon Feb 17 11:19:20 2025 +0000

        TD-5292 when clicking ‘go back’ links few course content screens are missing in between.

    commit 25f6523
    Author: sherif-olaboye <123654949+sherif-olaboye@users.noreply.github.com>
    Date:   Thu Feb 13 16:29:45 2025 +0000

        TD-5291 Issue on 'Course set up' screen when selected Few course content first time and changed to 'All' of them clicking 'change link'

    commit 6c2d6e4
    Author: sherif-olaboye <123654949+sherif-olaboye@users.noreply.github.com>
    Date:   Thu Feb 13 16:12:51 2025 +0000

        TD-5292 Issue on 'Course set up' screen when selected Few course content first time and changed to 'All' of them clicking 'change link'

    commit 0879dbf
    Merge: 5dff09b c916149
    Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com>
    Date:   Thu Feb 13 11:02:11 2025 +0000

        Merge pull request #3118 from TechnologyEnhancedLearning/Develop/Fixes/TD-5333-Issuewithoptionalproficienciesnotretainingtopreviousstatewhenremovedandaddedthemback

        TD-5333 Issue with optional proficiencies not retaining to previous State when removed and added them back

    commit 5dff09b
    Merge: ec0e37c 6a4b4c2
    Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com>
    Date:   Wed Feb 12 16:43:49 2025 +0000

        Merge pull request #3114 from TechnologyEnhancedLearning/Develop/Fixes/TD-5222-Errorwhenenrollingastaffonselfassessmentfromthetrackingsystem

        TD-5222 Error when enrolling a staff on self assessment from the tracking system

    commit 7ef6456
    Author: Sherif Olaboye <Sherif.Olaboye@hee.nhs.uk>
    Date:   Wed Feb 12 09:37:16 2025 +0000

        TD-3542 Console '500' error is seeing on the 'My staff' screen when clicked 'Supervise' link for 'Version_2_Data_Professions framework' assessment

    commit ec0e37c
    Merge: 951c95f a78c0a8
    Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com>
    Date:   Tue Feb 11 09:19:45 2025 +0000

        Merge pull request #3099 from TechnologyEnhancedLearning/Develop/Fixes/TD-5292-Issuewith'Goback'linkwhencreatingacourseandadding'Coursecontent'on'Coursesetup'screen

        TD-5292 Issue with 'Go back' link when creating a course and adding 'Course content' on 'Course set up' screen

    commit 951c95f
    Merge: 1ab13f7 fc760ef
    Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com>
    Date:   Tue Feb 11 09:14:42 2025 +0000

        Merge pull request #3096 from TechnologyEnhancedLearning/Develop/Fixes/TD-5291-Issueon'Coursesetup'screenwhenselectedFewcoursecontentfirsttimeandchangedto'All'ofthemclicking'changelink'

        TD-5291 Issue on 'Course set up' screen when selected Few course content first time and changed to 'All' of them clicking 'change link'

    commit c916149
    Author: Sherif Olaboye <Sherif.Olaboye@hee.nhs.uk>
    Date:   Mon Feb 10 09:54:52 2025 +0000

        TD-5333 Issue with optional proficiencies not retaining to previous state when removed and added them back

    commit 1ab13f7
    Merge: 0584b6b ef9eabd
    Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com>
    Date:   Fri Feb 7 10:49:48 2025 +0000

        Merge pull request #3102 from TechnologyEnhancedLearning/Develop/Fix/TD-5306-Selfassessment-report-name-Issue

        TD-5306-self-assessments excel report file name format changed.

    commit 0584b6b
    Merge: 764d023 2f0d16c
    Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com>
    Date:   Fri Feb 7 10:48:08 2025 +0000

        Merge pull request #3111 from TechnologyEnhancedLearning/Develop/feature/TD-4475-Count-of-matching-proficiencies

        TD-4475-Count of matching proficiencies should be shown on 'Supervisor' section same as on 'Learning Portal' for the self assessments

    commit 764d023
    Merge: 17ad383 0bc5eab
    Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com>
    Date:   Fri Feb 7 07:30:06 2025 +0000

        Merge pull request #3115 from TechnologyEnhancedLearning/DLS-Release-v1.1.1

        Dls release v1.1.1

    commit 6a4b4c2
    Author: Sherif Olaboye <Sherif.Olaboye@hee.nhs.uk>
    Date:   Wed Feb 5 09:11:44 2025 +0000

        TD-5222 Error when enrolling a staff on self assessment from the tracking system

    commit 2f0d16c
    Author: Auldrin Possa <Auldrin.Possa@hee.nhs.uk>
    Date:   Tue Feb 4 16:20:14 2025 +0000

        TD-4475-matching proficiencies count added to screen

    commit ef9eabd
    Author: Auldrin Possa <Auldrin.Possa@hee.nhs.uk>
    Date:   Fri Jan 31 16:55:48 2025 +0000

        TD-5306-self-assessments report file name format changed

    commit a78c0a8
    Author: Sherif Olaboye <Sherif.Olaboye@hee.nhs.uk>
    Date:   Fri Jan 31 14:00:49 2025 +0000

        TD-5292 Issue with 'Go back' link when creating a course and adding 'Course content' on 'Course set up' screen

    commit fc760ef
    Author: Sherif Olaboye <Sherif.Olaboye@hee.nhs.uk>
    Date:   Fri Jan 31 10:21:49 2025 +0000

        TD-5291 Issue on 'Course set up' screen when selected Few course content first time and changed to 'All' of them clicking 'change link'

    commit 4c1d42f
    Author: Sherif Olaboye <Sherif.Olaboye@hee.nhs.uk>
    Date:   Thu Jan 30 13:31:08 2025 +0000

        TD-5291 Issue on 'Course set up' screen when selected Few course content first time and changed to 'All' of them clicking 'change link'

    commit 409b1ee
    Author: Sherif Olaboye <Sherif.Olaboye@hee.nhs.uk>
    Date:   Thu Jan 30 12:48:35 2025 +0000

        TD-5291 Issue on 'Course set up' screen when selected Few course content first time and changed to 'All' of them clicking 'change link'
@kevwhitt-hee kevwhitt-hee merged commit d37970d into DLS-Release-v1.3.0 Mar 5, 2025
3 checks passed
@kevwhitt-hee kevwhitt-hee deleted the Develop/Features/TD-5389-NRPLinks branch March 5, 2025 08:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants