changes to the username generation to have a more brother view

Web/app.py

@@ -1984,7 +1984,7 @@ def _upload_student_cards_excel():
 
     if not current_permissions['actions'].get('can_manage_user', False):
         flash('Ihnen fehlen die nötigen Berechtigungen, um diese Aktion auszuführen.', 'error')
-        return redirect(url_for('library'))
+        return redirect(url_for('library_view'))
 
     if not cfg.MODULES.is_enabled('student_cards'):
         flash('Schülerausweis-Modul ist deaktiviert.', 'error')
@@ -2882,47 +2882,21 @@ def user_status():
 
 
 ##################################################### changes to be made to account for the new account permison managment system ##############################
-""""
+
 @app.route('/')
 def home():
-    """"""
+    """
     Main route for the application homepage.
     Redirects to the appropriate view based on user role.
     
     Returns:
         flask.Response: Rendered template or redirect
-    """"""
+    """
     if 'username' not in session:
         flash('Bitte mit registriertem Konto anmelden!', 'error')
         return redirect(url_for('login'))
         
-    if not cfg.MODULES.is_enabled('inventory'):
+    return redirect(url_for('home_admin'))
-        if cfg.MODULES.is_enabled('library'):
-            return redirect('/library')
-        else:
-            return "Weder Inventar- noch Bibliotheks-Modul sind aktiviert.", 403
-
-    elif not us.check_admin(session['username']):
-        return render_template(
-            'main.html',
-            username=session['username'],
-            library_module_enabled=cfg.MODULES.is_enabled('library'),
-            student_cards_module_enabled=cfg.MODULES.is_enabled('student_cards'),
-            mail_module_enabled=cfg.MODULES.is_enabled('mail'),
-            student_default_borrow_days=cfg.STUDENT_DEFAULT_BORROW_DAYS,
-            student_max_borrow_days=cfg.STUDENT_MAX_BORROW_DAYS,
-            open_item=request.args.get('open_item')
-        )
-    else:
-        permissions = _get_current_user_permissions() or us.build_default_permission_payload('standard_user')
-        if _page_access_allowed(permissions, 'home_admin') and _action_access_allowed(permissions, 'can_manage_settings'):
-            return redirect(url_for('home_admin'))
-
-        fallback_endpoint = _permission_denied_fallback_endpoint(permissions, current_endpoint='home')
-        if fallback_endpoint == 'logout':
-            flash('Für diesen Benutzer sind aktuell keine Seiten freigegeben.', 'error')
-        return redirect(url_for(fallback_endpoint))
-"""
 
 @app.route('/home_admin')
 def home_admin():
@@ -3679,7 +3653,7 @@ def api_library_item_update(item_id):
     
     if not current_permissions['actions'].get('can_edit', False):
         flash('Ihnen fehlen die nötigen Berechtigungen, um diese Aktion auszuführen.', 'error')
-        return redirect(url_for('library'))
+        return redirect(url_for('library_view'))
     if not cfg.MODULES.is_enabled('library'):
         return jsonify({'ok': False, 'message': 'Bibliotheks-Modul ist deaktiviert.'}), 403
 
@@ -3912,7 +3886,7 @@ def student_cards_admin():
     
     if not current_permissions['actions'].get('can_manage_users', False):
         flash('Ihnen fehlen die nötigen Berechtigungen, um diese Aktion auszuführen.', 'error')
-        return redirect(url_for('library'))
+        return redirect(url_for('library_view'))
     if not cfg.MODULES.is_enabled('student_cards'):
         flash('Schülerausweis-Modul ist deaktiviert.', 'error')
         return redirect(url_for('home_admin'))
@@ -4057,7 +4031,7 @@ def student_cards_print():
         
     if not current_permissions['actions'].get('can_manage_users', False):
         flash('Ihnen fehlen die nötigen Berechtigungen, um diese Aktion auszuführen.', 'error')
