Skip to content

LS26001308: kup-data-table: fix group and sort date column #2848

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
lucafoscili merged 1 commit into from
Apr 21, 2026
Merged

LS26001308: kup-data-table: fix group and sort date column #2848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 4 additions & 6 deletions packages/ketchup/src/managers/kup-data/kup-data-cell-helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,11 @@ export function getCellValue(
values.sort((n1, n2) => {
return compareValues(
n1.obj,
kupObjects.isDate(n1.obj) || kupObjects.isNumber(n1.obj)
? n1.value
: getValueForDisplay2(n1, column),
n1.value,
getValueForDisplay2(n1, column),
n2.obj,
kupObjects.isDate(n2.obj) || kupObjects.isNumber(n2.obj)
? n2.value
: getValueForDisplay2(n2, column),
n2.value,
getValueForDisplay2(n2, column),
SortMode.A
);
});
Expand Down
28 changes: 16 additions & 12 deletions packages/ketchup/src/utils/cell-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,18 +137,22 @@ export function compareCell(
): number {
return compareValues(
cell1.obj,
cell1.decode ?? cell1.value,
cell1.value,
cell1.decode,
cell2.obj,
cell2.decode ?? cell2.value,
cell2.value,
cell2.decode,
sortMode
);
}

export function compareValues(
obj1: any,
value1: any,
decode1: any,
obj2: any,
value2: any,
decode2: any,
sortMode: SortMode
): number {
const sm = sortMode === 'A' ? 1 : -1;
Expand All @@ -166,8 +170,8 @@ export function compareValues(
return compare * sm;
}

let s1: string = value1;
let s2: string = value2;
let s1: string = decode1 ?? value1;
let s2: string = decode2 ?? value2;

if (s1 == s2) {
return 0;
Expand All @@ -184,14 +188,14 @@ export function compareValues(
let v1: any = s1;
let v2: any = s2;
if (dom.ketchup.objects.isNumber(obj1)) {
v1 = dom.ketchup.math.numberifySafe(s1);
v2 = dom.ketchup.math.numberifySafe(s2);
v1 = dom.ketchup.math.numberifySafe(value1);
v2 = dom.ketchup.math.numberifySafe(value2);
} else if (dom.ketchup.objects.isDate(obj1)) {
const firstDateValue = dom.ketchup.dates.toDate(
dom.ketchup.dates.format(s1, KupDatesFormats.ISO_DATE)
dom.ketchup.dates.format(value1, KupDatesFormats.ISO_DATE)
);
const secondDateValue = dom.ketchup.dates.toDate(
dom.ketchup.dates.format(s2, KupDatesFormats.ISO_DATE)
dom.ketchup.dates.format(value2, KupDatesFormats.ISO_DATE)
);
if (firstDateValue && secondDateValue) {
v1 = firstDateValue;
Expand All @@ -202,19 +206,19 @@ export function compareValues(
// returns an invalid date when it tries to parse a time
// This solution is simpler and it works because the time format
// was assumed to be equals to HH:mm:ss or HH:mm
const firstTimeValue = Number(s1.replace(/:/g, ''));
const secondTimeValue = Number(s2.replace(/:/g, ''));
const firstTimeValue = Number(value1.replace(/:/g, ''));
const secondTimeValue = Number(value2.replace(/:/g, ''));
if (!Number.isNaN(firstTimeValue) && !Number.isNaN(secondTimeValue)) {
v1 = firstTimeValue;
v2 = secondTimeValue;
}
} else if (dom.ketchup.objects.isTimestamp(obj1)) {
const firstTimestampValue = dom.ketchup.dates.toDate(
dom.ketchup.dates.format(s1, KupDatesFormats.ISO_DATE),
dom.ketchup.dates.format(value1, KupDatesFormats.ISO_DATE),
KupDatesFormats.ISO_DATE_TIME
);
const secondTimestampValue = dom.ketchup.dates.toDate(
dom.ketchup.dates.format(s2, KupDatesFormats.ISO_DATE),
dom.ketchup.dates.format(value2, KupDatesFormats.ISO_DATE),
KupDatesFormats.ISO_DATE_TIME
);
if (firstTimestampValue && secondTimestampValue) {
Expand Down
Loading