Anpassung PDF Service

checkin-server.js

@@ -3,7 +3,7 @@
 const express = require('express');
 const path = require('path');
 const { db } = require('./database');
-const { getCurrentDate, getCurrentTime, updateTotalHours } = require('./helpers/utils');
+const { getCurrentDate, getCurrentTime, updateTotalHours, formatHoursMin } = require('./helpers/utils');
 
 const checkinApp = express();
 const CHECKIN_PORT = 3334;
@@ -139,7 +139,7 @@ checkinApp.get('/api/checkout/:userId', (req, res) => {
               return sendResponse(req, res, false, { error: 'Fehler beim Aktualisieren', status: 500 });
             }
             const successTitle = 'Schönen Feierabend, du wurdest erfolgreich ausgecheckt';
-            const successMessage = `End-Zeit erfasst: ${currentTime}. Gesamtstunden: ${totalHours.toFixed(2)} h`;
+            const successMessage = `End-Zeit erfasst: ${currentTime}. Gesamtstunden: ${formatHoursMin(totalHours)}`;
             sendResponse(req, res, true, {
               title: successTitle,
               message: successMessage,

database.js

@@ -26,6 +26,13 @@ function initDatabase() {
       // Fehler ignorieren wenn Spalte bereits existiert
     });
 
+    // Migration: default_break_minutes (Standard-Pausenzeit pro Mitarbeiter)
+    db.run(`ALTER TABLE users ADD COLUMN default_break_minutes INTEGER DEFAULT 30`, (err) => {
+      if (err && !err.message.includes('duplicate column')) {
+        console.warn('Warnung beim Hinzufügen der Spalte default_break_minutes:', err.message);
+      }
+    });
+
     // Stundenerfassung-Tabelle
     db.run(`CREATE TABLE IF NOT EXISTS timesheet_entries (
       id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -208,6 +215,31 @@ function initDatabase() {
       }
     });
 
+    // Tabelle: Protokoll für Überstunden-Korrekturen durch Verwaltung
+    db.run(`CREATE TABLE IF NOT EXISTS overtime_corrections (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      user_id INTEGER NOT NULL,
+      correction_hours REAL NOT NULL,
+      reason TEXT,
+      corrected_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+      FOREIGN KEY (user_id) REFERENCES users(id)
+    )`, (err) => {
+      if (err) {
+        console.warn('Warnung beim Erstellen der overtime_corrections Tabelle:', err.message);
+      }
+    });
+
+    // Migration: reason Spalte für overtime_corrections hinzufügen (falls Tabelle bereits existiert)
+    db.run(`ALTER TABLE overtime_corrections ADD COLUMN reason TEXT`, (err) => {
+      // Fehler ignorieren wenn Spalte bereits existiert
+      if (err && !err.message.includes('duplicate column')) {
+        // "duplicate column" ist SQLite CLI wording; sqlite3 node liefert typischerweise "duplicate column name"
+        if (!err.message.includes('duplicate column name')) {
+          console.warn('Warnung beim Hinzufügen der Spalte reason (overtime_corrections):', err.message);
+        }
+      }
+    });
+
     // Migration: Urlaubstage-Offset (manuelle Korrektur durch Verwaltung)
     db.run(`ALTER TABLE users ADD COLUMN vacation_offset_days REAL DEFAULT 0`, (err) => {
       // Fehler ignorieren wenn Spalte bereits existiert

doc/Stunderfassung todo.txt

@@ -15,3 +15,4 @@
 - Ausgefüllte Tage anhand der Tage pro woche gültig setzten                                                     -> DONE 
 - Überstunden müssen anhand der Tagesstunden auch auf gültig setzten (Tag ausgefüllt wenn weniger als 8h)       -> DONE sollte passen
 - Verplante Urlaubstage müssen auf abgezogen werden, wenn die Woche die gepalnt war eingereicht wurde.          -> DONE
+- Grund für Überstundenkorrektur                                                                                -> DONE            

helpers/utils.js

@@ -132,6 +132,22 @@ function getWeekStart(dateStr) {
   return `${year}-${month}-${dayOfMonth}`;
 }
 
+// Helper: Dezimalstunden in Anzeige "X h Y min" (z. B. 8.25 -> "8 h 15 min", -1.5 -> "-1 h 30 min")
+function formatHoursMin(decimalHours) {
+  if (decimalHours == null || !Number.isFinite(Number(decimalHours))) return '0h 0min';
+  const n = Number(decimalHours);
+  const sign = n < 0 ? -1 : 1;
+  const absVal = Math.abs(n);
+  let h = Math.floor(absVal);
+  let min = Math.round((absVal - h) * 60);
+  if (min >= 60) {
+    h += 1;
+    min = 0;
+  }
+  const prefix = sign < 0 ? '-' : '';
+  return prefix + h + 'h ' + min + 'min';
+}
+
 module.exports = {
   hasRole,
   getDefaultRole,
@@ -143,5 +159,6 @@ module.exports = {
   formatDateTime,
   getCalendarWeek,
   getWeekDatesFromCalendarWeek,
-  getWeekStart
+  getWeekStart,
+  formatHoursMin
 };

public/css/style.css

@@ -976,6 +976,20 @@ table input[type="text"] {
   margin-bottom: 10px;
 }
 
+.employee-new-version-warning {
+  display: inline-block;
+  margin-left: 10px;
+  padding: 2px 8px;
+  font-size: 12px;
+  font-weight: 700;
+  color: #e74c3c;
+  background-color: #fee;
+  border: 1px solid #e74c3c;
+  border-radius: 999px;
+  vertical-align: middle;
+  line-height: 1.6;
+}
+
 .employee-details {
   font-size: 14px;
   color: #666;
@@ -1100,6 +1114,11 @@ table input[type="text"] {
   }
 }
 
+/* Pausenfeld: rot nur wenn unter gesetzlicher Mindestpause (Tooltip im HTML) */
+input.break-below-legal {
+  color: #dc3545;
+}
+
 /* App Footer */
 .app-footer {
   text-align: center;

public/js/admin.js

@@ -17,6 +17,10 @@ document.addEventListener('DOMContentLoaded', function() {
       return;
     }
     
+    const defaultBreakInput = document.getElementById('defaultBreakMinutes');
+    const defaultBreakVal = defaultBreakInput && defaultBreakInput.value !== '' ? parseInt(defaultBreakInput.value, 10) : 30;
+    const default_break_minutes = (!isNaN(defaultBreakVal) && defaultBreakVal >= 0) ? defaultBreakVal : 30;
+
     const formData = {
       username: document.getElementById('username').value,
       password: document.getElementById('password').value,
@@ -26,7 +30,8 @@ document.addEventListener('DOMContentLoaded', function() {
       personalnummer: document.getElementById('personalnummer').value,
       wochenstunden: document.getElementById('wochenstunden').value,
       arbeitstage: document.getElementById('arbeitstage').value,
-      urlaubstage: document.getElementById('urlaubstage').value
+      urlaubstage: document.getElementById('urlaubstage').value,
+      default_break_minutes: default_break_minutes
     };
     
     try {
@@ -318,6 +323,9 @@ async function saveUser(userId) {
   const wochenstunden = row.querySelector('input[data-field="wochenstunden"]').value;
   const arbeitstage = row.querySelector('input[data-field="arbeitstage"]').value;
   const urlaubstage = row.querySelector('input[data-field="urlaubstage"]').value;
+  const defaultBreakInput = row.querySelector('input[data-field="default_break_minutes"]');
+  const default_break_minutes = defaultBreakInput && defaultBreakInput.value !== '' ? parseInt(defaultBreakInput.value, 10) : 30;
+  const normalizedDefaultBreak = (!isNaN(default_break_minutes) && default_break_minutes >= 0) ? default_break_minutes : 30;
   
   // Rollen aus Checkboxen sammeln
   const roleCheckboxes = row.querySelectorAll('.role-checkbox:checked');
@@ -340,6 +348,7 @@ async function saveUser(userId) {
         wochenstunden: wochenstunden || null,
         arbeitstage: arbeitstage || 5,
         urlaubstage: urlaubstage || null,
+        default_break_minutes: normalizedDefaultBreak,
         roles: roles
       })
     });
@@ -351,6 +360,8 @@ async function saveUser(userId) {
       row.querySelector('span[data-field="personalnummer"]').textContent = personalnummer || '-';
       row.querySelector('span[data-field="wochenstunden"]').textContent = wochenstunden || '-';
       row.querySelector('span[data-field="urlaubstage"]').textContent = urlaubstage || '-';
+      const defaultBreakDisplay = row.querySelector('span[data-field="default_break_minutes"]');
+      if (defaultBreakDisplay) defaultBreakDisplay.textContent = normalizedDefaultBreak;
       
       // Rollen-Display aktualisieren
       const rolesDisplay = row.querySelector('div[data-field="roles"]');

public/js/dashboard.js

@@ -6,6 +6,7 @@ let currentHolidayDates = new Set(); // Feiertage der aktuellen Woche (YYYY-MM-D
 let userWochenstunden = 0; // Wochenstunden des Users
 let userArbeitstage = 5; // Arbeitstage pro Woche des Users (Standard: 5)
 let weekendPercentages = { saturday: 100, sunday: 100 }; // Wochenend-Prozentsätze (100% = normal)
+let defaultBreakMinutes = 30; // Standard-Pausenzeit des Mitarbeiters (Vorbelegung)
 let latestSubmittedTimesheetId = null; // ID der neuesten eingereichten Version
 
 // Wochenend-Prozentsätze laden
@@ -50,7 +51,7 @@ async function loadUserStats() {
     const currentOvertimeEl = document.getElementById('currentOvertime');
     if (currentOvertimeEl) {
       const overtime = stats.currentOvertime || 0;
-      currentOvertimeEl.textContent = overtime >= 0 ? `+${overtime.toFixed(2)}` : overtime.toFixed(2);
+      currentOvertimeEl.textContent = (overtime >= 0 ? '+' : '') + formatHoursMin(overtime);
       currentOvertimeEl.style.color = overtime >= 0 ? '#27ae60' : '#e74c3c';
       // Auch die Border-Farbe des Cards anpassen
       const overtimeCard = currentOvertimeEl.closest('.stat-card');
@@ -376,16 +377,18 @@ function getFullDayHours() {
 // Woche laden
 async function loadWeek() {
   try {
-    // User-Daten laden (Wochenstunden, Arbeitstage)
+    // User-Daten laden (Wochenstunden, Arbeitstage, Standard-Pausenzeit)
     try {
       const userResponse = await fetch('/api/user/data');
       const userData = await userResponse.json();
       userWochenstunden = userData.wochenstunden || 0;
       userArbeitstage = userData.arbeitstage || 5;
+      defaultBreakMinutes = userData.default_break_minutes ?? 30;
     } catch (error) {
       console.warn('Konnte User-Daten nicht laden:', error);
       userWochenstunden = 0;
       userArbeitstage = 5;
+      defaultBreakMinutes = 30;
     }
     
     const parts = currentWeekStart.split('-');
@@ -472,7 +475,7 @@ function renderWeek() {
     
     const startTime = entry.start_time || '';
     const endTime = entry.end_time || '';
-    const breakMinutes = entry.break_minutes || 0;
+    const breakMinutes = (entry.break_minutes != null && entry.break_minutes !== '') ? entry.break_minutes : defaultBreakMinutes;
     const hours = entry.total_hours || 0;
     const overtimeTaken = entry.overtime_taken_hours || '';
     const vacationType = entry.vacation_type || '';
@@ -545,47 +548,52 @@ function renderWeek() {
     // Stunden-Anzeige für halben Tag Urlaub berechnen
     let hoursDisplay = '';
     if (isFullDayVacation) {
-      hoursDisplay = fullDayHours.toFixed(2) + ' h (Urlaub)';
+      hoursDisplay = formatHoursMin(fullDayHours) + ' (Urlaub)';
     } else if (isHalfDayVacation) {
       const halfHours = fullDayHours / 2;
       const workHours = hours || 0; // Das sind die gearbeiteten Stunden (ohne Urlaub)
       const totalHours = halfHours + workHours;
       if (workHours > 0.01) {
-        hoursDisplay = totalHours.toFixed(2) + ' h (' + halfHours.toFixed(2) + ' h Urlaub + ' + workHours.toFixed(2) + ' h)';
+        hoursDisplay = formatHoursMin(totalHours) + ' (' + formatHoursMin(halfHours) + ' Urlaub + ' + formatHoursMin(workHours) + ')';
       } else {
-        hoursDisplay = halfHours.toFixed(2) + ' h (Urlaub)';
+        hoursDisplay = formatHoursMin(halfHours) + ' (Urlaub)';
       }
     } else if (isSick) {
-      hoursDisplay = fullDayHours.toFixed(2) + ' h (Krank)';
+      hoursDisplay = formatHoursMin(fullDayHours) + ' (Krank)';
     } else if (isHoliday && isWeekend) {
       // Feiertag am Wochenende: keine Tagesarbeitsstunden
-      hoursDisplay = (hours ? hours.toFixed(2) : '0') + ' h (Feiertag)';
+      hoursDisplay = formatHoursMin(hours || 0) + ' (Feiertag)';
     } else if (isHoliday && !hours) {
-      hoursDisplay = fullDayHours.toFixed(2) + ' h (Feiertag)';
+      hoursDisplay = formatHoursMin(fullDayHours) + ' (Feiertag)';
     } else if (isHoliday && hours) {
-      hoursDisplay = fullDayHours.toFixed(2) + ' + ' + hours.toFixed(2) + ' h (Überst.)';
+      hoursDisplay = formatHoursMin(fullDayHours) + ' + ' + formatHoursMin(hours) + ' (Überst.)';
     } else {
-      hoursDisplay = hours.toFixed(2) + ' h';
+      hoursDisplay = formatHoursMin(hours);
     }
 
+    const requiredBreak = (startTime && endTime) ? calculateRequiredBreakMinutes(startTime, endTime) : null;
+    const isBreakBelowLegal = requiredBreak !== null && breakMinutes < requiredBreak;
+    const breakClass = isBreakBelowLegal ? 'break-below-legal' : '';
+    const breakTitle = isBreakBelowLegal ? ' title="Die Pausenzeit liegt unterhalb der gesetzlichen Vorgabe."' : '';
+
     return `
       <tr>
         <td><strong>${getWeekday(dateStr)}</strong></td>
         <td>${formatDateDE(dateStr)}${isFullDayVacation ? ' <span style="color: #28a745;">(Urlaub - ganzer Tag)</span>' : ''}${isSick ? ' <span style="color: #e74c3c;">(Krank)</span>' : ''}${holidayLabel}</td>
         <td>
-          <input type="time" value="${startTime}" 
+          <input type="time" id="start_time_${dateStr}" name="start_time_${dateStr}" value="${startTime}" 
                  data-date="${dateStr}" data-field="start_time" 
                  step="60" 
                  ${timeFieldsDisabled} ${disabled} oninput="saveEntry(this)" onchange="saveEntry(this)" onblur="saveEntry(this); checkWeekComplete();">
         </td>
         <td>
-          <input type="time" value="${endTime}" 
+          <input type="time" id="end_time_${dateStr}" name="end_time_${dateStr}" value="${endTime}" 
                  data-date="${dateStr}" data-field="end_time" 
                  step="60" 
                  ${timeFieldsDisabled} ${disabled} oninput="saveEntry(this)" onchange="saveEntry(this)" onblur="saveEntry(this); checkWeekComplete();">
         </td>
         <td>
-          <input type="number" value="${breakMinutes}" min="0" step="15"
+          <input type="number" id="break_minutes_${dateStr}" name="break_minutes_${dateStr}" value="${breakMinutes}" min="0" step="15" class="${breakClass}"${breakTitle}
                  data-date="${dateStr}" data-field="break_minutes" 
                  ${timeFieldsDisabled} ${disabled} oninput="saveEntry(this)" onchange="saveEntry(this)">
         </td>
@@ -733,7 +741,7 @@ function renderWeek() {
   `;
   
   document.getElementById('timesheetTable').innerHTML = html;
-  document.getElementById('totalHours').textContent = totalHours.toFixed(2) + ' h';
+  document.getElementById('totalHours').textContent = formatHoursMin(totalHours);
   
   // Überstunden-Berechnung (startDate und endDate sind bereits oben deklariert)
   
@@ -995,13 +1003,9 @@ function updateOvertimeDisplay() {
     }
   }
   
-  // Überstunden berechnen (wie im Backend: mit adjustedSollStunden)
-  // totalHours enthält bereits Feiertagsstunden (8h oder gearbeitete Stunden) aus dem Feiertag-Zweig oben
+  // Variante B: Überstunden/Fehlstunden = Gesamt − Soll (Soll immer vertraglich)
   const totalHoursWithVacation = totalHours + vacationHours;
-  const adjustedSollStunden = sollStunden - (fullDayOvertimeDays * fullDayHours);
-  // overtimeHours = Überstunden diese Woche (wie im Backend berechnet)
-  // Genommene Überstunden werden abgezogen, um die Netto-Überstunden zu erhalten
-  const overtimeHours = totalHoursWithVacation - adjustedSollStunden - overtimeTaken;
+  const overtimeHours = totalHoursWithVacation - sollStunden;
   
   // Überstunden-Anzeige aktualisieren
   const overtimeSummaryItem = document.getElementById('overtimeSummaryItem');
@@ -1009,14 +1013,14 @@ function updateOvertimeDisplay() {
   if (overtimeSummaryItem && overtimeHoursSpan) {
     overtimeSummaryItem.style.display = 'block';
     const sign = overtimeHours >= 0 ? '+' : '';
-    overtimeHoursSpan.textContent = `${sign}${overtimeHours.toFixed(2)} h`;
+    overtimeHoursSpan.textContent = (sign === '+' ? '+' : '') + formatHoursMin(overtimeHours);
     overtimeHoursSpan.style.color = overtimeHours >= 0 ? '#27ae60' : '#e74c3c';
   }
   
   // Gesamtstunden-Anzeige aktualisieren
   const totalHoursElement = document.getElementById('totalHours');
   if (totalHoursElement) {
-    totalHoursElement.textContent = totalHoursWithVacation.toFixed(2) + ' h';
+    totalHoursElement.textContent = formatHoursMin(totalHoursWithVacation);
   }
 }
 
@@ -1087,6 +1091,26 @@ function calculateRequiredBreakMinutes(startTime, endTime) {
   return 0; // Weniger als 6 Stunden: keine gesetzliche Pause erforderlich
 }
 
+// Aktualisiert die visuelle Kennzeichnung (nur rot + Tooltip wenn unter gesetzlicher Mindestpause)
+function updateBreakCompliance(dateStr) {
+  const startInput = document.querySelector(`input[data-date="${dateStr}"][data-field="start_time"]`);
+  const endInput = document.querySelector(`input[data-date="${dateStr}"][data-field="end_time"]`);
+  const breakInput = document.querySelector(`input[data-date="${dateStr}"][data-field="break_minutes"]`);
+  if (!breakInput) return;
+  breakInput.classList.remove('break-below-legal');
+  breakInput.removeAttribute('title');
+  const startTime = startInput && startInput.value ? startInput.value.trim() : '';
+  const endTime = endInput && endInput.value ? endInput.value.trim() : '';
+  if (!startTime || !endTime) return;
+  const required = calculateRequiredBreakMinutes(startTime, endTime);
+  if (required === null) return;
+  const breakVal = breakInput.value ? (parseInt(breakInput.value, 10) || 0) : 0;
+  if (breakVal < required) {
+    breakInput.classList.add('break-below-legal');
+    breakInput.setAttribute('title', 'Die Pausenzeit liegt unterhalb der gesetzlichen Vorgabe.');
+  }
+}
+
 // Eintrag speichern
 async function saveEntry(input) {
   const date = input.dataset.date;
@@ -1133,19 +1157,6 @@ async function saveEntry(input) {
   const end_time = actualEndTime;
   let break_minutes = breakInput && breakInput.value ? (parseInt(breakInput.value) || 0) : (parseInt(currentEntries[date].break_minutes) || 0);
   
-  // Automatische Vorbelegung der Pausenzeiten basierend auf gesetzlichen Vorgaben
-  // Wird ausgelöst, wenn start_time oder end_time geändert werden
-  if ((input.dataset.field === 'start_time' || input.dataset.field === 'end_time') && start_time && end_time) {
-    const requiredBreakMinutes = calculateRequiredBreakMinutes(start_time, end_time);
-    if (requiredBreakMinutes !== null && requiredBreakMinutes > break_minutes) {
-      // Setze den höheren Wert (gesetzliche Mindestpause)
-      break_minutes = requiredBreakMinutes;
-      // Aktualisiere das Input-Feld im DOM
-      if (breakInput) {
-        breakInput.value = break_minutes;
-      }
-    }
-  }
   const notes = notesInput ? (notesInput.value || '') : (currentEntries[date].notes || '');
   const vacation_type = vacationSelect && vacationSelect.value ? vacationSelect.value : (currentEntries[date].vacation_type || null);
   const overtime_taken_hours = overtimeInput && overtimeInput.value ? overtimeInput.value : (currentEntries[date].overtime_taken_hours || null);
@@ -1257,7 +1268,7 @@ async function saveEntry(input) {
     if (hoursElement) {
       if (isFullDayVacation) {
         // Ganzer Tag Urlaub: Zeige fullDayHours mit "(Urlaub)" Label
-        hoursElement.textContent = fullDayHours.toFixed(2) + ' h (Urlaub)';
+        hoursElement.textContent = formatHoursMin(fullDayHours) + ' (Urlaub)';
         currentEntries[date].total_hours = fullDayHours;
       } else if (isHalfDayVacation) {
         // Halber Tag Urlaub: Berechne Stunden aus Start/Ende falls vorhanden
@@ -1278,9 +1289,9 @@ async function saveEntry(input) {
         
         const totalHours = halfHours + workHours;
         if (workHours > 0) {
-          hoursElement.textContent = totalHours.toFixed(2) + ' h (' + halfHours.toFixed(2) + ' h Urlaub + ' + workHours.toFixed(2) + ' h)';
+          hoursElement.textContent = formatHoursMin(totalHours) + ' (' + formatHoursMin(halfHours) + ' Urlaub + ' + formatHoursMin(workHours) + ')';
         } else {
-          hoursElement.textContent = halfHours.toFixed(2) + ' h (Urlaub)';
+          hoursElement.textContent = formatHoursMin(halfHours) + ' (Urlaub)';
         }
         currentEntries[date].total_hours = totalHours;
       } else {
@@ -1288,15 +1299,15 @@ async function saveEntry(input) {
         const d = new Date(date);
         const isWeekendHoliday = isHoliday && (d.getDay() === 6 || d.getDay() === 0);
         if (isSick) {
-          hoursElement.textContent = fullDayHours.toFixed(2) + ' h (Krank)';
+          hoursElement.textContent = formatHoursMin(fullDayHours) + ' (Krank)';
         } else if (isWeekendHoliday) {
-          hoursElement.textContent = (hours ? hours.toFixed(2) : '0') + ' h (Feiertag)';
+          hoursElement.textContent = formatHoursMin(hours || 0) + ' (Feiertag)';
         } else if (isHoliday && !hours) {
-          hoursElement.textContent = fullDayHours.toFixed(2) + ' h (Feiertag)';
+          hoursElement.textContent = formatHoursMin(fullDayHours) + ' (Feiertag)';
         } else if (isHoliday && hours) {
-          hoursElement.textContent = fullDayHours.toFixed(2) + ' + ' + hours.toFixed(2) + ' h (Überst.)';
+          hoursElement.textContent = formatHoursMin(fullDayHours) + ' + ' + formatHoursMin(hours) + ' (Überst.)';
         } else {
-          hoursElement.textContent = hours.toFixed(2) + ' h';
+          hoursElement.textContent = formatHoursMin(hours);
         }
       }
     }
@@ -1431,10 +1442,10 @@ async function saveEntry(input) {
         const isHalfDayVacation = vacationType === 'half';
         const fullDayHours = getFullDayHours();
         
-        let hoursText = result.total_hours.toFixed(2) + ' h';
+        let hoursText = formatHoursMin(result.total_hours);
         
         if (isFullDayVacation) {
-          hoursText = fullDayHours.toFixed(2) + ' h (Urlaub)';
+          hoursText = formatHoursMin(fullDayHours) + ' (Urlaub)';
         } else if (isHalfDayVacation) {
           // Bei halbem Tag Urlaub: result.total_hours enthält nur die gearbeiteten Stunden
           // Die Urlaubsstunden müssen addiert werden
@@ -1443,25 +1454,25 @@ async function saveEntry(input) {
           const totalHours = halfHours + workHours; // Gesamt = Urlaub + gearbeitet
           
           if (workHours > 0.01) {
-            hoursText = totalHours.toFixed(2) + ' h (' + halfHours.toFixed(2) + ' h Urlaub + ' + workHours.toFixed(2) + ' h)';
+            hoursText = formatHoursMin(totalHours) + ' (' + formatHoursMin(halfHours) + ' Urlaub + ' + formatHoursMin(workHours) + ')';
           } else {
-            hoursText = halfHours.toFixed(2) + ' h (Urlaub)';
+            hoursText = formatHoursMin(halfHours) + ' (Urlaub)';
           }
           
           // Aktualisiere currentEntries mit den Gesamtstunden
           currentEntries[date].total_hours = totalHours;
         } else if (isSick) {
-          hoursText = fullDayHours.toFixed(2) + ' h (Krank)';
+          hoursText = formatHoursMin(fullDayHours) + ' (Krank)';
         } else if (isHoliday) {
           const d = new Date(date);
           const isWeekendHoliday = (d.getDay() === 6 || d.getDay() === 0);
           if (isWeekendHoliday) {
-            hoursText = (result.total_hours || 0).toFixed(2) + ' h (Feiertag)';
+            hoursText = formatHoursMin(result.total_hours || 0) + ' (Feiertag)';
           } else if (result.total_hours <= fullDayHours) {
-            hoursText = fullDayHours.toFixed(2) + ' h (Feiertag)';
+            hoursText = formatHoursMin(fullDayHours) + ' (Feiertag)';
           } else {
             const overtime = result.total_hours - fullDayHours;
-            hoursText = fullDayHours.toFixed(2) + ' + ' + overtime.toFixed(2) + ' h (Überst.)';
+            hoursText = formatHoursMin(fullDayHours) + ' + ' + formatHoursMin(overtime) + ' (Überst.)';
           }
         }
         
@@ -1477,7 +1488,7 @@ async function saveEntry(input) {
       Object.values(currentEntries).forEach(e => {
         totalHours += e.total_hours || 0;
       });
-      document.getElementById('totalHours').textContent = totalHours.toFixed(2) + ' h';
+      document.getElementById('totalHours').textContent = formatHoursMin(totalHours);
       
       // Überstunden-Anzeige aktualisieren (bei jeder Änderung)
       updateOvertimeDisplay();
@@ -1490,6 +1501,10 @@ async function saveEntry(input) {
       // Submit-Button Status prüfen (nach jedem Speichern)
       checkWeekComplete();
       
+      if (field === 'start_time' || field === 'end_time' || field === 'break_minutes') {
+        updateBreakCompliance(date);
+      }
+      
       // Visuelles Feedback
       input.style.backgroundColor = '#d4edda';
       setTimeout(() => {
@@ -1572,7 +1587,7 @@ function checkWeekComplete() {
     if (overtimeValue > fullDayHours) {
       if (!startTime || !endTime || startTime === '' || endTime === '') {
         allWeekdaysFilled = false;
-        missingFields.push(formatDateDE(dateStr) + ' (bei Überstunden > ' + fullDayHours.toFixed(2) + 'h müssen Start/Ende vorhanden sein)');
+        missingFields.push(formatDateDE(dateStr) + ' (bei Überstunden > ' + formatHoursMin(fullDayHours) + ' müssen Start/Ende vorhanden sein)');
         continue; // Weiter zum nächsten Tag
       }
     }
@@ -2058,22 +2073,22 @@ function toggleSickStatus(dateStr) {
     
     if (newStatus) {
       // Krank: Zeige fullDayHours mit "(Krank)" Label
-      hoursElement.textContent = fullDayHours.toFixed(2) + ' h (Krank)';
+      hoursElement.textContent = formatHoursMin(fullDayHours) + ' (Krank)';
       currentEntries[dateStr].total_hours = fullDayHours;
     } else {
       // Zurück zu normaler Anzeige basierend auf anderen Status
       const d = new Date(dateStr);
       const isWeekendHoliday = isHoliday && (d.getDay() === 6 || d.getDay() === 0);
       if (isFullDayVacation) {
-        hoursElement.textContent = fullDayHours.toFixed(2) + ' h (Urlaub)';
+        hoursElement.textContent = formatHoursMin(fullDayHours) + ' (Urlaub)';
       } else if (isWeekendHoliday) {
-        hoursElement.textContent = (hours ? hours.toFixed(2) : '0') + ' h (Feiertag)';
+        hoursElement.textContent = formatHoursMin(hours || 0) + ' (Feiertag)';
       } else if (isHoliday && !hours) {
-        hoursElement.textContent = fullDayHours.toFixed(2) + ' h (Feiertag)';
+        hoursElement.textContent = formatHoursMin(fullDayHours) + ' (Feiertag)';
       } else if (isHoliday && hours) {
-        hoursElement.textContent = fullDayHours.toFixed(2) + ' + ' + hours.toFixed(2) + ' h (Überst.)';
+        hoursElement.textContent = formatHoursMin(fullDayHours) + ' + ' + formatHoursMin(hours) + ' (Überst.)';
       } else {
-        hoursElement.textContent = hours.toFixed(2) + ' h';
+        hoursElement.textContent = formatHoursMin(hours);
       }
     }
   }

public/js/format-hours.js

@@ -0,0 +1,79 @@
+// Gleiche Logik wie helpers/utils.js formatHoursMin – für Browser (Dashboard, EJS-Seiten).
+// Wird global als window.formatHoursMin bereitgestellt.
+(function () {
+  function formatHoursMin(decimalHours) {
+    if (decimalHours == null || !Number.isFinite(Number(decimalHours))) return '0h 0min';
+    var n = Number(decimalHours);
+    var sign = n < 0 ? -1 : 1;
+    var absVal = Math.abs(n);
+    var h = Math.floor(absVal);
+    var min = Math.round((absVal - h) * 60);
+    if (min >= 60) {
+      h += 1;
+      min = 0;
+    }
+    var prefix = sign < 0 ? '-' : '';
+    return prefix + h + 'h ' + min + 'min';
+  }
+
+  /** Dezimalstunden in h:mm (z. B. 1.5 -> "1:30", -0.75 -> "-0:45") */
+  function decimalHoursToHhMm(decimalHours) {
+    if (decimalHours == null || !Number.isFinite(Number(decimalHours))) return '0:00';
+    var n = Number(decimalHours);
+    var sign = n < 0 ? -1 : 1;
+    var absVal = Math.abs(n);
+    var h = Math.floor(absVal);
+    var min = Math.round((absVal - h) * 60);
+    if (min >= 60) {
+      h += 1;
+      min = 0;
+    }
+    var prefix = sign < 0 ? '-' : '';
+    return prefix + h + ':' + String(min).padStart(2, '0');
+  }
+
+  /**
+   * Parst h:mm oder Xh Ymin zu Dezimalstunden.
+   * Beispiele: "1:30" -> 1.5, "-0:45" -> -0.75, "1h 30min" -> 1.5.
+   * @returns {number|null} Dezimalstunden oder null bei ungültiger Eingabe
+   */
+  function parseHoursMin(str) {
+    if (str == null) return null;
+    var s = String(str).trim();
+    if (s === '') return 0;
+    var sign = 1;
+    if (s.charAt(0) === '-') {
+      sign = -1;
+      s = s.slice(1).trim();
+    } else if (s.charAt(0) === '+') {
+      s = s.slice(1).trim();
+    }
+    // h:mm oder h:mm:ss
+    var colonMatch = s.match(/^(\d+):(\d{1,2})(?::(\d{1,2}))?$/);
+    if (colonMatch) {
+      var hours = parseInt(colonMatch[1], 10);
+      var minutes = parseInt(colonMatch[2], 10);
+      if (minutes >= 60) return null;
+      var sec = colonMatch[3] != null ? parseInt(colonMatch[3], 10) : 0;
+      if (sec >= 60) return null;
+      var decimal = hours + minutes / 60 + sec / 3600;
+      return sign * decimal;
+    }
+    // Xh Ymin (optional Leerzeichen)
+    var hmMatch = s.match(/^(\d+)\s*h\s*(\d{1,2})?\s*min$/i);
+    if (hmMatch) {
+      var h = parseInt(hmMatch[1], 10);
+      var m = (hmMatch[2] != null) ? parseInt(hmMatch[2], 10) : 0;
+      if (m >= 60) return null;
+      return sign * (h + m / 60);
+    }
+    // Nur Zahl (Dezimalstunden) zulassen als Fallback
+    var num = parseFloat(s.replace(',', '.'));
+    if (!Number.isFinite(num)) return null;
+    return sign * num;
+  }
+
+  window.formatHoursMin = formatHoursMin;
+  window.decimalHoursToHhMm = decimalHoursToHhMm;
+  window.parseHoursMin = parseHoursMin;
+})();

routes/admin-routes.js

@@ -8,7 +8,7 @@ const { requireAdmin } = require('../middleware/auth');
 function registerAdminRoutes(app) {
   // Admin-Bereich
   app.get('/admin', requireAdmin, (req, res) => {
-    db.all('SELECT id, username, firstname, lastname, role, personalnummer, wochenstunden, urlaubstage, arbeitstage, created_at FROM users ORDER BY created_at DESC', 
+    db.all('SELECT id, username, firstname, lastname, role, personalnummer, wochenstunden, urlaubstage, arbeitstage, default_break_minutes, created_at FROM users ORDER BY created_at DESC', 
       (err, users) => {
         // LDAP-Konfiguration, Sync-Log und Optionen abrufen
         db.get('SELECT * FROM ldap_config WHERE id = 1', (err, ldapConfig) => {
@@ -48,7 +48,7 @@ function registerAdminRoutes(app) {
 
   // Benutzer erstellen
   app.post('/admin/users', requireAdmin, (req, res) => {
-    const { username, password, firstname, lastname, roles, personalnummer, wochenstunden, urlaubstage, arbeitstage } = req.body;
+    const { username, password, firstname, lastname, roles, personalnummer, wochenstunden, urlaubstage, arbeitstage, default_break_minutes } = req.body;
     const hashedPassword = bcrypt.hashSync(password, 10);
     
     // Normalisiere die optionalen Felder
@@ -56,6 +56,8 @@ function registerAdminRoutes(app) {
     const normalizedWochenstunden = wochenstunden && wochenstunden !== '' ? parseFloat(wochenstunden) : null;
     const normalizedUrlaubstage = urlaubstage && urlaubstage !== '' ? parseFloat(urlaubstage) : null;
     const normalizedArbeitstage = arbeitstage && arbeitstage !== '' ? parseInt(arbeitstage) : 5;
+    const parsedBreak = default_break_minutes !== undefined && default_break_minutes !== '' ? parseInt(default_break_minutes, 10) : 30;
+    const normalizedDefaultBreak = (!isNaN(parsedBreak) && parsedBreak >= 0) ? parsedBreak : 30;
     
     // Rollen verarbeiten: Erwarte Array, konvertiere zu JSON-String
     let rolesArray = [];
@@ -73,8 +75,8 @@ function registerAdminRoutes(app) {
     
     const rolesJson = JSON.stringify(rolesArray);
     
-    db.run('INSERT INTO users (username, password, firstname, lastname, role, personalnummer, wochenstunden, urlaubstage, arbeitstage) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)',
-      [username, hashedPassword, firstname, lastname, rolesJson, normalizedPersonalnummer, normalizedWochenstunden, normalizedUrlaubstage, normalizedArbeitstage],
+    db.run('INSERT INTO users (username, password, firstname, lastname, role, personalnummer, wochenstunden, urlaubstage, arbeitstage, default_break_minutes) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
+      [username, hashedPassword, firstname, lastname, rolesJson, normalizedPersonalnummer, normalizedWochenstunden, normalizedUrlaubstage, normalizedArbeitstage, normalizedDefaultBreak],
       (err) => {
         if (err) {
           return res.status(400).json({ error: 'Benutzername existiert bereits' });
@@ -100,10 +102,13 @@ function registerAdminRoutes(app) {
     });
   });
 
-  // Benutzer aktualisieren (Personalnummer, Wochenstunden, Urlaubstage, Rollen)
+  // Benutzer aktualisieren (Personalnummer, Wochenstunden, Urlaubstage, Rollen, Standard-Pause)
   app.put('/admin/users/:id', requireAdmin, (req, res) => {
     const userId = req.params.id;
-    const { personalnummer, wochenstunden, urlaubstage, arbeitstage, roles } = req.body;
+    const { personalnummer, wochenstunden, urlaubstage, arbeitstage, roles, default_break_minutes } = req.body;
+    
+    const parsedBreak = default_break_minutes !== undefined && default_break_minutes !== '' ? parseInt(default_break_minutes, 10) : 30;
+    const normalizedDefaultBreak = (!isNaN(parsedBreak) && parsedBreak >= 0) ? parsedBreak : 30;
     
     // Rollen verarbeiten falls vorhanden
     let rolesJson = null;
@@ -122,12 +127,13 @@ function registerAdminRoutes(app) {
     // SQL-Query dynamisch zusammenstellen
     if (rolesJson !== null) {
       // Aktualisiere auch Rollen
-      db.run('UPDATE users SET personalnummer = ?, wochenstunden = ?, urlaubstage = ?, arbeitstage = ?, role = ? WHERE id = ?',
+      db.run('UPDATE users SET personalnummer = ?, wochenstunden = ?, urlaubstage = ?, arbeitstage = ?, default_break_minutes = ?, role = ? WHERE id = ?',
         [
           personalnummer || null,
           wochenstunden ? parseFloat(wochenstunden) : null,
           urlaubstage ? parseFloat(urlaubstage) : null,
           arbeitstage ? parseInt(arbeitstage) : 5,
+          normalizedDefaultBreak,
           rolesJson,
           userId
         ],
@@ -139,12 +145,13 @@ function registerAdminRoutes(app) {
         });
     } else {
       // Nur andere Felder aktualisieren
-      db.run('UPDATE users SET personalnummer = ?, wochenstunden = ?, urlaubstage = ?, arbeitstage = ? WHERE id = ?',
+      db.run('UPDATE users SET personalnummer = ?, wochenstunden = ?, urlaubstage = ?, arbeitstage = ?, default_break_minutes = ? WHERE id = ?',
         [
           personalnummer || null,
           wochenstunden ? parseFloat(wochenstunden) : null,
           urlaubstage ? parseFloat(urlaubstage) : null,
           arbeitstage ? parseInt(arbeitstage) : 5,
+          normalizedDefaultBreak,
           userId
         ],
         (err) => {

routes/user-routes.js

@@ -57,14 +57,15 @@ function registerUserRoutes(app) {
   app.get('/api/user/data', requireAuth, (req, res) => {
     const userId = req.session.userId;
 
-    db.get('SELECT wochenstunden, arbeitstage FROM users WHERE id = ?', [userId], (err, user) => {
+    db.get('SELECT wochenstunden, arbeitstage, default_break_minutes FROM users WHERE id = ?', [userId], (err, user) => {
       if (err) {
         return res.status(500).json({ error: 'Fehler beim Abrufen der User-Daten' });
       }
 
       res.json({ 
         wochenstunden: user?.wochenstunden || 0,
-        arbeitstage: user?.arbeitstage || 5
+        arbeitstage: user?.arbeitstage || 5,
+        default_break_minutes: user?.default_break_minutes ?? 30
       });
     });
   });
@@ -392,6 +393,7 @@ function registerUserRoutes(app) {
                           const endDate = new Date(week.week_end);
                           let workdays = 0;
                           let filledWorkdays = 0;
+                          const fullDayHoursForCheck = wochenstunden > 0 && arbeitstage > 0 ? wochenstunden / arbeitstage : 8;
 
                           for (let d = new Date(startDate); d <= endDate; d.setDate(d.getDate() + 1)) {
                             const day = d.getDay();
@@ -407,15 +409,18 @@ function registerUserRoutes(app) {
                               // Tag gilt als ausgefüllt wenn:
                               // - Ganzer Tag Urlaub (vacation_type = 'full')
                               // - Krank (sick_status = 1)
+                              // - Ganzer Tag Überstunden (overtime_taken_hours = fullDayHours)
                               // - ODER Start- und End-Zeit vorhanden sind
                               if (entry) {
                                 const isFullDayVacation = entry.vacation_type === 'full';
                                 const isSick = entry.sick_status === 1 || entry.sick_status === true;
+                                const overtimeValue = entry.overtime_taken_hours ? parseFloat(entry.overtime_taken_hours) : 0;
+                                const isFullDayOvertime = overtimeValue > 0 && Math.abs(overtimeValue - fullDayHoursForCheck) < 0.01;
                                 const hasStartAndEnd = entry.start_time && entry.end_time &&
                                   entry.start_time.toString().trim() !== '' &&
                                   entry.end_time.toString().trim() !== '';
 
-                                if (isFullDayVacation || isSick || hasStartAndEnd) {
+                                if (isFullDayVacation || isSick || isFullDayOvertime || hasStartAndEnd) {
                                   filledWorkdays++;
                                 }
                               }
@@ -461,7 +466,7 @@ function registerUserRoutes(app) {
                             const isFullDayOvertime = overtimeValue > 0 && Math.abs(overtimeValue - fullDayHours) < 0.01;
 
                             if (entry.overtime_taken_hours) {
-                              weekOvertimeTaken += entry.overtime_taken_hours;
+                              weekOvertimeTaken += parseFloat(entry.overtime_taken_hours) || 0;
                             }
 
                             // Wenn 8 Überstunden eingetragen sind, zählt der Tag als 0 Stunden
@@ -502,19 +507,14 @@ function registerUserRoutes(app) {
                             }
                           }
 
-                          // Sollstunden berechnen
+                          // Sollstunden berechnen (Variante B: immer vertraglich, nicht reduziert durch „genommen“)
                           const sollStunden = (wochenstunden / arbeitstage) * workdays;
 
-                          // Überstunden für diese Woche: (totalHours + vacationHours + holidayHours) - adjustedSollStunden
                           const weekTotalHoursWithVacation = weekTotalHours + weekVacationHours + holidayHours;
-                          const adjustedSollStunden = sollStunden - (fullDayOvertimeDays * fullDayHours);
-                          // weekOvertimeHours = Überstunden diese Woche (wie im Frontend berechnet)
-                          const weekOvertimeHours = weekTotalHoursWithVacation - adjustedSollStunden;
+                          // Überstunden/Fehlstunden = Gesamt − Soll (kann negativ sein)
+                          const weekOvertimeHours = weekTotalHoursWithVacation - sollStunden;
 
                           // Kumulativ addieren
-                          // WICHTIG: weekOvertimeHours enthält bereits die Überstunden dieser Woche (kann negativ sein bei 8 Überstunden)
-                          // weekOvertimeTaken enthält die verbrauchten Überstunden (8 Stunden pro Tag mit 8 Überstunden)
-                          // Die aktuellen Überstunden = Summe aller Wochen-Überstunden - verbrauchte Überstunden
                           totalOvertimeHours += weekOvertimeHours;
                           totalOvertimeTaken += weekOvertimeTaken;
                           totalVacationDays += weekVacationDays;
@@ -523,10 +523,8 @@ function registerUserRoutes(app) {
 
                           // Wenn alle Wochen verarbeitet wurden, Antwort senden
                           if (processedWeeks === weeks.length && !hasError) {
-                            // Aktuelle Überstunden = Summe aller Wochen-Überstunden - verbrauchte Überstunden + Offset
-                            // weekOvertimeHours enthält bereits die korrekte Berechnung pro Woche (wie im Frontend)
-                            // weekOvertimeTaken enthält die verbrauchten Überstunden (8 Stunden pro Tag mit 8 Überstunden)
-                            const currentOvertime = (totalOvertimeHours - totalOvertimeTaken) + overtimeOffsetHours;
+                            // Variante B: Verbleibend = Summe Wochen-Überstunden + Offset („genommen“ nur Anzeige)
+                            const currentOvertime = totalOvertimeHours + overtimeOffsetHours;
                             const remainingVacation = urlaubstage - totalVacationDays + vacationOffsetDays;
 
                             res.json({
@@ -586,6 +584,17 @@ function registerUserRoutes(app) {
         const arbeitstage = user.arbeitstage || 5;
         const overtimeOffsetHours = user.overtime_offset_hours ? parseFloat(user.overtime_offset_hours) : 0;
 
+        // Korrekturen durch die Verwaltung (Historie) laden
+        db.all(
+          `SELECT correction_hours, corrected_at, reason
+           FROM overtime_corrections
+           WHERE user_id = ?
+           ORDER BY corrected_at DESC`,
+          [userId],
+          (correctionsErr, corrections) => {
+            // Falls Tabelle noch nicht existiert (z. B. alte DB), nicht hart fehlschlagen
+            const overtimeCorrections = correctionsErr ? [] : (corrections || []);
+
             // Alle eingereichten Wochen abrufen
             db.all(`SELECT DISTINCT week_start, week_end 
                   FROM weekly_timesheets 
@@ -599,7 +608,11 @@ function registerUserRoutes(app) {
 
                 // Wenn keine Wochen vorhanden
                 if (!weeks || weeks.length === 0) {
-              return res.json({ weeks: [] });
+                  return res.json({
+                    weeks: [],
+                    overtime_offset_hours: overtimeOffsetHours,
+                    overtime_corrections: overtimeCorrections
+                  });
                 }
 
                 const { getCalendarWeek } = require('../helpers/utils');
@@ -650,6 +663,7 @@ function registerUserRoutes(app) {
                           const endDate = new Date(week.week_end);
                           let workdays = 0;
                           let filledWorkdays = 0;
+                          const fullDayHoursForCheck = wochenstunden > 0 && arbeitstage > 0 ? wochenstunden / arbeitstage : 8;
 
                           for (let d = new Date(startDate); d <= endDate; d.setDate(d.getDate() + 1)) {
                             const day = d.getDay();
@@ -665,11 +679,13 @@ function registerUserRoutes(app) {
                               if (entry) {
                                 const isFullDayVacation = entry.vacation_type === 'full';
                                 const isSick = entry.sick_status === 1 || entry.sick_status === true;
+                                const overtimeValue = entry.overtime_taken_hours ? parseFloat(entry.overtime_taken_hours) : 0;
+                                const isFullDayOvertime = overtimeValue > 0 && Math.abs(overtimeValue - fullDayHoursForCheck) < 0.01;
                                 const hasStartAndEnd = entry.start_time && entry.end_time &&
                                   entry.start_time.toString().trim() !== '' &&
                                   entry.end_time.toString().trim() !== '';
 
-                            if (isFullDayVacation || isSick || hasStartAndEnd) {
+                                if (isFullDayVacation || isSick || isFullDayOvertime || hasStartAndEnd) {
                                   filledWorkdays++;
                                 }
                               }
@@ -680,7 +696,11 @@ function registerUserRoutes(app) {
                           if (filledWorkdays < workdays) {
                             processedWeeks++;
                             if (processedWeeks === weeks.length && !hasError) {
-                          res.json({ weeks: weekData });
+                              res.json({
+                                weeks: weekData,
+                                overtime_offset_hours: overtimeOffsetHours,
+                                overtime_corrections: overtimeCorrections
+                              });
                             }
                             return;
                           }
@@ -734,11 +754,10 @@ function registerUserRoutes(app) {
                             }
                           }
 
-                      // Sollstunden berechnen
+                          // Sollstunden berechnen (Variante B: immer vertraglich)
                           const sollStunden = (wochenstunden / arbeitstage) * workdays;
                           const weekTotalHoursWithVacation = weekTotalHours + weekVacationHours + holidayHours;
-                      const adjustedSollStunden = sollStunden - (fullDayOvertimeDays * fullDayHours);
-                      const weekOvertimeHours = weekTotalHoursWithVacation - adjustedSollStunden;
+                          const weekOvertimeHours = weekTotalHoursWithVacation - sollStunden;
 
                           // Kalenderwoche berechnen
                           const calendarWeek = getCalendarWeek(week.week_start);
@@ -753,7 +772,7 @@ function registerUserRoutes(app) {
                             overtime_hours: parseFloat(weekOvertimeHours.toFixed(2)),
                             overtime_taken: parseFloat(weekOvertimeTaken.toFixed(2)),
                             total_hours: parseFloat(weekTotalHoursWithVacation.toFixed(2)),
-                        soll_stunden: parseFloat(adjustedSollStunden.toFixed(2)),
+                            soll_stunden: parseFloat(sollStunden.toFixed(2)),
                             vacation_days: parseFloat(weekVacationDays.toFixed(1)),
                             workdays: workdays
                           });
@@ -768,12 +787,18 @@ function registerUserRoutes(app) {
                               if (a.calendar_week !== b.calendar_week) return b.calendar_week - a.calendar_week;
                               return new Date(b.week_start) - new Date(a.week_start);
                             });
-                        res.json({ weeks: weekData, overtime_offset_hours: overtimeOffsetHours });
+                            res.json({
+                              weeks: weekData,
+                              overtime_offset_hours: overtimeOffsetHours,
+                              overtime_corrections: overtimeCorrections
+                            });
                           }
                         }); // getHolidaysForDateRange.then
                     }); // db.all (allEntries)
                 }); // weeks.forEach
               }); // db.all (weeks)
