Heedls 656 add course page 1 search #904
Merged
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
wilkinsm
suggested changes
Feb 3, 2022
There was a problem hiding this comment.
Thanks @AlexJacksonDS looks good, just a few points to look at.
...olutions.Web/Views/TrackingSystem/Delegates/GroupCourses/AddCourseToGroupSelectCourse.cshtml
Outdated
Show resolved
Hide resolved
...ons.Web/ViewModels/TrackingSystem/Delegates/GroupCourses/AddCourseToGroupCoursesViewModel.cs
Outdated
Show resolved
Hide resolved
...ons.Web/ViewModels/TrackingSystem/Delegates/GroupCourses/AddCourseToGroupCoursesViewModel.cs
Outdated
Show resolved
Hide resolved
...rningSolutions.Web.Tests/Controllers/TrackingSystem/Delegates/GroupCoursesControllerTests.cs
Outdated
Show resolved
Hide resolved
|
All the merge conflicts were line ending conflicts, I have no idea how they happened, but I'm the only person to touch these files and they are correct on the previous branch that I created them in for part 3 of this ticket (HEEDLS-658) |
livzorn
suggested changes
Feb 7, 2022
DigitalLearningSolutions.Data.Tests/Services/CourseServiceTests.cs
Outdated
Show resolved
Hide resolved
DigitalLearningSolutions.Data.Tests/Services/CourseServiceTests.cs
Outdated
Show resolved
Hide resolved
...b/ViewModels/TrackingSystem/Delegates/GroupCourses/AddCourseToGroupViewModelFilterOptions.cs
Outdated
Show resolved
Hide resolved
livzorn
approved these changes
Feb 8, 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-656
Description
Add search and filter functionality to the Select Course page of the Add Course to Group journey. Category filter is not available when the admin user has a specified CategoryID.
Screenshots
Page with admin Category ID = 1
No JS:
Developer checks
(Leave tasks unticked if they haven't been appropriate for your ticket.)
I have: