fix(dashboard): resolver metricas reales, endpoints profile y descriptor classmethod v3.6.2
This commit is contained in:
@@ -6,7 +6,7 @@ from flask_babel import Babel, gettext as _
|
||||
from config.config import Config
|
||||
|
||||
# Initialize extensions
|
||||
__version__ = "3.6.1"
|
||||
__version__ = "3.6.2"
|
||||
db = SQLAlchemy()
|
||||
migrate = Migrate()
|
||||
cors = CORS()
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
from app import db
|
||||
from datetime import datetime
|
||||
from datetime import datetime, timezone
|
||||
from app.services.crypto_service import CryptoService
|
||||
|
||||
class _hybrid_setting_method:
|
||||
"""Descriptor que resuelve si se invoca sobre la clase SystemSetting o sobre una instancia."""
|
||||
def __init__(self, inst_func, cls_func):
|
||||
self.inst_func = inst_func
|
||||
self.cls_func = cls_func
|
||||
self.inst_func = getattr(inst_func, '__func__', inst_func)
|
||||
self.cls_func = getattr(cls_func, '__func__', cls_func)
|
||||
|
||||
def __get__(self, instance, owner):
|
||||
if instance is None:
|
||||
@@ -28,7 +28,7 @@ class SystemSetting(db.Model):
|
||||
description = db.Column(db.String(255), nullable=True)
|
||||
category = db.Column(db.String(50), default='system', nullable=True)
|
||||
is_encrypted = db.Column(db.Boolean, default=False, nullable=True)
|
||||
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
|
||||
updated_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None), onupdate=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
|
||||
|
||||
def __init__(self, **kwargs):
|
||||
super().__init__(**kwargs)
|
||||
@@ -54,7 +54,6 @@ class SystemSetting(db.Model):
|
||||
pass
|
||||
return default
|
||||
|
||||
@classmethod
|
||||
def _cls_get_decrypted_value(cls, key, default=None):
|
||||
try:
|
||||
record = cls.query.filter_by(key=key).first()
|
||||
@@ -79,7 +78,6 @@ class SystemSetting(db.Model):
|
||||
pass
|
||||
return default
|
||||
|
||||
@classmethod
|
||||
def _cls_get_masked_value(cls, key, default=''):
|
||||
try:
|
||||
record = cls.query.filter_by(key=key).first()
|
||||
@@ -122,7 +120,7 @@ class SystemSetting(db.Model):
|
||||
if category:
|
||||
record.category = category
|
||||
record.is_encrypted = is_encrypted
|
||||
record.updated_at = datetime.utcnow()
|
||||
record.updated_at = datetime.now(timezone.utc).replace(tzinfo=None)
|
||||
db.session.commit()
|
||||
return record
|
||||
|
||||
|
||||
@@ -151,6 +151,29 @@ def get_stats():
|
||||
upcoming_reservations = [serialize_reservation(r) for r in upcoming_reservations_q]
|
||||
milestones = [serialize_milestone(m) for m in milestones_q]
|
||||
|
||||
jwt_user = getattr(g, 'jwt_user', None)
|
||||
user_id = getattr(jwt_user, 'id', None)
|
||||
|
||||
my_today_count = 0
|
||||
my_total_reservations = 0
|
||||
my_today_classes = []
|
||||
if user_id:
|
||||
my_today_q = Reservation.query.filter(
|
||||
Reservation.user_id == user_id,
|
||||
func.date(Reservation.start_time) == today,
|
||||
Reservation.status != 'CANCELLED'
|
||||
).order_by(Reservation.start_time.asc()).all()
|
||||
my_today_count = len(my_today_q)
|
||||
my_today_classes = [serialize_reservation(r) for r in my_today_q]
|
||||
my_total_reservations = Reservation.query.filter(
|
||||
Reservation.user_id == user_id,
|
||||
Reservation.status.in_(['CONFIRMED', 'PENDING'])
|
||||
).count()
|
||||
else:
|
||||
my_today_count = today_reservations
|
||||
my_total_reservations = len(today_reservations_q)
|
||||
my_today_classes = today_schedule_list[:5]
|
||||
|
||||
# ---- Bedelía: Filtros completos de Aulas y Comisiones por Día (Hoy), Mañana, Semana y Mes ----
|
||||
import calendar
|
||||
today_dt = datetime.utcnow()
|
||||
@@ -564,12 +587,16 @@ def get_stats():
|
||||
'unassigned_today_classrooms': unassigned_today_count,
|
||||
'unassigned_today_pct': unassigned_today_pct,
|
||||
'total_active_commissions': total_active_commissions,
|
||||
'tomorrow_reservations': len(tomorrow_reservations_q) if 'tomorrow_reservations_q' in locals() else 0
|
||||
'tomorrow_reservations': len(tomorrow_reservations_q) if 'tomorrow_reservations_q' in locals() else 0,
|
||||
'my_today_count': my_today_count,
|
||||
'my_total_reservations': my_total_reservations,
|
||||
'virtual_rooms_count': virtual_classrooms
|
||||
},
|
||||
'audit_logs': audit_data,
|
||||
'monthly_data': monthly_data,
|
||||
'pending_reservations': pending_reservations,
|
||||
'today_schedule_list': today_schedule_list,
|
||||
'my_today_classes': my_today_classes,
|
||||
'tomorrow_schedule_list': tomorrow_schedule_list if 'tomorrow_schedule_list' in locals() else [],
|
||||
'week_schedule_list': week_schedule_list,
|
||||
'upcoming_reservations': upcoming_reservations,
|
||||
|
||||
@@ -7,7 +7,7 @@ OPENAPI_SPEC = {
|
||||
"info": {
|
||||
"title": "Edu-Space REST API",
|
||||
"description": "Enterprise Academic & Physical Space Management REST API with JWT Authentication and Role-Based Access Control.",
|
||||
"version": "3.6.1"
|
||||
"version": "3.6.2"
|
||||
},
|
||||
"servers": [
|
||||
{
|
||||
|
||||
@@ -47,7 +47,15 @@ class UserService:
|
||||
'email': user.email,
|
||||
'role': role_name,
|
||||
'is_admin': user.is_admin(),
|
||||
'is_active': user.is_active,
|
||||
'last_login': user.last_login.strftime('%Y-%m-%d %H:%M') if user.last_login else None,
|
||||
'created_at': user.created_at.strftime('%Y-%m-%d %H:%M') if user.created_at else None,
|
||||
'permissions': permissions,
|
||||
'preferred_language': user.preferred_language,
|
||||
'theme_preference': user.theme_preference
|
||||
'theme_preference': user.theme_preference or 'auto',
|
||||
'first_name': getattr(user, 'first_name', user.name.split()[0] if user.name else ''),
|
||||
'last_name': getattr(user, 'last_name', ' '.join(user.name.split()[1:]) if user.name and len(user.name.split()) > 1 else ''),
|
||||
'document_type': getattr(user, 'document_type', 'DNI'),
|
||||
'document_number': getattr(user, 'document_number', ''),
|
||||
'personal_email': getattr(user, 'personal_email', '')
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user