+          }
+        );
       }); // db.get (user)
     }); // db.get (options)
   }); // app.get

routes/verwaltung-routes.js

@@ -105,8 +105,12 @@ function registerVerwaltungRoutes(app) {
           return new Date(b.week_start) - new Date(a.week_start);
         });
 
+        // Flag: Gibt es in irgendeiner Woche eine neue Version nach Download?
+        const hasNewVersionAfterDownload = sortedWeeks.some(w => w.has_new_version_after_download);
+        
         return {
           ...employee,
+          has_new_version_after_download: hasNewVersionAfterDownload,
           weeks: sortedWeeks
         };
       }).sort((a, b) => {
@@ -132,6 +136,8 @@ function registerVerwaltungRoutes(app) {
   app.put('/api/verwaltung/user/:id/overtime-offset', requireVerwaltung, (req, res) => {
     const userId = req.params.id;
     const raw = req.body ? req.body.overtime_offset_hours : undefined;
+    const reasonRaw = req.body ? req.body.reason : undefined;
+    const reason = (reasonRaw === null || reasonRaw === undefined) ? '' : String(reasonRaw).trim();
 
     // Leere Eingabe => 0
     const normalized = (raw === '' || raw === null || raw === undefined) ? 0 : parseFloat(raw);
@@ -139,12 +145,59 @@ function registerVerwaltungRoutes(app) {
       return res.status(400).json({ error: 'Ungültiger Überstunden-Offset' });
     }
 
-    db.run('UPDATE users SET overtime_offset_hours = ? WHERE id = ?', [normalized, userId], (err) => {
-      if (err) {
-        console.error('Fehler beim Speichern des Überstunden-Offsets:', err);
-        return res.status(500).json({ error: 'Fehler beim Speichern des Überstunden-Offsets' });
+    // Neue Logik: Korrektur protokollieren + kumulativ addieren
+    // Feld in der Verwaltung soll nach dem Speichern immer auf 0 zurückgesetzt werden.
+    if (normalized === 0) {
+      return res.json({ success: true, overtime_offset_hours: 0 });
     }
-      res.json({ success: true, overtime_offset_hours: normalized });
+
+    if (!reason) {
+      return res.status(400).json({ error: 'Bitte geben Sie einen Grund für die Korrektur an.' });
+    }
+
+    db.serialize(() => {
+      db.run('BEGIN TRANSACTION');
+
+      db.run(
+        `INSERT INTO overtime_corrections (user_id, correction_hours, reason, corrected_at)
+         VALUES (?, ?, ?, datetime('now'))`,
+        [userId, normalized, reason],
+        (err) => {
+          if (err) {
+            console.error('Fehler beim Speichern der Überstunden-Korrektur:', err);
+            db.run('ROLLBACK', () => {
+              return res.status(500).json({ error: 'Fehler beim Speichern der Überstunden-Korrektur' });
+            });
+            return;
+          }
+
+          db.run(
+            'UPDATE users SET overtime_offset_hours = COALESCE(overtime_offset_hours, 0) + ? WHERE id = ?',
+            [normalized, userId],
+            (err) => {
+              if (err) {
+                console.error('Fehler beim Aktualisieren des Überstunden-Offsets:', err);
+                db.run('ROLLBACK', () => {
+                  return res.status(500).json({ error: 'Fehler beim Speichern des Überstunden-Offsets' });
+                });
+                return;
+              }
+
+              db.run('COMMIT', (err) => {
+                if (err) {
+                  console.error('Fehler beim Commit der Überstunden-Korrektur:', err);
+                  db.run('ROLLBACK', () => {
+                    return res.status(500).json({ error: 'Fehler beim Speichern der Überstunden-Korrektur' });
+                  });
+                  return;
+                }
+
+                res.json({ success: true, overtime_offset_hours: 0 });
+              });
+            }
+          );
+        }
+      );
     });
   });
 
@@ -168,6 +221,26 @@ function registerVerwaltungRoutes(app) {
     });
   });
 
+  // API: Überstunden-Korrektur-Historie für einen User abrufen
+  app.get('/api/verwaltung/user/:id/overtime-corrections', requireVerwaltung, (req, res) => {
+    const userId = req.params.id;
+
+    db.all(
+      `SELECT correction_hours, corrected_at, reason
+       FROM overtime_corrections
+       WHERE user_id = ?
+       ORDER BY corrected_at DESC`,
+      [userId],
+      (err, rows) => {
+        // Falls Tabelle noch nicht existiert (z. B. alte DB), nicht hart fehlschlagen
+        if (err) {
+          return res.json({ corrections: [] });
+        }
+        res.json({ corrections: rows || [] });
+      }
+    );
+  });
+
   // API: Krankheitstage für einen User im aktuellen Jahr abrufen
   app.get('/api/verwaltung/user/:id/sick-days', requireVerwaltung, (req, res) => {
     const userId = req.params.id;
@@ -524,12 +597,11 @@ function registerVerwaltungRoutes(app) {
                     const weekOvertimeHours = totalHoursWithVacation - sollStunden;
                     
                     // Kumulative Überstunden: Summe aller Wochen bis zur aktuellen Woche
-                    // cumulativeOvertimeHours enthält bereits alle vorherigen Wochen
                     const totalCumulativeOvertimeHours = cumulativeOvertimeHours + weekOvertimeHours;
                     const totalCumulativeOvertimeTaken = cumulativeOvertimeTaken + overtimeTaken;
                     
-                    // Verbleibende Überstunden = kumulative Überstunden - kumulative genommene Überstunden
-                    const remainingOvertime = totalCumulativeOvertimeHours - totalCumulativeOvertimeTaken;
+                    // Variante B: Verbleibend = Summe Wochen-Überstunden („genommen“ nur Anzeige)
+                    const remainingOvertime = totalCumulativeOvertimeHours;
                     const remainingOvertimeWithOffset = remainingOvertime + overtimeOffsetHours;
                     
                     // Verbleibende Urlaubstage (berücksichtigt alle eingereichten Wochen, nicht nur die aktuelle)

services/overtime-service.js

@@ -94,6 +94,7 @@ function getCurrentOvertimeForUser(userId, db, callback) {
                     const endDate = new Date(week.week_end);
                     let workdays = 0;
                     let filledWorkdays = 0;
+                    const fullDayHoursForCheck = wochenstunden > 0 && arbeitstage > 0 ? wochenstunden / arbeitstage : 8;
 
                     for (let d = new Date(startDate); d <= endDate; d.setDate(d.getDate() + 1)) {
                       const day = d.getDay();
@@ -108,12 +109,14 @@ function getCurrentOvertimeForUser(userId, db, callback) {
                         if (entry) {
                           const isFullDayVacation = entry.vacation_type === 'full';
                           const isSick = entry.sick_status === 1 || entry.sick_status === true;
+                          const overtimeValue = entry.overtime_taken_hours ? parseFloat(entry.overtime_taken_hours) : 0;
+                          const isFullDayOvertime = overtimeValue > 0 && Math.abs(overtimeValue - fullDayHoursForCheck) < 0.01;
                           const hasStartAndEnd =
                             entry.start_time &&
                             entry.end_time &&
                             entry.start_time.toString().trim() !== '' &&
                             entry.end_time.toString().trim() !== '';
-                          if (isFullDayVacation || isSick || hasStartAndEnd) {
+                          if (isFullDayVacation || isSick || isFullDayOvertime || hasStartAndEnd) {
                             filledWorkdays++;
                           }
                         }
@@ -168,17 +171,17 @@ function getCurrentOvertimeForUser(userId, db, callback) {
                       }
                     }
 
+                    // Variante B: Soll immer vertraglich, Verbleibend ohne Abzug „genommen“
                     const sollStunden = (wochenstunden / arbeitstage) * workdays;
                     const weekTotalHoursWithVacation = weekTotalHours + weekVacationHours + holidayHours;
-                    const adjustedSollStunden = sollStunden - fullDayOvertimeDays * fullDayHours;
-                    const weekOvertimeHours = weekTotalHoursWithVacation - adjustedSollStunden;
+                    const weekOvertimeHours = weekTotalHoursWithVacation - sollStunden;
 
                     totalOvertimeHours += weekOvertimeHours;
                     totalOvertimeTaken += weekOvertimeTaken;
                     processedWeeks++;
 
                     if (processedWeeks === weeks.length && !hasError) {
-                      done(totalOvertimeHours - totalOvertimeTaken + overtimeOffsetHours);
+                      done(totalOvertimeHours + overtimeOffsetHours);
                     }
                   });
               }

services/pdf-service.js

@@ -3,7 +3,7 @@
 const PDFDocument = require('pdfkit');
 const QRCode = require('qrcode');
 const { db } = require('../database');
-const { formatDate, formatDateTime } = require('../helpers/utils');
+const { formatDate, formatDateTime, formatHoursMin } = require('../helpers/utils');
 const { getHolidaysWithNamesForDateRange } = require('./feiertage-service');
 
 // Kalenderwoche berechnen
@@ -190,7 +190,7 @@ function generatePDF(timesheetId, req, res) {
             // Feiertag am Wochenende: keine Tagesarbeitsstunden anzeigen
             const holidayDay = new Date(row.date + 'T12:00:00').getDay();
             const isWeekendHoliday = (holidayDay === 0 || holidayDay === 6);
-            const holidayHoursStr = isWeekendHoliday ? '0 h (Feiertag)' : fullDayHours.toFixed(2) + ' h (Feiertag)';
+            const holidayHoursStr = isWeekendHoliday ? '0h 0min (Feiertag)' : formatHoursMin(fullDayHours) + ' (Feiertag)';
             const rowData = [formatDate(row.date), '-', '-', '-', holidayHoursStr];
             rowData.forEach((data, i) => {
               doc.text(data, x, y, { width: colWidths[i], align: 'left' });
@@ -215,7 +215,7 @@ function generatePDF(timesheetId, req, res) {
             entry.start_time || '-',
             entry.end_time || '-',
             entry.break_minutes ? `${entry.break_minutes} min` : '-',
-            entry.total_hours ? entry.total_hours.toFixed(2) + ' h' : '-'
+            entry.total_hours ? formatHoursMin(entry.total_hours) : '-'
           ];
           
           rowData.forEach((data, i) => {
@@ -229,7 +229,7 @@ function generatePDF(timesheetId, req, res) {
             const desc = entry[`activity${i}_desc`];
             const hours = entry[`activity${i}_hours`];
             const projectNumber = entry[`activity${i}_project_number`];
-            if (desc && desc.trim() && hours > 0) {
+            if (desc && desc.trim()) {
               activities.push({ 
                 desc: desc.trim(), 
                 hours: parseFloat(hours),
@@ -250,7 +250,7 @@ function generatePDF(timesheetId, req, res) {
               if (activity.projectNumber) {
                 activityText += ` (Projekt: ${activity.projectNumber})`;
               }
-              activityText += ` - ${activity.hours.toFixed(2)} h`;
+              activityText += ` - ${formatHoursMin(activity.hours)}`;
               doc.fontSize(9).font('Helvetica');
               doc.text(activityText, 70, doc.y, { width: 360 });
               doc.moveDown(0.2);
@@ -264,7 +264,7 @@ function generatePDF(timesheetId, req, res) {
             overtimeInfo.push('Feiertag: ' + (holidayNames.get(entry.date) || 'Feiertag'));
           }
           if (entry.overtime_taken_hours && parseFloat(entry.overtime_taken_hours) > 0) {
-            overtimeInfo.push(`Überstunden genommen: ${parseFloat(entry.overtime_taken_hours).toFixed(2)} h`);
+            overtimeInfo.push(`Überstunden genommen: ${formatHoursMin(parseFloat(entry.overtime_taken_hours))}`);
           }
           if (entry.vacation_type) {
             const vacationText = entry.vacation_type === 'full' ? 'Ganzer Tag' : 'Halber Tag';
@@ -308,7 +308,7 @@ function generatePDF(timesheetId, req, res) {
         doc.font('Helvetica-Bold');
         // Gesamtstunden = Arbeitsstunden + Urlaubsstunden + Feiertagsstunden (8h pro Feiertag)
         const totalHoursWithVacation = totalHours + vacationHours + holidayHours;
-        doc.text(`Gesamtstunden: ${totalHoursWithVacation.toFixed(2)} h`, 50, doc.y);
+        doc.text(`Gesamtstunden: ${formatHoursMin(totalHoursWithVacation)}`, 50, doc.y);
         
         // Überstunden berechnen und anzeigen
         const wochenstunden = timesheet.wochenstunden || 0;
@@ -318,11 +318,11 @@ function generatePDF(timesheetId, req, res) {
         doc.moveDown(0.3);
         doc.font('Helvetica-Bold');
         if (overtimeHours > 0) {
-          doc.text(`Überstunden: +${overtimeHours.toFixed(2)} h`, 50, doc.y);
+          doc.text(`Überstunden: +${formatHoursMin(overtimeHours)}`, 50, doc.y);
         } else if (overtimeHours < 0) {
-          doc.text(`Überstunden: ${overtimeHours.toFixed(2)} h`, 50, doc.y);
+          doc.text(`Überstunden: ${formatHoursMin(overtimeHours)}`, 50, doc.y);
         } else {
-          doc.text(`Überstunden: 0.00 h`, 50, doc.y);
+          doc.text(`Überstunden: ${formatHoursMin(0)}`, 50, doc.y);
         }
         
         doc.end();
@@ -462,7 +462,7 @@ function generatePDFToBuffer(timesheetId, req) {
               // Feiertag am Wochenende: keine Tagesarbeitsstunden anzeigen
               const holidayDay = new Date(row.date + 'T12:00:00').getDay();
               const isWeekendHoliday = (holidayDay === 0 || holidayDay === 6);
-              const holidayHoursStr = isWeekendHoliday ? '0 h (Feiertag)' : fullDayHoursBuf.toFixed(2) + ' h (Feiertag)';
+              const holidayHoursStr = isWeekendHoliday ? '0h 0min (Feiertag)' : formatHoursMin(fullDayHoursBuf) + ' (Feiertag)';
               const rowDataBuf = [formatDate(row.date), '-', '-', '-', holidayHoursStr];
               rowDataBuf.forEach((data, i) => {
                 doc.text(data, x, y, { width: colWidths[i], align: 'left' });
@@ -487,7 +487,7 @@ function generatePDFToBuffer(timesheetId, req) {
               entry.start_time || '-',
               entry.end_time || '-',
               entry.break_minutes ? `${entry.break_minutes} min` : '-',
-              entry.total_hours ? entry.total_hours.toFixed(2) + ' h' : '-'
+              entry.total_hours ? formatHoursMin(entry.total_hours) : '-'
             ];
             
             rowData.forEach((data, i) => {
@@ -500,7 +500,7 @@ function generatePDFToBuffer(timesheetId, req) {
               const desc = entry[`activity${i}_desc`];
               const hours = entry[`activity${i}_hours`];
               const projectNumber = entry[`activity${i}_project_number`];
-              if (desc && desc.trim() && hours > 0) {
+              if (desc && desc.trim()) {
                 activities.push({ 
                   desc: desc.trim(), 
                   hours: parseFloat(hours),
@@ -519,7 +519,7 @@ function generatePDFToBuffer(timesheetId, req) {
                 if (activity.projectNumber) {
                   activityText += ` (Projekt: ${activity.projectNumber})`;
                 }
-                activityText += ` - ${activity.hours.toFixed(2)} h`;
+                activityText += ` - ${formatHoursMin(activity.hours)}`;
                 doc.fontSize(9).font('Helvetica');
                 doc.text(activityText, 70, doc.y, { width: 360 });
                 doc.moveDown(0.2);
@@ -532,7 +532,7 @@ function generatePDFToBuffer(timesheetId, req) {
               overtimeInfo.push('Feiertag: ' + (holidayNames.get(entry.date) || 'Feiertag'));
             }
             if (entry.overtime_taken_hours && parseFloat(entry.overtime_taken_hours) > 0) {
-              overtimeInfo.push(`Überstunden genommen: ${parseFloat(entry.overtime_taken_hours).toFixed(2)} h`);
+              overtimeInfo.push(`Überstunden genommen: ${formatHoursMin(parseFloat(entry.overtime_taken_hours))}`);
             }
             if (entry.vacation_type) {
               const vacationText = entry.vacation_type === 'full' ? 'Ganzer Tag' : 'Halber Tag';
@@ -573,7 +573,7 @@ function generatePDFToBuffer(timesheetId, req) {
           doc.moveDown(0.5);
           doc.font('Helvetica-Bold');
           const totalHoursWithVacation = totalHours + vacationHours + holidayHours;
-          doc.text(`Gesamtstunden: ${totalHoursWithVacation.toFixed(2)} h`, 50, doc.y);
+          doc.text(`Gesamtstunden: ${formatHoursMin(totalHoursWithVacation)}`, 50, doc.y);
           
           const wochenstunden = timesheet.wochenstunden || 0;
           const overtimeHours = totalHoursWithVacation - wochenstunden;
@@ -581,11 +581,11 @@ function generatePDFToBuffer(timesheetId, req) {
           doc.moveDown(0.3);
           doc.font('Helvetica-Bold');
           if (overtimeHours > 0) {
-            doc.text(`Überstunden: +${overtimeHours.toFixed(2)} h`, 50, doc.y);
+            doc.text(`Überstunden: +${formatHoursMin(overtimeHours)}`, 50, doc.y);
           } else if (overtimeHours < 0) {
-            doc.text(`Überstunden: ${overtimeHours.toFixed(2)} h`, 50, doc.y);
+            doc.text(`Überstunden: ${formatHoursMin(overtimeHours)}`, 50, doc.y);
           } else {
-            doc.text(`Überstunden: 0.00 h`, 50, doc.y);
+            doc.text(`Überstunden: ${formatHoursMin(0)}`, 50, doc.y);
           }
           
           doc.end();

views/admin.ejs

@@ -107,6 +107,11 @@
               <label for="urlaubstage">Urlaubstage</label>
               <input type="number" id="urlaubstage" name="urlaubstage" step="0.5" min="0" placeholder="z.B. 25">
             </div>
+            <div class="form-group">
+              <label for="defaultBreakMinutes">Standard-Pausenzeit (Min)</label>
+              <input type="number" id="defaultBreakMinutes" name="default_break_minutes" min="0" step="15" placeholder="30">
+              <small style="color: #666; display: block; margin-top: 5px;">Vorbelegung Pausenzeit pro Tag (Min., mind. 0).</small>
+            </div>
           </div>
           
           <button type="submit" class="btn btn-primary">Benutzer anlegen</button>
@@ -136,6 +141,7 @@
               <th>Wochenstunden</th>
               <th>Arbeitstage pro Woche</th>
               <th>Urlaubstage</th>
+              <th>Standard-Pause (Min)</th>
               <th>Erstellt am</th>
               <th>Aktionen</th>
             </tr>
@@ -194,6 +200,10 @@
                   <span class="user-field-display" data-field="urlaubstage"><%= u.urlaubstage || '-' %></span>
                   <input type="number" step="0.5" class="user-field-edit" data-field="urlaubstage" data-user-id="<%= u.id %>" value="<%= u.urlaubstage || '' %>" style="display: none; width: 80px;">
                 </td>
+                <td>
+                  <span class="user-field-display" data-field="default_break_minutes"><%= (u.default_break_minutes != null && u.default_break_minutes !== '') ? u.default_break_minutes : '-' %></span>
+                  <input type="number" min="0" step="15" class="user-field-edit" data-field="default_break_minutes" data-user-id="<%= u.id %>" value="<%= (u.default_break_minutes != null && u.default_break_minutes !== '') ? u.default_break_minutes : '' %>" style="display: none; width: 80px;">
+                </td>
                 <td><%= new Date(u.created_at).toLocaleDateString('de-DE') %></td>
                 <td>
                   <button onclick="editUser(<%= u.id %>)" class="btn btn-primary btn-sm edit-user-btn" data-user-id="<%= u.id %>">Bearbeiten</button>

views/dashboard.ejs

@@ -52,11 +52,11 @@
       <div class="summary">
         <div class="summary-item">
           <strong>Gesamtstunden diese Woche:</strong>
-          <span id="totalHours">0.00 h</span>
+          <span id="totalHours">0h 0min</span>
         </div>
         <div class="summary-item" id="overtimeSummaryItem" style="display: none;">
           <strong>Überstunden diese Woche:</strong>
-          <span id="overtimeHours">0.00 h</span>
+          <span id="overtimeHours">0h 0min</span>
         </div>
       </div>
 
@@ -194,6 +194,7 @@
     </div>
   </div>
 
+  <script src="/js/format-hours.js"></script>
   <script src="/js/dashboard.js"></script>
   <script>
     // Wochenende-Sektion ein-/ausklappen

views/overtime-breakdown.ejs

@@ -153,6 +153,15 @@
         <span class="summary-label">Manuelle Korrektur (Verwaltung):</span>
         <span class="summary-value" id="overtimeOffset">-</span>
       </div>
+      <div id="correctionsSection" style="margin-top: 15px; display: none;">
+        <div id="correctionsHeader" class="collapsible-header" style="cursor: pointer; padding: 12px; background-color: #f5f5f5; border: 1px solid #ddd; border-radius: 4px; display: flex; justify-content: space-between; align-items: center;">
+          <span style="font-weight: 600; color: #2c3e50;">Korrekturen durch die Verwaltung</span>
+          <span id="correctionsToggleIcon" style="font-size: 16px; transition: transform 0.3s;">▼</span>
+        </div>
+        <div id="correctionsContent" style="display: none; border: 1px solid #ddd; border-top: none; border-radius: 0 0 4px 4px; background-color: #fff; padding: 10px 12px;">
+          <ul id="correctionsList" style="margin: 0; padding-left: 18px;"></ul>
+        </div>
+      </div>
     </div>
 
     <div id="loading" class="loading">Lade Daten...</div>
@@ -178,6 +187,7 @@
     </table>
   </div>
 
+  <script src="/js/format-hours.js"></script>
   <script>
     // Rollenwechsel
     const roleSwitcher = document.getElementById('roleSwitcher');
@@ -213,6 +223,27 @@
       return date.toLocaleDateString('de-DE');
     }
 
+    // SQLite-Datetime (YYYY-MM-DD HH:MM:SS) robust parsen
+    function parseSqliteDatetime(value) {
+      if (!value) return null;
+      const s = String(value);
+      if (s.includes('T')) return new Date(s);
+      // SQLite datetime('now') liefert UTC ohne "T" / "Z"
+      return new Date(s.replace(' ', 'T') + 'Z');
+    }
+
+    // formatHoursMin aus format-hours.js (window.formatHoursMin)
+
+    let correctionsExpanded = false;
+    function toggleCorrectionsSection() {
+      const content = document.getElementById('correctionsContent');
+      const icon = document.getElementById('correctionsToggleIcon');
+      if (!content || !icon) return;
+      correctionsExpanded = !correctionsExpanded;
+      content.style.display = correctionsExpanded ? 'block' : 'none';
+      icon.style.transform = correctionsExpanded ? 'rotate(180deg)' : 'rotate(0deg)';
+    }
+
     // Überstunden-Daten laden
     async function loadOvertimeBreakdown() {
       const loadingEl = document.getElementById('loading');
@@ -243,23 +274,26 @@
           totalOvertimeTaken += week.overtime_taken;
         });
         const overtimeOffset = data.overtime_offset_hours || 0;
-        const remainingOvertime = totalOvertime - totalOvertimeTaken + overtimeOffset;
+        // Variante B: Verbleibend = Summe Wochen-Überstunden + Offset („genommen“ nur Anzeige)
+        const remainingOvertime = totalOvertime + overtimeOffset;
+        // Gesamt Überstunden = Verbleibend + Genommen (kumuliert inkl. bereits verbrauchter)
+        const displayTotalOvertime = remainingOvertime + totalOvertimeTaken;
 
         // Zusammenfassung anzeigen
         const totalOvertimeEl = document.getElementById('totalOvertime');
         totalOvertimeEl.textContent = 
-          (totalOvertime >= 0 ? '+' : '') + totalOvertime.toFixed(2) + ' h';
+          (displayTotalOvertime >= 0 ? '+' : '') + formatHoursMin(displayTotalOvertime);
         totalOvertimeEl.className = 
-          'summary-value ' + (totalOvertime >= 0 ? 'overtime-positive' : 'overtime-negative');
+          'summary-value ' + (displayTotalOvertime >= 0 ? 'overtime-positive' : 'overtime-negative');
         
         const totalOvertimeTakenEl = document.getElementById('totalOvertimeTaken');
         totalOvertimeTakenEl.textContent = 
-          totalOvertimeTaken.toFixed(2) + ' h';
-        totalOvertimeTakenEl.className = 'summary-value overtime-positive';
+          totalOvertimeTaken > 0 ? '-' + formatHoursMin(totalOvertimeTaken) : formatHoursMin(0);
+        totalOvertimeTakenEl.className = 'summary-value overtime-negative';
         
         const remainingOvertimeEl = document.getElementById('remainingOvertime');
         remainingOvertimeEl.textContent = 
-          (remainingOvertime >= 0 ? '+' : '') + remainingOvertime.toFixed(2) + ' h';
+          (remainingOvertime >= 0 ? '+' : '') + formatHoursMin(remainingOvertime);
         remainingOvertimeEl.className = 
           'summary-value ' + (remainingOvertime >= 0 ? 'overtime-positive' : 'overtime-negative');
         
@@ -267,13 +301,48 @@
         const offsetItem = document.getElementById('offsetItem');
         const offsetValue = document.getElementById('overtimeOffset');
         if (overtimeOffset !== 0) {
-          offsetValue.textContent = (overtimeOffset >= 0 ? '+' : '') + overtimeOffset.toFixed(2) + ' h';
+          offsetValue.textContent = (overtimeOffset >= 0 ? '+' : '') + formatHoursMin(overtimeOffset);
           offsetValue.className = 'summary-value ' + (overtimeOffset >= 0 ? 'overtime-positive' : 'overtime-negative');
           offsetItem.style.display = 'flex';
         } else {
           offsetItem.style.display = 'none';
         }
 
+        // Korrekturen durch die Verwaltung anzeigen (Collapsible, nur wenn vorhanden)
+        const correctionsSectionEl = document.getElementById('correctionsSection');
+        const correctionsListEl = document.getElementById('correctionsList');
+        const correctionsHeaderEl = document.getElementById('correctionsHeader');
+        const correctionsContentEl = document.getElementById('correctionsContent');
+        const correctionsIconEl = document.getElementById('correctionsToggleIcon');
+        const corrections = Array.isArray(data.overtime_corrections) ? data.overtime_corrections : [];
+
+        if (correctionsSectionEl && correctionsListEl && correctionsHeaderEl && correctionsContentEl && correctionsIconEl && corrections.length > 0) {
+          correctionsSectionEl.style.display = 'block';
+          correctionsListEl.innerHTML = '';
+
+          corrections.forEach(c => {
+            const dt = parseSqliteDatetime(c.corrected_at);
+            const dateText = dt ? dt.toLocaleDateString('de-DE') : '';
+            const hoursText = formatHoursMin(c.correction_hours);
+            const reason = (c && c.reason != null) ? String(c.reason).trim() : '';
+            const li = document.createElement('li');
+            li.textContent = reason
+              ? `Korrektur am ${dateText} ${hoursText} – ${reason}`
+              : `Korrektur am ${dateText} ${hoursText}`;
+            correctionsListEl.appendChild(li);
+          });
+
+          // Standard: zugeklappt
+          correctionsExpanded = false;
+          correctionsContentEl.style.display = 'none';
+          correctionsIconEl.style.transform = 'rotate(0deg)';
+
+          // Click-Handler setzen (idempotent)
+          correctionsHeaderEl.onclick = toggleCorrectionsSection;
+        } else if (correctionsSectionEl) {
+          correctionsSectionEl.style.display = 'none';
+        }
+        
         summaryBoxEl.style.display = 'block';
 
         // Tabelle füllen
@@ -284,14 +353,16 @@
           const dateRange = formatDate(week.week_start) + ' - ' + formatDate(week.week_end);
           const overtimeClass = week.overtime_hours >= 0 ? 'overtime-positive' : 'overtime-negative';
           const overtimeSign = week.overtime_hours >= 0 ? '+' : '';
+          const overtimeCell = Math.abs(week.overtime_hours) < 0.01 ? '-' : overtimeSign + formatHoursMin(week.overtime_hours);
+          const takenCell = week.overtime_taken > 0 ? '-' + formatHoursMin(week.overtime_taken) : '-';
           
           row.innerHTML = `
             <td><strong>${week.year} KW${calendarWeekStr}</strong></td>
             <td>${dateRange}</td>
-            <td>${week.total_hours.toFixed(2)} h</td>
-            <td>${week.soll_stunden.toFixed(2)} h</td>
-            <td class="${overtimeClass}">${overtimeSign}${week.overtime_hours.toFixed(2)} h</td>
-            <td>${week.overtime_taken.toFixed(2)} h</td>
+            <td>${formatHoursMin(week.total_hours)}</td>
+            <td>${formatHoursMin(week.soll_stunden)}</td>
+            <td class="${overtimeClass}">${overtimeCell}</td>
+            <td class="overtime-negative">${takenCell}</td>
             <td>${week.vacation_days > 0 ? week.vacation_days.toFixed(1) : '-'}</td>
           `;
           tableBodyEl.appendChild(row);

views/verwaltung.ejs

@@ -85,32 +85,48 @@
                     <% if (employee.user.personalnummer) { %>
                       <span style="margin-left: 10px; color: #666;">(Personalnummer: <%= employee.user.personalnummer %>)</span>
                     <% } %>
+                    <% if (employee.has_new_version_after_download) { %>
+                      <span class="employee-new-version-warning">ACHTUNG: Neue version eingereicht</span>
+                    <% } %>
                   </div>
                   <div class="employee-details" style="margin-top: 10px;">
                     <div style="display: inline-block; margin-right: 20px;">
-                      <strong>Aktuelle Überstunden:</strong> <span class="current-overtime-value" data-user-id="<%= employee.user.id %>">-</span> Stunden
+                      <strong>Aktuelle Überstunden:</strong> <span class="current-overtime-value" data-user-id="<%= employee.user.id %>">-</span>
                     </div>
                     <div style="display: inline-block; margin-right: 20px;">
                       <strong>Verbleibender Urlaub:</strong> <span class="remaining-vacation-value" data-user-id="<%= employee.user.id %>">-</span> Tage
                     </div>
                     <div style="display: inline-flex; gap: 8px; align-items: center; margin-right: 20px;">
-                      <strong>Überstunden-Offset:</strong>
+                      <strong>Überstunden-Korrektur:</strong>
                       <input
-                        type="number"
-                        step="0.25"
+                        type="text"
                         class="overtime-offset-input"
                         data-user-id="<%= employee.user.id %>"
-                        value="<%= (employee.user.overtime_offset_hours !== undefined && employee.user.overtime_offset_hours !== null) ? employee.user.overtime_offset_hours : 0 %>"
-                        style="width: 90px; padding: 4px 6px; border: 1px solid #ddd; border-radius: 4px;"
-                        title="Manuelle Korrektur (positiv oder negativ) in Stunden" />
+                        value="0:00"
+                        placeholder="z. B. 1:30, 10:30 oder -0:45"
+                        style="width: 110px; padding: 4px 6px; border: 1px solid #ddd; border-radius: 4px;"
+                        title="Korrektur in h:mm (z. B. 1:30, 10:30 oder -0:45). Nach dem Speichern wird das Feld auf 0:00 gesetzt." />
                       <button
                         type="button"
                         class="btn btn-success btn-sm save-overtime-offset-btn"
                         data-user-id="<%= employee.user.id %>"
                         style="padding: 6px 10px; white-space: nowrap;"
-                        title="Überstunden-Offset speichern">
+                        title="Überstunden-Korrektur speichern (addiert/abzieht und protokolliert)">
                         Speichern
                       </button>
+                      <button
+                        type="button"
+                        class="btn btn-secondary btn-sm toggle-overtime-corrections-btn"
+                        data-user-id="<%= employee.user.id %>"
+                        style="padding: 6px 10px; white-space: nowrap;"
+                        title="Korrektur-Historie anzeigen/ausblenden">
+                        Historie
+                      </button>
+                    </div>
+                    <div class="overtime-corrections-container" data-user-id="<%= employee.user.id %>" style="display: none; margin: 10px; padding: 10px 12px; background: #f8f9fa; border: 1px solid #dee2e6; border-radius: 6px;">
+                      <div class="overtime-corrections-loading" style="color: #666; font-size: 13px;">Lade Korrekturen...</div>
+                      <div class="overtime-corrections-empty" style="display: none; color: #999; font-size: 13px;">Keine Korrekturen vorhanden.</div>
+                      <ul class="overtime-corrections-list" style="margin: 8px 0 0 0; padding-left: 18px; font-size: 13px;"></ul>
                     </div>
                     <div style="display: inline-flex; gap: 8px; align-items: center; margin-right: 20px;">
                       <strong>Urlaubstage-Offset:</strong>
@@ -302,6 +318,7 @@
     </div>
   </div>
 
+  <script src="/js/format-hours.js"></script>
   <script>
     async function loadStatsForDiv(statsDiv) {
       const userId = statsDiv.dataset.userId;
@@ -325,13 +342,13 @@
             const weekOvertimeColor = data.weekOvertimeHours < 0 ? '#dc3545' : (data.weekOvertimeHours > 0 ? '#28a745' : '#666');
             const sign = data.weekOvertimeHours >= 0 ? '+' : '';
             statsHTML += `<div class="stats-inline" style="display: inline-block; margin-right: 20px;">
-              <strong>Überstunden:</strong> <span style="color: ${weekOvertimeColor};">${sign}${data.weekOvertimeHours.toFixed(2)} h</span>
+              <strong>Überstunden:</strong> <span style="color: ${weekOvertimeColor};">${sign}${formatHoursMin(data.weekOvertimeHours)}</span>
             </div>`;
           }
           if (data.overtimeOffsetHours !== undefined && data.overtimeOffsetHours !== 0) {
             statsHTML += `<div class="stats-inline" style="display: inline-block; margin-right: 20px;">
-              <strong>Offset:</strong> <span>${Number(data.overtimeOffsetHours).toFixed(2)} h</span>
-              ${data.remainingOvertimeWithOffset !== undefined ? `<span style="color: #28a745;">(verbleibend inkl. Offset: ${Number(data.remainingOvertimeWithOffset).toFixed(2)} h)</span>` : ''}
+              <strong>Offset:</strong> <span>${formatHoursMin(Number(data.overtimeOffsetHours))}</span>
+              ${data.remainingOvertimeWithOffset !== undefined ? `<span style="color: #28a745;">(verbleibend inkl. Offset: ${formatHoursMin(Number(data.remainingOvertimeWithOffset))})</span>` : ''}
             </div>`;
           }
           if (data.totalVacationDays !== undefined || data.vacationDays !== undefined) {
@@ -417,7 +434,7 @@
             el.textContent = '-';
             el.style.color = '';
           } else {
-            el.textContent = value >= 0 ? '+' + value.toFixed(2) : value.toFixed(2);
+            el.textContent = (value >= 0 ? '+' : '') + formatHoursMin(value);
             el.style.color = value >= 0 ? '#27ae60' : '#e74c3c';
           }
         });
@@ -489,6 +506,184 @@
     loadCurrentOvertime();
     loadRemainingVacation();
 
+    // Überstunden-Korrektur-Historie laden/anzeigen
+    function parseSqliteDatetime(value) {
+      if (!value) return null;
+      const s = String(value);
+      if (s.includes('T')) return new Date(s);
+      return new Date(s.replace(' ', 'T') + 'Z');
+    }
+
+    // formatHoursMin aus format-hours.js (window.formatHoursMin)
+
+    function showOvertimeCorrectionReasonModal(opts) {
+      const title = opts && opts.title ? String(opts.title) : 'Grund für die Korrektur';
+      const promptText = opts && opts.prompt ? String(opts.prompt) : 'Bitte geben Sie einen Grund an, warum die Korrektur vorgenommen wird.';
+      const onSubmit = opts && typeof opts.onSubmit === 'function' ? opts.onSubmit : null;
+      const onCancel = opts && typeof opts.onCancel === 'function' ? opts.onCancel : null;
+
+      const modal = document.createElement('div');
+      modal.style.cssText = `
+        position: fixed;
+        inset: 0;
+        background: rgba(0,0,0,0.5);
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        z-index: 10000;
+      `;
+
+      const box = document.createElement('div');
+      box.style.cssText = `
+        background: #fff;
+        border-radius: 8px;
+        width: 90%;
+        max-width: 520px;
+        box-shadow: 0 4px 12px rgba(0,0,0,0.2);
+        padding: 18px 18px 14px 18px;
+      `;
+
+      box.innerHTML = `
+        <div style="display:flex; align-items:center; justify-content:space-between; gap:10px; margin-bottom: 8px;">
+          <h3 style="margin: 0; font-size: 16px; color: #2c3e50;">${title}</h3>
+          <button type="button" data-action="close" class="btn btn-secondary btn-sm" style="padding: 6px 10px;">✕</button>
+        </div>
+        <div style="color:#666; font-size: 13px; margin-bottom: 10px;">${promptText}</div>
+        <textarea data-role="reason" rows="4" style="width: 100%; padding: 10px; border: 1px solid #ddd; border-radius: 6px; font-family: inherit; font-size: 13px; resize: vertical;" placeholder="Grund..."></textarea>
+        <div data-role="error" style="display:none; margin-top: 8px; color:#dc3545; font-size: 13px;"></div>
+        <div style="display:flex; justify-content:flex-end; gap: 10px; margin-top: 12px;">
+          <button type="button" data-action="cancel" class="btn btn-secondary">Abbrechen</button>
+          <button type="button" data-action="submit" class="btn btn-success">Speichern</button>
+        </div>
+      `;
+
+      modal.appendChild(box);
+      document.body.appendChild(modal);
+
+      const textarea = box.querySelector('textarea[data-role="reason"]');
+      const errorEl = box.querySelector('[data-role="error"]');
+
+      function close() {
+        document.body.removeChild(modal);
+      }
+
+      function cancel() {
+        try {
+          if (onCancel) onCancel();
+        } finally {
+          close();
+        }
+      }
+
+      function setError(msg) {
+        if (!errorEl) return;
+        errorEl.textContent = msg;
+        errorEl.style.display = msg ? 'block' : 'none';
+      }
+
+      async function submit() {
+        const reason = textarea ? textarea.value.trim() : '';
+        if (!reason) {
+          setError('Bitte Grund angeben.');
+          if (textarea) textarea.focus();
+          return;
+        }
+        setError('');
+        if (onSubmit) {
+          await onSubmit(reason);
+        }
+        close();
+      }
+
+      modal.addEventListener('click', (e) => {
+        if (e.target === modal) cancel();
+      });
+      box.querySelectorAll('button[data-action="close"], button[data-action="cancel"]').forEach(btn => {
+        btn.addEventListener('click', cancel);
+      });
+      const submitBtn = box.querySelector('button[data-action="submit"]');
+      if (submitBtn) submitBtn.addEventListener('click', submit);
+
+      if (textarea) {
+        textarea.focus();
+        textarea.addEventListener('keydown', (e) => {
+          if (e.key === 'Escape') cancel();
+          if ((e.key === 'Enter' && (e.ctrlKey || e.metaKey))) {
+            e.preventDefault();
+            submit();
+          }
+        });
+      }
+    }
+
+    async function loadOvertimeCorrectionsForUser(userId) {
+      const container = document.querySelector(`.overtime-corrections-container[data-user-id="${userId}"]`);
+      if (!container) return;
+
+      const loadingEl = container.querySelector('.overtime-corrections-loading');
+      const emptyEl = container.querySelector('.overtime-corrections-empty');
+      const listEl = container.querySelector('.overtime-corrections-list');
+
+      if (loadingEl) loadingEl.style.display = 'block';
+      if (emptyEl) emptyEl.style.display = 'none';
+      if (listEl) listEl.innerHTML = '';
+
+      try {
+        const resp = await fetch(`/api/verwaltung/user/${userId}/overtime-corrections`);
+        const data = await resp.json().catch(() => ({}));
+        const corrections = Array.isArray(data.corrections) ? data.corrections : [];
+
+        if (!resp.ok) {
+          throw new Error(data.error || 'Fehler beim Laden der Korrekturen');
+        }
+
+        if (corrections.length === 0) {
+          if (emptyEl) emptyEl.style.display = 'block';
+          return;
+        }
+
+        corrections.forEach(c => {
+          const dt = parseSqliteDatetime(c.corrected_at);
+          const dateText = dt ? dt.toLocaleDateString('de-DE') : '';
+          const hoursText = formatHoursMin(c.correction_hours);
+          const reason = (c && c.reason != null) ? String(c.reason).trim() : '';
+          const li = document.createElement('li');
+          li.textContent = reason
+            ? `Korrektur am ${dateText} ${hoursText} – ${reason}`
+            : `Korrektur am ${dateText} ${hoursText}`;
+          if (listEl) listEl.appendChild(li);
+        });
+      } catch (e) {
+        console.error('Fehler beim Laden der Überstunden-Korrekturen:', e);
+        if (emptyEl) {
+          emptyEl.textContent = 'Fehler beim Laden der Korrekturen.';
+          emptyEl.style.display = 'block';
+        }
+      } finally {
+        if (loadingEl) loadingEl.style.display = 'none';
+      }
+    }
+
+    document.querySelectorAll('.toggle-overtime-corrections-btn').forEach(btn => {
+      btn.addEventListener('click', async function() {
+        const userId = this.dataset.userId;
+        const container = document.querySelector(`.overtime-corrections-container[data-user-id="${userId}"]`);
+        if (!container) return;
+
+        const isOpen = container.style.display !== 'none' && container.style.display !== '';
+        if (isOpen) {
+          container.style.display = 'none';
+          return;
+        }
+
+        container.style.display = 'block';
+
+        // Beim Öffnen immer neu laden (damit neue Korrekturen sofort sichtbar sind)
+        await loadOvertimeCorrectionsForUser(userId);
+        container.dataset.loaded = 'true';
+      });
+    });
+
     // Überstunden-Offset speichern
     document.querySelectorAll('.save-overtime-offset-btn').forEach(btn => {
       btn.addEventListener('click', async function() {
@@ -496,30 +691,59 @@
         const input = document.querySelector(`.overtime-offset-input[data-user-id="${userId}"]`);
         if (!input) return;
 
+        if (this.dataset.modalOpen === 'true') return;
+
         const originalText = this.textContent;
-        this.disabled = true;
-        this.textContent = '...';
 
         // leere Eingabe => 0 (Backend macht das auch, aber UI soll sauber sein)
         const raw = (input.value || '').trim();
-        const value = raw === '' ? '' : Number(raw);
+        const value = (typeof parseHoursMin === 'function' ? parseHoursMin(raw) : null);
+        if (value === null && raw !== '') {
+          alert('Ungültiges Format. Bitte h:mm oder hh:mm eingeben (z. B. 1:30, 10:30 oder -0:45).');
+          return;
+        }
+        const decimalValue = (value === null ? 0 : value);
 
+        // Wenn keine Korrektur (0), nichts tun außer UI auf 0:00 zu normalisieren
+        if (decimalValue === 0) {
+          input.value = (typeof decimalHoursToHhMm === 'function' ? decimalHoursToHhMm(0) : '0:00');
+          this.textContent = originalText;
+          this.disabled = false;
+          return;
+        }
+
+        this.dataset.modalOpen = 'true';
+        this.disabled = true;
+
+        // Modal: Grund ist Pflicht
+        showOvertimeCorrectionReasonModal({
+          title: 'Grund für die Überstunden-Korrektur',
+          prompt: `Korrektur: ${decimalValue >= 0 ? '+' : ''}${formatHoursMin(decimalValue)}`,
+          onCancel: () => {
+            delete this.dataset.modalOpen;
+            this.disabled = false;
+          },
+          onSubmit: async (reason) => {
+            this.textContent = '...';
             try {
               const resp = await fetch(`/api/verwaltung/user/${userId}/overtime-offset`, {
                 method: 'PUT',
                 headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ overtime_offset_hours: value })
+                body: JSON.stringify({ overtime_offset_hours: decimalValue, reason })
               });
               const data = await resp.json();
               if (!resp.ok) {
-            alert(data.error || 'Fehler beim Speichern des Offsets');
+                alert(data.error || 'Fehler beim Speichern der Korrektur');
+                this.textContent = originalText;
+                this.disabled = false;
+                delete this.dataset.modalOpen;
                 return;
               }
 
-          // Normalisiere Input auf Zahl (Backend gibt number zurück)
-          input.value = (data.overtime_offset_hours !== undefined && data.overtime_offset_hours !== null)
-            ? Number(data.overtime_offset_hours)
-            : 0;
+              // Normalisiere Input auf h:mm (Backend gibt 0 zurück nach Speichern)
+              input.value = (typeof decimalHoursToHhMm === 'function')
+                ? decimalHoursToHhMm((data.overtime_offset_hours !== undefined && data.overtime_offset_hours !== null) ? Number(data.overtime_offset_hours) : 0)
+                : '0:00';
 
               // Stats für diesen User neu laden
               const statDivs = document.querySelectorAll(`.group-stats[data-user-id="${userId}"]`);
@@ -535,22 +759,29 @@
               });
               loadCurrentOvertime();
 
+              // Historie (falls geöffnet) aktualisieren
+              const correctionsContainer = document.querySelector(`.overtime-corrections-container[data-user-id="${userId}"]`);
+              if (correctionsContainer && correctionsContainer.style.display !== 'none') {
+                await loadOvertimeCorrectionsForUser(userId);
+              }
+
               this.textContent = '✓';
               setTimeout(() => {
                 this.textContent = originalText;
                 this.disabled = false;
+                delete this.dataset.modalOpen;
               }, 900);
             } catch (e) {
-          console.error('Fehler beim Speichern des Offsets:', e);
-          alert('Fehler beim Speichern des Offsets');
-        } finally {
-          if (this.textContent === '...') {
+              console.error('Fehler beim Speichern der Korrektur:', e);
+              alert('Fehler beim Speichern der Korrektur');
               this.textContent = originalText;
               this.disabled = false;
+              delete this.dataset.modalOpen;
             }
           }
         });
       });
+    });
 
     // Urlaubstage-Offset speichern
     document.querySelectorAll('.save-vacation-offset-btn').forEach(btn => {