Skip to content

Heedls 500 learning log test fixes #951

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

Merged
merged 2 commits into from
Feb 18, 2022
Merged

Heedls 500 learning log test fixes #951

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b3e797
HEEDLS-500 - fix learning log JS datetime sorting
DanBloxham-sw Feb 18, 2022
605308d
HEEDLS-500 - replace old JS date parsing method as it is now redundant
DanBloxham-sw Feb 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions DigitalLearningSolutions.Web/Scripts/searchSortFilterAndPaginate/sort.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@ export function getSortValue(
case 'Name':
return getElementText(searchableElement, 'name').toLocaleLowerCase();
case 'DateRegistered':
return parseDate(getElementText(searchableElement, 'registration-date'));
return parseDateAndTime(getElementText(searchableElement, 'registration-date'));
case 'StartedDate':
return parseDate(getElementText(searchableElement, 'started-date'));
return parseDateAndTime(getElementText(searchableElement, 'started-date'));
case 'Enrolled':
return parseDate(getElementText(searchableElement, 'enrolled-date'));
return parseDateAndTime(getElementText(searchableElement, 'enrolled-date'));
case 'LastAccessed':
return parseDate(getElementText(searchableElement, 'accessed-date'));
return parseDateAndTime(getElementText(searchableElement, 'accessed-date'));
case 'LastUpdated':
return parseDate(getElementText(searchableElement, 'last-updated-date'));
return parseDateAndTime(getElementText(searchableElement, 'last-updated-date'));
case 'CompleteByDate':
return parseDate(getElementText(searchableElement, 'complete-by-date'));
return parseDateAndTime(getElementText(searchableElement, 'complete-by-date'));
case 'Completed':
return parseDate(getElementText(searchableElement, 'completed-date'));
return parseDateAndTime(getElementText(searchableElement, 'completed-date'));
case 'HasDiagnostic,DiagnosticScore':
return parseInt(getElementText(searchableElement, 'diagnostic-score').split('/')[0] || '-1', 10);
case 'IsAssessed,Passes':
Expand Down Expand Up @@ -75,7 +75,7 @@ export function getSortValue(
case 'CandidateNumber':
return getElementText(searchableElement, 'delegate-id').toLocaleLowerCase();
case 'When':
return parseDate(getElementText(searchableElement, 'when'));
return parseDateAndTime(getElementText(searchableElement, 'when'));
case 'LearningTime':
return parseNonNegativeIntOrNotApplicable(getElementText(searchableElement, 'learning-time'));
case 'AssessmentScore':
Expand All @@ -91,9 +91,9 @@ function getElementText(searchableElement: ISearchableElement, elementName: stri
?? '';
}

function parseDate(dateString: string): Date {
const date = moment(dateString, 'DD/MM/YYYY').toDate();
return date.toString() === 'Invalid Date' ? new Date(0) : date;
function parseDateAndTime(dateString: string): Date {
const dateAndTime = moment(dateString, 'DD/MM/YYYY hh:mm:ss').toDate();
return dateAndTime.toString() === 'Invalid Date' ? new Date(0) : dateAndTime;
}

function parseNonNegativeIntOrNotApplicable(value: string): number {
Expand Down