core/Projektarbeit-MYP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

"Update logging configuration and related files for improved debugging support"

Browse Source
This commit is contained in:
Till Tomczak
2025-05-29 09:58:29 +02:00
parent 06cfc0b8aa
commit a5e7556527
10 changed files with 665 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

379
backend/app/templates/calendar.html
View File

@@ -1 +1,378 @@
{% extends "base.html" %}
{% block title %}Kalender - Mercedes-Benz MYP Platform{% endblock %}
{% block head %}
{{ super() }}
<meta name="csrf-token" content="{{ csrf_token() }}">
<!-- FullCalendar CSS -->
<link href="{{ url_for('static', filename='js/fullcalendar/main.min.css') }}" rel="stylesheet">
{% endblock %}
{% block content %}
<div class="min-h-screen bg-gradient-to-br from-slate-50 via-blue-50 to-indigo-50 dark:from-slate-900 dark:via-slate-800 dark:to-slate-900">
<div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
<!-- Header -->
<div class="mb-8 flex flex-col sm:flex-row sm:items-center sm:justify-between">
<div>
<h1 class="text-3xl font-bold text-slate-900 dark:text-white">Druckjob-Kalender</h1>
<p class="text-slate-600 dark:text-slate-400 mt-2">Übersicht aller geplanten und laufenden 3D-Druckjobs</p>
</div>
{% if can_edit %}
<div class="mt-4 sm:mt-0">
<button onclick="openCreateEventModal()"
class="px-4 py-2 bg-gradient-to-r from-blue-500 to-blue-600 text-white rounded-xl hover:from-blue-600 hover:to-blue-700 transition-all duration-300 shadow-lg">
<svg class="w-5 h-5 inline mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6"></path>
</svg>
Neuen Job erstellen
</button>
</div>
{% endif %}
</div>
<!-- Filter -->
<div class="bg-white dark:bg-slate-800 rounded-xl shadow-lg p-4 mb-6">
<div class="flex flex-wrap items-center gap-4">
<div>
<label for="printerFilter" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-1">
Drucker filtern:
</label>
<select id="printerFilter"
class="px-3 py-2 border border-slate-300 dark:border-slate-600 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-transparent dark:bg-slate-700 dark:text-white">
<option value="">Alle Drucker</option>
{% for printer in printers %}
<option value="{{ printer.id }}">{{ printer.name }} {% if printer.location %}({{ printer.location }}){% endif %}</option>
{% endfor %}
</select>
</div>
<div class="flex items-center gap-2">
<button onclick="refreshCalendar()"
class="px-3 py-2 bg-slate-200 dark:bg-slate-700 text-slate-700 dark:text-slate-300 rounded-lg hover:bg-slate-300 dark:hover:bg-slate-600 transition-all duration-300">
<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15"></path>
</svg>
</button>
</div>
</div>
</div>
<!-- Kalender -->
<div class="bg-white dark:bg-slate-800 rounded-xl shadow-lg p-6">
<div id="calendar"></div>
</div>
<!-- Legende -->
<div class="bg-white dark:bg-slate-800 rounded-xl shadow-lg p-4 mt-6">
<h3 class="text-sm font-medium text-slate-700 dark:text-slate-300 mb-3">Legende</h3>
<div class="flex flex-wrap gap-4">
<div class="flex items-center">
<div class="w-4 h-4 bg-green-500 rounded mr-2"></div>
<span class="text-sm text-slate-600 dark:text-slate-400">Geplant / Abgeschlossen</span>
</div>
<div class="flex items-center">
<div class="w-4 h-4 bg-blue-500 rounded mr-2"></div>
<span class="text-sm text-slate-600 dark:text-slate-400">Läuft</span>
</div>
<div class="flex items-center">
<div class="w-4 h-4 bg-gray-500 rounded mr-2"></div>
<span class="text-sm text-slate-600 dark:text-slate-400">Wartend</span>
</div>
<div class="flex items-center">
<div class="w-4 h-4 bg-red-500 rounded mr-2"></div>
<span class="text-sm text-slate-600 dark:text-slate-400">Abgebrochen</span>
</div>
</div>
</div>
</div>
</div>
{% if can_edit %}
<!-- Event erstellen/bearbeiten Modal -->
<div id="eventModal" class="fixed inset-0 bg-black bg-opacity-50 hidden z-50">
<div class="flex items-center justify-center min-h-screen p-4">
<div class="bg-white dark:bg-slate-800 rounded-2xl shadow-xl max-w-md w-full p-6">
<div class="flex justify-between items-center mb-4">
<h3 id="modalTitle" class="text-lg font-medium text-slate-900 dark:text-white">Neuen Job erstellen</h3>
<button onclick="closeEventModal()" class="text-slate-400 hover:text-slate-600 dark:hover:text-slate-300">
<svg class="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path>
</svg>
</button>
</div>
<form id="eventForm" class="space-y-4">
<input type="hidden" id="eventId" name="eventId">
<!-- Titel -->
<div>
<label for="eventTitle" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-1">
Job-Titel
</label>
<input type="text" id="eventTitle" name="title" required
class="w-full px-3 py-2 border border-slate-300 dark:border-slate-600 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-transparent dark:bg-slate-700 dark:text-white">
</div>
<!-- Beschreibung -->
<div>
<label for="eventDescription" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-1">
Beschreibung (optional)
</label>
<textarea id="eventDescription" name="description" rows="2"
class="w-full px-3 py-2 border border-slate-300 dark:border-slate-600 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-transparent dark:bg-slate-700 dark:text-white resize-none"></textarea>
</div>
<!-- Drucker -->
<div>
<label for="eventPrinter" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-1">
Drucker
</label>
<select id="eventPrinter" name="printerId" required
class="w-full px-3 py-2 border border-slate-300 dark:border-slate-600 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-transparent dark:bg-slate-700 dark:text-white">
<option value="">Drucker auswählen</option>
{% for printer in printers %}
<option value="{{ printer.id }}">{{ printer.name }} {% if printer.location %}({{ printer.location }}){% endif %}</option>
{% endfor %}
</select>
</div>
<!-- Start-Zeit -->
<div>
<label for="eventStart" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-1">
Start-Zeit
</label>
<input type="datetime-local" id="eventStart" name="start" required
class="w-full px-3 py-2 border border-slate-300 dark:border-slate-600 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-transparent dark:bg-slate-700 dark:text-white">
</div>
<!-- End-Zeit -->
<div>
<label for="eventEnd" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-1">
End-Zeit
</label>
<input type="datetime-local" id="eventEnd" name="end" required
class="w-full px-3 py-2 border border-slate-300 dark:border-slate-600 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-transparent dark:bg-slate-700 dark:text-white">
</div>
<!-- Buttons -->
<div class="flex items-center justify-end space-x-3 pt-4">
<button type="button" onclick="closeEventModal()"
class="px-4 py-2 border border-slate-300 dark:border-slate-600 text-slate-700 dark:text-slate-300 rounded-lg hover:bg-slate-50 dark:hover:bg-slate-700 transition-all duration-300">
Abbrechen
</button>
<button type="submit"
class="px-4 py-2 bg-blue-500 text-white rounded-lg hover:bg-blue-600 transition-all duration-300">
Speichern
</button>
<button type="button" id="deleteEventBtn" onclick="deleteEvent()" style="display: none;"
class="px-4 py-2 bg-red-500 text-white rounded-lg hover:bg-red-600 transition-all duration-300">
Löschen
</button>
</div>
</form>
</div>
</div>
</div>
{% endif %}
<!-- FullCalendar JS -->
<script src="{{ url_for('static', filename='js/fullcalendar/main.min.js') }}"></script>
<script>
document.addEventListener('DOMContentLoaded', function() {
const calendarEl = document.getElementById('calendar');
const printerFilter = document.getElementById('printerFilter');
const canEdit = {% if can_edit %}true{% else %}false{% endif %};
let calendar = new FullCalendar.Calendar(calendarEl, {
initialView: 'timeGridWeek',
locale: 'de',
headerToolbar: {
left: 'prev,next today',
center: 'title',
right: 'dayGridMonth,timeGridWeek,timeGridDay'
},
height: 'auto',
slotMinTime: '06:00:00',
slotMaxTime: '22:00:00',
businessHours: {
daysOfWeek: [1, 2, 3, 4, 5], // Montag bis Freitag
startTime: '08:00',
endTime: '18:00'
},
events: function(info, successCallback, failureCallback) {
loadEvents(info.startStr, info.endStr, successCallback, failureCallback);
},
eventClick: function(info) {
if (canEdit) {
editEvent(info.event);
} else {
showEventDetails(info.event);
}
},
selectable: canEdit,
select: function(info) {
if (canEdit) {
openCreateEventModal(info.startStr, info.endStr);
}
},
eventDidMount: function(info) {
// Tooltip hinzufügen
info.el.title = info.event.title + '\nDrucker: ' + info.event.extendedProps.printerName + '\nStatus: ' + info.event.extendedProps.status;
}
});
calendar.render();
// Filter-Event
printerFilter.addEventListener('change', function() {
calendar.refetchEvents();
});
// Globale Funktionen definieren
window.refreshCalendar = function() {
calendar.refetchEvents();
};
window.openCreateEventModal = function(start, end) {
start = start || null;
end = end || null;
document.getElementById('modalTitle').textContent = 'Neuen Job erstellen';
document.getElementById('eventForm').reset();
document.getElementById('eventId').value = '';
document.getElementById('deleteEventBtn').style.display = 'none';
if (start) {
document.getElementById('eventStart').value = start.slice(0, 16);
}
if (end) {
document.getElementById('eventEnd').value = end.slice(0, 16);
}
document.getElementById('eventModal').classList.remove('hidden');
};
window.closeEventModal = function() {
document.getElementById('eventModal').classList.add('hidden');
};
window.editEvent = function(event) {
document.getElementById('modalTitle').textContent = 'Job bearbeiten';
document.getElementById('eventId').value = event.id;
document.getElementById('eventTitle').value = event.title;
document.getElementById('eventDescription').value = event.extendedProps.description || '';
document.getElementById('eventPrinter').value = event.extendedProps.printerId;
document.getElementById('eventStart').value = event.startStr.slice(0, 16);
document.getElementById('eventEnd').value = event.endStr ? event.endStr.slice(0, 16) : '';
document.getElementById('deleteEventBtn').style.display = 'block';
document.getElementById('eventModal').classList.remove('hidden');
};
window.showEventDetails = function(event) {
const status = event.extendedProps.status;
const statusText = status === 'scheduled' ? 'Geplant' :
status === 'running' ? 'Läuft' :
status === 'finished' ? 'Abgeschlossen' : status;
alert('Job: ' + event.title + '\nDrucker: ' + event.extendedProps.printerName + '\nStatus: ' + statusText + '\nBenutzer: ' + event.extendedProps.userName);
};
window.deleteEvent = function() {
const eventId = document.getElementById('eventId').value;
if (!eventId) return;
if (!confirm('Möchten Sie diesen Job wirklich löschen?')) return;
fetch('/api/calendar/event/' + eventId, {
method: 'DELETE',
headers: {
'Content-Type': 'application/json',
}
})
.then(response => response.json())
.then(data => {
if (data.success) {
calendar.refetchEvents();
closeEventModal();
} else {
alert('Fehler beim Löschen: ' + (data.error || 'Unbekannter Fehler'));
}
})
.catch(error => {
console.error('Fehler:', error);
alert('Fehler beim Löschen des Jobs');
});
};
// Event-Form Submit
document.getElementById('eventForm').addEventListener('submit', function(e) {
e.preventDefault();
const formData = new FormData(e.target);
const data = {
title: formData.get('title'),
description: formData.get('description'),
printerId: parseInt(formData.get('printerId')),
start: formData.get('start'),
end: formData.get('end')
};
const eventId = formData.get('eventId');
const isEdit = eventId && eventId !== '';
const url = isEdit ? ('/api/calendar/event/' + eventId) : '/api/calendar/event';
const method = isEdit ? 'PUT' : 'POST';
fetch(url, {
method: method,
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify(data)
})
.then(response => response.json())
.then(data => {
if (data.success) {
calendar.refetchEvents();
closeEventModal();
} else {
alert('Fehler beim Speichern: ' + (data.error || 'Unbekannter Fehler'));
}
})
.catch(error => {
console.error('Fehler:', error);
alert('Fehler beim Speichern des Jobs');
});
});
function loadEvents(start, end, successCallback, failureCallback) {
const printerId = printerFilter.value;
const params = new URLSearchParams({
from: start,
to: end
});
if (printerId) {
params.append('printer_id', printerId);
}
fetch('/api/calendar?' + params)
.then(response => response.json())
.then(events => {
successCallback(events);
})
.catch(error => {
console.error('Fehler beim Laden der Events:', error);
failureCallback(error);
});
}
// Auto-Refresh alle 30 Sekunden
setInterval(function() {
calendar.refetchEvents();
}, 30000);
});
</script>
{% endblock %}