fix(dashboard): resolver diagnosticos estaticos y variables no inicializadas v3.6.3
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.2"
|
||||
__version__ = "3.6.3"
|
||||
db = SQLAlchemy()
|
||||
migrate = Migrate()
|
||||
cors = CORS()
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 156 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 18 KiB |
@@ -6,7 +6,7 @@ from app.models.user import User
|
||||
from app.models.reservation import Reservation
|
||||
from app.models.audit_log import AuditLog
|
||||
from app.services.audit_service import AuditService
|
||||
from datetime import datetime, timedelta
|
||||
from datetime import datetime, timedelta, timezone
|
||||
from sqlalchemy import func
|
||||
from app import db
|
||||
|
||||
@@ -67,8 +67,48 @@ def serialize_milestone(m):
|
||||
@jwt_required
|
||||
def get_stats():
|
||||
"""Retorna estadísticas clave y datos operativos para el Dashboard."""
|
||||
today = datetime.utcnow().date()
|
||||
today = datetime.now(timezone.utc).date()
|
||||
|
||||
total_classrooms = 0
|
||||
total_subjects = 0
|
||||
total_users = 0
|
||||
today_reservations = 0
|
||||
pending_count = 0
|
||||
physical_classrooms = 0
|
||||
virtual_classrooms = 0
|
||||
occupancy_rate = 0
|
||||
assigned_classrooms = 0
|
||||
assigned_pct = 0.0
|
||||
unassigned_classrooms = 0
|
||||
unassigned_pct = 0.0
|
||||
assigned_today_count = 0
|
||||
assigned_today_pct = 0.0
|
||||
unassigned_today_count = 0
|
||||
unassigned_today_pct = 0.0
|
||||
total_active_commissions = 0
|
||||
tomorrow_reservations_q = []
|
||||
my_today_count = 0
|
||||
my_total_reservations = 0
|
||||
my_today_classes = []
|
||||
tomorrow_schedule_list = []
|
||||
filter_stats = {}
|
||||
date_labels = {}
|
||||
unassigned_commissions_tomorrow = []
|
||||
unassigned_commissions_week = []
|
||||
unassigned_commissions_month = []
|
||||
unassigned_commissions_general = []
|
||||
available_classrooms_today = []
|
||||
available_classrooms_tomorrow = []
|
||||
available_classrooms_week = []
|
||||
available_classrooms_month = []
|
||||
virtual_rooms_data = []
|
||||
audit_data = []
|
||||
pending_reservations = []
|
||||
today_schedule_list = []
|
||||
week_schedule_list = []
|
||||
upcoming_reservations = []
|
||||
milestones = []
|
||||
|
||||
try:
|
||||
total_classrooms = Classroom.query.filter_by(is_active=True).count()
|
||||
total_subjects = Subject.query.filter_by(is_active=True).count()
|
||||
@@ -129,7 +169,7 @@ def get_stats():
|
||||
pending_count = len(pending_reservations_q)
|
||||
|
||||
upcoming_reservations_q = Reservation.query.filter(
|
||||
Reservation.start_time >= datetime.utcnow()
|
||||
Reservation.start_time >= datetime.now(timezone.utc).replace(tzinfo=None)
|
||||
).order_by(Reservation.start_time.asc()).limit(10).all()
|
||||
|
||||
milestones_q = AcademicMilestone.query.filter(
|
||||
@@ -176,7 +216,7 @@ def get_stats():
|
||||
|
||||
# ---- Bedelía: Filtros completos de Aulas y Comisiones por Día (Hoy), Mañana, Semana y Mes ----
|
||||
import calendar
|
||||
today_dt = datetime.utcnow()
|
||||
today_dt = datetime.now(timezone.utc).replace(tzinfo=None)
|
||||
tomorrow_dt = today_dt + timedelta(days=1)
|
||||
tomorrow_start = tomorrow_dt.replace(hour=0, minute=0, second=0, microsecond=0)
|
||||
tomorrow_end = tomorrow_dt.replace(hour=23, minute=59, second=59, microsecond=0)
|
||||
@@ -587,7 +627,7 @@ 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),
|
||||
'my_today_count': my_today_count,
|
||||
'my_total_reservations': my_total_reservations,
|
||||
'virtual_rooms_count': virtual_classrooms
|
||||
@@ -597,22 +637,22 @@ def get_stats():
|
||||
'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 [],
|
||||
'tomorrow_schedule_list': tomorrow_schedule_list,
|
||||
'week_schedule_list': week_schedule_list,
|
||||
'upcoming_reservations': upcoming_reservations,
|
||||
'milestones': milestones,
|
||||
'filter_stats': filter_stats if 'filter_stats' in locals() else {},
|
||||
'date_labels': date_labels if 'date_labels' in locals() else {},
|
||||
'filter_stats': filter_stats,
|
||||
'date_labels': date_labels,
|
||||
'ui': {
|
||||
'show_role_banner': SystemSetting.get_value('dashboard_role_banner_enabled', 'true') in ['true', 'True', '1', True]
|
||||
},
|
||||
'bedelia': {
|
||||
'unassigned_commissions_tomorrow': unassigned_commissions_tomorrow if 'unassigned_commissions_tomorrow' in locals() else [],
|
||||
'unassigned_commissions_tomorrow': unassigned_commissions_tomorrow,
|
||||
'unassigned_commissions_week': unassigned_commissions_week,
|
||||
'unassigned_commissions_month': unassigned_commissions_month,
|
||||
'unassigned_commissions_general': unassigned_commissions_general,
|
||||
'available_classrooms_today': available_classrooms_today,
|
||||
'available_classrooms_tomorrow': available_classrooms_tomorrow if 'available_classrooms_tomorrow' in locals() else [],
|
||||
'available_classrooms_tomorrow': available_classrooms_tomorrow,
|
||||
'available_classrooms_week': available_classrooms_week,
|
||||
'available_classrooms_month': available_classrooms_month,
|
||||
'virtual_rooms': virtual_rooms_data,
|
||||
@@ -625,6 +665,9 @@ def get_stats():
|
||||
def sync_google_sheets():
|
||||
"""Ejecuta la sincronización real con las hojas de cálculo de Google Sheets con soporte de filtros y entidades."""
|
||||
from app.services.sheets_importer import GoogleSheetsImporter
|
||||
filter_career = None
|
||||
filter_subject = None
|
||||
filter_day = None
|
||||
try:
|
||||
data = request.get_json(silent=True) or {}
|
||||
custom_url = data.get('sheets_url') or data.get('base_url')
|
||||
|
||||
@@ -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.2"
|
||||
"version": "3.6.3"
|
||||
},
|
||||
"servers": [
|
||||
{
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
|
||||
|
||||
setup(
|
||||
name="edu-space-admin",
|
||||
version="3.6.2",
|
||||
version="3.6.3",
|
||||
description="Administrative interface for Edu-Space Classroom Management System",
|
||||
author="Edu-Space Development Team",
|
||||
author_email="admin@edu-space.com",
|
||||
|
||||
Reference in New Issue
Block a user