Squashed commit of the following:

commit e6e21e5
Merge: cf20e9c 38132f1
Author: rshrirohit <[email protected]>
Date:   Wed Jul 24 16:15:26 2024 +0100

    Merge pull request #2755 from TechnologyEnhancedLearning/Develop/Fixes/TD-4354-ConvertingBytesToGBandMB

    TD-4354 Converting Bytes To GB and MB on manage centre screens

commit cf20e9c
Merge: 790276d f426116
Author: rshrirohit <[email protected]>
Date:   Wed Jul 24 16:14:54 2024 +0100

    Merge pull request #2754 from TechnologyEnhancedLearning/Develop/Fixes/TD-4376-Issuewithnottrimmingofthetrailing/leadingendspacesonSuperAdminsearchscreens

    TD-4376 Issue with not trimming of the  trailing/leading end spaces on Super Admin search screens

commit 790276d
Merge: 0d9fc74 5663316
Author: rshrirohit <[email protected]>
Date:   Wed Jul 24 16:13:03 2024 +0100

    Merge pull request #2749 from TechnologyEnhancedLearning/Develop/Fix/TD-4370-Accounts-appearing-DelegateActivities-export

    TD-4370-Email format validation added in SQL query.

commit 0d9fc74
Merge: 3e1cf87 2492e72
Author: rshrirohit <[email protected]>
Date:   Wed Jul 24 16:11:00 2024 +0100

    Merge pull request #2748 from TechnologyEnhancedLearning/Develop/Fixes/TD-4136-RemovingLabelForGuestUser

    TD 4136 Removing label for guest user

commit 3e1cf87
Merge: 9e1fbe7 5c2939e
Author: rshrirohit <[email protected]>
Date:   Wed Jul 24 16:10:20 2024 +0100

    Merge pull request #2747 from TechnologyEnhancedLearning/Develop/Fixes/TD-4206-Mismatchofcountofcoursesseeingon'CentreDashboard'whencomparedtothe'Centrecoursesetup'screencountallcourse

    TD-4206 Mismatch of count of courses seeing on 'Centre Dashboard' when compared to the 'Centre course set up' screen

commit 9e1fbe7
Merge: 909abb0 d48dd4b
Author: rshrirohit <[email protected]>
Date:   Wed Jul 24 16:09:43 2024 +0100

    Merge pull request #2743 from TechnologyEnhancedLearning/Develop/Fix/TD-4339-Centre-Edit-details-error

    TD-4339- Issue showing console '500' error when 'Edit details' on 'Manage centre' screen

commit 909abb0
Merge: 8dcea75 2d700ed
Author: rshrirohit <[email protected]>
Date:   Wed Jul 24 16:06:14 2024 +0100

    Merge branch 'Release-2024.29-Hotfix' into Release-2024.32

commit 38132f1
Author: Rohit Shrivastava <[email protected]>
Date:   Wed Jul 24 08:47:13 2024 +0100

    TD-4354 Converting Bytes To GB and MB on manage centre screens

commit f426116
Author: Sherif Olaboye <[email protected]>
Date:   Tue Jul 23 16:22:08 2024 +0100

    TD-4376 Issue with not trimming of the trailing/leading end spaces on Super Admin search screens

commit 2d700ed
Merge: 277aa11 484237b
Author: rshrirohit <[email protected]>
Date:   Mon Jul 22 15:00:22 2024 +0100

    Merge pull request #2750 from TechnologyEnhancedLearning/Develop/Fixes/TD-4269-UpdateInEnrolmentMethod

    TD-4269 Enrolment method changed to Enrolled by Admin/Supervisor everywhere to avoid confusion

commit 277aa11
Merge: 1239067 b3c4a45
Author: rshrirohit <[email protected]>
Date:   Mon Jul 22 14:59:59 2024 +0100

    Merge pull request #2751 from TechnologyEnhancedLearning/Develop/Fix/TD-4223-Last-access-date-IssueFix

    TD-4223- Passed blank 'last access date' when a delegate added to a group.

commit 8dcea75
Merge: 69970db 1239067
Author: rshrirohit <[email protected]>
Date:   Mon Jul 22 14:59:01 2024 +0100

    Merge branch 'Release-2024.29-Hotfix' into Release-2024.32