-        return redirect(url_for('library'))
+        return redirect(url_for('library_view'))
     if not cfg.MODULES.is_enabled('student_cards'):
         flash('Schülerausweis-Modul ist deaktiviert.', 'error')
         return redirect(url_for('home_admin'))
@@ -4091,7 +4065,7 @@ def student_card_barcode_print():
         
     if not current_permissions['actions'].get('can_manage_users', False):
         flash('Ihnen fehlen die nötigen Berechtigungen, um diese Aktion auszuführen.', 'error')
-        return redirect(url_for('library'))
+        return redirect(url_for('library_view'))
     if not cfg.MODULES.is_enabled('student_cards'):
         flash('Schülerausweis-Modul ist deaktiviert.', 'error')
         return redirect(url_for('home_admin'))
@@ -4124,7 +4098,7 @@ def student_card_barcode_download():
         
     if not current_permissions['actions'].get('can_manage_users', False):
         flash('Ihnen fehlen die nötigen Berechtigungen, um diese Aktion auszuführen.', 'error')
-        return redirect(url_for('library'))
+        return redirect(url_for('library_view'))
     if not cfg.MODULES.is_enabled('student_cards'):
         flash('Schülerausweis-Modul ist deaktiviert.', 'error')
         return redirect(url_for('home_admin'))
@@ -4308,7 +4282,7 @@ def student_card_single_barcode_download(card_id):
         
     if not current_permissions['actions'].get('can_manage_users', False):
         flash('Ihnen fehlen die nötigen Berechtigungen, um diese Aktion auszuführen.', 'error')
-        return redirect(url_for('library'))
+        return redirect(url_for('library_view'))
     if not cfg.MODULES.is_enabled('student_cards'):
         flash('Schülerausweis-Modul ist deaktiviert.', 'error')
         return redirect(url_for('home_admin'))
@@ -6392,7 +6366,7 @@ def delete_item(id):
     
     if not cfg.MODULES.is_enabled('inventory'):
         flash('Bibliotheks-Modul ist deaktiviert.', 'error')
-        return redirect(url_for('library'))
+        return redirect(url_for('library_view'))
     
     # Resolve all related item ids (grouped variants) and load their data
     group_item_ids = it.get_group_item_ids(id)
@@ -6530,7 +6504,7 @@ def bulk_delete_items():
     
     if not cfg.MODULES.is_enabled('inventory'):
         flash('Bibliotheks-Modul ist deaktiviert.', 'error')
-        return redirect(url_for('library'))
+        return redirect(url_for('library_view'))
 
     payload = request.get_json(silent=True) or {}
     item_ids = payload.get('item_ids') or request.form.getlist('item_ids')
@@ -6595,7 +6569,7 @@ def edit_item(id):
     
     if not cfg.MODULES.is_enabled('inventory'):
         flash('Bibliotheks-Modul ist deaktiviert.', 'error')
-        return redirect(url_for('library'))
+        return redirect(url_for('library_view'))
     
     # Strip whitespace from all text fields
     name = sanitize_form_value(request.form.get('name'))
@@ -6725,7 +6699,7 @@ def update_group():
 
     if not current_permissions['actions'].get('can_edit', False):
         flash('Ihnen fehlen die nötigen Berechtigungen, um diese Aktion (Löschen) auszuführen.', 'error')
-        return redirect(url_for('library'))
+        return redirect(url_for('library_view'))
     
     data = request.get_json()
     series_group_id = data.get('series_group_id')
@@ -7073,9 +7047,10 @@ def ausleihen(id):
         if current_permissions['actions'].get('can_borrow') and not is_library_item:
             if student_card_id:
                 student_user = us.get_user_by_student_card(student_card_id)
+                app.logger.debug(f"Borrowing on behalf of student card {student_card_id}: found user {student_user}")
                 if not student_user:
                     flash('Keine Schülerin/kein Schüler mit dieser Ausweis-ID gefunden.', 'error')
