AmineTMIRI/frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfixing

Browse Source
This commit is contained in:
MuslemRahimi 2025-02-26 16:50:20 +01:00
parent 7341f42f86
commit ec27fd44d9
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/lib/utils.ts
View File

@ -161,32 +161,31 @@ export const groupScreenerRules = (allRows) => {
export const groupEarnings = (earnings) => { export const groupEarnings = (earnings) => {
return Object?.entries( return Object?.entries(
earnings earnings?.reduce((acc, item) => {
?.reduce((acc, item) => { const date = new Date(item?.date);
const date = new Date(item?.date); const berlinDate = new Intl.DateTimeFormat('en-US', {
const berlinDate = new Intl.DateTimeFormat('en-US', { day: '2-digit',
day: '2-digit', month: 'short',
month: 'short', year: 'numeric',
year: 'numeric', timeZone: 'Europe/Berlin'
timeZone: 'Europe/Berlin' }).format(date);
}).format(date);
if (!acc[berlinDate]) acc[berlinDate] = []; if (!acc[berlinDate]) acc[berlinDate] = [];
acc[berlinDate]?.push(item); acc[berlinDate]?.push(item);
return acc; return acc;
}, {}) }, {})
) )
// Sort the grouped dates in descending order // Sort the grouped dates in descending order (most recent first)
?.sort(([dateA], [dateB]) => new Date(dateA) - new Date(dateB)) ?.sort(([dateA], [dateB]) => new Date(dateB) - new Date(dateA))
?.map(([date, earnings]) => [ ?.map(([date, earnings]) => [
date, date,
// Sort earnings within the date by time // Sort earnings within the date by time in descending order
earnings?.sort((a, b) => { earnings?.sort((a, b) => {
const berlinTimeA = new Date( const berlinTimeA = new Date(
new Date(`${item?.date}T${a?.time}`).toLocaleString('en-US', { timeZone: 'Europe/Berlin' }) new Date(`${a?.date}T${a?.time}`).toLocaleString('en-US', { timeZone: 'Europe/Berlin' })
); );
const berlinTimeB = new Date( const berlinTimeB = new Date(
new Date(`${item?.date}T${b?.time}`).toLocaleString('en-US', { timeZone: 'Europe/Berlin' }) new Date(`${b?.date}T${b?.time}`).toLocaleString('en-US', { timeZone: 'Europe/Berlin' })
); );
return berlinTimeB - berlinTimeA; return berlinTimeB - berlinTimeA;
}) })