Skip to content

Commit dfe3334

Browse files
committed
Squashed commit of the following:
commit 0597301 Merge: 11c4e38 93f3edf Author: rshrirohit <[email protected]> Date: Wed Sep 11 08:47:50 2024 +0100 Merge pull request #2830 from TechnologyEnhancedLearning/Develop/Fix/TD-4672-DateTime-Issue-SelfAssessment TD-4672-Acitivity Delegates - Dates converted to local date time commit 11c4e38 Merge: b9a1ced eae4fb4 Author: rshrirohit <[email protected]> Date: Wed Sep 11 08:46:54 2024 +0100 Merge pull request #2825 from TechnologyEnhancedLearning/Develop/Fixes/TD-4702-Downloadself-assessmentcertificatelinkURLcanbemanipulatedandabletodownloadotheruservalidcertificates TD-4702 Download self-assessment certificate link URL can be manipulated and able to download other user valid certificates commit b9a1ced Merge: 4ebf27e 217fbb1 Author: rshrirohit <[email protected]> Date: Wed Sep 11 08:43:32 2024 +0100 Merge pull request #2822 from TechnologyEnhancedLearning/Develop/Fix/TD-4634-Inactive-courses TD-4634- Customisation active check added in the completed activities commit 4ebf27e Merge: 839cd64 8b8b281 Author: rshrirohit <[email protected]> Date: Wed Sep 11 08:36:47 2024 +0100 Merge pull request #2801 from TechnologyEnhancedLearning/Develop/Fix/TD-4645-Pattern-for-email-validation TD-4645-Pattern for email validation updated in the SQL queries commit 839cd64 Merge: e6d78cf 04e712b Author: rshrirohit <[email protected]> Date: Wed Sep 11 08:36:15 2024 +0100 Merge pull request #2800 from TechnologyEnhancedLearning/Develop/Fixes/TD-4384-IssueWithBackLinks TD-4384, changes to fix the issue with the Back Links on the User Feedback Component commit e6d78cf Merge: c4483b4 e3d5967 Author: rshrirohit <[email protected]> Date: Wed Sep 11 08:22:23 2024 +0100 Merge pull request #2773 from TechnologyEnhancedLearning/Develop/Features/TD-4429-Additionaloptionalcompetenciescheckboxonthelearnersignoffrequestscreen TD-4429 Additional optional competencies checkbox on the supervisor sign off screen commit 93f3edf Author: Auldrin Possa <[email protected]> Date: Mon Sep 9 14:38:59 2024 +0100 TD-4672-Dates converted to local date time commit c4483b4 Merge: 50d2325 4156972 Author: rshrirohit <[email protected]> Date: Mon Sep 9 12:36:18 2024 +0100 Merge pull request #2821 from TechnologyEnhancedLearning/Develop/Fix/TD-4671-Delegate-activities-Course-DateTime-Issue TD-4671-Course enrolled, lastupdated and completed date converted to local date time commit 50d2325 Merge: 7699681 59d481c Author: rshrirohit <[email protected]> Date: Mon Sep 9 08:17:59 2024 +0100 Merge branch 'master' into Release-2024.38 commit 59d481c Merge: 8c6196c 7df765c Author: rshrirohit <[email protected]> Date: Mon Sep 9 08:00:19 2024 +0100 Merge pull request #2824 from TechnologyEnhancedLearning/Release-2024.32 Release 2024.32 commit eae4fb4 Author: Sherif Olaboye <[email protected]> Date: Fri Sep 6 16:52:43 2024 +0100 TD-4702 Download self-assessment certificate link URL can be manipulated and able to download other user valid certificates commit 217fbb1 Author: Auldrin Possa <[email protected]> Date: Thu Sep 5 17:27:12 2024 +0100 TD-4634- Customisation active check added in the completed activities commit 4156972 Author: Auldrin Possa <[email protected]> Date: Thu Sep 5 15:36:59 2024 +0100 TD-4671-Course enrolled, lastupdated and completed date converted to local date time. User time zone initialized on centre change event. commit 7699681 Merge: 94cd1ef 7df765c Author: rshrirohit <[email protected]> Date: Thu Sep 5 12:34:28 2024 +0100 Merge branch 'Release-2024.32' into Release-2024.38 commit 94cd1ef Merge: ab6433e c944585 Author: rshrirohit <[email protected]> Date: Thu Sep 5 12:33:49 2024 +0100 Merge pull request #2820 from TechnologyEnhancedLearning/revert-2796-Develop/Fix/TD-4634-Inactive-Unpublished-courses Revert "TD-4634-Modified stored proc to return active and published status of courses." commit c944585 Author: rshrirohit <[email protected]> Date: Thu Sep 5 11:36:04 2024 +0100 Revert "TD-4634-Modified stored proc to return active and published status of courses." commit 7df765c Merge: 429a2ea b1b4473 Author: rshrirohit <[email protected]> Date: Thu Sep 5 10:12:46 2024 +0100 Merge pull request #2815 from TechnologyEnhancedLearning/Develop/Features/TD-4092-RefactorDLSCompetencySelfAssessmentCertificatetoimprovemaintainabilityandsecurity TD-4092 Resolving certificate showing error 403 commit b1b4473 Author: Sherif Olaboye <[email protected]> Date: Wed Sep 4 13:48:31 2024 +0100 TD-4092 Resolving certificate showing 403 forbidden error commit 429a2ea Merge: 335495b 5e5ccec Author: rshrirohit <[email protected]> Date: Wed Sep 4 10:17:06 2024 +0100 Merge pull request #2809 from TechnologyEnhancedLearning/Develop/Fixes/TD-4243-Resolvingduplicateofcourses Develop/fixes/td 4243 resolving duplicate of courses in enrol activity, available activities and current activities commit 5e5ccec Author: Sherif Olaboye <[email protected]> Date: Tue Sep 3 16:10:11 2024 +0100 TD-4243 Resolving duplication of courses in enrol activity, available activities and current activities commit 04e712b Author: Abhimanu Sinha <[email protected]> Date: Mon Sep 2 14:32:22 2024 +0100 Keeping the consistency between '<' and 'Go Back' text and resolving the comment. commit 8b8b281 Author: Auldrin Possa <[email protected]> Date: Mon Sep 2 14:15:29 2024 +0100 TD-4645-pattern for email validation updated in the sql queries commit d64ad58 Author: Abhimanu Sinha <[email protected]> Date: Mon Sep 2 12:44:02 2024 +0100 TD-4384, changes to fix the issue with the Back Links on the User Feedback component. commit 335495b Merge: d82983b b10beb2 Author: rshrirohit <[email protected]> Date: Mon Sep 2 09:51:09 2024 +0100 Merge pull request #2797 from TechnologyEnhancedLearning/Develop/Fixes/TD-4243-Few'addon'coursesshowingon'LearningPortal'notshowingon'Coursesetup&Delegateactivitiesscreensfix TD-4243 Few 'add on' courses showing on 'Learning Portal' not showing… commit b10beb2 Author: rshrirohit <[email protected]> Date: Mon Sep 2 09:38:02 2024 +0100 Update Resources.resx commit 131eebf Merge: 690c64b d82983b Author: rshrirohit <[email protected]> Date: Mon Sep 2 08:58:28 2024 +0100 Merge branch 'Release-2024.32' into Develop/Fixes/TD-4243-Few'addon'coursesshowingon'LearningPortal'notshowingon'Coursesetup&Delegateactivitiesscreensfix commit d82983b Merge: 913c148 fa929ea Author: rshrirohit <[email protected]> Date: Fri Aug 30 10:12:01 2024 +0100 Merge pull request #2798 from TechnologyEnhancedLearning/Develop/Fix/TD-4436-UTCdate-And-LocalDateTime TD-4436 -Stored proc modified to update Completeby date and supervisor in the group enrolment commit fa929ea Author: Auldrin Possa <[email protected]> Date: Thu Aug 29 15:54:28 2024 +0100 TD-4436 -stored proc modified to update completeby date and supervisor in the group enrolment commit ab6433e Merge: ecfbbcf 913c148 Author: rshrirohit <[email protected]> Date: Thu Aug 29 09:06:10 2024 +0100 Merge branch 'Release-2024.32' into Release-2024.38 commit ecfbbcf Merge: 7aacff7 4f1be28 Author: rshrirohit <[email protected]> Date: Thu Aug 29 09:03:17 2024 +0100 Merge pull request #2796 from TechnologyEnhancedLearning/Develop/Fix/TD-4634-Inactive-Unpublished-courses TD-4634-Modified stored proc to return active and published status of courses. commit 913c148 Merge: 7464148 3d2c41e Author: rshrirohit <[email protected]> Date: Thu Aug 29 08:56:45 2024 +0100 Merge pull request #2794 from TechnologyEnhancedLearning/Develop/Fixes/TD-4601-AppSettingsChangesForSSOandFreshdesk TD-4601 AppSettings Changes For SSO and Freshdesk commit 7464148 Merge: c373338 27fc65d Author: rshrirohit <[email protected]> Date: Thu Aug 29 08:53:26 2024 +0100 Merge pull request #2793 from TechnologyEnhancedLearning/Develop/Fixes/TD-4240-ChangingPrivacyDataLink TD-4240 Changing privacy data link commit 7aacff7 Merge: 34e37a9 b59905c Author: rshrirohit <[email protected]> Date: Thu Aug 29 08:52:36 2024 +0100 Merge pull request #2791 from TechnologyEnhancedLearning/Develop/Features/TD-4603-UsetheTD-4595featureflagtoalsohidetheviewoldticketslinkfromRequestSupportpage TD-4603 Use the TD-4595 feature flag to also hide the view old ticket… commit 34e37a9 Merge: 6a838c1 e29928b Author: rshrirohit <[email protected]> Date: Thu Aug 29 08:51:02 2024 +0100 Merge pull request #2790 from TechnologyEnhancedLearning/Develop/Fix/TD-4592-View-notifications-backbutton TD-4592-NoCaching attribute added to methods commit 6a838c1 Merge: 76c4214 016519b Author: rshrirohit <[email protected]> Date: Thu Aug 29 08:50:20 2024 +0100 Merge pull request #2788 from TechnologyEnhancedLearning/Develop/Fix/TD-4591-showing-emails-of-Supervisors-as-GUID TD-4591-Modified SQL query to get centre email first if exists. commit 690c64b Author: Sherif Olaboye <[email protected]> Date: Wed Aug 28 10:11:50 2024 +0100 TD-4243 Few 'add on' courses showing on 'Learning Portal' not showing on 'Course set up' & 'Delegate activities' screens commit 4f1be28 Author: Auldrin Possa <[email protected]> Date: Tue Aug 27 12:09:36 2024 +0100 TD-4634-Modified stored proc to return active and published status of courses commit 76c4214 Merge: 2ec541f c373338 Author: rshrirohit <[email protected]> Date: Fri Aug 23 14:52:08 2024 +0100 Merge branch 'Release-2024.32' into Release-2024.38 commit 3d2c41e Author: Rohit Shrivastava <[email protected]> Date: Fri Aug 23 08:54:57 2024 +0100 TD-4601 AppSettings Changes For SSO and Freshdesk commit 27fc65d Author: Rohit Shrivastava <[email protected]> Date: Fri Aug 23 08:44:50 2024 +0100 TD-4240 Changing Privacy Data Link commit c373338 Merge: b31623d 3ad42ef Author: rshrirohit <[email protected]> Date: Thu Aug 22 16:31:23 2024 +0100 Merge pull request #2792 from TechnologyEnhancedLearning/Develop/Fix/TD-4436-Enrolment-dateTime-issue TD-4436- Converted utc date to local date time using NodaTime package commit 3ad42ef Author: Auldrin Possa <[email protected]> Date: Thu Aug 22 16:17:14 2024 +0100 TD-4436- converted utc date to local date time using NodaTime package commit b59905c Author: Sherif Olaboye <[email protected]> Date: Thu Aug 22 10:06:59 2024 +0100 TD-4603 Use the TD-4595 feature flag to also hide the view old tickets link from Request Support page commit b31623d Merge: d9faf16 74fab62 Author: rshrirohit <[email protected]> Date: Wed Aug 21 15:58:19 2024 +0100 Merge pull request #2789 from TechnologyEnhancedLearning/Develop/Fix/TD-4436-Enrolment-dateTime-issue TD-4436- Removed DateTime conversion for LastUpdated nullable date field. commit 2ec541f Merge: 0f0400f 65025b0 Author: rshrirohit <[email protected]> Date: Wed Aug 21 15:57:44 2024 +0100 Merge pull request #2778 from TechnologyEnhancedLearning/Develop/Fixes/TD-4539-Issueshowingconsole'500'erroronthescreenwhenclickedbrowserbackbuttonafterprocessingtheBulkUploadregistration TD-4539 Issue showing console '500' error on the screen when clicked browser back button after processing the Bulk Upload registration commit 0f0400f Merge: 0324423 b2e11d5 Author: rshrirohit <[email protected]> Date: Wed Aug 21 15:57:09 2024 +0100 Merge pull request #2777 from TechnologyEnhancedLearning/Develop/Fixes/TD-4515-Issueshowingconsole'500'erroronthescreenwhenclickedbrowserbackbuttonaftersubmittingrequestsupportticket TD-4515 Issue showing console '500' error on the screen when clicked browser back button after submitting request support ticket commit 0324423 Merge: 9af1dd8 e8417c9 Author: rshrirohit <[email protected]> Date: Wed Aug 21 15:54:43 2024 +0100 Merge pull request #2776 from TechnologyEnhancedLearning/Develop/Fixes/TD-4502-Issuenotlistingthedelegateson'Sendwelcomemessage'screenforwhosePasswordissetandunclaimed TD-4502 Issue not listing the delegates on 'Send welcome message' screen for whose Password is set and unclaimed commit d9faf16 Merge: 572af95 f1e2b05 Author: rshrirohit <[email protected]> Date: Wed Aug 21 15:53:26 2024 +0100 Merge pull request #2657 from TechnologyEnhancedLearning/Develop/Features/TD-4092-RefactorDLSCompetencySelfAssessmentCertificatetoimprovemaintainabilityandsecurity TD-4092 Refactor dls competency self assessment certificate to improve maintainability and security commit e29928b Author: Auldrin Possa <[email protected]> Date: Wed Aug 21 15:48:58 2024 +0100 TD-4592-No caching attribute added to methods commit f1e2b05 Author: Sherif Olaboye <[email protected]> Date: Wed Aug 21 15:36:51 2024 +0100 TD-4092 Changing 404 code to 401 commit 74fab62 Author: Auldrin Possa <[email protected]> Date: Wed Aug 21 15:27:39 2024 +0100 TD-4436-DateTime convertion removed. commit 4f6847a Merge: 51dcb68 572af95 Author: Sherif Olaboye <[email protected]> Date: Wed Aug 21 13:38:41 2024 +0100 Merge remote-tracking branch 'origin/Release-2024.32' into Develop/Features/TD-4092-RefactorDLSCompetencySelfAssessmentCertificatetoimprovemaintainabilityandsecurity commit 9af1dd8 Merge: 9d07715 572af95 Author: rshrirohit <[email protected]> Date: Wed Aug 21 11:29:01 2024 +0100 Merge branch 'Release-2024.32' into Release-2024.38 commit 572af95 Merge: eb85659 21f2fe1 Author: rshrirohit <[email protected]> Date: Wed Aug 21 11:27:50 2024 +0100 Merge pull request #2780 from TechnologyEnhancedLearning/Develop/Fix/TD-4436-Enrolment-dateTime-issue TD-4436- Date saved as UTC datetime and retrieved date as local (time zone) datetime commit e8417c9 Author: Sherif Olaboye <[email protected]> Date: Wed Aug 21 11:17:10 2024 +0100 TD-4502 Removing password check from the where condition commit 016519b Author: Auldrin Possa <[email protected]> Date: Wed Aug 21 10:53:12 2024 +0100 TD-4591-Modified SQL query to get center email first if exists. commit b2e11d5 Author: Sherif Olaboye <[email protected]> Date: Wed Aug 21 10:46:30 2024 +0100 TD-4515 Changing the error code commit 65025b0 Author: Sherif Olaboye <[email protected]> Date: Wed Aug 21 10:43:09 2024 +0100 TD-4539 changing the error code commit e3d5967 Author: Sherif Olaboye <[email protected]> Date: Wed Aug 21 10:30:54 2024 +0100 TD-4429 Additional optional competencies checkbox on the supervisor sign off screen commit 9d07715 Merge: a764719 05d2e14 Author: rshrirohit <[email protected]> Date: Wed Aug 21 09:15:37 2024 +0100 Merge pull request #2785 from TechnologyEnhancedLearning/Develop/Features/TD-4595-Removethelegacytrackingsystemtilefromtheapplicationselector TD-4595 Remove the legacy tracking system tile from the application selector commit a764719 Merge: f0e2c92 8bbc69c Author: rshrirohit <[email protected]> Date: Wed Aug 21 09:14:11 2024 +0100 Merge pull request #2784 from TechnologyEnhancedLearning/Develop/Fix/TD-4590-Choose-Supervisor-sort-order' TD-4590- Sorted supervisor list, added email address and removed centre name commit eb85659 Merge: 53c570f 3217477 Author: rshrirohit <[email protected]> Date: Wed Aug 21 09:13:19 2024 +0100 Merge pull request #2783 from TechnologyEnhancedLearning/Develop/Fixes/TD-4238-Launchingfewcoursesfrom'Currentactivities'orfrom'Coursesetup'seeingbacklinkasCompletedactivities' TD-4238 Launching few courses from 'Current activities' or from 'Course set up' seeing back link as 'Completed activities' commit 21f2fe1 Author: Auldrin Possa <[email protected]> Date: Wed Aug 21 09:12:33 2024 +0100 TD-4436- Removed folder references commit f0e2c92 Merge: 08108ea 0f85654 Author: rshrirohit <[email protected]> Date: Wed Aug 21 09:12:33 2024 +0100 Merge pull request #2782 from TechnologyEnhancedLearning/Develop/Features/TD-4599-LinkToLegacySuperAdmin TD-4599 Provide links to legacy super admin commit 08108ea Merge: 26c3658 9d5c110 Author: rshrirohit <[email protected]> Date: Wed Aug 21 08:34:40 2024 +0100 Merge pull request #2779 from TechnologyEnhancedLearning/Develop/Fixes/TD-4509-Issuewith'Search'showingvarioussearchresultsbasedonleading/trailingendspacesgivenon'AllFrameworks'&'MyFrameworks'screens TD-4509 Issue with 'Search' showing various search results based on leading/trailing end spaces given on 'All Frameworks' & 'My Frameworks' screens commit 26c3658 Merge: b07feae 19e62f7 Author: rshrirohit <[email protected]> Date: Tue Aug 20 14:53:39 2024 +0100 Merge pull request #2775 from TechnologyEnhancedLearning/Develop/Fix/TD-4460-URL-parameter-manipulation TD-4460- Action filter applied to verify centre specific self assessment commit 05d2e14 Author: Sherif Olaboye <[email protected]> Date: Mon Aug 19 16:52:46 2024 +0100 TD-4595 Remove the legacy tracking system tile from the application selector commit f13227c Author: Sherif Olaboye <[email protected]> Date: Mon Aug 19 16:41:55 2024 +0100 TD-4595 Remove the legacy tracking system tile from the application selector commit 8bbc69c Author: Auldrin Possa <[email protected]> Date: Mon Aug 19 14:53:02 2024 +0100 TD-4590- Sorted supervisor list, added email address and removed center name commit 3217477 Author: Sherif Olaboye <[email protected]> Date: Mon Aug 19 10:44:41 2024 +0100 TD-4238 Resolving current activities showing back link as ‘Completed activities’ commit b07feae Merge: 0aeac45 53c570f Author: rshrirohit <[email protected]> Date: Mon Aug 19 10:40:40 2024 +0100 Merge branch 'Release-2024.32' into Release-2024.38 commit 53c570f Merge: 1dd34d0 a2c5481 Author: rshrirohit <[email protected]> Date: Mon Aug 19 10:36:38 2024 +0100 Merge pull request #2781 from TechnologyEnhancedLearning/Develop/Fixes/TD-4535-CorrectingTableColumnName TD-4535 Changed the column for storing email in centres table commit a2c5481 Author: Rohit Shrivastava <[email protected]> Date: Mon Aug 19 09:49:00 2024 +0100 TD-4535 Changed the column for storing email in centres table commit 0f85654 Author: kevwhitt-hee <[email protected]> Date: Mon Aug 19 09:42:40 2024 +0100 Fixes redirect controller code, appends "legacy" and formatter changes commit 065bd33 Author: kevwhitt-hee <[email protected]> Date: Mon Aug 19 08:20:51 2024 +0100 TD-4599 Implements links to legacy super admin from super admin - system commit b15f627 Author: Auldrin Possa <[email protected]> Date: Fri Aug 16 19:00:49 2024 +0100 TD-4436- Date saved as utc DateTime and retrived date as local (time zone) DateTime commit 9d5c110 Author: Sherif Olaboye <[email protected]> Date: Fri Aug 16 10:17:33 2024 +0100 TD-4509 Issue with 'Search' showing various search results based on leading/trailing end spaces given on 'All Frameworks' & 'My Frameworks' screens commit 1dd34d0 Merge: 827693c 882a811 Author: rshrirohit <[email protected]> Date: Fri Aug 16 08:42:52 2024 +0100 Merge pull request #2753 from TechnologyEnhancedLearning/Develop/Fixes/TD-4243-Few'addon'coursesshowingon'LearningPortal'notshowingon'Coursesetup'&'Delegateactivities'screens TD-4243 Few 'add on' courses showing on 'Learning Portal' not showing on 'Course set up' & 'Delegate activities' screens commit 24919ea Author: Sherif Olaboye <[email protected]> Date: Thu Aug 15 11:03:44 2024 +0100 TD-4539 Issue showing console '500' error on the screen when clicked browser back button after processing the Bulk Upload registration commit 0aeac45 Merge: 33594e0 827693c Author: rshrirohit <[email protected]> Date: Thu Aug 15 08:43:10 2024 +0100 Merge branch 'Release-2024.32' into Release-2024.38 commit 550bff1 Author: Sherif Olaboye <[email protected]> Date: Wed Aug 14 10:48:03 2024 +0100 TD-4515 Issue showing console '500' error on the screen when clicked browser back button after submitting request support ticket commit 33594e0 Merge: fb3651e bc85432 Author: rshrirohit <[email protected]> Date: Tue Aug 13 14:30:02 2024 +0100 Merge pull request #2772 from TechnologyEnhancedLearning/Develop/Features/TD-4469-CourseReportDetail TD-4469 Adds usage detail tab to centre course report export commit fb3651e Merge: 9de2f37 02d3ed9 Author: rshrirohit <[email protected]> Date: Tue Aug 13 14:27:29 2024 +0100 Merge pull request #2770 from TechnologyEnhancedLearning/Develop/Features/TD-4428-Additionaloptionalcompetenciescheckboxonthelearnersignoffrequestscreen TD-4428 Additional optional competencies checkbox on the learner signoff request screen commit 827693c Merge: 515f0ce 93ee220 Author: rshrirohit <[email protected]> Date: Tue Aug 13 14:24:36 2024 +0100 Merge pull request #2767 from TechnologyEnhancedLearning/Develop/Fix/TD-4445-Prevent-course-enrolment TD-4445-Course validation added for self enrolment. commit ddb931e Author: Sherif Olaboye <[email protected]> Date: Tue Aug 13 10:03:37 2024 +0100 TD-4502 Issue not listing the delegates on 'Send welcome message' screen for whose Password is set and unclaimed commit 515f0ce Merge: 60bc596 6202973 Author: rshrirohit <[email protected]> Date: Tue Aug 13 08:24:31 2024 +0100 Merge pull request #2724 from TechnologyEnhancedLearning/Develop/Fixes/TD-4238-Launchingfewcoursesfrom'Currentactivities'orfrom'Coursesetup'seeingbacklinkasCompletedactivities' TD-4238 launching few courses from 'current activities' or from 'course setup' seeing back link as completed activities' commit 19e62f7 Author: Auldrin Possa <[email protected]> Date: Fri Aug 9 17:32:50 2024 +0100 TD-4460- action filter applied to verify centre specific self assessment commit bc85432 Author: kevwhitt-hee <[email protected]> Date: Thu Aug 8 16:34:10 2024 +0100 TD-4469 Removes unnecessary using statements from related classes commit 0ef836f Author: kevwhitt-hee <[email protected]> Date: Thu Aug 8 16:26:28 2024 +0100 IDE formatter changes commit 822ee04 Author: kevwhitt-hee <[email protected]> Date: Thu Aug 8 16:18:18 2024 +0100 TD-4469 Moves centre filtering to table join and applies to summary query as well as detail queries commit f8da95d Author: Sherif Olaboye <[email protected]> Date: Thu Aug 8 16:07:28 2024 +0100 TD-4429 Additional optional competencies checkbox on the supervisor sign off screen commit b4e795f Merge: b2a9745 1856174 Author: kevwhitt-hee <[email protected]> Date: Thu Aug 8 16:00:25 2024 +0100 Merge pull request #2771 from TechnologyEnhancedLearning/Develop/Features/TD-4469CourseReportDetail TD-4469 Merging into correct branch commit 1856174 Author: kevwhitt-hee <[email protected]> Date: Thu Aug 8 15:52:45 2024 +0100 TD-4469 Limits details query by learner centre ID and updates related tests commit 02d3ed9 Author: Sherif Olaboye <[email protected]> Date: Wed Aug 7 15:01:47 2024 +0100 TD-4428 changing the control name to the optional competencies commit 154b21d Author: Sherif Olaboye <[email protected]> Date: Wed Aug 7 13:10:57 2024 +0100 TD-4428 Additional optional competencies checkbox on the learner sign off request screen commit 392eeed Author: Sherif Olaboye <[email protected]> Date: Wed Aug 7 12:15:36 2024 +0100 TD-4428 Additional optional competencies checkbox on the learner sign off request screen commit 9de2f37 Merge: 2da0421 9909956 Author: rshrirohit <[email protected]> Date: Wed Aug 7 10:53:40 2024 +0100 Merge pull request #2766 from TechnologyEnhancedLearning/Develop/Features/TD-4427-ChecktheminimumoptionalcompetencieshavebeenaddedbeforeenablingRequestSign-off TD-4427 Check the minimum optional competencies have been added before enabling Request Sign-off commit 9909956 Author: Sherif Olaboye <[email protected]> Date: Wed Aug 7 09:17:41 2024 +0100 TD-4427 renaming the NumberOfAssignOptionalCompetencies to NumberOfSelfAssessedOptionalCompetencies commit a91115d Merge: cbd0dff 39243c8 Author: Sherif Olaboye <[email protected]> Date: Wed Aug 7 09:09:02 2024 +0100 Merge remote-tracking branch 'origin/Release-2024.38' into Develop/Features/TD-4427-ChecktheminimumoptionalcompetencieshavebeenaddedbeforeenablingRequestSign-off commit 2da0421 Merge: 39243c8 60bc596 Author: rshrirohit <[email protected]> Date: Wed Aug 7 08:25:44 2024 +0100 Merge branch 'Release-2024.32' into Release-2024.38 commit 60bc596 Merge: e15940e 8c6196c Author: rshrirohit <[email protected]> Date: Wed Aug 7 08:25:08 2024 +0100 Merge branch 'master' into Release-2024.32 commit 8c6196c Merge: 6060d13 3997d37 Author: rshrirohit <[email protected]> Date: Wed Aug 7 08:01:28 2024 +0100 Merge pull request #2769 from TechnologyEnhancedLearning/Release-2024.29-Hotfix-2.0 Release 2024.29 hotfix 2.0 commit b2a9745 Author: kevwhitt-hee <[email protected]> Date: Tue Aug 6 09:34:07 2024 +0100 TD-4469 Implements usage detail tab in course report spreadsheet commit 39243c8 Merge: 7eeca89 667c53a Author: rshrirohit <[email protected]> Date: Tue Aug 6 07:46:42 2024 +0100 Merge pull request #2764 from TechnologyEnhancedLearning/Develop/Features/TD-4426-Addaminimumoptionalcompetenciesintfieldtotheselfassessmentstable TD- 4426 Add a minimum optional competencies int field to the self assessments table commit 7eeca89 Merge: dd87364 f76b8ba Author: rshrirohit <[email protected]> Date: Tue Aug 6 07:45:20 2024 +0100 Merge pull request #2761 from TechnologyEnhancedLearning/Develop/Features/TD-4324-IncludeOptionalintheFilteroptionsonthelearnercompetenciesmenu TD-4324 Include "Optional" in the Filter options on the learner competencies menu commit dd87364 Merge: f2d5674 301cbf2 Author: rshrirohit <[email protected]> Date: Tue Aug 6 07:38:48 2024 +0100 Merge pull request #2768 from TechnologyEnhancedLearning/Develop/Features/TD-4322-IntroduceOptionaltaginthelearnercompetenciesmenu(Overview) td-4322 Introduce "Optional" tag in the learner competencies menu (Overview) commit 301cbf2 Author: Sherif Olaboye <[email protected]> Date: Mon Aug 5 16:32:13 2024 +0100 TD-4322 Removing the whitespace commit 6cb76bf Author: Sherif Olaboye <[email protected]> Date: Mon Aug 5 16:19:20 2024 +0100 TD-4322 Introduce "Optional" tag in the learner competencies menu (Overview) commit 8e40fa3 Author: Sherif Olaboye <[email protected]> Date: Mon Aug 5 16:00:08 2024 +0100 TD-4322 Putiing the condition on the main page instead of inside the tag commit 93ee220 Author: Auldrin Possa <[email protected]> Date: Mon Aug 5 15:21:36 2024 +0100 TD-4445-customisation validation added for self enrolment commit cbd0dff Author: Sherif Olaboye <[email protected]> Date: Mon Aug 5 11:42:45 2024 +0100 TD-4427 Check the minimum optional competencies have been added before enabling Request Sign-off commit f2d5674 Merge: 88400ed e15940e Author: rshrirohit <[email protected]> Date: Mon Aug 5 09:42:26 2024 +0100 Merge branch 'Release-2024.32' into Release-2024.38 commit e15940e Merge: 6c54f88 3997d37 Author: rshrirohit <[email protected]> Date: Mon Aug 5 09:40:43 2024 +0100 Merge branch 'Release-2024.29-Hotfix-2.0' into Release-2024.32 commit 6c54f88 Merge: b93bc6d d950288 Author: rshrirohit <[email protected]> Date: Mon Aug 5 09:37:38 2024 +0100 Merge pull request #2763 from TechnologyEnhancedLearning/Develop/Fixes/TD-4354-ConvertingMBintoGBForPerDelegateUploadSpace TD-4354 Converting MB into GB for per delegate upload space commit 3997d37 Merge: 2d700ed a3df63f Author: rshrirohit <[email protected]> Date: Mon Aug 5 09:36:08 2024 +0100 Merge pull request #2765 from TechnologyEnhancedLearning/Develop/Fixes/TD-4467-RevertingTheChangesInClockUtility TD-4467 Reverting the changes made in ClockUtility commit 88400ed Merge: 0fe2ca6 6e11c0b Author: rshrirohit <[email protected]> Date: Mon Aug 5 08:48:20 2024 +0100 Merge pull request #2762 from TechnologyEnhancedLearning/Develop/Fixes/TD-4333-CorrectionsInCourseAdminFieldsArea TD-4333 Corrections In Course Admin Fields Area commit b93bc6d Merge: a22510d 858894d Author: rshrirohit <[email protected]> Date: Mon Aug 5 08:19:32 2024 +0100 Merge pull request #2758 from TechnologyEnhancedLearning/Develop/Fix/TD-4436-Issue-with-Enrolment-datetime TD-4436 - Issue with the Enrolment date/time for the courses when enrolled by 'Group' commit 0fe2ca6 Merge: e6e21e5 9a2b8e6 Author: rshrirohit <[email protected]> Date: Mon Aug 5 08:16:44 2024 +0100 Merge pull request #2757 from TechnologyEnhancedLearning/Develop/Fixes/TD-4364-BacklinksForMobileViewAdded TD-4364 Back links For Mobile View Added commit a3df63f Author: Rohit Shrivastava <[email protected]> Date: Fri Aug 2 08:42:25 2024 +0100 TD-4467 Reverting the changes made in ClockUtility commit 667c53a Author: Sherif Olaboye <[email protected]> Date: Thu Aug 1 12:11:19 2024 +0100 Removing unnecessary reference commit ec60ef0 Author: Sherif Olaboye <[email protected]> Date: Thu Aug 1 12:01:26 2024 +0100 TD-4426 Add a minimum optional competencies int field to the self assessments table commit d950288 Author: Rohit Shrivastava <[email protected]> Date: Thu Aug 1 08:52:49 2024 +0100 TD-4354 Converting MB into GB for per delegate upload space commit 6e11c0b Author: Rohit Shrivastava <[email protected]> Date: Thu Aug 1 08:03:55 2024 +0100 TD-4333 Corrections In Course Admin Fields Area commit f76b8ba Author: Sherif Olaboye <[email protected]> Date: Wed Jul 31 15:18:13 2024 +0100 TD-4324 Include "Optional" in the Filter options on the learner competencies menu commit cca2c2a Author: Sherif Olaboye <[email protected]> Date: Tue Jul 30 10:04:59 2024 +0100 Develop/Features/TD-4322-IntroduceOptionaltaginthelearnercompetenciesmenu(Overview) commit 858894d Author: Auldrin Possa <[email protected]> Date: Fri Jul 26 16:12:56 2024 +0100 TD-4436 - removed FirstSubmittedTime from UpdateProgressSupervisorAndCompleteByDate(+), created new service method to edit progress supervisor commit 9a2b8e6 Author: Rohit Shrivastava <[email protected]> Date: Fri Jul 26 08:53:02 2024 +0100 TD-4364 Back links For Mobile View Added commit 882a811 Author: Sherif Olaboye <[email protected]> Date: Mon Jul 22 16:59:51 2024 +0100 TD-4243 Few 'add on' courses showing on 'Learning Portal' not showing on 'Course set up' & 'Delegate activities' screens commit 6202973 Author: Sherif Olaboye <[email protected]> Date: Tue Jul 9 10:46:56 2024 +0100 TD-4238 Launching few courses from 'Current activities' or from 'Course set up' seeing back link as 'Completed activities' commit 8c51508 Merge: cfea661 0fbbe4c Author: Sherif Olaboye <[email protected]> Date: Fri Jul 5 09:52:04 2024 +0100 Merge remote-tracking branch 'origin/Release-2024.32' into Develop/Fixes/TD-4238-Launchingfewcoursesfrom'Currentactivities'orfrom'Coursesetup'seeingbacklinkasCompletedactivities' commit cfea661 Author: Sherif Olaboye <[email protected]> Date: Tue Jun 18 11:35:25 2024 +0100 TD-4238 Launching few courses from 'Current activities' or from 'Course set up' seeing back link as 'Completed activities' commit 51dcb68 Author: Sherif Olaboye <[email protected]> Date: Mon May 20 09:38:23 2024 +0100 TD-4092 Adding a check for an unauthorise candidate number commit e5f238a Author: Sherif Olaboye <[email protected]> Date: Fri May 17 18:59:21 2024 +0100 TD-4092 Refactor DLS Competency Self Assessment Certificates to improve maintainability and security commit 28fbe20 Author: Sherif Olaboye <[email protected]> Date: Fri May 17 18:30:04 2024 +0100 TD-4092 Refactor DLS Competency Self Assessment Certificates to improve maintainability and security
1 parent 57a24c6 commit dfe3334

