Compare commits

...

3 Commits

Author SHA1 Message Date
Aiirondev_dev ffab9b7fdf changes to the mahnungen_admin
Release Inventarsystem / release-docker (push) Successful in 2m16s
2026-08-23 17:42:12 +02:00
Aiirondev_dev 2f2c71d0a4 slight changes
Release Inventarsystem / release-docker (push) Successful in 2m15s
2026-08-23 17:28:43 +02:00
Aiirondev_dev 5388562b46 slight changes
Release Inventarsystem / release-docker (push) Successful in 2m15s
2026-08-23 17:26:35 +02:00
+14 -7
View File
@@ -3641,6 +3641,7 @@ def test_mahnungen():
return val
current_time = datetime.datetime.now(ZoneInfo("Europe/Berlin"))
current_time_naive = current_time.replace(tzinfo=None)
client = None
try:
@@ -3722,8 +3723,10 @@ def test_mahnungen():
or ''
)
due_date_obj = record.get('DueDate')
days_overdue = (current_time - due_date_obj).days if due_date_obj else 0
# KORREKTUR: 'record' statt 'appt'
due_date = record.get('DueDate', current_time)
due_date_naive = due_date.replace(tzinfo=None) if due_date else current_time_naive
days_overdue = (current_time_naive - due_date_naive).days
is_blocked = user_block_map.get(raw_user, False)
overdue_list.append({
@@ -3731,7 +3734,7 @@ def test_mahnungen():
'item_name': item_name,
'user': display_user,
'klasse': user_class,
'due_date': fmt_dt(due_date_obj),
'due_date': fmt_dt(due_date), # KORREKTUR: 'due_date' statt 'due_date_obj'
'days_overdue': days_overdue,
'mahnstufe': record.get('Mahnstufe', 0),
'is_blocked': is_blocked
@@ -3823,6 +3826,7 @@ def mahnungen_admin():
return val
current_time = datetime.datetime.now(ZoneInfo("Europe/Berlin"))
current_time_naive = current_time.replace(tzinfo=None)
client = None
try:
@@ -3833,7 +3837,6 @@ def mahnungen_admin():
users_col = db['users']
student_cards_col = db['student_cards']
# Überfällige Ausleihen abrufen (Status 'active' und DueDate in der Vergangenheit)
overdue_records = list(ausleihungen_col.find({
'Status': 'active',
'DueDate': {'$lt': current_time}
@@ -3842,7 +3845,6 @@ def mahnungen_admin():
overdue_list = []
if overdue_records:
# Bulk-Lookups zur Vermeidung von N+1 Queries
item_ids = []
for r in overdue_records:
i_id = r.get('Item')
@@ -3880,7 +3882,6 @@ def mahnungen_admin():
if ausweis_id:
class_map[str(ausweis_id).strip().lower()] = dec_cls
# Datenaufbereitung für das Template
for record in overdue_records:
item_id = str(record.get('Item') or '')
item_doc = item_map.get(item_id, {})
@@ -3905,7 +3906,13 @@ def mahnungen_admin():
)
due_date_obj = record.get('DueDate')
days_overdue = (current_time - due_date_obj).days if due_date_obj else 0
if due_date_obj:
due_date_naive = due_date_obj.replace(tzinfo=None) if due_date_obj.tzinfo else due_date_obj
days_overdue = (current_time_naive - due_date_naive).days
else:
days_overdue = 0
is_blocked = user_block_map.get(raw_user, False)
overdue_list.append({