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 2024-12-18 22:10:30 +01:00
parent 9a41359da3
commit 51b2f0a065
2 changed files with 66 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/routes/etf/[tickerID]/+page.svelte
View File

@ -484,8 +484,7 @@
//===============================================// //===============================================//
function defaultTickMarkFormatter(timePoint, tickMarkType, locale) { function defaultTickMarkFormatter(timePoint, tickMarkType, locale) {
const formatOptions = { const formatOptions = {
timeZone: "UTC", // Ensure UTC time zone timeZone: "UTC",
hour12: true, // Use 12-hour format
}; };
switch (tickMarkType) { switch (tickMarkType) {
@ -499,21 +498,26 @@
formatOptions.day = "numeric"; formatOptions.day = "numeric";
break; break;
case 3: // TickMarkType.Time: case 3: // TickMarkType.Time:
formatOptions.hour = "numeric"; formatOptions.hour12 = true; // Use 12-hour clock
formatOptions.hour = "numeric"; // Use numeric hour without leading zero
break; break;
case 4: // TickMarkType.TimeWithSeconds: case 4: // TickMarkType.TimeWithSeconds:
formatOptions.hour = "numeric"; formatOptions.hour12 = true; // Use 12-hour clock
formatOptions.minute = "2-digit"; formatOptions.hour = "numeric"; // Use numeric hour without leading zero
formatOptions.second = "2-digit"; formatOptions.minute = "2-digit"; // Always show minutes with leading zero
formatOptions.second = "2-digit"; // Always show seconds with leading zero
break; break;
default: default:
return ""; // Ensure this default case handles unexpected tickMarkType values
}
if ([3, 4]?.includes(tickMarkType)) {
const date = new Date(timePoint?.timestamp * 1000);
return new Intl.DateTimeFormat(locale, formatOptions)?.format(date);
} else {
const date = new Date(timePoint?.timestamp);
return new Intl.DateTimeFormat(locale, formatOptions)?.format(date);
}
} }
// Use 'en-US' to ensure the format '10 PM'
const date = new Date(timePoint.timestamp * 1000);
return new Intl.DateTimeFormat('en-US', formatOptions).format(date);
}
$: options = { $: options = {
width: width, width: width,

28
src/routes/stocks/[tickerID]/+page.svelte
View File

@ -456,8 +456,7 @@
//===============================================// //===============================================//
function defaultTickMarkFormatter(timePoint, tickMarkType, locale) { function defaultTickMarkFormatter(timePoint, tickMarkType, locale) {
const formatOptions = { const formatOptions = {
timeZone: "UTC", // Ensure UTC time zone timeZone: "UTC",
hour12: true, // Use 12-hour format
}; };
switch (tickMarkType) { switch (tickMarkType) {
@ -471,21 +470,26 @@
formatOptions.day = "numeric"; formatOptions.day = "numeric";
break; break;
case 3: // TickMarkType.Time: case 3: // TickMarkType.Time:
formatOptions.hour = "numeric"; formatOptions.hour12 = true; // Use 12-hour clock
formatOptions.hour = "numeric"; // Use numeric hour without leading zero
break; break;
case 4: // TickMarkType.TimeWithSeconds: case 4: // TickMarkType.TimeWithSeconds:
formatOptions.hour = "numeric"; formatOptions.hour12 = true; // Use 12-hour clock
formatOptions.minute = "2-digit"; formatOptions.hour = "numeric"; // Use numeric hour without leading zero
formatOptions.second = "2-digit"; formatOptions.minute = "2-digit"; // Always show minutes with leading zero
formatOptions.second = "2-digit"; // Always show seconds with leading zero
break; break;
default: default:
return ""; // Ensure this default case handles unexpected tickMarkType values
}
if ([3, 4]?.includes(tickMarkType)) {
const date = new Date(timePoint?.timestamp * 1000);
return new Intl.DateTimeFormat(locale, formatOptions)?.format(date);
} else {
const date = new Date(timePoint?.timestamp);
return new Intl.DateTimeFormat(locale, formatOptions)?.format(date);
}
} }
// Use 'en-US' to ensure the format '10 PM'
const date = new Date(timePoint.timestamp * 1000);
return new Intl.DateTimeFormat('en-US', formatOptions).format(date);
}
$: options = { $: options = {