commit b3c4a45
Author: Auldrin Possa <[email protected]>
Date:   Mon Jul 22 09:28:04 2024 +0100

    TD-4223- test cases updated for enrol delegate on group courses.

commit 33570c6
Author: Auldrin Possa <[email protected]>
Date:   Mon Jul 22 07:14:10 2024 +0100

    TD-4223- passed blank last access date when a new delegate enrolled on group courses.

commit 484237b
Author: Rohit Shrivastava <[email protected]>
Date:   Fri Jul 19 08:09:57 2024 +0100

    TD-4269 Enrolment method changed to Enrolled by Admin/Supervisor everywhere to avoid confusion

commit 5663316
Author: Auldrin Possa <[email protected]>
Date:   Thu Jul 18 16:34:36 2024 +0100

    Email format validation added with Coalesce() in the sql query

commit f2b39c2
Author: Auldrin Possa <[email protected]>
Date:   Wed Jul 17 16:09:11 2024 +0100

    TD-4370-Email format validation added in sql query

commit 2492e72
Author: Rohit Shrivastava <[email protected]>
Date:   Wed Jul 17 12:09:02 2024 +0100

    TD-4136 Removing Label For Guest User

commit 5c2939e
Author: Sherif Olaboye <[email protected]>
Date:   Wed Jul 17 10:10:39 2024 +0100

    TD-4206 Mismatch of count of courses seeing on 'Centre Dashboard' when compared to the 'Centre course set up' screen

commit 1239067
Merge: ec45563 d99e78a
Author: rshrirohit <[email protected]>
Date:   Wed Jul 17 09:09:30 2024 +0100

    Merge pull request #2746 from TechnologyEnhancedLearning/Develop/Fixes/TD-4269-ChangingTextToEnrolledBySupervisor

    TD-4269 Changing text to enrolled by supervisor

commit ec45563
Merge: 9f8636c 538ec14
Author: rshrirohit <[email protected]>
Date:   Wed Jul 17 09:09:08 2024 +0100

    Merge pull request #2745 from TechnologyEnhancedLearning/Develop/Fixes/TD-4334-Issuewith'Completeby'datenotshowingonselfassessmentcards

    TD-4334 Issue with 'Complete by' date not showing on self assessment cards

commit 9f8636c
Merge: a21da3e a27f116
Author: rshrirohit <[email protected]>
Date:   Wed Jul 17 09:08:09 2024 +0100

    Merge pull request #2744 from TechnologyEnhancedLearning/Develop/Fix/TD-4223-Last-access-date-IssueFix

    TD-4223- 'Last access' date shouldn't be seen for the delegate record for the courses when enrolled by admin on 'Tracking system' & 'Learning Portal'

commit d99e78a
Author: Rohit Shrivastava <[email protected]>
Date:   Tue Jul 16 09:15:17 2024 +0100

    TD-4269 Changing Text To Enrolled By Supervisor

commit 538ec14
Author: Sherif Olaboye <[email protected]>
Date:   Mon Jul 15 10:59:55 2024 +0100

    TD-4334 Resolving enroling course from supervisor failing sometimes

commit a27f116
Author: Auldrin Possa <[email protected]>
Date:   Mon Jul 15 10:15:34 2024 +0100

    TD-4223- stored proc, table constraint and code updated to use GetDate()

commit d48dd4b
Author: Auldrin Possa <[email protected]>
Date:   Thu Jul 11 14:41:12 2024 +0100

    TD-4339- null/empty check added for centre name

commit 69970db
Merge: 1c2886a a21da3e
Author: rshrirohit <[email protected]>
Date:   Thu Jul 11 12:33:44 2024 +0100

    Merge branch 'Release-2024.29-Hotfix' into Release-2024.32

commit a21da3e
Merge: e4bcd8e 2faa41a
Author: rshrirohit <[email protected]>
Date:   Thu Jul 11 12:29:31 2024 +0100

    Merge pull request #2742 from TechnologyEnhancedLearning/Develop/Fixes/TD-4334-Issuewith'Completeby'datenotshowingonselfassessmentcards

    TD-4334 Issue with 'Complete by' date not showing on self assessment cards

