Skip to content

TD-4086 Allow centre admins to launch tableau from reports page #2774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 20 commits into from
Sep 27, 2024
Merged

TD-4086 Allow centre admins to launch tableau from reports page #2774

merged 20 commits into from
Sep 27, 2024

Conversation

@kevwhitt-hee
Copy link
Contributor

@kevwhitt-hee kevwhitt-hee commented Aug 9, 2024 •
edited
Loading

JIRA link

TD-4086

Description

Introduces a new link to the Tableau self assessment dashboard in the Self Assessment Reports page in the Tracking System. Implements JWT authentication for Tableau Server API and uses to display the identifiable self assessment dashboard embedded in a new view, passing the email address of the logged in user as a user attribute in the JWT token.

Screenshots

image

image
image
image
localhost_44363_TrackingSystem_Centre_Reports_SelfAssessments
localhost_44363_TrackingSystem_Centre_Reports_SelfAssessments_TableauCompetencyDashboard

Developer checks

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

I have:

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

@kevwhitt-hee
Copy link
Contributor Author

@rshrirohit, created a draft PR so that it is easier to see the work that I've done on this branch.

@kevwhitt-hee kevwhitt-hee marked this pull request as draft August 21, 2024 08:26
@kevwhitt-hee
TD-4086-Adds tableau JWT token helper class and settings
07727e2
@kevwhitt-hee
Adds users.primaryemail to JWT claims
3a0b5de
@kevwhitt-hee
Starts to add view and controller code
801ea9b
@kevwhitt-hee
Removes duplicate using using directives from Startup
49250ce
@kevwhitt-hee
Sends JWT auth token to Tableau and redirects to dashboard if successful
70fe40c
@kevwhitt-hee
TD-4086 Reworks JWT token generation to add iss and kid to token headers
8a949fc
@kevwhitt-hee
Squashed commit of the following:
6bfece6 
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.
@kevwhitt-hee
TD-4086 Reworks the JWT token code to generate correct format with co…
028e860 
…rrect encoding
@kevwhitt-hee
TD-4086 removing unneeded comment
c5208b5
@kevwhitt-hee
Removes unnecessary using statements
0955280
@kevwhitt-hee
Reworks tableau code to use tableau's embed visualisation library
b95bfd5
@kevwhitt-hee
Reworks the embed view and fixes embed scope
face0f8
@kevwhitt-hee
Squashed commit of the following:
0415f9a 
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
@kevwhitt-hee
Improves navigation and tweaks email JWT param name
e5ac58c
@kevwhitt-hee kevwhitt-hee force-pushed the Develop/Features/TD-4086-CentreAdminLaunchTableau branch from d3f3569 to e5ac58c Compare September 18, 2024 10:05
@kevwhitt-hee kevwhitt-hee marked this pull request as ready for review September 25, 2024 13:56
@kevwhitt-hee
Copy link
Contributor Author

@rshrirohit when this gets merged to UAT, we need to add a config value for the Tableau connected app secret to the UAT server before it will work. I will look at doing that now (and I'll get the production one in place in readiness too).

@kevwhitt-hee kevwhitt-hee marked this pull request as draft September 25, 2024 14:11
@kevwhitt-hee
Copy link
Contributor Author

@rshrirohit moved back to draft, please don't merge. Still problems Tableau side picking up the user.

@kevwhitt-hee kevwhitt-hee marked this pull request as ready for review September 26, 2024 15:04
@kevwhitt-hee
Copy link
Contributor Author

@rshrirohit, I have feature flagged this. It should work subject to some config on Tableau but shouldn't be tested until that has been done. It would be useful to get it into test, though, so that Sarah and others can work with it while we get it working please.

@rshrirohit rshrirohit merged commit 97783c5 into Release-2024.38 Sep 27, 2024
2 checks passed
@rshrirohit rshrirohit deleted the Develop/Features/TD-4086-CentreAdminLaunchTableau branch September 27, 2024 07:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@kevwhitt-hee @rshrirohit