changes to the student Name Processing

changes to the user processing in the api_item_datail Function
slight change to get the right information out of a database record
2026-10-20 20:07:23 +02:00 · 2026-10-20 19:20:36 +02:00 · 2026-10-20 19:08:58 +02:00
1 changed files with 17 additions and 18 deletions
@@ -4498,17 +4498,25 @@ def api_item_detail(item_id):
        else:
            status_label = 'Verfügbar'

+        # Helper function to get borrower display name
+        def get_borrower_name(user_raw):
+            if not user_raw:
+                return ''
+            try:
+                user_doc = student_cards_col.find_one({'_id': ObjectId(user_raw)})
+                if user_doc:
+                    if user_doc.get('SchülerName'):
+                        return decrypt_text(str(user_doc.get('SchülerName', '')))
+                    return str(user_doc.get('AusweisId', ''))
+            except Exception:
+                pass
+            return str(user_raw)
+
        # Prefer the most recent active borrower across the group
        borrower_value = ''
        for rec in borrow_records:
            if rec.get('Status') == 'active' and rec.get('User'):
-                try:
-                    user_raw = rec.get('User')
-                    user_doc = student_cards_col.find_one({'_id': ObjectId(user_raw)}) if user_raw else None
-                    if user_doc:
-                        borrower_value = decrypt_text(str(user_doc.get('SchülerName', ''))) if user_doc.get('SchülerName') else str(user_doc.get('AusweisId', ''))
-                except Exception:
-                    borrower_value = str(rec.get('User', ''))
+                borrower_value = get_borrower_name(rec.get('User'))
                break
        
        if not borrower_value and item.get('User'):
@@ -4531,22 +4539,13 @@ def api_item_detail(item_id):
            rows = []
            
            for rec in borrow_records[:3]:
-                user_raw = rec.get('User')
-                app.logger.debug(f"Processing borrow record: {rec}")
-                user_doc = student_cards_col.find_one({'_id': ObjectId(user_raw)}) if user_raw else None
-                app.logger.debug(f"Found user_doc: {user_doc}")
-                if user_doc:
-                    borrower_value = decrypt_text(str(user_doc.get('SchülerName', ''))) if user_doc.get('SchülerName') else str(user_doc.get('AusweisId', ''))
-                try:
-                    user = user_doc if user_doc is not None else ''
-                except Exception:
-                    user = user_doc
+                rec_borrower_name = get_borrower_name(rec.get('User')) or '-'
                status = rec.get('Status', '')
                start = fmt_dt(rec.get('Start'))
                end = fmt_dt(rec.get('End'))
                notes = html.escape(str(rec.get('Notes') or ''))
                rows.append(
-                    f"<li><strong>{html.escape(str(user or '-'))}</strong> — "
+                    f"<li><strong>{html.escape(rec_borrower_name)}</strong> — "
                    f"{html.escape(str(status))} — "
                    f"{html.escape(str(start))} → {html.escape(str(end))}"
                    f"{(' — ' + notes) if notes else ''}</li>"
Author	SHA1	Message	Date
Aiirondev_dev	363f0df530	changes to the student Name Processing	2026-10-20 20:07:23 +02:00
Aiirondev_dev	34bb3cf4c3	changes to the user processing in the api_item_datail Function	2026-10-20 19:20:36 +02:00
Aiirondev_dev	18706c6d1c	slight change to get the right information out of a database record	2026-10-20 19:08:58 +02:00