torsten/stechuhr3
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor TimefixService to simplify local time extraction from timestamps and improve UTC handling, ensuring consistent time representation without redundant conversions.

Browse Source
This commit is contained in:
Torsten Schulz (local)
2025-10-20 08:57:29 +02:00
parent 12a83cd7ec
commit 074c08ccd1
1 changed files with 5 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
backend/src/services/TimefixService.js
View File

@@ -62,21 +62,10 @@ class TimefixService {
// Verwende korrigierte Werte aus Timefix // Verwende korrigierte Werte aus Timefix
const tf = timefixForEntry[0]; const tf = timefixForEntry[0];
// WICHTIG: DB speichert UTC, Frontend erwartet lokale Zeit
if (typeof tf.fix_date_time === 'string') { if (typeof tf.fix_date_time === 'string') {
// Parse als UTC und konvertiere zu lokaler Zeit
const [datePart, timePart] = tf.fix_date_time.split(' '); const [datePart, timePart] = tf.fix_date_time.split(' ');
const [h, m, s] = timePart.split(':').map(Number); [hours, minutes] = timePart.split(':').map(Number);
// Erstelle UTC-Date aus den Komponenten
const [year, month, day] = datePart.split('-').map(Number);
const utcDate = new Date(Date.UTC(year, month - 1, day, h, m, s));
// Extrahiere lokale Stunden/Minuten
hours = utcDate.getHours();
minutes = utcDate.getMinutes();
} else if (tf.fix_date_time instanceof Date) { } else if (tf.fix_date_time instanceof Date) {
// Date-Objekt: Verwende lokale Zeit
hours = tf.fix_date_time.getHours(); hours = tf.fix_date_time.getHours();
minutes = tf.fix_date_time.getMinutes(); minutes = tf.fix_date_time.getMinutes();
} }
@@ -84,23 +73,12 @@ class TimefixService {
action = tf.fix_type; action = tf.fix_type;
} else { } else {
// Keine Korrektur - verwende Original-Werte aus Worklog // Keine Korrektur - verwende Original-Werte aus Worklog
// WICHTIG: DB speichert UTC, Frontend erwartet lokale Zeit
if (typeof entry.tstamp === 'string') { if (typeof entry.tstamp === 'string') {
// Parse als UTC und konvertiere zu lokaler Zeit
const [datePart, timePart] = entry.tstamp.split(' '); const [datePart, timePart] = entry.tstamp.split(' ');
const [h, m, s] = timePart.split(':').map(Number); [hours, minutes] = timePart.split(':').map(Number);
// Erstelle UTC-Date aus den Komponenten
const [year, month, day] = datePart.split('-').map(Number);
const utcDate = new Date(Date.UTC(year, month - 1, day, h, m, s));
// Extrahiere lokale Stunden/Minuten
hours = utcDate.getHours();
minutes = utcDate.getMinutes();
} else if (entry.tstamp instanceof Date) { } else if (entry.tstamp instanceof Date) {
// Date-Objekt: Verwende lokale Zeit hours = entry.tstamp.getUTCHours();
hours = entry.tstamp.getHours(); minutes = entry.tstamp.getUTCMinutes();
minutes = entry.tstamp.getMinutes();
} }
// Parse state // Parse state
@@ -282,21 +260,9 @@ class TimefixService {
} }
// Erstelle die korrigierte Zeit als Date-Objekt // Erstelle die korrigierte Zeit als Date-Objekt
// WICHTIG: Frontend sendet lokale Zeit, DB erwartet UTC
const [newHours, newMinutes] = newTime.split(':').map(Number); const [newHours, newMinutes] = newTime.split(':').map(Number);
const [newYear, newMonth, newDay] = newDate.split('-').map(Number); const [newYear, newMonth, newDay] = newDate.split('-').map(Number);
const correctedDateTime = new Date(newYear, newMonth - 1, newDay, newHours, newMinutes, 0);
// Erstelle lokales Date-Objekt
const localDateTime = new Date(newYear, newMonth - 1, newDay, newHours, newMinutes, 0);
// Konvertiere zu UTC-String für die Datenbank (Format: YYYY-MM-DD HH:MM:SS)
const utcYear = localDateTime.getUTCFullYear();
const utcMonth = String(localDateTime.getUTCMonth() + 1).padStart(2, '0');
const utcDay = String(localDateTime.getUTCDate()).padStart(2, '0');
const utcHours = String(localDateTime.getUTCHours()).padStart(2, '0');
const utcMinutes = String(localDateTime.getUTCMinutes()).padStart(2, '0');
const utcSeconds = String(localDateTime.getUTCSeconds()).padStart(2, '0');
const correctedDateTime = `${utcYear}-${utcMonth}-${utcDay} ${utcHours}:${utcMinutes}:${utcSeconds}`;
// Prüfe ob bereits ein Timefix existiert // Prüfe ob bereits ein Timefix existiert
const existingTimefix = await Timefix.findOne({ const existingTimefix = await Timefix.findOne({