commit 1c2886a
Merge: 0942655 d63b952
Author: rshrirohit <[email protected]>
Date:   Thu Jul 11 12:27:19 2024 +0100

    Merge pull request #2741 from TechnologyEnhancedLearning/Develop/feature/TD-4233-Display-competency-flags

    TD-4233- Display competency flags in the Choose optional competencies screen

commit 0942655
Merge: db2b3bc a49090b
Author: rshrirohit <[email protected]>
Date:   Thu Jul 11 12:23:40 2024 +0100

    Merge pull request #2740 from TechnologyEnhancedLearning/Develop/Fix/TD-4320-Supervisor-emails-on-ManageSupervisors-list

    TD-4320-Supervisor emails should be shown on 'Manage Supervisors' list/ 'Quick add'

commit db2b3bc
Merge: 2482ac7 22f3007
Author: rshrirohit <[email protected]>
Date:   Thu Jul 11 12:19:50 2024 +0100

    Merge pull request #2739 from TechnologyEnhancedLearning/Develop/Fix/TD-3939-EnrolCourseSelfAssessment-error

    TD-3939- Enrol course and self assessment issue fixed

commit 2482ac7
Merge: 3b50338 0dec788
Author: rshrirohit <[email protected]>
Date:   Thu Jul 11 12:08:47 2024 +0100

    Merge pull request #2732 from TechnologyEnhancedLearning/Develop/Fixes/TD-4137-'Switchapplication'navigationlinkshouldberemovedfrom'Givepagefeedback'screensforloggedinuser

    TD-4137  switch application navigation link should be removed from give page feedback screens for logged in user

commit 3b50338
Merge: 0fbbe4c e4bcd8e
Author: rshrirohit <[email protected]>
Date:   Thu Jul 11 07:32:58 2024 +0100

    Merge branch 'Release-2024.29-Hotfix' into Release-2024.32

commit 2faa41a
Author: Sherif Olaboye <[email protected]>
Date:   Wed Jul 10 11:48:44 2024 +0100

    TD-4334 Issue with 'Complete by' date not showing on self assessment cards

commit d63b952
Author: Auldrin Possa <[email protected]>
Date:   Tue Jul 9 18:26:29 2024 +0100

    TD-4233- competency flags added to optional competencies

commit 0dec788
Author: Sherif Olaboye <[email protected]>
Date:   Mon Jul 8 10:04:52 2024 +0100

    'Switch application' navigation link should be removed from 'Give page feedback' screens for logged in user

commit 14b6583
Merge: 579645a 0fbbe4c
Author: Sherif Olaboye <[email protected]>
Date:   Fri Jul 5 10:53:28 2024 +0100

    Merge remote-tracking branch 'origin/Release-2024.32' into Develop/Fixes/TD-4137-'Switchapplication'navigationlinkshouldberemovedfrom'Givepagefeedback'screensforloggedinuser

commit a49090b
Author: Auldrin Possa <[email protected]>
Date:   Fri Jul 5 10:19:34 2024 +0100

    TD-4320-Supervisor email added to manage supervior list

commit 22f3007
Author: Auldrin Possa <[email protected]>
Date:   Wed Jul 3 15:16:35 2024 +0100

    TD-3939- fixed sql query column alias space issue

commit 0fbbe4c
Merge: e07d496 4fc773d
Author: rshrirohit <[email protected]>
Date:   Mon Jul 1 15:31:13 2024 +0100

    Merge pull request #2737 from TechnologyEnhancedLearning/Develop/Fixes/TD-4136-RemovedExtraTextFromFeedbackSumitPage

    TD-4136 Removed Extra Text From Feedback Submit Page

commit e07d496
Merge: f499739 5a7ef92
Author: rshrirohit <[email protected]>
Date:   Mon Jul 1 15:30:37 2024 +0100

    Merge pull request #2736 from TechnologyEnhancedLearning/Develop/Fixes/TD-4244-AddedHiddenInLearningPortalTabForInactive

    TD-4244 Added hidden in learning portal added for inactive courses as well