-                    return redirect(url_for('library'))
+                    return redirect(url_for('library_view'))
                 effective_borrower = student_user.get('Username') or student_user.get('username') or username
                 if borrow_duration_days is None:
                     try:
@@ -7941,7 +7916,7 @@ def register():
             name = (request.form.get('name') or '').strip()
             last_name = (request.form.get('last-name') or '').strip()
 
-            # Generate a username from the first 2 letters of first and last name.
+            # Generate a username from the first 3 letters of first and last name.
             username = us.build_unique_username_from_name(name, last_name)
             
             permission_preset = (request.form.get('permission_preset') or 'standard_user').strip()
@@ -9112,7 +9087,7 @@ def library_item_invoices(item_id):
                 
     if not current_permissions['pages'].get('library_loans_admin', False):
         flash('Ihnen fehlen die nötigen Berechtigungen, um diese Aktion auszuführen.', 'error')
-        return redirect(url_for('library'))
+        return redirect(url_for('library_view'))
 
     client = None
     try:
@@ -10019,7 +9994,7 @@ def fetch_book_info(isbn):
             
     if not current_permissions['actions'].get('can_insert', False):
         flash('Ihnen fehlen die nötigen Berechtigungen, um diese Aktion auszuführen.', 'error')
-        return redirect(url_for('library'))
+        return redirect(url_for('library_view'))
 
     if not cfg.MODULES.is_enabled('library'):
         return jsonify({"error": "Bibliotheks-Modul ist deaktiviert."}), 403
@@ -10070,7 +10045,7 @@ def download_book_cover():
             
     if not current_permissions['actions'].get('can_insert', False):
         flash('Ihnen fehlen die nötigen Berechtigungen, um diese Aktion auszuführen.', 'error')
-        return redirect(url_for('library'))
+        return redirect(url_for('library_view'))
     if not cfg.MODULES.is_enabled('library'):
         return jsonify({"error": "Bibliotheks-Modul ist deaktiviert."}), 403
     

Web/modules/database/user.py

@@ -97,18 +97,18 @@ def build_name_synonym(first_name, last_name=''):
     last = _clean_name_fragment(last_name)
 
     if first and last:
-        return (first[:2] + last[:2]).title()
+        return (first[:3] + last[:3]).title()
 
     combined = (first + last)
     if not combined:
         return 'User'
-    return combined[:4].title()
+    return combined[:6].title()
 
 
 def build_username_from_name(first_name, last_name=''):
     """
     Build a deterministic username abbreviation from first and last name.
-    Uses 2 letters from each name and stores it lowercase.
+    Uses 3 letters from each name and stores it lowercase.
     
     Args:
         first_name (str): First name
@@ -123,12 +123,12 @@ def build_username_from_name(first_name, last_name=''):
 
 def build_unique_username_from_name(first_name, last_name=''):
     """
-    Build a unique username from the first 2 letters of the first name and
+    Build a unique username from the first 3 letters of the first name and
-    the first 2 letters of the last name.
+    the first 3 letters of the last name.
     """
     first = _clean_name_fragment(first_name)
     last = _clean_name_fragment(last_name)
-    base_username = (first[:2] + last[:2]).lower()
+    base_username = (first[:3] + last[:3]).lower()
 
     if not base_username:
         base_username = 'user'
@@ -594,8 +594,8 @@ def student_card_exists(student_card_id):
         return False
     client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
     db = _get_tenant_db(client)
-    users = db['users']
+    users = db['student_cards']
-    exists = users.find_one({'StudentCardId': normalized}) is not None
+    exists = users.find_one({'SchülerName': normalized}) is not None
     client.close()
     return exists
 
@@ -607,8 +607,8 @@ def get_user_by_student_card(student_card_id):
         return None
     client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
     db = _get_tenant_db(client)
-    users = db['users']
+    users = db['student_cards']
-    found_user = users.find_one({'StudentCardId': normalized})
+    found_user = users.find_one({'SchülerName': normalized})
     client.close()
     return found_user