Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-07-27 18:12:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #451 from jaimeferj/bugfix/parseDatesOnSort

Browse Source 
Fixes issue #441: Dates were not parsed on sorting
This commit is contained in:
Elian Doran 2024-10-10 23:31:47 +03:00 committed by GitHub
commit 0ec3232c81
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/services/search/expressions/order_by_and_limit.ts
View File

@ -68,8 +68,16 @@ class OrderByAndLimitExp extends Expression {
return larger; return larger;
} }
// if both are dates, then parse them for dates comparison
if (typeof valA === "string" && this.isDate(valA) &&
typeof valB === "string" && this.isDate(valB)) {
valA = new Date(valA);
valB = new Date(valB);
}
// if both are numbers, then parse them for numerical comparison // if both are numbers, then parse them for numerical comparison
if (typeof valA === "string" && this.isNumber(valA) && else if (typeof valA === "string" && this.isNumber(valA) &&
typeof valB === "string" && this.isNumber(valB)) { typeof valB === "string" && this.isNumber(valB)) {
valA = parseFloat(valA); valA = parseFloat(valA);
valB = parseFloat(valB); valB = parseFloat(valB);
@ -99,6 +107,10 @@ class OrderByAndLimitExp extends Expression {
return noteSet; return noteSet;
} }
isDate(date: number | string) {
return (new Date(date) !== "Invalid Date") && !isNaN(new Date(date));
}
isNumber(x: number | string) { isNumber(x: number | string) {
if (typeof x === 'number') { if (typeof x === 'number') {
return true; return true;