Push notification fix

Web/app.py

@@ -1183,7 +1183,6 @@ def create_return_reminders():
             },
             {'User': 1, 'Item': 1, 'Status': 1, 'Start': 1, 'End': 1}
         ))
-
         item_ids = []
         for entry in candidates:
             item_id = entry.get('Item')
@@ -1565,9 +1564,9 @@ def update_appointment_statuses():
                             app.logger.warning(f"Fehler beim Erstellen der Admin-Notif (Stufe 2): {n_err}")
 
                     # 2. Web-Push Notification für Admins
-                    if 'send_push_to_all_admins' in globals():
+                    if 'create_return_reminders' in globals():
                         try:
-                            send_push_to_all_admins(title=title, body=body, url=target_url)
+                            create_return_reminders(title=title, body=body, url=target_url)
                         except Exception as p_err:
                             app.logger.error(f"Fehler beim Senden der Admin-Push (Stufe 2): {p_err}")
 
@@ -1596,9 +1595,9 @@ def update_appointment_statuses():
                             app.logger.warning(f"Fehler beim Erstellen der Admin-Notif (Stufe 1): {n_err}")
 
                     # 2. Web-Push Notification für Admins
-                    if 'send_push_to_all_admins' in globals():
+                    if 'create_return_reminders' in globals():
                         try:
-                            send_push_to_all_admins(title=title, body=body, url=target_url)
+                            create_return_reminders(title=title, body=body, url=target_url)
                         except Exception as p_err:
                             app.logger.error(f"Fehler beim Senden der Admin-Push (Stufe 1): {p_err}")
 
@@ -3566,19 +3565,19 @@ def generate_test_ausleihen():
         test_students = [
             {
                 "AusweisId": "TEST-AUSWEIS-01",
-                "SchülerName": "Max Mustermann (Stufe 1 Test)",
+                "SchülerName": encrypt_text("Max Mustermann (Stufe 1 Test)"),
                 "Klasse": "9a",
                 "is_blocked": False
             },
             {
                 "AusweisId": "TEST-AUSWEIS-02",
-                "SchülerName": "Erika Musterfrau (Stufe 2 Test)",
+                "SchülerName": encrypt_text("Erika Musterfrau (Stufe 2 Test)"),
                 "Klasse": "10b",
                 "is_blocked": False
             },
             {
                 "AusweisId": "TEST-AUSWEIS-03",
-                "SchülerName": "Tom Frisch (Keine Mahnung Test)",
+                "SchülerName": encrypt_text("Tom Frisch (Keine Mahnung Test)"),
                 "Klasse": "8c",
                 "is_blocked": False
             }
@@ -3748,8 +3747,8 @@ def mahnungen_admin():
                 item_doc = item_map.get(item_id, {})
                 item_name = item_doc.get('Name', item_id)
                 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 '')
                 decrypted_user = decrypt_text(raw_user)
@@ -3767,27 +3766,28 @@ def mahnungen_admin():
                     days_overdue = (current_time_naive - due_date_naive).days
                 else:
                     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:
         app.logger.error(f"Fehler beim Laden der Mahnungsverwaltung: {e}")
         flash('Fehler beim Laden der Mahnungsverwaltung.', 'error')