This commit is contained in:
+22
-21
@@ -3747,8 +3747,8 @@ def mahnungen_admin():
|
|||||||
item_doc = item_map.get(item_id, {})
|
item_doc = item_map.get(item_id, {})
|
||||||
item_name = item_doc.get('Name', item_id)
|
item_name = item_doc.get('Name', item_id)
|
||||||
item_code = item_doc.get('Code_4', '')
|
item_code = item_doc.get('Code_4', '')
|
||||||
if item_code:
|
|
||||||
item_name = f"{item_name} ({item_code})"
|
# ENTFERNT: item_name = f"{item_name} ({item_code})" - Wir übergeben es separat ans Frontend
|
||||||
|
|
||||||
raw_user = str(record.get('User') or '')
|
raw_user = str(record.get('User') or '')
|
||||||
decrypted_user = decrypt_text(raw_user)
|
decrypted_user = decrypt_text(raw_user)
|
||||||
@@ -3766,27 +3766,28 @@ def mahnungen_admin():
|
|||||||
days_overdue = (current_time_naive - due_date_naive).days
|
days_overdue = (current_time_naive - due_date_naive).days
|
||||||
else:
|
else:
|
||||||
days_overdue = 0
|
days_overdue = 0
|
||||||
|
overdue_list.append({
|
||||||
|
'id': str(record.get('_id')),
|
||||||
|
'item_name': item_name,
|
||||||
|
'item_code': item_code,
|
||||||
|
'ausweis_id': ausweis_id,
|
||||||
|
'schueler_name': student_name,
|
||||||
|
'klasse': student_class,
|
||||||
|
'email': student_email,
|
||||||
|
'due_date': fmt_dt(due_date_obj),
|
||||||
|
'days_overdue': days_overdue,
|
||||||
|
'mahnstufe': record.get('Mahnstufe', 0),
|
||||||
|
'is_blocked': is_blocked
|
||||||
|
})
|
||||||
|
|
||||||
overdue_list.append({
|
|
||||||
'id': str(record.get('_id')),
|
|
||||||
'item_name': item_name,
|
|
||||||
'ausweis_id': ausweis_id,
|
|
||||||
'schueler_name': student_name,
|
|
||||||
'klasse': student_class,
|
|
||||||
'email': student_email,
|
|
||||||
'due_date': fmt_dt(due_date_obj),
|
|
||||||
'days_overdue': days_overdue,
|
|
||||||
'mahnstufe': record.get('Mahnstufe', 0),
|
|
||||||
'is_blocked': is_blocked
|
|
||||||
})
|
|
||||||
|
|
||||||
return render_template(
|
|
||||||
'mahnungen_admin.html',
|
|
||||||
overdue_list=overdue_list,
|
|
||||||
library_module_enabled=cfg.MODULES.is_enabled('library'),
|
|
||||||
student_cards_module_enabled=cfg.MODULES.is_enabled('student_cards'),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
return render_template(
|
||||||
|
'mahnungen_admin.html',
|
||||||
|
overdue_items=overdue_list,
|
||||||
|
# KORRIGIERT: 'overdue_items' statt 'overdue_list', damit es zum HTML passt
|
||||||
|
library_module_enabled=cfg.MODULES.is_enabled('library'),
|
||||||
|
student_cards_module_enabled=cfg.MODULES.is_enabled('student_cards'),
|
||||||
|
)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
app.logger.error(f"Fehler beim Laden der Mahnungsverwaltung: {e}")
|
app.logger.error(f"Fehler beim Laden der Mahnungsverwaltung: {e}")
|
||||||
flash('Fehler beim Laden der Mahnungsverwaltung.', 'error')
|
flash('Fehler beim Laden der Mahnungsverwaltung.', 'error')
|
||||||
|
|||||||
Reference in New Issue
Block a user