Farbanpassungen und -
This commit is contained in:
@@ -288,8 +288,8 @@
|
|||||||
|
|
||||||
const totalOvertimeTakenEl = document.getElementById('totalOvertimeTaken');
|
const totalOvertimeTakenEl = document.getElementById('totalOvertimeTaken');
|
||||||
totalOvertimeTakenEl.textContent =
|
totalOvertimeTakenEl.textContent =
|
||||||
formatHoursMin(totalOvertimeTaken);
|
totalOvertimeTaken > 0 ? '-' + formatHoursMin(totalOvertimeTaken) : formatHoursMin(0);
|
||||||
totalOvertimeTakenEl.className = 'summary-value overtime-positive';
|
totalOvertimeTakenEl.className = 'summary-value overtime-negative';
|
||||||
|
|
||||||
const remainingOvertimeEl = document.getElementById('remainingOvertime');
|
const remainingOvertimeEl = document.getElementById('remainingOvertime');
|
||||||
remainingOvertimeEl.textContent =
|
remainingOvertimeEl.textContent =
|
||||||
@@ -353,14 +353,16 @@
|
|||||||
const dateRange = formatDate(week.week_start) + ' - ' + formatDate(week.week_end);
|
const dateRange = formatDate(week.week_start) + ' - ' + formatDate(week.week_end);
|
||||||
const overtimeClass = week.overtime_hours >= 0 ? 'overtime-positive' : 'overtime-negative';
|
const overtimeClass = week.overtime_hours >= 0 ? 'overtime-positive' : 'overtime-negative';
|
||||||
const overtimeSign = week.overtime_hours >= 0 ? '+' : '';
|
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 = `
|
row.innerHTML = `
|
||||||
<td><strong>${week.year} KW${calendarWeekStr}</strong></td>
|
<td><strong>${week.year} KW${calendarWeekStr}</strong></td>
|
||||||
<td>${dateRange}</td>
|
<td>${dateRange}</td>
|
||||||
<td>${formatHoursMin(week.total_hours)}</td>
|
<td>${formatHoursMin(week.total_hours)}</td>
|
||||||
<td>${formatHoursMin(week.soll_stunden)}</td>
|
<td>${formatHoursMin(week.soll_stunden)}</td>
|
||||||
<td class="${overtimeClass}">${overtimeSign}${formatHoursMin(week.overtime_hours)}</td>
|
<td class="${overtimeClass}">${overtimeCell}</td>
|
||||||
<td>${formatHoursMin(week.overtime_taken)}</td>
|
<td class="overtime-negative">${takenCell}</td>
|
||||||
<td>${week.vacation_days > 0 ? week.vacation_days.toFixed(1) : '-'}</td>
|
<td>${week.vacation_days > 0 ? week.vacation_days.toFixed(1) : '-'}</td>
|
||||||
`;
|
`;
|
||||||
tableBodyEl.appendChild(row);
|
tableBodyEl.appendChild(row);
|
||||||
|
|||||||
Reference in New Issue
Block a user