блоки 2 и 3 доработки интерфейса системы тестирования

This commit is contained in:
Константин Лебединский
2026-04-29 21:06:17 +05:00
parent eff3fda5b0
commit bba96f8f9f
37 changed files with 4440 additions and 1292 deletions
+68 -4
View File
@@ -14,7 +14,7 @@ from flask import (
url_for,
)
from ..config import is_assignment_feature_enabled, is_dev_ui
from ..config import get_dev_fio_password, is_assignment_feature_enabled, is_dev_ui
from ..messages import RU
from .decorators import login_required, current_user
from .services import AuthError, authenticate_credentials
@@ -46,7 +46,11 @@ def _do_login(login: str, password: str):
def login_page():
if current_user() is not None:
return redirect(_safe_next('/'))
return render_template('auth/login.html', next=_safe_next('/'))
return render_template(
'auth/login.html',
next=_safe_next('/'),
dev_fio_enabled=bool(get_dev_fio_password()),
)
@auth_bp.route('/login', methods=['POST'])
@@ -57,11 +61,21 @@ def login_submit():
_do_login(login, password)
except AuthError as e:
flash(e.message, 'error')
return render_template('auth/login.html', next=_safe_next('/'), login=login), e.status
return render_template(
'auth/login.html',
next=_safe_next('/'),
login=login,
dev_fio_enabled=bool(get_dev_fio_password()),
), e.status
except Exception:
log.exception('login_submit failed')
flash(RU['loginFailed'], 'error')
return render_template('auth/login.html', next=_safe_next('/'), login=login), 500
return render_template(
'auth/login.html',
next=_safe_next('/'),
login=login,
dev_fio_enabled=bool(get_dev_fio_password()),
), 500
return redirect(_safe_next('/'))
@@ -96,6 +110,56 @@ def api_logout():
return jsonify(message=RU['loggedOut'])
@auth_bp.route('/api/auth/dev/assignment-directory', methods=['GET'])
@login_required
def api_assignment_directory():
"""Список сотрудников для назначения теста с поиском по имени/логину и фильтром отдела."""
from ..db import get_session
from ..models import Department, User as UserModel
q_str = (request.args.get('q') or '').strip()
dept_filter = (request.args.get('department') or '').strip()
clinic_filter = (request.args.get('clinic') or 'all').strip()
session = get_session()
dept_rows = session.query(Department).order_by(Department.name).all()
dept_by_name = {d.name: d.id for d in dept_rows}
departments = [d.name for d in dept_rows]
query = (
session.query(UserModel)
.filter(UserModel.is_active.is_(True))
)
if q_str:
like = f'%{q_str}%'
query = query.filter(
UserModel.full_name.ilike(like) | UserModel.login.ilike(like)
)
if dept_filter and dept_filter in dept_by_name:
query = query.filter(UserModel.department_id == dept_by_name[dept_filter])
if clinic_filter == 'with':
query = query.filter(UserModel.staff_id.isnot(None))
elif clinic_filter == 'without':
query = query.filter(UserModel.staff_id.is_(None))
users = query.order_by(UserModel.full_name).limit(200).all()
dept_name_by_id = {d.id: d.name for d in dept_rows}
people = [
{
'staffId': str(u.id),
'fio': u.full_name,
'webLogin': u.login,
'role': u.role,
'department': dept_name_by_id.get(u.department_id) if u.department_id else None,
'clinicUserId': u.staff_id,
}
for u in users
]
return jsonify(people=people, departments=departments)
@auth_bp.route('/api/auth/me', methods=['GET'])
@login_required
def api_me():