Heedls 551 add new course #865

livzorn · 2022-01-18T09:38:41Z

JIRA link

Description

Multi page form for adding a new course.

I ended up refactoring the validation on EditCourseDetails, moving the methods from the ManageCourseController to a helper file so they could be used in the CourseSetupController.

I also created an EditSectionContentHelper file to commonise the code around selecting/deselecting with the CourseContentController.

Screenshots

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.
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. Full manual testing guidelines can be found here: https://softwiretech.atlassian.net/wiki/spaces/HEE/pages/6703648740/Testing
Updated/added documentation in Swiki and/or Readme. Links (if any) are below:
- doc_1_here
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 own MR to ensure everything is as expected.

livzorn · 2022-01-18T13:17:47Z

DigitalLearningSolutions.Data/DataServices/CourseDataService.cs

-        public bool DoesCourseExistAtCentre(int customisationId, int centreId, int? categoryId)
-        {


Noticed this method was unused so I removed it. It's from another ticket I worked on when I made a new version of it and forgot to remove the old.

livzorn · 2022-01-18T13:18:37Z

DigitalLearningSolutions.Data.Tests/DataServices/CourseDataServiceTests.cs

-        [Test]
-        public void DoesCourseExistAtCentre_returns_true_if_course_exists()
-        {
-            // When
-            var result = courseDataService.DoesCourseExistAtCentre(100, 101, null);
-
-            // Then
-            result.Should().BeTrue();
-        }


These removed tests were just for the unused method I removed

AlexJacksonDS

I think I've covered most of the stuff here, but this is quite a large MR so I may find more stuff when it comes to re-review.

DigitalLearningSolutions.Data/DataServices/CourseDataService.cs

DigitalLearningSolutions.Data/Services/CourseService.cs

DigitalLearningSolutions.Web/Controllers/TrackingSystem/CourseSetup/CourseSetupController.cs

...ns.Web/ViewModels/TrackingSystem/CourseSetup/AddNewCentreCourse/SetCourseContentViewModel.cs

...earningSolutions.Web/Views/TrackingSystem/CourseSetup/AddNewCentreCourse/SelectCourse.cshtml

DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/Index.cshtml

DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AddNewCentreCourse/Summary.cshtml

...ingSolutions.Web/Views/TrackingSystem/CourseSetup/Shared/_EditCourseDetailsFormInputs.cshtml

AlexJacksonDS

Marked some of the things I think might need moving in the controller

DigitalLearningSolutions.Web/Controllers/TrackingSystem/CourseSetup/CourseSetupController.cs

DigitalLearningSolutions.Data.Tests/DataServices/CourseDataServiceTests.cs

DigitalLearningSolutions.Data.Tests/Services/CourseServiceTests.cs

DigitalLearningSolutions.Data.Tests/Services/CourseTopicsServiceTests.cs

DigitalLearningSolutions.Data.Tests/Services/SectionServiceTests.cs

DigitalLearningSolutions.Data.Tests/Services/TutorialServiceTests.cs

DigitalLearningSolutions.Data/DataServices/CourseDataService.cs

DigitalLearningSolutions.Data/Services/CourseService.cs

…e and complete the set course details controller actions

…misationId in DoesCourseNameExistAtCentre optional

...ningSolutions.Web.Tests/Controllers/TrackingSystem/CourseSetup/CourseSetupControllerTests.cs

DigitalLearningSolutions.Web.Tests/Helpers/EditCourseSectionHelperTests.cs

DigitalLearningSolutions.Web/Controllers/TrackingSystem/CourseSetup/CourseSetupController.cs

wilkinsm

Nice one Olivia, loads of work gone in here!
I've left some suggestions and changes to look at.

DigitalLearningSolutions.Web/Controllers/TrackingSystem/CourseSetup/CourseSetupController.cs

DigitalLearningSolutions.Web/Helpers/CourseDetailsValidator.cs

...earningSolutions.Web/Views/TrackingSystem/CourseSetup/AddNewCentreCourse/SelectCourse.cshtml

…rom post

…ontent

wilkinsm

Nice one Olivia, looks good to merge.

livzorn commented Jan 18, 2022

View reviewed changes

AlexJacksonDS suggested changes Jan 18, 2022

View reviewed changes

livzorn force-pushed the HEEDLS-551-add-new-course branch from 1142983 to a96412d Compare January 19, 2022 12:21

AlexJacksonDS reviewed Jan 19, 2022

View reviewed changes

livzorn force-pushed the HEEDLS-551-add-new-course branch from a96412d to f523297 Compare January 21, 2022 09:14

AlexJacksonDS approved these changes Jan 21, 2022

View reviewed changes

wilkinsm reviewed Jan 25, 2022

View reviewed changes

DigitalLearningSolutions.Data.Tests/DataServices/CourseDataServiceTests.cs Outdated Show resolved Hide resolved

wilkinsm reviewed Jan 25, 2022

View reviewed changes

DigitalLearningSolutions.Data.Tests/Services/CourseServiceTests.cs Show resolved Hide resolved

wilkinsm reviewed Jan 25, 2022

View reviewed changes

DigitalLearningSolutions.Data.Tests/Services/CourseServiceTests.cs Outdated Show resolved Hide resolved

wilkinsm reviewed Jan 25, 2022

View reviewed changes

DigitalLearningSolutions.Data.Tests/Services/CourseServiceTests.cs Outdated Show resolved Hide resolved

wilkinsm reviewed Jan 25, 2022

View reviewed changes

DigitalLearningSolutions.Data.Tests/Services/CourseServiceTests.cs Outdated Show resolved Hide resolved

wilkinsm reviewed Jan 25, 2022

View reviewed changes

DigitalLearningSolutions.Data.Tests/Services/CourseTopicsServiceTests.cs Show resolved Hide resolved

wilkinsm reviewed Jan 25, 2022

View reviewed changes

DigitalLearningSolutions.Data.Tests/Services/CourseTopicsServiceTests.cs Outdated Show resolved Hide resolved

wilkinsm reviewed Jan 25, 2022

View reviewed changes

DigitalLearningSolutions.Data.Tests/Services/CourseTopicsServiceTests.cs Show resolved Hide resolved

wilkinsm reviewed Jan 25, 2022

View reviewed changes

DigitalLearningSolutions.Data.Tests/Services/SectionServiceTests.cs Outdated Show resolved Hide resolved

wilkinsm reviewed Jan 25, 2022

View reviewed changes

DigitalLearningSolutions.Data.Tests/Services/SectionServiceTests.cs Outdated Show resolved Hide resolved

wilkinsm reviewed Jan 25, 2022

View reviewed changes

DigitalLearningSolutions.Data.Tests/Services/SectionServiceTests.cs Outdated Show resolved Hide resolved

wilkinsm reviewed Jan 25, 2022

View reviewed changes

DigitalLearningSolutions.Data.Tests/Services/TutorialServiceTests.cs Outdated Show resolved Hide resolved

wilkinsm reviewed Jan 25, 2022

View reviewed changes

DigitalLearningSolutions.Data.Tests/Services/TutorialServiceTests.cs Outdated Show resolved Hide resolved

wilkinsm reviewed Jan 25, 2022

View reviewed changes

DigitalLearningSolutions.Data/DataServices/CourseDataService.cs Show resolved Hide resolved

wilkinsm reviewed Jan 25, 2022

View reviewed changes

DigitalLearningSolutions.Data/Services/CourseService.cs Outdated Show resolved Hide resolved

OliZor added 8 commits January 25, 2022 14:55

HEEDLS-551 Create basic structure

f2c2288

HEEDLS-551 Partially set up Confirmation and Summary

945b41c

HEEDLS-551 Set up view models

e81cb60

HEEDLS-551 Fix errors from rebase

2d2f5ca

HEEDLS-551 Add partial form inputs to views

3851b99

HEEDLS-551 Populate select course dropdown and split form data

b72d154

HEEDLS-551 Switch to using Application name for the select course pag…

13247ea

…e and complete the set course details controller actions

HEEDLS-551 Complete course set options part of journey and make custo…

6d30d5f

…misationId in DoesCourseNameExistAtCentre optional

OliZor added 9 commits January 25, 2022 14:55

HEEDLS-551 Fix dropdown width issue on select course page

6196402

HEEDLS-551 Tidying

65e6d68

HEEDLS-551 Split long views into partials

ec9d435

HEEDLS-551 Refactor css

bc19d01

HEEDLS-551 Direct user back to summary if they access a page from there

6fcb8b3

HEEDLS-551 Refactor controller

0679314

HEEDLS-551 Undo change to csproj

60e4586

HEEDLS-551 Refactor controller and pull out logic into services

7b5307b

HEEDLS-551 Remove duplicate constants

5226877

wilkinsm reviewed Jan 25, 2022

View reviewed changes

...ningSolutions.Web.Tests/Controllers/TrackingSystem/CourseSetup/CourseSetupControllerTests.cs Show resolved Hide resolved

wilkinsm reviewed Jan 25, 2022

View reviewed changes

...ningSolutions.Web.Tests/Controllers/TrackingSystem/CourseSetup/CourseSetupControllerTests.cs Outdated Show resolved Hide resolved

wilkinsm reviewed Jan 25, 2022

View reviewed changes

...ningSolutions.Web.Tests/Controllers/TrackingSystem/CourseSetup/CourseSetupControllerTests.cs Outdated Show resolved Hide resolved

wilkinsm reviewed Jan 25, 2022

View reviewed changes

...ningSolutions.Web.Tests/Controllers/TrackingSystem/CourseSetup/CourseSetupControllerTests.cs Outdated Show resolved Hide resolved

wilkinsm reviewed Jan 25, 2022

View reviewed changes

...ningSolutions.Web.Tests/Controllers/TrackingSystem/CourseSetup/CourseSetupControllerTests.cs Outdated Show resolved Hide resolved

wilkinsm reviewed Jan 25, 2022

View reviewed changes

DigitalLearningSolutions.Web.Tests/Helpers/EditCourseSectionHelperTests.cs Outdated Show resolved Hide resolved

wilkinsm reviewed Jan 25, 2022

View reviewed changes

DigitalLearningSolutions.Web.Tests/Helpers/EditCourseSectionHelperTests.cs Outdated Show resolved Hide resolved

wilkinsm reviewed Jan 25, 2022

View reviewed changes

DigitalLearningSolutions.Web.Tests/Helpers/EditCourseSectionHelperTests.cs Outdated Show resolved Hide resolved

wilkinsm reviewed Jan 25, 2022

View reviewed changes

DigitalLearningSolutions.Web.Tests/Helpers/EditCourseSectionHelperTests.cs Outdated Show resolved Hide resolved

wilkinsm reviewed Jan 25, 2022

View reviewed changes

DigitalLearningSolutions.Web/Controllers/TrackingSystem/CourseSetup/CourseSetupController.cs Outdated Show resolved Hide resolved

wilkinsm reviewed Jan 25, 2022

View reviewed changes

DigitalLearningSolutions.Web/Controllers/TrackingSystem/CourseSetup/CourseSetupController.cs Outdated Show resolved Hide resolved

wilkinsm reviewed Jan 25, 2022

View reviewed changes

DigitalLearningSolutions.Web/Controllers/TrackingSystem/CourseSetup/CourseSetupController.cs Outdated Show resolved Hide resolved

HEEDLS-551 Refactor controller, services, and tests

58d9238

livzorn force-pushed the HEEDLS-551-add-new-course branch from 60188a9 to 58d9238 Compare January 25, 2022 17:29

HEEDLS-551 tiny fixes

eb7374c

wilkinsm suggested changes Jan 25, 2022

View reviewed changes

OliZor added 3 commits January 26, 2022 10:26

HEEDLS-551 Rename validator methods and other small fixes

918ed14

HEEDLS-551 Add completion criteria to summary page and remove model f…

4dd46c7

…rom post

HEEDLS-551 Fix bugs to do with saving tutorials and courses with no c…

70f4f7e

…ontent

wilkinsm approved these changes Jan 27, 2022

View reviewed changes

livzorn merged commit b73841d into master Jan 27, 2022

		public bool DoesCourseExistAtCentre(int customisationId, int centreId, int? categoryId)
		{

Heedls 551 add new course #865

Heedls 551 add new course #865

Uh oh!

Conversation

livzorn commented Jan 18, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

JIRA link

Description

Screenshots

Developer checks

Uh oh!

livzorn Jan 18, 2022

Choose a reason for hiding this comment

Uh oh!

livzorn Jan 18, 2022

Choose a reason for hiding this comment

Uh oh!

AlexJacksonDS left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

AlexJacksonDS left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

wilkinsm left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

wilkinsm left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

livzorn commented Jan 18, 2022 •

edited

Loading