commit f499739
Merge: ddba990 037f9ef
Author: rshrirohit <[email protected]>
Date:   Mon Jul 1 15:29:53 2024 +0100

    Merge pull request #2735 from TechnologyEnhancedLearning/Develop/Fix/TD-2364-linking-admin-registered-unclaimed-account

    TD-2364- Added action method without custom policy to verify dls account before linking.

commit e4bcd8e
Merge: a2522dc ce39364
Author: rshrirohit <[email protected]>
Date:   Mon Jul 1 15:26:14 2024 +0100

    Merge pull request #2734 from TechnologyEnhancedLearning/Develop/Fixes/TD-4223-IssueAroundLastAccessDate

    TD 4223 Issue around last access date and submitted date

commit ddba990
Merge: 7e0584f 7a7f300
Author: rshrirohit <[email protected]>
Date:   Mon Jul 1 15:25:20 2024 +0100

    Merge pull request #2733 from TechnologyEnhancedLearning/Develop/Fixes/TD-4207-Clickingbrowserbackbuttonafterdeletingthe'DelegateGroup'showingconsole'404'errorinsteadof'410'error

    TD-4207 Clicking browser back button after deleting the 'Delegate Group' showing console '404' error instead of '410' error

commit 7e0584f
Merge: 66c20bd 1f4430d
Author: rshrirohit <[email protected]>
Date:   Mon Jul 1 15:12:44 2024 +0100

    Merge pull request #2731 from TechnologyEnhancedLearning/Develop/Fix/TD-4277-Adding-course-to-Delegate-group

    TD-4277- Added restriction to add archived courses

commit a2522dc
Merge: 3dd2e02 3d4257f
Author: rshrirohit <[email protected]>
Date:   Mon Jul 1 15:10:21 2024 +0100

    Merge pull request #2730 from TechnologyEnhancedLearning/Develop/Fix/TD-4279-Re-enrol-deleted-self-assessment

    TD-4279- Re-enrolling a self assessment for the existing delegates not showing the 'remove' button

commit 66c20bd
Merge: 4bd33c4 f828fce
Author: rshrirohit <[email protected]>
Date:   Mon Jul 1 14:58:58 2024 +0100

    Merge pull request #2729 from TechnologyEnhancedLearning/Develop/Fixes/TD-4134-Issueadding'DigitalLearningSolutions-Pagenolongeravailable'texttothe'Goback'linkson'Givepagefeedback'screens

    Develop/fixes/td 4134 issue adding digital learning solutions page no longer available text to the 'go back 'links on give page feedback screens

commit 4fc773d
Author: Rohit Shrivastava <[email protected]>
Date:   Thu Jun 27 18:22:09 2024 +0100

    TD-4136 Removed Extra Text From Feedback Submit Page

commit 5a7ef92
Author: Rohit Shrivastava <[email protected]>
Date:   Thu Jun 27 18:06:43 2024 +0100

    TD-4244 Added hidden in learning portal added for inactive courses as well

commit 037f9ef
Author: Auldrin Possa <[email protected]>
Date:   Thu Jun 27 15:56:02 2024 +0100

    TD-2364- Added VerifyLinkDlsAccount(+) action method to verify dls account before linking.

commit ce39364
Author: Rohit Shrivastava <[email protected]>
Date:   Thu Jun 27 10:25:35 2024 +0100

    TD-4223 Changes in Submitted time and last access date

commit 7a7f300
Author: Sherif Olaboye <[email protected]>
Date:   Wed Jun 26 16:05:11 2024 +0100

    TD-4207 Clicking browser back button after deleting the 'Delegate Group' showing console '404' error instead of '410' error

commit 579645a
Author: Sherif Olaboye <[email protected]>
Date:   Tue Jun 25 16:00:27 2024 +0100

    TD-4137 'Switch application' navigation link should be removed from 'Give page feedback' screens for logged in user

commit 1f4430d
Author: Auldrin Possa <[email protected]>
Date:   Tue Jun 25 12:34:14 2024 +0100

    Test case updated.

commit 89289ea
Author: Auldrin Possa <[email protected]>
Date:   Tue Jun 25 12:10:23 2024 +0100

    TD-4277- Added restriction to add archived courses

commit 3d4257f
Author: Auldrin Possa <[email protected]>
Date:   Mon Jun 24 16:28:06 2024 +0100

    TD-4279- enrolment method id added to update statement.

commit 4bd33c4
Merge: 1857cea 3dd2e02
Author: rshrirohit <[email protected]>
Date:   Mon Jun 24 15:11:39 2024 +0100

    Merge branch 'Release-2024.29-Hotfix' into Release-2024.32

commit f828fce
Author: Sherif Olaboye <[email protected]>
Date:   Mon Jun 24 15:00:10 2024 +0100

    TD-4134 Issue adding 'Digital Learning Solutions-Page no longer available' text to the 'Go back' links on 'Give page feedback' screens

commit 3dd2e02
Merge: d16c1ba a44f73d
Author: rshrirohit <[email protected]>
Date:   Mon Jun 24 11:18:21 2024 +0100

    Merge pull request #2728 from TechnologyEnhancedLearning/Develop/Fixes/TD-4269-Issuewiththe'Enrolmentmethod'and'Lastaccessdate'whenadminenrolledtheselfassessmentonTrackingsystemhotfix

    TD-4269 Issue with the 'Enrolment method' and 'Last access date' when admin enrolled the self assessment on Tracking system

commit 1857cea
Merge: 698ac7b a150940
Author: rshrirohit <[email protected]>
Date:   Mon Jun 24 11:06:34 2024 +0100

    Merge pull request #2723 from TechnologyEnhancedLearning/Develop/Fix/TD-4232-Course-Certificate-Console-errors

    TD-4232- Course Certificate - Console errors

commit a44f73d
Author: Sherif Olaboye <[email protected]>
Date:   Fri Jun 21 15:10:48 2024 +0100

    TD-4269 Issue with the 'Enrolment method' and 'Last access date' when admin enrolled the self assessment on Tracking system

commit a150940
Author: Auldrin Possa <[email protected]>
Date:   Thu Jun 20 11:09:37 2024 +0100

    Typescript code added to show/hide download button

commit cb5d0ad
Merge: ab84239 698ac7b
Author: Auldrin Possa <[email protected]>
Date:   Thu Jun 20 10:40:24 2024 +0100

    Merge branch 'Release-2024.32' into Develop/Fix/TD-4232-Course-Certificate-Console-errors

commit ab84239
Author: Auldrin Possa <[email protected]>
Date:   Mon Jun 17 13:54:58 2024 +0100

    TD-4232- Javascript code removed from the view.

Author: kevwhitt-hee

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs

@@ -171,7 +171,7 @@ GROUP BY
         public void UpdateLastAccessed(int selfAssessmentId, int delegateUserId)
         {
             var numberOfAffectedRows = connection.Execute(
-                @"UPDATE CandidateAssessments SET LastAccessed = GETUTCDATE()
+                @"UPDATE CandidateAssessments SET LastAccessed = GETDATE()
                       WHERE SelfAssessmentID = @selfAssessmentId AND DelegateUserID = @delegateUserId",
                 new { selfAssessmentId, delegateUserId }
             );

DigitalLearningSolutions.Web/Views/SuperAdmin/Centres/ManageCentre.cshtml

@@ -12,7 +12,8 @@
             </ol>
             <p class="nhsuk-breadcrumb__back">
                 <a class="nhsuk-breadcrumb__backlink"
-                   asp-controller="Centres" asp-action="Index">Back to Centres</a>
+                 asp-controller="Centres" asp-action="Index"
+                >Back to Centres</a>
             </p>
         </div>
     </nav>
@@ -186,14 +187,7 @@
                         <b>Per delegate upload space</b>
                     </dt>
                     <dd class="nhsuk-summary-list__value">
-                        @if (@Model.CandidateByteLimit == 1024)
-                        {
-                            @($"{Model.CandidateByteLimit / 1024} GB")
-                        }
-                        else
-                        {
-                            @($"{Model.CandidateByteLimit} MB")
-                        }
+                        @Model.CandidateByteLimit MB
                     </dd>
                 </div>
                 <div class="nhsuk-summary-list__row details-list-with-button__row">
@@ -214,7 +208,7 @@
                asp-controller="Centres"
                asp-action="CentreRoleLimits"
                asp-route-centreId="@Model.CentreId">
-                Customise role limits
+              Customise role limits
             </a>
         </div>
     </div>