Heedls 563 course delegates basic #564

AlexJacksonDS · 2021-08-26T14:24:33Z

JIRA link

https://softwiretech.atlassian.net/browse/HEEDLS-563

Description

Adds a course delegates page in the delegates section of the tracking system.
This has a dropdown to select the course that is styled the same as the filter dropdowns with no javascript, so some styling will likely have to change in the future.

Note that I've implemented the 'Archived' as an item in the details list rather than a tag as it doesn't really make sense as a tag.

Screenshots

Developer checks

I have:

Run the formatter and made sure there are no IDE errors.
Written tests for the changes (controller, data services, services, view models etc) and 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.
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.

DanBloxham-sw

A few small suggestions/questions.

DigitalLearningSolutions.Web/Startup.cs

DigitalLearningSolutions.Data/Models/Courses/Course.cs

DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/CourseDelegates/Index.cshtml

...ions.Web/Views/TrackingSystem/Delegates/CourseDelegates/_SearchableCourseDelegateCard.cshtml

...Web/ViewModels/TrackingSystem/Delegates/CourseDelegates/SearchableCourseDelegateViewModel.cs

DigitalLearningSolutions.Web/Helpers/FilterableTagHelper.cs

DigitalLearningSolutions.Data/Services/CourseDelegatesService.cs

DigitalLearningSolutions.Data/Models/CourseDelegates/CourseDelegate.cs

DigitalLearningSolutions.Data.Tests/Services/CourseDelegatesServiceTests.cs

...ions.Web/Views/TrackingSystem/Delegates/CourseDelegates/_SearchableCourseDelegateCard.cshtml

DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/CourseDelegates/Index.cshtml

stellake · 2021-09-02T11:14:48Z

...olutions.Web/ViewModels/TrackingSystem/Delegates/CourseDelegates/CourseDelegatesViewModel.cs

+        public IEnumerable<SelectListItem> Courses { get; set; }
+        public bool? Active { get; set; }
+
+        public IEnumerable<SearchableCourseDelegateViewModel> Delegates { get; set; }


It might be neater to have customisationId, Active, and Delegates live on the same nullable object, e.g. SelectedCourseDetails or something - then if there are no customisations to choose from, the data is simply null but we're forcing the CustomisationId and Active to be populated if a course does exist.

CustomisationId needs to stay on the base model as it breaks model binding otherwise

stellake · 2021-09-02T11:15:30Z

DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/courseDelegates.scss

+  width: 63%;
+
+  @include mq($from: $xl-desktop) {
+    width: 80%;


Where are these values coming from? (63% and 80%)

Matching the filter dropdowns for now until 580 is done.

Could we add a TODO in that case with a reference to 580?

DigitalLearningSolutions.Web/Helpers/DateHelper.cs

stellake · 2021-09-02T11:26:51Z

DigitalLearningSolutions.Data/DataServices/CourseDataService.cs

+                    FROM Customisations AS c
+                    JOIN Applications AS a on a.ApplicationID = c.ApplicationID
+                    WHERE (CentreID = @centreId OR CentreID = 0)
+	                AND (a.CourseCategoryID = @categoryId OR @categoryId = 0)",


I think I'd still prefer the categoryId to be null with no filter rather than "0" which can be ambiguous. What do you think?

Admins don't have a nullable CategoryId. I think we should keep this behaviour consistent with the AdminUser records so it doesn't cause confusion unless we want to go through and change everything.

But I think in this query the "categoryId" is effectively a filter on category id, which intuitively would be:

Null = no filter

Value = filter applied

DigitalLearningSolutions.Data/DataServices/CourseDataService.cs

DigitalLearningSolutions.Data.Tests/Services/CourseDelegatesServiceTests.cs

AlexJacksonDS · 2021-09-06T08:34:55Z

New screenshots

DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/Shared/_DelegatesSideNavMenu.cshtml

stellake · 2021-09-06T13:46:07Z

DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/courseDelegates.scss

+  width: 63%;
+
+  @include mq($from: $xl-desktop) {
+    width: 80%;


Could we add a TODO in that case with a reference to 580?

stellake · 2021-09-06T13:59:12Z

DigitalLearningSolutions.Data/DataServices/CourseDataService.cs

+                    FROM Customisations AS c
+                    JOIN Applications AS a on a.ApplicationID = c.ApplicationID
+                    WHERE (CentreID = @centreId OR CentreID = 0)
+	                AND (a.CourseCategoryID = @categoryId OR @categoryId = 0)",


But I think in this query the "categoryId" is effectively a filter on category id, which intuitively would be:

Null = no filter

Value = filter applied

stellake

Looks good :)

AlexJacksonDS added 6 commits August 24, 2021 17:43

HEEDLS-563 Add Course Delegates page

768c6d4

HEEDLS-563 Refactor logic to work with no courses due to permissions

2f2e527

HEEDLS-563 Small layout fix and tag colour

1f611a3

HEEDLS-563 Add unit tests

062732c

HEEDLS-563 Fix unit test with different result on test

8d7b601

Merge branch 'master' into HEEDLS-563-course-delegates-basic

38e9481

DanBloxham-sw reviewed Aug 27, 2021

View reviewed changes

AlexJacksonDS added 2 commits September 1, 2021 10:25

Merge branch 'master' into HEEDLS-563-course-delegates-basic

1903903

HEEDLS-563 Review markups

3ae1897

DanBloxham-sw approved these changes Sep 1, 2021

View reviewed changes

stellake reviewed Sep 2, 2021

View reviewed changes

AlexJacksonDS added 5 commits September 3, 2021 15:32

HEEDLS-563 Review markups

82d686f

Merge branch 'master' into HEEDLS-563-course-delegates-basic

6a3f7af

HEEDLS-563 Shuffle some DateHelper methods around

1c0ef80

HEEDLS-563 Fix header button layout

d757924

HEEDLS-563 Reorder buttons on card

c54befa

stellake reviewed Sep 6, 2021

View reviewed changes

AlexJacksonDS added 3 commits September 6, 2021 15:38

HEEDLS-563 Rename data service methods and fix link

2da8b2b

Merge branch 'master' into HEEDLS-563-course-delegates-basic

26df4f9

HEEDLS-563 Fix error post merge

471fd1e

stellake approved these changes Sep 6, 2021

View reviewed changes

AlexJacksonDS merged commit ad686eb into master Sep 6, 2021

AlexJacksonDS deleted the HEEDLS-563-course-delegates-basic branch September 6, 2021 15:00

Heedls 563 course delegates basic #564

Heedls 563 course delegates basic #564

Uh oh!

Conversation

AlexJacksonDS commented Aug 26, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

JIRA link

Description

Screenshots

Developer checks

Uh oh!

DanBloxham-sw 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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

AlexJacksonDS Sep 3, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

AlexJacksonDS commented Sep 6, 2021

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

stellake left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

AlexJacksonDS commented Aug 26, 2021 •

edited

Loading

AlexJacksonDS Sep 3, 2021 •

edited

Loading