Skip to content

TD-5636 issueallowingtoaddduplicateresourceson'competence resourcesignposting'screen #3284

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
Closed
wants to merge 194 commits into from
Closed

TD-5636 issueallowingtoaddduplicateresourceson'competence resourcesignposting'screen #3284

wants to merge 194 commits into from

Conversation

@sherif-olaboye
Copy link
Contributor

JIRA link

TD-####

Description

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

Screenshots

Paste screenshots for all views created or changed: mobile, tablet and desktop, wave analyser showing no errors.

Developer checks

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

I have:

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

@kevwhitt-hee
TD-5163 Process imported competencies
6cf28ac
@kevwhitt-hee
TD-5163 modifies the insert competency group method to take an option…
a43b862 
…al framework id
@kevwhitt-hee
TD-5286 Renames role profiles to competency assessments throughout th…
a65f2f8 
…e application
@kevwhitt-hee
TD-5286 Gives framework developers and contributors access to the com…
e44b957 
…petency assessments interface
@kevwhitt-hee
TD-5286 Migration to add and populate the SelfAssessmentFrameworks an…
a7f68a0 
…d SelfAssessmentTaskStatus tables
@kevwhitt-hee
TD-5286 Tweaks the competency assessments table
b2c5413
@kevwhitt-hee
TD-480 Amends previous migration and sets up basic services and contr…
dc7b945 
…oller for creating a new assessment
@kevwhitt-hee
Adjusts migration to allow null description on insert self assessment
e0c17fd
@kevwhitt-hee
TD-480 Implements create assessment controller and service
af9c63b
@kevwhitt-hee
Formatting and labelling fixes
46b4f4d
@kevwhitt-hee
Resolving post-rebase merge conflict problems
4a48c0c
@kevwhitt-hee
TD-5286 Renames role profiles to competency assessments throughout th…
c524236 
…e application
@kevwhitt-hee
TD-480 Amends previous migration and sets up basic services and contr…
54949e0 
…oller for creating a new assessment
@kevwhitt-hee
TD-5163 Process imported competencies
36b9da8
@kevwhitt-hee
Resolving post-rebase merge conflict problems
b97a74e
@kevwhitt-hee
TD-480 Implements create assessment controller and service
7fbf441
@kevwhitt-hee
TD-481 Implements basic MVC components for task list page and wires t…
621da1c 
…hem up to existing buttons
@kevwhitt-hee
Adds task status tags and cannot start yet logic and asp actions for …
dcc9126 
…links
@kevwhitt-hee
Fixes link name
5e0a6b5
@kevwhitt-hee
TD-481 Fixes a problem with the Id of the competency assessment not b…
28d1146 
…eing retained when a new one is created
@kevwhitt-hee
Update ManageCompetencyAssessment.cshtml
583cc11
@kevwhitt-hee
Update ManageCompetencyAssessment.cshtml
0f03547
@kevwhitt-hee
Fixes routing of cancel button on edit name page
d1646fa
@kevwhitt-hee
Uses borderless summary list to disply name and status
4abf026
@kevwhitt-hee
post rebase merge conflict fix
d79749e
@kevwhitt-hee
Post rebase fixes
d69cbca
@kevwhitt-hee
Post rebase fix
9ae33a7
@kevwhitt-hee
Merge pull request #3119 from TechnologyEnhancedLearning/Develop/Feat…
17ee3c4 
…ures/TD-481-CreateAssessmentTaskList

TD-481 create assessment task list
@kevwhitt-hee
TD-482 Implements Edit Description MVC form
ab4d827
@kevwhitt-hee
IDE formatter changes
eab0c2a
rshrirohit and others added 26 commits May 21, 2025 11:22
@rshrirohit
Merge pull request #3270 from TechnologyEnhancedLearning/Develop/feat…
f6a25c8 
…ure/TD-3718_Display_LastAccessed_SuperAdmin_Card

TD_3718 Adding the text 'Last accessed date' to the administrators card in the superadmin section
@rshrirohit
Merge pull request #3271 from TechnologyEnhancedLearning/Develop/feat…
fda2a45 
…ure/TD-3719_Display_LastAccessed_SuperAdmin_DelegateCard

TD_3719 Added 'Last accessed date' to the delegates card within the superadmin module
@rshrirohit
Merge pull request #3272 from TechnologyEnhancedLearning/Develop/feat…
c61de1b 
…ure/TD-5583_Display_LastAccessed_TrackingSystem_DeegatesCard

TD_5583_ Added Last accessed date field to the view delegates section within Tracking System
@rshrirohit
Merge pull request #3273 from TechnologyEnhancedLearning/Develop/Fixe…
55b7429 
…s/TD-3715_Test_Failed_Change_LastAccessed_Lastaccesseddate_Delegate_Reports

TD-3715 Fix for initial test fail scenario changed Last Accessed column name to Last accessed date in delegate excel reports
@rshrirohit
Merge pull request #3274 from TechnologyEnhancedLearning/Develop/Fix/…
7cacd96 
…TD-5620-Competency-Empty-Description-Save-issue

