-
Notifications
You must be signed in to change notification settings - Fork 1
Heedls 862 merge delegate progress pages #1096
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.
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
Merged
AlexJacksonDS
merged 10 commits into
master
from
HEEDLS-862-merge-delegate-progress-pages
May 17, 2022
Merged
Heedls 862 merge delegate progress pages #1096
AlexJacksonDS
merged 10 commits into
master
from
HEEDLS-862-merge-delegate-progress-pages
May 17, 2022
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JBsoftwire
approved these changes
May 6, 2022
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, one question that's just a double-check.
DanBloxham-sw
suggested changes
May 10, 2022
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Number of things I've spotted. Some might just be me overlooking something.
DigitalLearningSolutions.Data/DataServices/CourseDelegatesDataService.cs
Outdated
Show resolved
Hide resolved
...ingSolutions.Web.AutomatedUiTests/AccessibilityTests/BasicAuthenticatedAccessibilityTests.cs
Outdated
Show resolved
Hide resolved
DigitalLearningSolutions.Data/Services/CourseDelegatesService.cs
Outdated
Show resolved
Hide resolved
...Web/ViewModels/TrackingSystem/Delegates/CourseDelegates/SearchableCourseDelegateViewModel.cs
Show resolved
Hide resolved
...ingSolutions.Web/Views/TrackingSystem/Delegates/Shared/_DelegateCourseProgressButtons.cshtml
Show resolved
Hide resolved
DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/DelegateProgress/Index.cshtml
Outdated
Show resolved
Hide resolved
DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/DelegateProgress/Index.cshtml
Outdated
Show resolved
Hide resolved
livzorn
approved these changes
May 17, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
JIRA link
https://softwiretech.atlassian.net/browse/HEEDLS-862
Description
Merged the Detailed Progress and Delegate Progress pages.
Moved all the Edit links to the View Delegate and Course Delegate cards.
Fixed the return page logic for these Edit pages.
Sorted out breadcrumbs.
Moved the Remove from course action to be with other similar actions in DelegateProgressController.
Screenshots
View Delegate card:

Course Delegate card:

Delegate Progress:



Developer checks
(Leave tasks unticked if they haven't been appropriate for your ticket.)
I have: