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

🐛📚 "Migrate JavaScript templates to Jinja for better documentation and maintainability"

Browse Source
This commit is contained in:
Till Tomczak
2025-06-18 09:33:05 +02:00
parent f1e3a2cfea
commit 709a541835
4 changed files with 564 additions and 1570 deletions
Download Patch File Download Diff File Expand all files Collapse all files

240
backend/templates/dashboard.html
View File

@ -1,4 +1,5 @@
{% extends "base.html" %}
{% from 'macros/ui_components.html' import status_indicator, progress_bar, printer_card, clickable_card, dashboard_stat_card, printer_overview_table, filter_tabs %}
{% block title %}Dashboard - Mercedes-Benz MYP Platform{% endblock %}
@ -294,67 +295,39 @@
</div>
</div>
<!-- Stats Overview Cards -->
<!-- Stats Overview Cards mit Jinja-Macros -->
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6">
<!-- Active Jobs Card -->
<div class="dashboard-card p-6">
<div class="flex justify-between">
<div>
<h3 class="stat-label">Aktive Aufträge</h3>
<div class="stat-value">{{ active_jobs_count }}</div>
</div>
<div class="mb-stat-icon text-slate-900 dark:text-white">
<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="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-3 7h3m-3 4h3m-6-4h.01M9 16h.01" />
</svg>
</div>
</div>
</div>
<!-- Available Printers Card -->
<div class="dashboard-card p-6">
<div class="flex justify-between">
<div>
<h3 class="stat-label">Verfügbare Drucker</h3>
<div class="stat-value">{{ available_printers_count }}</div>
</div>
<div class="mb-stat-icon text-green-600 dark:text-green-400">
<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="M5 12h14M5 12a2 2 0 01-2-2V6a2 2 0 012-2h14a2 2 0 012 2v4a2 2 0 01-2 2M5 12a2 2 0 00-2 2v4a2 2 0 002 2h14a2 2 0 002-2v-4a2 2 0 00-2-2m-2-4h.01M17 16h.01" />
</svg>
</div>
</div>
</div>
<!-- Total Jobs Card -->
<div class="dashboard-card p-6">
<div class="flex justify-between">
<div>
<h3 class="stat-label">Aufträge (gesamt)</h3>
<div class="stat-value">{{ total_jobs_count }}</div>
</div>
<div class="mb-stat-icon text-purple-600 dark:text-purple-400">
<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="M9 17v-2m3 2v-4m3 4v-6m2 10H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z" />
</svg>
</div>
</div>
</div>
<!-- Success Rate Card -->
<div class="dashboard-card p-6">
<div class="flex justify-between">
<div>
<h3 class="stat-label">Erfolgsrate</h3>
<div class="stat-value">{{ success_rate }}%</div>
</div>
<div class="mb-stat-icon text-amber-600 dark:text-amber-400">
<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="M11.049 2.927c.3-.921 1.603-.921 1.902 0l1.519 4.674a1 1 0 00.95.69h4.915c.969 0 1.371 1.24.588 1.81l-3.976 2.888a1 1 0 00-.363 1.118l1.518 4.674c.3.922-.755 1.688-1.538 1.118l-3.976-2.888a1 1 0 00-1.176 0l-3.976 2.888c-.783.57-1.838-.197-1.538-1.118l1.518-4.674a1 1 0 00-.363-1.118l-3.976-2.888c-.784-.57-.38-1.81.588-1.81h4.914a1 1 0 00.951-.69l1.519-4.674z" />
</svg>
</div>
</div>
</div>
{{ dashboard_stat_card(
title="Aktive Aufträge",
value=active_jobs_count,
icon="fas fa-clipboard-list",
color="slate",
trend=active_jobs_trend if active_jobs_trend else None
) }}
{{ dashboard_stat_card(
title="Verfügbare Drucker",
value=available_printers_count,
icon="fas fa-print",
color="green",
trend=printer_availability_trend if printer_availability_trend else None
) }}
{{ dashboard_stat_card(
title="Aufträge (gesamt)",
value=total_jobs_count,
icon="fas fa-chart-line",
color="purple",
trend=total_jobs_trend if total_jobs_trend else None
) }}
{{ dashboard_stat_card(
title="Erfolgsrate",
value=success_rate ~ "%",
icon="fas fa-star",
color="amber",
trend=success_rate_trend if success_rate_trend else None
) }}
</div>
<!-- Active Jobs Section -->
@ -376,32 +349,30 @@
{% if active_jobs and active_jobs|length > 0 %}
{% for job in active_jobs %}
<tr class="hover:bg-gray-50 dark:hover:bg-slate-700/50">
<td class="px-6 py-4 whitespace-nowrap">
<div class="flex items-center">
<div class="mb-status-indicator {{ job.status_class }}"></div>
<span class="ml-2 text-sm font-medium text-slate-700 dark:text-slate-300">
{{ job.status_text }}
</span>
</div>
</td>
<td class="px-6 py-4 whitespace-nowrap">
<div class="text-sm font-medium text-slate-900 dark:text-white">{{ job.name }}</div>
<div class="text-xs text-slate-500 dark:text-slate-400">{{ job.file_name }}</div>
</td>
<td class="px-6 py-4 whitespace-nowrap">
<div class="text-sm text-slate-700 dark:text-slate-300">{{ job.printer }}</div>
</td>
<td class="px-6 py-4 whitespace-nowrap">
<div class="text-sm text-slate-700 dark:text-slate-300">{{ job.start_time }}</div>
</td>
<td class="px-6 py-4 whitespace-nowrap">
<div class="mb-progress-container">
<div class="mb-progress-bar" style="width: {{ job.progress }}%"></div>
</div>
<div class="text-xs text-right mt-1 text-slate-500 dark:text-slate-400">{{ job.progress }}%</div>
</td>
<td class="px-6 py-4 whitespace-nowrap text-right">
<a href="{{ url_for('jobs_page') }}#job-{{ job.id }}" class="text-slate-900 dark:text-white hover:text-slate-700 dark:hover:text-slate-300 font-medium">Details</a>
<td colspan="6" class="p-0">
<a href="{{ url_for('jobs_page') }}#job-{{ job.id }}" class="block px-6 py-4">
<div class="grid grid-cols-6 gap-4">
<div class="col-span-1">
{{ status_indicator(job.status, job.status_text) }}
</div>
<div class="col-span-1">
<div class="text-sm font-medium text-slate-900 dark:text-white">{{ job.name }}</div>
<div class="text-xs text-slate-500 dark:text-slate-400">{{ job.file_name }}</div>
</div>
<div class="col-span-1">
<div class="text-sm text-slate-700 dark:text-slate-300">{{ job.printer }}</div>
</div>
<div class="col-span-1">
<div class="text-sm text-slate-700 dark:text-slate-300">{{ job.start_time }}</div>
</div>
<div class="col-span-1">
{{ progress_bar(job.progress) }}
</div>
<div class="col-span-1 text-right">
<span class="text-slate-900 dark:text-white hover:text-slate-700 dark:hover:text-slate-300 font-medium">Details</span>
</div>
</div>
</a>
</td>
</tr>
{% endfor %}
@ -436,19 +407,7 @@
<div class="space-y-4">
{% if printers and printers|length > 0 %}
{% for printer in printers %}
<div class="flex items-center justify-between p-4 rounded-xl bg-gray-50 dark:bg-slate-700/30">
<div class="flex items-center">
<div class="mb-status-indicator {{ printer.status_class }} mr-3"></div>
<div>
<div class="text-sm font-medium text-slate-900 dark:text-white">{{ printer.name }}</div>
<div class="text-xs text-slate-500 dark:text-slate-400">{{ printer.model }}</div>
</div>
</div>
<div class="text-right">
<div class="text-sm font-medium text-slate-700 dark:text-slate-300">{{ printer.status_text }}</div>
<div class="text-xs text-slate-500 dark:text-slate-400">{{ printer.location }}</div>
</div>
</div>
{{ printer_card(printer) }}
{% endfor %}
{% else %}
<div class="text-center py-8">
@ -498,52 +457,39 @@
{% endblock %}
{% block extra_js %}
<script>
// Vereinfachtes Dashboard mit minimaler JavaScript-Abhängigkeit
document.addEventListener('DOMContentLoaded', function() {
// Klickbare Drucker-Karten
const printerCards = document.querySelectorAll('[data-printer-id]');
printerCards.forEach(card => {
card.style.cursor = 'pointer';
card.addEventListener('click', () => {
const printerId = card.dataset.printerId;
if (printerId) {
window.location.href = `/printers/${printerId}`;
}
});
});
// Job-Zeilen klickbar machen
const jobRows = document.querySelectorAll('tbody tr[data-job-id]');
jobRows.forEach(row => {
row.style.cursor = 'pointer';
row.addEventListener('click', () => {
const jobId = row.dataset.jobId;
if (jobId) {
window.location.href = `/jobs#job-${jobId}`;
}
});
});
// Einfache Hover-Effekte
const cards = document.querySelectorAll('.dashboard-card');
cards.forEach(card => {
card.addEventListener('mouseenter', () => {
card.style.transform = 'translateY(-2px)';
});
card.addEventListener('mouseleave', () => {
card.style.transform = 'translateY(0)';
});
});
console.log('✅ Vereinfachtes Dashboard geladen');
});
// Auto-Refresh alle 60 Sekunden (optional)
{% if config.get('AUTO_REFRESH_DASHBOARD', False) %}
setTimeout(() => {
window.location.reload();
}, 60000);
{% endif %}
</script>
<!-- Auto-Refresh über Jinja-Macro -->
{% if config.get('AUTO_REFRESH_DASHBOARD', False) %}
{{ auto_refresh(60) }}
{% endif %}
<!-- Minimal CSS für Interaktivität ohne JavaScript -->
<style>
/* CSS-basierte Hover-Effekte für Dashboard-Karten */
.dashboard-card {
transition: transform 0.2s ease-in-out;
}
.dashboard-card:hover {
transform: translateY(-2px);
}
/* Klickbare Drucker-Karten mit CSS-Cursor */
[data-printer-id] {
cursor: pointer;
}
/* Klickbare Job-Zeilen */
tbody tr[data-job-id] {
cursor: pointer;
}
/* Zebra-Streifen für bessere Lesbarkeit */
tbody tr:nth-child(even) {
background-color: rgba(0, 0, 0, 0.02);
}
.dark tbody tr:nth-child(even) {
background-color: rgba(255, 255, 255, 0.02);
}
</style>
{% endblock %}