TD-5620-Added code to check if the html editor is empty.
@kevwhitt-hee
Merge branch 'master' into DLS-Release-v1.3.0
8fa1d92
@kevwhitt-hee
Merge branch 'DLS-Release-v1.3.0' of https://github.com/TechnologyEnh…
b890dad 
…ancedLearning/DLSV2 into DLS-Release-v1.3.0
@kevwhitt-hee
Squashed commit of the following:
3641122 
commit 7cacd96
Merge: 55b7429 1697508
Author: rshrirohit <[email protected]>
Date:   Wed May 21 11:35:36 2025 +0100

    Merge pull request #3274 from TechnologyEnhancedLearning/Develop/Fix/TD-5620-Competency-Empty-Description-Save-issue

    TD-5620-Added code to check if the html editor is empty.

commit 55b7429
Merge: c61de1b 2d3dda8
Author: rshrirohit <[email protected]>
Date:   Wed May 21 11:29:26 2025 +0100

    Merge pull request #3273 from TechnologyEnhancedLearning/Develop/Fixes/TD-3715_Test_Failed_Change_LastAccessed_Lastaccesseddate_Delegate_Reports

    TD-3715 Fix for initial test fail scenario changed Last Accessed column name to Last accessed date in delegate excel reports

commit c61de1b
Merge: fda2a45 ab8492c
Author: rshrirohit <[email protected]>
Date:   Wed May 21 11:23:54 2025 +0100

    Merge pull request #3272 from TechnologyEnhancedLearning/Develop/feature/TD-5583_Display_LastAccessed_TrackingSystem_DeegatesCard

    TD_5583_ Added Last accessed date field to the view delegates section within Tracking System

commit fda2a45
Merge: f6a25c8 fd66a08
Author: rshrirohit <[email protected]>
Date:   Wed May 21 11:22:59 2025 +0100

    Merge pull request #3271 from TechnologyEnhancedLearning/Develop/feature/TD-3719_Display_LastAccessed_SuperAdmin_DelegateCard

    TD_3719 Added 'Last accessed date' to the delegates card within the superadmin module

commit f6a25c8
Merge: e42945b c26d12a
Author: rshrirohit <[email protected]>
Date:   Wed May 21 11:22:07 2025 +0100

    Merge pull request #3270 from TechnologyEnhancedLearning/Develop/feature/TD-3718_Display_LastAccessed_SuperAdmin_Card

    TD_3718 Adding the text 'Last accessed date' to the administrators card in the superadmin section

commit e42945b
Merge: 0a5d04e aaf8d95
Author: rshrirohit <[email protected]>
Date:   Wed May 21 11:21:34 2025 +0100

    Merge pull request #3268 from TechnologyEnhancedLearning/Develop/Fix/TD-5511-View-Edit-link-for-frameworks

    TD-5511-SQL query modified to get correct admin user role of framework

commit 0a5d04e
Merge: 7fa0ed7 6a7ddec
Author: rshrirohit <[email protected]>
Date:   Wed May 21 11:17:09 2025 +0100

    Merge pull request #3265 from TechnologyEnhancedLearning/Develop/Fixes/TD-5547_Hard_Coded_Fields_Should_Be_Dynamic

    TD-5547_Added logic to generate the Centre Custom Fields dynamically for Self Assessment Reports for a given centre.

commit 7fa0ed7
Merge: a961e4d 6f9fb33
Author: rshrirohit <[email protected]>
Date:   Wed May 21 10:49:44 2025 +0100

    Merge pull request #3260 from TechnologyEnhancedLearning/Develop/Features/TD-5568-Add'Lastaccesseddate'to'sort'filteron'Trackingsystem-Delegates'screen

    TD-5568 Add 'Last accessed date' to 'sort' filter on 'Tracking system - Delegates' screen

commit a961e4d
Merge: b395ce1 046fab2
Author: rshrirohit <[email protected]>
Date:   Wed May 21 10:45:11 2025 +0100

    Merge pull request #3198 from TechnologyEnhancedLearning/Develop/feature/TD-5434_Move_Banner_Text_Into_Footer

    TD_5434 Move the Centre Name to the top of footer across all Learning Portal Pages.

commit 1697508
Author: Auldrin Possa <[email protected]>
Date:   Tue May 20 15:57:04 2025 +0100

    TD-5620-Added code to check if the html editor is empty.

commit 2d3dda8
Author: ABSinhaa <[email protected]>
Date:   Tue May 20 14:44:04 2025 +0100

    TD-3715_Renamed the dataTable column name to 'Last accessed date'.

commit ab8492c
Author: ABSinhaa <[email protected]>
Date:   Tue May 20 14:18:55 2025 +0100

    TD_5583_ Added Last accessed date field to the view delegates section within the TrackingSystem ManageDelegates module.

commit fd66a08
Author: ABSinhaa <[email protected]>
Date:   Tue May 20 13:10:25 2025 +0100

    TD_3719_added the phrase 'Last accessed date' to the delegates card.

commit c26d12a
Author: ABSinhaa <[email protected]>
Date:   Tue May 20 12:50:20 2025 +0100

    TD_3718_ adding the text 'Last accessed date' to the administrators card in the superadmin section.

commit aaf8d95
Author: Auldrin Possa <[email protected]>
Date:   Mon May 19 22:14:15 2025 +0100

    TD-5511-GetAdminUserRoleForFrameworkId(+) query modified to get admin user role.

commit 6f9fb33
Author: Sherif Olaboye <[email protected]>
Date:   Mon May 19 16:58:28 2025 +0100

    TD-5568 changing to Last Accessed Date to Last accessed date

commit b395ce1
Merge: 267ac46 6d07122
Author: rshrirohit <[email protected]>
Date:   Mon May 19 16:25:38 2025 +0100

    Merge pull request #3267 from TechnologyEnhancedLearning/Develop/Fix/TD-5511-View-Edit-link-for-frameworks

    TD-5511-Displaying View/Review link based on framework review

commit 267ac46
Merge: 0d3242c b5ab440
Author: rshrirohit <[email protected]>
Date:   Mon May 19 16:21:33 2025 +0100

    Merge pull request #3266 from TechnologyEnhancedLearning/Develop/Fix/TD-5439-Bulk-confirmation-description-issue

    TD-5439-Added empty competency description check

commit 6d07122
Author: Auldrin Possa <[email protected]>
Date:   Fri May 16 15:49:22 2025 +0100

    TD-5511-Displaying View/Review based on framework review

commit b5ab440
Author: Auldrin Possa <[email protected]>
Date:   Thu May 15 12:16:25 2025 +0100

    TD-5439-Added empty competency description check. Increased competency text font to 19.

commit 6a7ddec
Author: ABSinhaa <[email protected]>
Date:   Thu May 15 11:24:29 2025 +0100

    TD-5547 : Rewrote the Self Assessment report code to incorporate and dynamically generate CENTRE custom fields into it.

commit 0d3242c
Merge: 39e3925 8d82452
Author: rshrirohit <[email protected]>
Date:   Tue May 13 15:11:25 2025 +0100

    Merge pull request #3264 from TechnologyEnhancedLearning/Develop/Fix/TD-5443-Validation-Summary-focus

    TD-5443-Validation summary field name corrected

commit 39e3925
Merge: 9a764c0 e2ec325
Author: rshrirohit <[email protected]>
Date:   Tue May 13 15:09:19 2025 +0100

    Merge pull request #3263 from TechnologyEnhancedLearning/Develop/Fixes/TD-3716-DisplaytheAdminAccountsLastAccesseddateintheTrackingSystemCentresAdministratorscards

    TD-3716 Display the AdminAccounts.LastAccessed date in the Tracking System -> Centres -> Administrators cards

commit 9a764c0
Merge: a7e04ca 85abefa
Author: rshrirohit <[email protected]>
Date:   Tue May 13 15:08:48 2025 +0100

    Merge pull request #3262 from TechnologyEnhancedLearning/Develop/Fixes/TD-3714-DisplaytheDelegateAccountsLastAccesseddateontheTrackingSystemdelegatescards

    TD- 3714 Display the DelegateAccounts.LastAccessed date on the Tracking System -> Delegates cards

commit a7e04ca
Merge: b740bf7 e364763
Author: rshrirohit <[email protected]>
Date:   Tue May 13 15:08:21 2025 +0100

    Merge pull request #3261 from TechnologyEnhancedLearning/Develop/Fix/TD-5451-Supervisor-Competency-empty-desc

    TD-5451-Empty competency description check added in the Supervise section.

commit b740bf7
Merge: 7be11c2 3f0ed28
Author: rshrirohit <[email protected]>
Date:   Tue May 13 15:02:32 2025 +0100

    Merge pull request #3258 from TechnologyEnhancedLearning/Develop/Fixes/TD-5487-IssueshowingmultiplecommentswhenclickedthebacklinkaftersubmittedthereviewonFrameworkssection

    TD-5487 Issue showing multiple comments when clicked the back link after submitted the review on Frameworks section

commit 8d82452
Author: Auldrin Possa <[email protected]>
Date:   Mon May 12 14:37:22 2025 +0100

    TD-5443-Validation summary field name corrected

commit e2ec325
Author: Sherif Olaboye <[email protected]>
Date:   Mon May 12 14:29:54 2025 +0100

    TD-3716 Display the AdminAccounts.LastAccessed date in the Tracking System -> Centres -> Administrators cards

commit 85abefa
Author: Sherif Olaboye <[email protected]>
Date:   Mon May 12 13:44:50 2025 +0100

    TD-3714 Display the DelegateAccounts.LastAccessed date on the Tracking System -> Delegates cards

commit e364763
Author: Auldrin Possa <[email protected]>
Date:   Mon May 12 11:51:40 2025 +0100

    TD-5451-empty competency description check added in Supervise section.

commit 7246e0d
Author: Sherif Olaboye <[email protected]>
Date:   Mon May 12 11:38:55 2025 +0100

    TD-5568 Add 'Last accessed date' to 'sort' filter on 'Tracking system - Delegates' screen

commit 3f0ed28
Author: Sherif Olaboye <[email protected]>
Date:   Fri May 9 10:58:09 2025 +0100

    TD-5487 Issue showing multiple comments when clicked the back link after submitted the review on Frameworks section

commit 7be11c2
Merge: 6e68df7 dbdda71
Author: rshrirohit <[email protected]>
Date:   Thu May 8 22:36:39 2025 +0100

    Merge pull request #3255 from TechnologyEnhancedLearning/Develop/Fixes/TD-5561-IssueshowingmismatchofcolouringofbuttonsonLearningPortal-Selfassessmentsscreen

    TD-5561 Issue showing mismatch of colouring of buttons on Learning Portal - Self assessments screen

commit 6e68df7
Merge: 030a385 0fce67c
Author: rshrirohit <[email protected]>
Date:   Thu May 8 22:30:13 2025 +0100

    Merge pull request #3249 from TechnologyEnhancedLearning/Develop/Fixes/TD-5557_Competency_Description_Not_Saved

    TD_5557 Framework Competency Group Description not showing up after update

commit 030a385
Merge: e3d3475 a6694a1
Author: rshrirohit <[email protected]>
Date:   Thu May 8 22:21:00 2025 +0100

    Merge pull request #3242 from TechnologyEnhancedLearning/Develop/Fixes/TD-5545-UpdateNotificationsTable

    TD-5545 Update Notifications Table

commit e3d3475
Merge: 498976b 89c5c9f
Author: rshrirohit <[email protected]>
Date:   Thu May 8 22:17:29 2025 +0100

    Merge pull request #3241 from TechnologyEnhancedLearning/Develop/Fix/TD-5447-framework-competency-ordering

    TD-Framework competency group id null check added.

commit 498976b
Merge: d7a4015 7dbc2e8
Author: rshrirohit <[email protected]>
Date:   Thu May 8 22:09:46 2025 +0100

    Merge pull request #3239 from TechnologyEnhancedLearning/Develop/Fixes/TD-5528-Issueshowingconsole'500'erroronthescreenwhenclickedbrowserbacklinkon'Importcompetenciescomplete'screen

    TD-5528 Issue showing console '500' error on the screen when clicked browser back link on 'Import competencies complete' screen

commit d7a4015
Merge: 9c52e49 d709470
Author: rshrirohit <[email protected]>
Date:   Thu May 8 22:02:47 2025 +0100

    Merge pull request #3233 from TechnologyEnhancedLearning/Develop/Fixes/TD-5487-IssueshowingmultiplecommentswhenclickedthebacklinkaftersubmittedthereviewonFrameworkssection

    TD-5487 Issue showing multiple comments when clicked the back link after submitted the review on Frameworks section

commit 9c52e49
Merge: 030f828 373f845
Author: Rohit Shrivastava <[email protected]>
Date:   Thu May 8 08:56:45 2025 +0100

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

commit dbdda71
Author: Sherif Olaboye <[email protected]>
Date:   Wed May 7 10:26:44 2025 +0100

    TD-5561 Issue showing mismatch of colouring of buttons on Learning Portal - Self assessments screen

commit 0fce67c
Author: ABSinhaa <[email protected]>
Date:   Thu May 1 15:14:04 2025 +0100

    TD_5557_ added a null check to the query for the description propery whenever we update any competency group, so that the updated description value can be saved to the DB and show up.

commit 046fab2
Author: ABSinhaa <[email protected]>
Date:   Tue Apr 29 15:20:44 2025 +0100

    TD-5434_Made changes to the code and now we are loading the banner text information directly from the centre table into the view component based on the logged in user, instead of using the views to inject it into the view components, did some clean up of removing the unwanted bannerText viewdata assigning, cleaned up unwanted braces.

commit a6694a1
Author: Rohit Shrivastava <[email protected]>
Date:   Tue Apr 29 09:10:18 2025 +0100

    TD-5545 UpdateNotificationsTable

commit 89c5c9f
Author: Auldrin Possa <[email protected]>
Date:   Mon Apr 28 16:05:46 2025 +0100

    TD-Framework competency group id null check added. Ordering of competencies and competency groups updated after delete operation

commit 1d5cbad
Author: ABSinhaa <[email protected]>
Date:   Mon Apr 28 15:45:26 2025 +0100

    TD_5434_ made changes based on the new comments received by the team, added the logic to show the footer application through out the aplication only when the BannerText field has a value. removed the banner text from the Learning Menu module pages.

commit 7dbc2e8
Author: Sherif Olaboye <[email protected]>
Date:   Fri Apr 25 15:49:39 2025 +0100

    TD-5528 Issue showing console '500' error on the screen when clicked browser back link on 'Import competencies complete' screen

commit 030f828
Merge: 3060538 35d91ff
Author: Rohit Shrivastava <[email protected]>
Date:   Fri Apr 25 09:31:11 2025 +0100

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

commit 3060538
Merge: 8faae58 120c5dd
Author: rshrirohit <[email protected]>
Date:   Thu Apr 24 12:16:32 2025 +0100

    Merge pull request #3229 from TechnologyEnhancedLearning/Develop/Fix/TD-5451-SelfAssessment-expander-issue

    TD-5451- Empty competency description check added

commit 8faae58
Merge: ff91492 43875c6
Author: rshrirohit <[email protected]>
Date:   Thu Apr 24 12:15:39 2025 +0100

    Merge pull request #3225 from TechnologyEnhancedLearning/Develop/Fix/TD-5514-Course-completion-overdue-emails

    TD-5514-Stored proc updated to add course name in the email subject

commit d709470
Author: Sherif Olaboye <[email protected]>
Date:   Wed Apr 23 11:00:56 2025 +0100

    TD-5487 Issue showing multiple comments when clicked the back link after submitted the review on Frameworks section

commit 120c5dd
Author: Auldrin Possa <[email protected]>
Date:   Thu Apr 17 17:11:56 2025 +0100

    TD-5451- Empty competency description check added

commit ff91492
Merge: 5f3f6d3 8823efb
Author: rshrirohit <[email protected]>
Date:   Thu Apr 17 14:16:28 2025 +0100

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

commit 5f3f6d3
Merge: 0f1ba1c cfea4e1
Author: rshrirohit <[email protected]>
Date:   Thu Apr 17 10:52:30 2025 +0100

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

commit 43875c6
Author: Auldrin Possa <[email protected]>
Date:   Wed Apr 16 15:37:23 2025 +0100

    TD-5514-Stored proc updated to add course name in the email subject

commit 0f1ba1c
Merge: daec6e8 e00e493
Author: rshrirohit <[email protected]>
Date:   Wed Apr 16 09:44:42 2025 +0100

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

commit daec6e8
Merge: fc779eb df6ebbc
Author: rshrirohit <[email protected]>
Date:   Tue Apr 15 15:01:03 2025 +0100

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

commit fc779eb
Merge: a37e385 9d7521e
Author: rshrirohit <[email protected]>
Date:   Tue Apr 15 09:22:48 2025 +0100

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

commit a37e385
Merge: 305f2d5 3821eb4
Author: rshrirohit <[email protected]>
Date:   Tue Apr 15 09:20:23 2025 +0100

    Merge pull request #3217 from TechnologyEnhancedLearning/Develop/Fix/TD-5511-View-Edit-link-for-frameworks

    TD-5511- The admin userid is used to check the framework owner

commit 105f110
Author: ABSINHAA <[email protected]>
Date:   Mon Apr 14 11:15:34 2025 +0100

    TD-5434_remove unwanted ommented code as we do not need the horizontal rule anymore.

commit d1a41de
Author: ABSINHAA <[email protected]>
Date:   Thu Apr 10 20:50:23 2025 +0100

    TD_5434 code changes for the new way for showing the banner text in the footer using view component, removing the banner text from the supervisor module and adding the centre information to the footer there.

commit 3821eb4
Author: Auldrin Possa <[email protected]>
Date:   Thu Apr 10 12:47:39 2025 +0100

    TD-5511-Framework query modified- The admin userid is used to check the framework owner

commit 305f2d5
Merge: 572d66b 7d00ef2
Author: rshrirohit <[email protected]>
Date:   Wed Apr 9 14:58:52 2025 +0100

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

commit 572d66b
Merge: 02df8da 7a001a4
Author: rshrirohit <[email protected]>
Date:   Wed Apr 9 14:52:19 2025 +0100

    Merge pull request #3210 from TechnologyEnhancedLearning/Develop/feature/TD-5481-complete-list-of-supervisors-Activity-delegates

    TD-5481-Added a Details view component to show supervisor list.

commit 7a001a4
Author: Auldrin Possa <[email protected]>
Date:   Mon Apr 7 16:12:25 2025 +0100

    TD-5481-Added a Details view component in the view to show supervisor list.

commit 02df8da
Merge: 7666ffe 6623b90
Author: rshrirohit <[email protected]>
Date:   Mon Apr 7 14:45:07 2025 +0100

    Merge pull request #3206 from TechnologyEnhancedLearning/Develop/feature/TD-5482-Role-on-My-Staff-page

    TD-5482-Related supervisor role added to view.

