its-consulting/Dienstplan-Pro
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(app): extract getVacationMapForMonth, dedupe 4x vacation loop

Browse source 
The "loop employees -> getVacationMode -> calculateAllEmployees" block
was copy-pasted in calculateBonuses, generateEmailReport, exportCSV and
exportBonusReport. Collapse to one storage helper. Behaviour identical:
calculateAllEmployees only reads keys present in employeeDuties.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Kenearos 2026-07-07 11:40:06 +02:00
parent 7efdcbe17b
commit de2befde7a
2 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app.js
View file

@ -455,12 +455,7 @@ class DienstplanApp {
const employeeDuties = this.storage.getAllEmployeeDutiesForMonth(year, month);
// Build vacation map for this month: { name: boolean }
const vacationMap = {};
Object.keys(employeeDuties).forEach(name => {
vacationMap[name] = this.storage.getVacationMode(name, yearMonth);
});
const vacationMap = this.storage.getVacationMapForMonth(yearMonth);
const results = this.calculator.calculateAllEmployees(employeeDuties, vacationMap);
resultsContainer.innerHTML = `<h3>Ergebnisse für ${monthName(month)} ${year}</h3>`;
@ -622,10 +617,7 @@ class DienstplanApp {
const employeeDuties = this.storage.getAllEmployeeDutiesForMonth(year, month);
const yearMonth = `${year}-${String(month).padStart(2, '0')}`;
const vacationMap = {};
Object.keys(employeeDuties).forEach(n => {
vacationMap[n] = this.storage.getVacationMode(n, yearMonth);
});
const vacationMap = this.storage.getVacationMapForMonth(yearMonth);
const results = this.calculator.calculateAllEmployees(employeeDuties, vacationMap);
const monthLabel = monthName(month);
@ -814,10 +806,7 @@ class DienstplanApp {
const yearMonth = `${year}-${String(month).padStart(2, '0')}`;
const employeeDuties = this.storage.getAllEmployeeDutiesForMonth(year, month);
const vacationMap = {};
Object.keys(employeeDuties).forEach(name => {
vacationMap[name] = this.storage.getVacationMode(name, yearMonth);
});
const vacationMap = this.storage.getVacationMapForMonth(yearMonth);
const results = this.calculator.calculateAllEmployees(employeeDuties, vacationMap);
let totalBonus = 0;
@ -1048,10 +1037,7 @@ class DienstplanApp {
// Compute via BonusCalculator (uses winning variant)
const yearMonth = `${year}-${String(month).padStart(2, '0')}`;
const vacationMap = {};
Object.keys(employeeDuties).forEach(n => {
vacationMap[n] = this.storage.getVacationMode(n, yearMonth);
});
const vacationMap = this.storage.getVacationMapForMonth(yearMonth);
const calcResults = this.calculator.calculateAllEmployees(employeeDuties, vacationMap);
for (const [name, data] of Object.entries(employeeData)) {