This commit is contained in:
Mateo Körber Belmonte
2025-04-08 21:17:50 +02:00
parent a4f06f4910
commit 4005f2abf0
+286 -76
View File
@@ -164,24 +164,173 @@ app.get('/summary', (req, res) => {
// Serve the weekly summary data // Serve the weekly summary data
app.get('/weekly-summary', (req, res) => { app.get('/weekly-summary', (req, res) => {
const week = req.query.week; const kw = req.query.kw;
if (!week) { if (!kw) {
return res.status(400).json({ status: 'error', message: 'Week query parameter is required!' }); return res.status(400).json({ status: 'error', message: 'KW query parameter is required! Format: KW11-2025' });
} }
const [year, month, day] = week.split('-').map(Number); try {
const weekStart = new Date(Date.UTC(year, month - 1, day)); // Extrahiere Wochennummer und Jahr
const weekEnd = new Date(weekStart); const match = kw.match(/KW(\d+)-(\d{4})/);
weekEnd.setUTCDate(weekStart.getUTCDate() + 4); if (!match) {
weekEnd.setUTCHours(23, 59, 59, 999); return res.status(400).json({
status: 'error',
message: 'Ungültiges KW-Format. Bitte KW11-2025 verwenden.'
});
}
const weekNumber = parseInt(match[1]);
const year = parseInt(match[2]);
if (weekNumber < 1 || weekNumber > 53) {
return res.status(400).json({
status: 'error',
message: 'Wochennummer muss zwischen 1 und 53 liegen.'
});
}
// Berechne das Datum des ersten Tags der angegebenen Kalenderwoche nach ISO-8601
const januaryFourth = new Date(Date.UTC(year, 0, 4));
const firstWeekday = januaryFourth.getUTCDay() || 7; // 1 für Mo, 7 für So
// Der erste Tag der ersten Woche ist der erste Montag vor oder am 4. Januar
const firstMondayOfYear = new Date(januaryFourth);
firstMondayOfYear.setUTCDate(januaryFourth.getUTCDate() - firstWeekday + 1);
// Berechne Montag der angegebenen Woche
const weekStart = new Date(firstMondayOfYear);
weekStart.setUTCDate(firstMondayOfYear.getUTCDate() + (weekNumber - 1) * 7);
const weekEnd = new Date(weekStart);
weekEnd.setUTCDate(weekStart.getUTCDate() + 4); // Freitag = Montag + 4 Tage
weekEnd.setUTCHours(23, 59, 59, 999);
// Initialize summary structure // Initialize summary structure
const summary = {
Monday: { Fleischgericht: [], Vegetarisch: [], Tagesgericht: [], Tagessalat: [] },
Tuesday: { Fleischgericht: [], Vegetarisch: [], Tagesgericht: [], Tagessalat: [] },
Wednesday: { Fleischgericht: [], Vegetarisch: [], Tagesgericht: [], Tagessalat: [] },
Thursday: { Fleischgericht: [], Vegetarisch: [], Tagesgericht: [], Tagessalat: [] },
Friday: { Fleischgericht: [], Vegetarisch: [], Tagesgericht: [], Tagessalat: [] }
};
const ratingValues = {
veryBad: 1,
bad: 2,
neutral: 3,
good: 4,
veryGood: 5
};
// Get DB data
const dbResults = db.prepare(`
SELECT date, time, category, rating
FROM feedback_entries
WHERE date BETWEEN ? AND ?
`).all(
weekStart.toLocaleDateString('de-DE'),
weekEnd.toLocaleDateString('de-DE')
);
// Process DB results
dbResults.forEach(row => {
const [day, month, year] = row.date.split('.').map(Number);
const [hours, minutes, seconds] = row.time.split(':').map(Number);
const date = new Date(Date.UTC(year, month - 1, day, hours, minutes, seconds));
const dayName = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'][date.getUTCDay()];
if (summary[dayName]) {
summary[dayName][row.category].push(ratingValues[row.rating]);
}
});
// Get CSV data
csv({
noheader: true,
headers: ['date', 'category', 'rating']
})
.fromFile(path.join(__dirname, '../../tablet-web-survey-data/data.csv'))
.then((csvResults) => {
// Process CSV results
csvResults.slice(1).forEach(row => {
const [datePart, timePart] = row.date.split(' ');
const [day, month, year] = datePart.split('.').map(Number);
const [hours, minutes, seconds] = timePart ? timePart.split(':').map(Number) : [0, 0, 0];
const date = new Date(Date.UTC(year, month - 1, day, hours, minutes, seconds));
if (date >= weekStart && date <= weekEnd) {
const dayName = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'][date.getUTCDay()];
if (summary[dayName]) {
summary[dayName][row.category].push(ratingValues[row.rating]);
}
}
});
// Calculate final averages combining both sources
const averageSummary = {};
Object.keys(summary).forEach(day => {
averageSummary[day] = {};
Object.keys(summary[day]).forEach(category => {
const ratings = summary[day][category];
const average = ratings.length ? (ratings.reduce((a, b) => a + b, 0) / ratings.length).toFixed(2) : 'N/A';
const count = ratings.length;
averageSummary[day][category] = { average, count };
});
});
res.json({
kw: kw,
startDatum: weekStart.toLocaleDateString('de-DE'),
endDatum: weekEnd.toLocaleDateString('de-DE'),
data: averageSummary
});
})
.catch((error) => {
console.error('Error reading CSV:', error);
// If CSV fails, calculate averages from DB data only
const averageSummary = {};
Object.keys(summary).forEach(day => {
averageSummary[day] = {};
Object.keys(summary[day]).forEach(category => {
const ratings = summary[day][category];
const average = ratings.length ? (ratings.reduce((a, b) => a + b, 0) / ratings.length).toFixed(2) : 'N/A';
const count = ratings.length;
averageSummary[day][category] = { average, count };
});
});
res.json({
kw: kw,
startDatum: weekStart.toLocaleDateString('de-DE'),
endDatum: weekEnd.toLocaleDateString('de-DE'),
data: averageSummary
});
});
} catch (error) {
console.error('Fehler bei der Berechnung der Kalenderwoche:', error);
res.status(500).json({ status: 'error', message: 'Interner Serverfehler' });
}
});
// Serve daily summary data
app.get('/api/dailySummary', (req, res) => {
const dateStr = req.query.date;
if (!dateStr) {
return res.status(400).json({ status: 'error', message: 'Date query parameter is required!' });
}
// Parse the requested date (format: YYYY-MM-DD)
const [year, month, day] = dateStr.split('-').map(Number);
// Format date for database query (D.M.YYYY format without padding zeros)
const formattedDate = `${day}.${month}.${year}`;
// Initialize summary structure for categories
const summary = { const summary = {
Monday: { Fleischgericht: [], Vegetarisch: [], Tagesgericht: [], Tagessalat: [] }, Fleischgericht: [],
Tuesday: { Fleischgericht: [], Vegetarisch: [], Tagesgericht: [], Tagessalat: [] }, Vegetarisch: [],
Wednesday: { Fleischgericht: [], Vegetarisch: [], Tagesgericht: [], Tagessalat: [] }, Tagesgericht: [],
Thursday: { Fleischgericht: [], Vegetarisch: [], Tagesgericht: [], Tagessalat: [] }, Tagessalat: []
Friday: { Fleischgericht: [], Vegetarisch: [], Tagesgericht: [], Tagessalat: [] }
}; };
const ratingValues = { const ratingValues = {
@@ -192,79 +341,140 @@ app.get('/weekly-summary', (req, res) => {
veryGood: 5 veryGood: 5
}; };
// Get DB data // Get DB data for the specific date
const dbResults = db.prepare(` const dbResults = db.prepare(`
SELECT date, time, category, rating SELECT category, rating
FROM feedback_entries FROM feedback_entries
WHERE date BETWEEN ? AND ? WHERE date = ?
`).all( `).all(formattedDate);
weekStart.toLocaleDateString('de-DE'),
weekEnd.toLocaleDateString('de-DE')
);
// Process DB results // Process DB results
dbResults.forEach(row => { dbResults.forEach(row => {
const [day, month, year] = row.date.split('.').map(Number); if (summary[row.category]) {
const [hours, minutes, seconds] = row.time.split(':').map(Number); summary[row.category].push(ratingValues[row.rating]);
const date = new Date(Date.UTC(year, month - 1, day, hours, minutes, seconds));
const dayName = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'][date.getUTCDay()];
if (summary[dayName]) {
summary[dayName][row.category].push(ratingValues[row.rating]);
} }
}); });
// Get CSV data // Calculate final averages and counts
csv({ const dailySummary = {};
noheader: true, Object.keys(summary).forEach(category => {
headers: ['date', 'category', 'rating'] const ratings = summary[category];
}) const average = ratings.length ? (ratings.reduce((a, b) => a + b, 0) / ratings.length).toFixed(2) : 'N/A';
.fromFile(path.join(__dirname, '../../tablet-web-survey-data/data.csv')) const count = ratings.length;
.then((csvResults) => { dailySummary[category] = { average, count };
// Process CSV results });
csvResults.slice(1).forEach(row => {
const [datePart, timePart] = row.date.split(' ');
const [day, month, year] = datePart.split('.').map(Number);
const [hours, minutes, seconds] = timePart ? timePart.split(':').map(Number) : [0, 0, 0];
const date = new Date(Date.UTC(year, month - 1, day, hours, minutes, seconds));
if (date >= weekStart && date <= weekEnd) { res.json(dailySummary);
const dayName = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'][date.getUTCDay()]; });
if (summary[dayName]) {
summary[dayName][row.category].push(ratingValues[row.rating]); // Wöchentliche Zusammenfassung durch Aufruf der täglichen API
app.get('/api/weekSummary', (req, res) => {
const kw = req.query.kw;
if (!kw) {
return res.status(400).json({ status: 'error', message: 'KW parameter ist erforderlich (Format: KW15-2025)!' });
}
try {
// Extrahiere Wochennummer und Jahr
const match = kw.match(/KW(\d+)-(\d{4})/);
if (!match) {
return res.status(400).json({
status: 'error',
message: 'Ungültiges KW-Format. Bitte KW15-2025 verwenden.'
});
}
const weekNumber = parseInt(match[1]);
const year = parseInt(match[2]);
// Berechne Montag der angegebenen Woche
const januaryFourth = new Date(Date.UTC(year, 0, 4));
const firstWeekday = januaryFourth.getUTCDay() || 7;
const firstMondayOfYear = new Date(januaryFourth);
firstMondayOfYear.setUTCDate(januaryFourth.getUTCDate() - firstWeekday + 1);
const monday = new Date(firstMondayOfYear);
monday.setUTCDate(firstMondayOfYear.getUTCDate() + (weekNumber - 1) * 7);
// Erstelle Array mit allen Wochentagen (Mo-Fr)
const weekDays = [];
const dayNames = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday'];
for (let i = 0; i < 5; i++) {
const date = new Date(monday);
date.setDate(monday.getDate() + i);
weekDays.push({
date: date.toISOString().split('T')[0], // YYYY-MM-DD Format
dayName: dayNames[i]
});
}
// Für jeden Tag die dailySummary API aufrufen
const weekSummary = {
Monday: {},
Tuesday: {},
Wednesday: {},
Thursday: {},
Friday: {}
};
// Zähle die fertigen Anfragen
let completedRequests = 0;
// Verarbeite jeden Tag einzeln
weekDays.forEach(day => {
// Rufe die bestehende API auf
const dailySummaryUrl = `/api/dailySummary?date=${day.date}`;
// Simuliere einen Request an unsere eigene API
const req = { query: { date: day.date } };
const mockRes = {
json: (data) => {
weekSummary[day.dayName] = data;
completedRequests++;
// Wenn alle Tage verarbeitet wurden, sende die Gesamtantwort
if (completedRequests === weekDays.length) {
res.json({
kw: kw,
startDatum: monday.toLocaleDateString('de-DE'),
endDatum: new Date(monday.getTime() + 4 * 24 * 60 * 60 * 1000).toLocaleDateString('de-DE'),
data: weekSummary
});
} }
} },
}); status: () => ({
json: () => {
// Calculate final averages combining both sources completedRequests++;
const averageSummary = {}; weekSummary[day.dayName] = {
Object.keys(summary).forEach(day => { Fleischgericht: { average: 'N/A', count: 0 },
averageSummary[day] = {}; Vegetarisch: { average: 'N/A', count: 0 },
Object.keys(summary[day]).forEach(category => { Tagesgericht: { average: 'N/A', count: 0 },
const ratings = summary[day][category]; Tagessalat: { average: 'N/A', count: 0 }
const average = ratings.length ? (ratings.reduce((a, b) => a + b, 0) / ratings.length).toFixed(2) : 'N/A'; };
const count = ratings.length;
averageSummary[day][category] = { average, count }; if (completedRequests === weekDays.length) {
}); res.json({
}); kw: kw,
startDatum: monday.toLocaleDateString('de-DE'),
res.json(averageSummary); endDatum: new Date(monday.getTime() + 4 * 24 * 60 * 60 * 1000).toLocaleDateString('de-DE'),
}) data: weekSummary
.catch((error) => { });
console.error('Error reading CSV:', error); }
// If CSV fails, calculate averages from DB data only }
const averageSummary = {}; })
Object.keys(summary).forEach(day => { };
averageSummary[day] = {};
Object.keys(summary[day]).forEach(category => { // Direkte Verwendung der gleichen Funktionslogik wie in /api/dailySummary
const ratings = summary[day][category]; const dailySummaryHandler = app._router.stack
const average = ratings.length ? (ratings.reduce((a, b) => a + b, 0) / ratings.length).toFixed(2) : 'N/A'; .filter(layer => layer.route && layer.route.path === '/api/dailySummary')[0]
const count = ratings.length; .route.stack[0].handle;
averageSummary[day][category] = { average, count };
}); dailySummaryHandler(req, mockRes);
});
res.json(averageSummary);
}); });
} catch (error) {
console.error('Fehler bei der Berechnung der Wochendaten:', error);
res.status(500).json({ status: 'error', message: 'Interner Serverfehler' });
}
}); });
server.listen(3000, () => { server.listen(3000, () => {