Externe Datei-Links + Power-User-Rolle + PAROL6-Demo
Block A — Externe Links:
- projekt_datei.extern_url: eine "Datei" kann Upload (BLOB) ODER Link sein
- Link-Route /cockpit/projekt/<id>/link, Werkstatt-UI mit Link-Feld
- Katalog + Detail rendern Links als "Oeffnen ↗", Uploads als Download
- Upload-Limit 30 -> 60 MB (grosse Bambu-3MF); darueber: externer Link
Block B — Power-User-Rolle:
- profil.rolle ('schueler'|'power'); Login setzt Session-Rolle
- Decorator power_oder_admin; ist_power-Helper
- Login-Kacheln: Power mit 🔧 statt Tier; Admin-Profilanlage mit Rollen-Dropdown
(Tier nur bei schueler Pflicht, Power kriegt Platzhalter-Slug 'power')
- Cockpit: kein Check-In fuer Power, stattdessen "Power-Werkzeuge"-Karte
- Power-Projekt-Regeln: mehrere parallel erlaubt, Abschluss direkt 'freigegeben'
- Rechte power_oder_admin: Drucker-Verwaltung, Software-Katalog,
Slot-fuer-SuS, inline-edit (beschraenkt auf drucker+software_seite)
- Bleibt admin-only: SuS-Profile, Projekt-Freigaben, Admin-Dashboard
- Power-relevante Admin-Templates: Zurueck-Link rollenabhaengig (Cockpit statt Dashboard)
Block C — PAROL6-Demo:
- scripts/seed_demo_parol6.py: Power-Profil 'Herb' + PAROL6-Roboterarm-Projekt
- GitHub-Repo als Link, Bauanleitung-PDF als BLOB, Cover aus 3MF-Render
- abgeschlossen+freigegeben -> im Katalog, als Vorlage waehlbar
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -6,7 +6,8 @@
|
||||
<h1>Drucker-Verwaltung</h1>
|
||||
<div>
|
||||
<a href="{{ url_for('oeffentlich.drucker') }}" class="btn btn-secondary">SuS-Ansicht</a>
|
||||
<a href="{{ url_for('admin.dashboard') }}" class="btn btn-secondary">← Dashboard</a>
|
||||
{% if session.admin %}<a href="{{ url_for('admin.dashboard') }}" class="btn btn-secondary">← Dashboard</a>
|
||||
{% else %}<a href="{{ url_for('profil.cockpit') }}" class="btn btn-secondary">← Cockpit</a>{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -13,14 +13,21 @@
|
||||
<div class="card">
|
||||
<h2>Neues Profil anlegen</h2>
|
||||
<form method="post" action="{{ url_for('admin.profil_neu') }}"
|
||||
style="display: grid; grid-template-columns: 1fr 1fr 1fr auto; gap: 0.6rem; align-items: end;">
|
||||
style="display: grid; grid-template-columns: 1.2fr 1fr 1.4fr 1fr auto; gap: 0.6rem; align-items: end;">
|
||||
<div>
|
||||
<label style="display:block; font-size: 0.85rem; color: var(--text-light);">Vorname</label>
|
||||
<input type="text" name="vorname" required style="padding: 0.5rem; width: 100%; border: 1px solid var(--border); border-radius: 4px;">
|
||||
</div>
|
||||
<div>
|
||||
<label style="display:block; font-size: 0.85rem; color: var(--text-light);">Rolle</label>
|
||||
<select name="rolle" id="rolle-select" style="padding: 0.5rem; width: 100%; border: 1px solid var(--border); border-radius: 4px;">
|
||||
<option value="schueler">Schueler</option>
|
||||
<option value="power">🔧 Power-User</option>
|
||||
</select>
|
||||
</div>
|
||||
<div id="tier-feld">
|
||||
<label style="display:block; font-size: 0.85rem; color: var(--text-light);">Tier-Icon</label>
|
||||
<select name="tier" required style="padding: 0.5rem; width: 100%; border: 1px solid var(--border); border-radius: 4px;">
|
||||
<select name="tier" id="tier-select" style="padding: 0.5rem; width: 100%; border: 1px solid var(--border); border-radius: 4px;">
|
||||
<option value="">— waehlen —</option>
|
||||
{% for t in tiere %}
|
||||
<option value="{{ t.slug }}">{{ t.emoji }} {{ t.name }}</option>
|
||||
@@ -39,7 +46,25 @@
|
||||
</form>
|
||||
<p style="margin-top: 0.8rem; font-size: 0.85rem; color: var(--text-light);">
|
||||
Eine 4-stellige PIN wird automatisch erzeugt und nach dem Speichern <strong>einmal</strong> angezeigt.
|
||||
<strong>Power-User</strong> (fortgeschrittene SuS oder du selbst) brauchen kein Tier und duerfen
|
||||
Drucker + Software verwalten + Slots fuer andere anlegen + mehrere Projekte fuehren.
|
||||
</p>
|
||||
<script>
|
||||
// Tier-Auswahl ausblenden, wenn Power-User gewaehlt wird
|
||||
(function() {
|
||||
var rolle = document.getElementById('rolle-select');
|
||||
var tierFeld = document.getElementById('tier-feld');
|
||||
var tierSelect = document.getElementById('tier-select');
|
||||
function sync() {
|
||||
var istPower = rolle.value === 'power';
|
||||
tierFeld.style.opacity = istPower ? '0.4' : '1';
|
||||
tierSelect.required = !istPower;
|
||||
tierSelect.disabled = istPower;
|
||||
}
|
||||
rolle.addEventListener('change', sync);
|
||||
sync();
|
||||
})();
|
||||
</script>
|
||||
</div>
|
||||
|
||||
<!-- Liste -->
|
||||
@@ -62,9 +87,11 @@
|
||||
<tbody>
|
||||
{% for p in profile %}
|
||||
<tr style="{% if not p.aktiv %}opacity: 0.5;{% endif %}">
|
||||
<td style="font-size: 1.5rem;">{{ tier_emoji(p.tier) }}</td>
|
||||
<td><strong>{{ p.vorname }}</strong></td>
|
||||
<td>{{ tier_name(p.tier) }}</td>
|
||||
<td style="font-size: 1.5rem;">{% if p.rolle == 'power' %}🔧{% else %}{{ tier_emoji(p.tier) }}{% endif %}</td>
|
||||
<td><strong>{{ p.vorname }}</strong>
|
||||
{% if p.rolle == 'power' %}<span class="badge badge-mittel" style="margin-left: 0.3rem;">Power</span>{% endif %}
|
||||
</td>
|
||||
<td>{% if p.rolle == 'power' %}<span style="color: var(--text-light);">—</span>{% else %}{{ tier_name(p.tier) }}{% endif %}</td>
|
||||
<td>{{ p.ag_name or p.ag_id }}</td>
|
||||
<td>{% if p.aktiv %}<span class="badge badge-anfaenger">aktiv</span>{% else %}<span class="badge">inaktiv</span>{% endif %}</td>
|
||||
<td>
|
||||
|
||||
@@ -6,7 +6,8 @@
|
||||
<h1>Slot-Uebersicht</h1>
|
||||
<div>
|
||||
<a href="{{ url_for('admin.slot_neu_lehrer') }}" class="btn btn-primary">+ Neuer Slot fuer SuS</a>
|
||||
<a href="{{ url_for('admin.dashboard') }}" class="btn btn-secondary">← Dashboard</a>
|
||||
{% if session.admin %}<a href="{{ url_for('admin.dashboard') }}" class="btn btn-secondary">← Dashboard</a>
|
||||
{% else %}<a href="{{ url_for('profil.cockpit') }}" class="btn btn-secondary">← Cockpit</a>{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -5,7 +5,8 @@
|
||||
<h1>Software-Karten</h1>
|
||||
<div>
|
||||
<a href="{{ url_for('oeffentlich.software') }}" class="btn btn-secondary">Oeffentliche Seite ansehen</a>
|
||||
<a href="{{ url_for('admin.admin_logout') }}" class="btn btn-secondary">Admin-Logout</a>
|
||||
{% if session.admin %}<a href="{{ url_for('admin.admin_logout') }}" class="btn btn-secondary">Admin-Logout</a>
|
||||
{% else %}<a href="{{ url_for('profil.cockpit') }}" class="btn btn-secondary">← Cockpit</a>{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -53,7 +53,25 @@
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
{# ====== Check-In-Modal — wenn heute noch nichts gewaehlt wurde ====== #}
|
||||
{# ====== POWER-WERKZEUGE (nur fuer Power-User) ====== #}
|
||||
{% if session.rolle == 'power' %}
|
||||
<div class="card" style="border-left: 4px solid var(--primary);">
|
||||
<h2>🔧 Power-Werkzeuge</h2>
|
||||
<p style="color: var(--text-light); font-size: 0.9rem; margin-bottom: 0.8rem;">
|
||||
Du bist Power-User — hier deine Verwaltungs-Bereiche. SuS-Profile und Projekt-Freigaben
|
||||
bleiben dem Lehrer-Admin vorbehalten.
|
||||
</p>
|
||||
<div style="display: flex; gap: 0.5rem; flex-wrap: wrap;">
|
||||
<a href="{{ url_for('admin.admin_drucker') }}" class="btn btn-secondary">🖨️ Drucker verwalten</a>
|
||||
<a href="{{ url_for('admin.software_liste') }}" class="btn btn-secondary">🖥️ Software-Katalog</a>
|
||||
<a href="{{ url_for('admin.slot_neu_lehrer') }}" class="btn btn-secondary">🔖 Slot fuer SuS</a>
|
||||
<a href="{{ url_for('profil.projekt_neu') }}" class="btn btn-primary">+ Projekt anlegen</a>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{# ====== Check-In-Modal — wenn heute noch nichts gewaehlt wurde (nicht fuer Power) ====== #}
|
||||
{% if session.rolle != 'power' %}
|
||||
{% if not status.check_in_heute %}
|
||||
<div class="card" style="border-top: 4px solid var(--primary);">
|
||||
<h2>Was machst du heute? 🎯</h2>
|
||||
@@ -117,6 +135,7 @@
|
||||
</form>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endif %}{# Ende: Check-In nur fuer Nicht-Power #}
|
||||
|
||||
{# ====== PROJEKT-KARTE — ganz oben, damit "Hier weitermachen" sofort sichtbar ist ====== #}
|
||||
{% if status.hat_projekte or not status.ist_neu or status.projekt.letztes %}
|
||||
|
||||
@@ -10,10 +10,17 @@
|
||||
{% if profile %}
|
||||
<div class="grid" style="grid-template-columns: repeat(auto-fill, minmax(160px, 1fr)); gap: 1rem; max-width: 900px; margin: 0 auto;">
|
||||
{% for p in profile %}
|
||||
<a href="{{ url_for('profil.login_pin', profil_id=p.id) }}" class="card profil-kachel">
|
||||
<a href="{{ url_for('profil.login_pin', profil_id=p.id) }}"
|
||||
class="card profil-kachel{% if p.rolle == 'power' %} profil-power{% endif %}">
|
||||
{% if p.rolle == 'power' %}
|
||||
<div style="font-size: 3rem;">🔧</div>
|
||||
<div style="font-weight: 600; margin-top: 0.3rem;">{{ p.vorname }}</div>
|
||||
<div style="font-size: 0.8rem; color: var(--text-light);">Power-User</div>
|
||||
{% else %}
|
||||
<div style="font-size: 3rem;">{{ tier_emoji(p.tier) }}</div>
|
||||
<div style="font-weight: 600; margin-top: 0.3rem;">{{ p.vorname }}</div>
|
||||
<div style="font-size: 0.8rem; color: var(--text-light);">{{ tier_name(p.tier) }}</div>
|
||||
{% endif %}
|
||||
</a>
|
||||
{% endfor %}
|
||||
</div>
|
||||
@@ -40,5 +47,9 @@
|
||||
transform: translateY(-3px);
|
||||
box-shadow: 0 6px 20px rgba(0,0,0,0.12);
|
||||
}
|
||||
.profil-power {
|
||||
border-color: var(--primary);
|
||||
background: linear-gradient(180deg, #fff, #EBF5FB);
|
||||
}
|
||||
</style>
|
||||
{% endblock %}
|
||||
|
||||
@@ -217,22 +217,26 @@
|
||||
{% if dateien %}
|
||||
<table style="margin-top: 0.5rem;">
|
||||
<thead>
|
||||
<tr><th>Datei</th><th>Typ</th><th>Groesse</th><th></th></tr>
|
||||
<tr><th>Datei / Link</th><th>Typ</th><th>Groesse</th><th></th></tr>
|
||||
</thead>
|
||||
<tbody id="dateien-tbody">
|
||||
{% for d in dateien %}
|
||||
<tr>
|
||||
<td>
|
||||
<a href="{{ url_for('api.projekt_datei_download', projekt_id=p.id, datei_id=d.id) }}">{{ d.dateiname }}</a>
|
||||
{% if d.extern_url %}
|
||||
🔗 <a href="{{ d.extern_url }}" target="_blank" rel="noopener noreferrer">{{ d.dateiname }} ↗</a>
|
||||
{% else %}
|
||||
📎 <a href="{{ url_for('api.projekt_datei_download', projekt_id=p.id, datei_id=d.id) }}">{{ d.dateiname }}</a>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td><span class="badge">{{ d.art }}</span></td>
|
||||
<td style="font-size: 0.85rem; color: var(--text-light);">
|
||||
{{ (d.groesse_bytes // 1024) if d.groesse_bytes else 0 }} KB
|
||||
{% if d.extern_url %}—{% else %}{{ (d.groesse_bytes // 1024) if d.groesse_bytes else 0 }} KB{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
<form method="post" action="{{ url_for('profil.projekt_datei_loeschen', projekt_id=p.id, datei_id=d.id) }}" style="display:inline;"
|
||||
onsubmit="return confirm('Datei {{ d.dateiname }} loeschen?')">
|
||||
<button class="btn btn-secondary" style="padding: 0.2rem 0.5rem; font-size: 0.8rem; color: var(--danger);">loeschen</button>
|
||||
onsubmit="return confirm('{{ d.dateiname }} entfernen?')">
|
||||
<button class="btn btn-secondary" style="padding: 0.2rem 0.5rem; font-size: 0.8rem; color: var(--danger);">entfernen</button>
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -241,7 +245,7 @@
|
||||
</table>
|
||||
{% else %}
|
||||
<p style="color: var(--text-light); margin-top: 0.5rem;">
|
||||
<em>Noch keine Dateien.</em>
|
||||
<em>Noch keine Dateien oder Links.</em>
|
||||
</p>
|
||||
{% endif %}
|
||||
|
||||
@@ -250,13 +254,29 @@
|
||||
padding: 1.5rem; text-align: center; cursor: pointer; background: #fafafa;">
|
||||
<div style="font-size: 1.1rem; color: var(--text-light);">📁 Dateien hier ablegen</div>
|
||||
<div style="font-size: 0.85rem; color: var(--text-light); margin-top: 0.3rem;">
|
||||
oder klicken — STL, 3MF, JPG, PNG · max. 30 MB pro Datei
|
||||
oder klicken — STL, 3MF, JPG, PNG · max. 60 MB pro Datei
|
||||
</div>
|
||||
<input type="file" id="datei-input" multiple
|
||||
accept=".stl,.3mf,image/jpeg,image/png,image/webp"
|
||||
style="display: none;">
|
||||
<div id="upload-status" style="margin-top: 0.5rem; font-size: 0.85rem;"></div>
|
||||
</div>
|
||||
|
||||
{# Link statt Upload #}
|
||||
<form method="post" action="{{ url_for('profil.projekt_link_hinzufuegen', projekt_id=p.id) }}"
|
||||
style="margin-top: 0.8rem; display: flex; gap: 0.5rem; flex-wrap: wrap; align-items: flex-end;">
|
||||
<div style="flex: 1; min-width: 140px;">
|
||||
<label style="display:block; font-size: 0.8rem; color: var(--text-light);">Oder Link statt Datei — Name</label>
|
||||
<input type="text" name="dateiname" maxlength="120" placeholder="z.B. Modell auf GitHub"
|
||||
style="padding: 0.4rem; width: 100%; border: 1px solid var(--border); border-radius: 4px;">
|
||||
</div>
|
||||
<div style="flex: 2; min-width: 200px;">
|
||||
<label style="display:block; font-size: 0.8rem; color: var(--text-light);">URL</label>
|
||||
<input type="url" name="extern_url" placeholder="https://..."
|
||||
style="padding: 0.4rem; width: 100%; border: 1px solid var(--border); border-radius: 4px;">
|
||||
</div>
|
||||
<button class="btn btn-secondary" style="font-size: 0.85rem;">🔗 Link hinzufuegen</button>
|
||||
</form>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
|
||||
@@ -144,14 +144,20 @@
|
||||
|
||||
{% if p.dateien %}
|
||||
<div class="kat-dateien">
|
||||
<strong style="font-size: 0.85rem;">Dateien:</strong>
|
||||
<strong style="font-size: 0.85rem;">Dateien & Links:</strong>
|
||||
{% for d in p.dateien %}
|
||||
<a href="{{ url_for('api.projekt_datei_download', projekt_id=p.id, datei_id=d.id) }}">
|
||||
{% if d.extern_url %}
|
||||
<a href="{{ d.extern_url }}" target="_blank" rel="noopener noreferrer" onclick="event.stopPropagation();">
|
||||
🔗 {{ d.dateiname }} ↗
|
||||
</a>
|
||||
{% else %}
|
||||
<a href="{{ url_for('api.projekt_datei_download', projekt_id=p.id, datei_id=d.id) }}" onclick="event.stopPropagation();">
|
||||
📎 {{ d.dateiname }}
|
||||
<span style="color: var(--text-light); font-size: 0.75rem;">
|
||||
({{ d.art }}, {{ (d.groesse_bytes // 1024) if d.groesse_bytes else 0 }} KB)
|
||||
</span>
|
||||
</a>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
Reference in New Issue
Block a user