commit 7666ffe
Merge: 9f1b4de d7bbaa9
Author: rshrirohit <[email protected]>
Date:   Fri Apr 4 08:14:24 2025 +0100

    Merge pull request #3204 from TechnologyEnhancedLearning/Develop/feature/TD-5439-Include-description-details-bulk-confirmation

    TD-5439 - A competency description is added to competency when it exists.

commit 6623b90
Author: Auldrin Possa <[email protected]>
Date:   Thu Apr 3 15:34:17 2025 +0100

    TD-5482-Related role added to view

commit d7bbaa9
Author: Auldrin Possa <[email protected]>
Date:   Tue Apr 1 15:52:03 2025 +0100

    TD-5439 - A competency description is added to competency when exists.

commit 9f1b4de
Merge: 86ec024 8240175
Author: rshrirohit <[email protected]>
Date:   Tue Apr 1 09:38:46 2025 +0100

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

commit 05b7dbf
Author: kevwhitt-hee <[email protected]>
Date:   Tue Apr 1 08:40:13 2025 +0100

    Fixes styling

commit e2dcf21
Author: kevwhitt-hee <[email protected]>
Date:   Tue Apr 1 08:27:23 2025 +0100

    Updates styling and hading wording according to design

commit 86ec024
Merge: 8158abd fffa334
Author: rshrirohit <[email protected]>
Date:   Fri Mar 28 08:15:12 2025 +0000

    Merge pull request #3197 from TechnologyEnhancedLearning/Develop/Fix/TD-5438-Move-View-Proficiencies-to-the-top

    TD-5438-Moved the 'View Proficiencies' button to the top.

commit 9b5a190
Author: ABSINHAA <[email protected]>
Date:   Thu Mar 27 16:28:21 2025 +0000

    TD_5434 Corrected the spacing indentation within the cshtml pages.

commit c6bdcc3
Author: ABSINHAA <[email protected]>
Date:   Thu Mar 27 16:16:58 2025 +0000

    TD_5343_Adding the centre information in the footer through out the learning portal pages as texts.

commit fffa334
Author: Auldrin Possa <[email protected]>
Date:   Thu Mar 27 14:54:10 2025 +0000

    TD-5438-Moved the 'View Proficiencies' button to the top.

commit 8158abd
Merge: 911ace7 4bd1f4b
Author: rshrirohit <[email protected]>
Date:   Tue Mar 25 14:22:34 2025 +0000

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

commit 911ace7
Merge: a9c9979 9c892a4
Author: rshrirohit <[email protected]>
Date:   Tue Mar 25 14:17:51 2025 +0000

    Merge pull request #3192 from TechnologyEnhancedLearning/Develop/feature/TD-5436-Todo-list-above-Frameworks

    TD-5436-'To Do' list has been moved above the 'Frameworks' section.

commit a9c9979
Merge: 92fe354 87d3841
Author: rshrirohit <[email protected]>
Date:   Tue Mar 25 14:16:47 2025 +0000

    Merge pull request #3191 from TechnologyEnhancedLearning/Develop/feature/TD-5435-Move-Todo-list-above-Staff

    TD-5435-'To Do' section has been moved above the 'Staff' section.

commit 92fe354
Merge: a54fb43 57df4e1
Author: rshrirohit <[email protected]>
Date:   Tue Mar 25 14:14:51 2025 +0000

    Merge pull request #3190 from TechnologyEnhancedLearning/Develop/Fix/TD-5443-Issue-allowing-to-add-multiple-flags

    TD-5443-Added check for existing flag names prior to add or edit custom flags.

commit a54fb43
Merge: e086d72 30bebd0
Author: rshrirohit <[email protected]>
Date:   Tue Mar 25 14:12:10 2025 +0000

    Merge pull request #3187 from TechnologyEnhancedLearning/Develop/Fixes/TD-3719-IncludingLastAccessedDateInSuperAdminDelegatesCard

    TD-3719 Including LastAccessed Date In SuperAdmin Delegates Card

commit 9c892a4
Author: Auldrin Possa <[email protected]>
Date:   Fri Mar 21 14:15:33 2025 +0000

    TD-5436-The 'To Do' section has been moved above the 'Frameworks' section.

commit 87d3841
Author: Auldrin Possa <[email protected]>
Date:   Fri Mar 21 11:35:34 2025 +0000

    TD-5435-The 'To Do' section has been moved above the 'Staff' section.

commit 57df4e1
Author: Auldrin Possa <[email protected]>
Date:   Thu Mar 20 17:15:57 2025 +0000

    TD-5443-Added check for existing flag names prior to add or edit custom flags

commit e086d72
Merge: ba800b7 98a838c
Author: rshrirohit <[email protected]>
Date:   Wed Mar 19 08:25:21 2025 +0000

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

commit 30bebd0
Author: Rohit Shrivastava <[email protected]>
Date:   Tue Mar 18 09:25:44 2025 +0000

    TD-3719 Including LastAccessed Date In SuperAdmin Delegates Card