File tree

134 files changed

+3296
-1248
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+3296
-1248
lines changed
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
namespace DigitalLearningSolutions.Data.Migrations
2+
{
3+
using FluentMigrator;
4+
5+
[Migration(202407221645)]
6+
public class AlterGetCurrentCoursesForCandidate_V3 : Migration
7+
{
8+
public override void Up()
9+
{
10+
Execute.Sql(Properties.Resources.TD_4243_Alter_GetCurrentCoursesForCandidate_V2_proc_up);
11+
}
12+
public override void Down()
13+
{
14+
Execute.Sql(Properties.Resources.TD_4243_Alter_GetCurrentCoursesForCandidate_V2_proc_down);
15+
}
16+
}
17+
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
namespace DigitalLearningSolutions.Data.Migrations
2+
{
3+
using FluentMigrator;
4+
5+
[Migration(202408141400)]
6+
public class Alter_uspCreateProgressRecord_V3_UtcDate : Migration
7+
{
8+
public override void Up()
9+
{
10+
Execute.Sql(Properties.Resources.TD_4436_Alter_uspCreateProgressRecord_V3_Up);
11+
}
12+
public override void Down()
13+
{
14+
Execute.Sql(Properties.Resources.TD_4436_Alter_uspCreateProgressRecord_V3_Down);
15+
}
16+
}
17+
}

DigitalLearningSolutions.Data.Migrations/202408221440_UpdatePrivacyPolicyRecord.cs

Lines changed: 540 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
namespace DigitalLearningSolutions.Data.Migrations
2+
{
3+
using FluentMigrator;
4+
5+
[Migration(202408271130)]
6+
public class Alter_GroupCustomisation_StoredProcs : Migration
7+
{
8+
public override void Up()
9+
{
10+
Execute.Sql(Properties.Resources.TD_4436_Alter_GroupCustomisation_Add_V2_UpdateCompleteBy_Supervisor_Up);
11+
Execute.Sql(Properties.Resources.TD_4436_Alter_uspCreateProgressRecordWithCompleteWithinMonths_Quiet_V2_Up);
12+
}
13+
public override void Down()
14+
{
15+
Execute.Sql(Properties.Resources.TD_4436_Alter_GroupCustomisation_Add_V2_UpdateCompleteBy_Supervisor_Down);
16+
Execute.Sql(Properties.Resources.TD_4436_Alter_uspCreateProgressRecordWithCompleteWithinMonths_Quiet_V2_Down);
17+
}
18+
19+
}
20+
}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
namespace DigitalLearningSolutions.Data.Migrations
2+
{
3+
using FluentMigrator;
4+
using System.Diagnostics.Metrics;
5+
6+
[Migration(202408271610)]
7+
public class AlterConstraintForProgressAddUtcDate : Migration
8+
{
9+
public override void Up()
10+
{
11+
Execute.Sql(@$"ALTER TABLE [dbo].[Progress] DROP CONSTRAINT [DF_Progress_FirstSubmittedTime];
12+
ALTER TABLE [dbo].[Progress] ADD CONSTRAINT [DF_Progress_FirstSubmittedTime] DEFAULT (GETUTCDATE()) FOR [FirstSubmittedTime];");
13+
}
14+
public override void Down()
15+
{
16+
Execute.Sql(@$"ALTER TABLE [dbo].[Progress] DROP CONSTRAINT [DF_Progress_FirstSubmittedTime];
17+
ALTER TABLE [dbo].[Progress] ADD CONSTRAINT [DF_Progress_FirstSubmittedTime] DEFAULT (GETDATE()) FOR [FirstSubmittedTime];");
18+
}
19+
20+
}
21+
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+

2+
3+
namespace DigitalLearningSolutions.Data.Migrations
4+
{
5+
using FluentMigrator;
6+
7+
[Migration(202409031645)]
8+
public class AlterAvailableandCompletedCoursesForDelegate : Migration
9+
{
10+
public override void Up()
11+
{
12+
Execute.Sql(Properties.Resources.TD_4243_Alter_GetActivitiesForDelegateEnrolment_proc_up);
13+
Execute.Sql(Properties.Resources.TD_4243_Alter_GetCompletedCoursesForCandidate_proc_up);
14+
Execute.Sql(Properties.Resources.TD_4243_Alter_GetCurrentCoursesForCandidate_V2_proc_up);
15+
}
16+
public override void Down()
17+
{
18+
Execute.Sql(Properties.Resources.TD_4243_Alter_GetActivitiesForDelegateEnrolment_proc_down);
19+
Execute.Sql(Properties.Resources.TD_4243_Alter_GetCompletedCoursesForCandidate_proc_down);
20+
Execute.Sql(Properties.Resources.TD_4243_Alter_GetCurrentCoursesForCandidate_V2_proc_down);
21+
}
22+
}
23+
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+

2+
3+
namespace DigitalLearningSolutions.Data.Migrations
4+
{
5+
using FluentMigrator;
6+
7+
[Migration(202409051645)]
8+
public class Alter_GetCompletedCoursesForCandidate_CourseActive : Migration
9+
{
10+
public override void Up()
11+
{
12+
Execute.Sql(Properties.Resources.TD_4634_Alter_GetCompletedCoursesForCandidate_UP);
13+
}
14+
public override void Down()
15+
{
16+
Execute.Sql(Properties.Resources.TD_4634_Alter_GetCompletedCoursesForCandidate_DOWN);
17+
}
18+
}
19+
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+

2+
namespace DigitalLearningSolutions.Data.Migrations
3+
{
4+
using FluentMigrator;
5+
6+
[Migration(202401081132)]
7+
public class AddMinimumOptionalCompetenciesToSelfAssessmentsTable : Migration
8+
{
9+
public override void Up()
10+
{
11+
Alter.Table("SelfAssessments").AddColumn("MinimumOptionalCompetencies").AsInt32().NotNullable().WithDefaultValue(0);
12+
}
13+
14+
public override void Down()
15+
{
16+
Delete.Column("MinimumOptionalCompetencies").FromTable("SelfAssessments");
17+
}
18+
}
19+
}

0 commit comments

Comments
 (0)