diff --git a/src/api/dashboard/static/js/ui/chart.js b/src/api/dashboard/static/js/ui/chart.js index b77b411..38ea2c0 100644 --- a/src/api/dashboard/static/js/ui/chart.js +++ b/src/api/dashboard/static/js/ui/chart.js @@ -4,11 +4,13 @@ import { updateIndicatorCandles } from './indicators-panel-new.js'; function formatDate(timestamp) { const date = new Date(timestamp); - const day = String(date.getDate()).padStart(2, '0'); - const month = String(date.getMonth() + 1).padStart(2, '0'); - const year = String(date.getFullYear()).slice(-2); - const hours = String(date.getHours()).padStart(2, '0'); - const minutes = String(date.getMinutes()).padStart(2, '0'); + // Convert to UTC+1 (Central European Time) + const utc1 = new Date(date.getTime() + (date.getTimezoneOffset() * 60000) + 3600000); + const day = String(utc1.getDate()).padStart(2, '0'); + const month = String(utc1.getMonth() + 1).padStart(2, '0'); + const year = String(utc1.getFullYear()).slice(-2); + const hours = String(utc1.getHours()).padStart(2, '0'); + const minutes = String(utc1.getMinutes()).padStart(2, '0'); return `${day}/${month}/${year} ${hours}:${minutes}`; } @@ -91,12 +93,18 @@ constructor() { borderColor: '#363d4e', autoScale: true, }, - timeScale: { +timeScale: { borderColor: '#363d4e', timeVisible: true, secondsVisible: false, rightOffset: 12, barSpacing: 10, + timeFormatter: (timestamp) => { + const date = new Date(timestamp); + // Convert to UTC+1 (Central European Time) + const utc1 = new Date(date.getTime() + (date.getTimezoneOffset() * 60000) + 3600000); + return `${String(utc1.getMonth() + 1).padStart(2, '0')}/${String(utc1.getDate()).padStart(2, '0')} ${String(utc1.getHours()).padStart(2, '0')}:${String(utc1.getMinutes()).padStart(2, '0')}`; + } }, handleScroll: { vertTouchDrag: false, diff --git a/src/api/dashboard/static/js/ui/indicators-panel-new.js b/src/api/dashboard/static/js/ui/indicators-panel-new.js index 469bb0b..f2f087c 100644 --- a/src/api/dashboard/static/js/ui/indicators-panel-new.js +++ b/src/api/dashboard/static/js/ui/indicators-panel-new.js @@ -864,9 +864,11 @@ export function drawIndicatorsOnChart() { const oldestDate = oldestTime ? new Date(oldestTime * 1000).toLocaleDateString() : 'N/A'; const newestDate = newestTime ? new Date(newestTime * 1000).toLocaleDateString() : 'N/A'; - console.log(`[Indicators] ========== Redrawing ==========`); +console.log(`[Indicators] ========== Redrawing ==========`); console.log(`[Indicators] Candles: ${candles.length} | Time range: ${oldestDate} (${oldestTime}) to ${newestDate} (${newestTime})`); + const activeIndicators = getActiveIndicators(); + // Remove all existing series activeIndicators.forEach(ind => { ind.series?.forEach(s => {