commit ba800b7
Merge: bde0460 513009c
Author: rshrirohit <[email protected]>
Date:   Mon Mar 17 09:16:42 2025 +0000

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

commit bde0460
Merge: 2c0a48f 1f0d1da
Author: rshrirohit <[email protected]>
Date:   Mon Mar 17 09:09:43 2025 +0000

    Merge pull request #3185 from TechnologyEnhancedLearning/Develop/Feauture/TD-3718-AddingLastAccessedDateinSuperAdminAdministratorsCard

    TD-3718 Adding LastAccessed Date in SuperAdmin Administrators Card

commit 2c0a48f
Merge: d636cb4 94bb54b
Author: rshrirohit <[email protected]>
Date:   Mon Mar 17 08:44:52 2025 +0000

    Merge pull request #3183 from TechnologyEnhancedLearning/Develop/Feature/TD-3715-IncludingLastAccessedDateInDelegatesExport

    TD-3715 Including last accessed date in delegates export

commit 1f0d1da
Author: Rohit Shrivastava <[email protected]>
Date:   Sun Mar 16 14:32:47 2025 +0000

    TD-3718 Adding LastAccessed Date in SuperAdmin Administrators Card

commit 94bb54b
Author: Rohit Shrivastava <[email protected]>
Date:   Fri Mar 14 16:03:14 2025 +0000

    TD-3715 Including LastAccessed Date In Delegates Export

commit d636cb4
Merge: fd992ed 6b805b7
Author: rshrirohit <[email protected]>
Date:   Fri Mar 14 15:53:24 2025 +0000

    Merge pull request #3176 from TechnologyEnhancedLearning/Develop/Fixes/TD-3717-AddingLastAccessedDateInSuperAdminUserAccountsCard

    TD-3717 Adding LastAccessed Date In SuperAdmin UserAccounts Card

commit fd992ed
Merge: 4afde56 5d4dd9c
Author: rshrirohit <[email protected]>
Date:   Fri Mar 14 15:53:13 2025 +0000

    Merge pull request #3175 from TechnologyEnhancedLearning/Develop/Feature/TD-3716-AddingLastAccessedDateInAdminCard

    TD-3716 Adding LastAccessed Date In Admin Card

commit 4afde56
Merge: 3407b72 1f17db2
Author: rshrirohit <[email protected]>
Date:   Fri Mar 14 15:52:57 2025 +0000

    Merge pull request #3174 from TechnologyEnhancedLearning/Develop/Feature/TD-3714-AddingLastAccessedDateToDelegatesCardInTrackingSystem

    TD-3714 Adding LastAccessed Date To Delegates Card In Tracking System

commit 3407b72
Merge: 2a8b0a2 01774db
Author: rshrirohit <[email protected]>
Date:   Fri Mar 14 15:52:38 2025 +0000

    Merge pull request #3173 from TechnologyEnhancedLearning/Develop/Feature/TD-3713-UpdateLastAccessedDateForAdminAccountsAndDelegateAccounts

    TD-3713- Update LastAccessed Date For AdminAccounts And DelegateAccounts

commit 1f17db2
Author: rshrirohit <[email protected]>
Date:   Fri Mar 14 11:01:39 2025 +0000

    TD-3714 Making LastAccessed date nullable in model

commit 2a8b0a2
Merge: b5cf544 53f1ba0
Author: rshrirohit <[email protected]>
Date:   Fri Mar 14 10:57:36 2025 +0000

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

commit 6b805b7
Author: Rohit Shrivastava <[email protected]>
Date:   Fri Mar 14 08:57:06 2025 +0000

    TD-3717 Adding LastAccessed Date In SuperAdmin UserAccounts Card

commit 5d4dd9c
Author: Rohit Shrivastava <[email protected]>
Date:   Thu Mar 13 21:11:08 2025 +0000

    TD-3716-Adding LastAccessed Date In Admin Card

commit be28d6d
Author: Rohit Shrivastava <[email protected]>
Date:   Thu Mar 13 17:15:01 2025 +0000

    TD-3714 Adding LastAccessed Date To Delegates Card In Tracking System

commit 01774db
Author: Rohit Shrivastava <[email protected]>
Date:   Thu Mar 13 16:55:29 2025 +0000

    TD-3713 Addressing test fail for the case when only admin account is present

commit 66d8aed
Author: Rohit Shrivastava <[email protected]>
Date:   Thu Mar 13 15:57:27 2025 +0000

    TD-3713- Update LastAccessed Date For AdminAccounts And DelegateAccounts

commit b5cf544
Merge: 13a4d51 52cb242
Author: rshrirohit <[email protected]>
Date:   Thu Mar 13 15:52:28 2025 +0000

    Merge pull request #3170 from TechnologyEnhancedLearning/Develop/Feature/TD-3712-UpdateLastAccessedDateForUsersDuringLogin

    TD-3712 Update LastAccessed Date For Users During Login

commit 13a4d51
Merge: 5414198 527973e
Author: rshrirohit <[email protected]>
Date:   Thu Mar 13 15:52:14 2025 +0000

    Merge pull request #3169 from TechnologyEnhancedLearning/Develop/Feature/TD-3711-AddingLastAccessedColumnsToTables

    TD-3711 Adding Last Accessed Columns To Tables

commit 52cb242
Author: Rohit Shrivastava <[email protected]>
Date:   Wed Mar 12 15:45:31 2025 +0000

    TD-3712 Correcting GetUTCDate()

commit 527973e
Author: Rohit Shrivastava <[email protected]>
Date:   Wed Mar 12 14:59:04 2025 +0000

    TD-3711 Correcting table name

commit 312ef00
Author: Rohit Shrivastava <[email protected]>
Date:   Wed Mar 12 10:21:01 2025 +0000

    TD-3712 Update LastAccessed Date For Users During Login

commit 9f585c3
Author: Rohit Shrivastava <[email protected]>
Date:   Tue Mar 11 21:55:02 2025 +0000

    TD-3711 Adding Last Accessed Columns To Tables
@sherif-olaboye
TD-5581 Issue showing multiple comments on 'Frameworks' - 'Comments' …
79ab922 
…section when clicked browser back link
@sherif-olaboye
TD-5581 Issue showing multiple comments on 'Frameworks' - 'Comments' …
430d824 
…section when clicked browser back link
@sherif-olaboye
TD-5581 Issue showing multiple comments on 'Frameworks' - 'Comments' …
0c0f356 
…section when clicked browser back link
@kevwhitt-hee
Merge branch 'DLS-Release-v1.2.1' into DLS-Release-v1.3.0
9befbce
@rshrirohit
Merge branch 'master' into DLS-Release-v1.2.1
0bc1d19
@rshrirohit
Merge branch 'DLS-Release-v1.2.1' into DLS-Release-v1.3.0
13e7f36
TD-5443-Bulk-upload- flags comparision modified by adding Trim and To…
40a60d8 
…Lower functions
@kevwhitt-hee
Fixes caused by merge conflicts from 1.2.1
c4b4739
@rshrirohit
Merge pull request #3277 from TechnologyEnhancedLearning/Develop/Fixe…
744a9ce 
…s/TD-5581-Issueshowingmultiplecommentson'Frameworks'-'Comments'sectionwhenclickedbrowserbacklink

TD-5581 Issue showing multiple comments on 'Frameworks' - 'Comments' section when clicked browser back link
@rshrirohit
Merge pull request #3278 from TechnologyEnhancedLearning/Develop/Fix/…
aa02953 
…TD-5443-Bulk-upload-Duplicate-flags

TD-5443-Bulk upload - Duplicate flags - existing flag comparison modified.
@sherif-olaboye
TD-5581 Issue showing multiple comments on 'Frameworks' - 'Comments' …
2ee09c1 
…section when clicked browser back link
TD-5511-Sql modified to show FrameworkReviewID for admin logged in fr…
79c3e65 
…om different centre.
@rshrirohit
TD-3712 Updating LastAccessed For Unverified Users Login
69dfe66
@rshrirohit
Merge pull request #3280 from TechnologyEnhancedLearning/Develop/Fixe…
cfd8bad 
…s/TD-5581-Issueshowing'someexistingcompetencyrecordschangedorder'on'competencyfileuploaded'screenwhenmodifiedthecompetencies

Issue showing multiple comments on 'Frameworks' - 'Comments' section when clicked browser back link
@rshrirohit
Merge pull request #3282 from TechnologyEnhancedLearning/Develop/Fixe…
d3d67cd 
…s/TD-3712-UpdatingLastAccessedForUnverifiedUsersLogin

TD-3712 Updating Last Accessed For Unverified Users Login
@rshrirohit
Merge pull request #3281 from TechnologyEnhancedLearning/Develop/Fix/…
3b4c166 
…TD-5511-View-Edit-link-for-frameworks

TD-5511-Sql modified to show FrameworkReviewID for admin logged in from different centre.
@rshrirohit
Merge branch 'DLS-Release-v1.2.1' into DLS-Release-v1.3.0
0403feb
@sherif-olaboye
TD-5636 Issue allowing to add duplicate resources on 'Competence Reso…
0c4351d 
…urce signposting' screen
@rshrirohit
Copy link
Collaborator

@sherif-olaboye, why is this targeted to the master branch? Do we still need this, or shall I reject this PR?

@sherif-olaboye
Copy link
Contributor Author

@sherif-olaboye, why is this targeted to the master branch? Do we still need this, or shall I reject this PR?

I did not need this, that is why I close it

@rshrirohit rshrirohit deleted the Develop/Fixes/TD-5636-Issueallowingtoaddduplicateresourceson'CompetenceResourcesignposting'screen branch July 8, 2025 08:13
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.

6 participants

@sherif-olaboye @rshrirohit @kevwhitt-hee @Auldrin-Possa @ABSinhaa