fix(qa): resolver diagnosticos estaticos, sincronizacion moodle y actualizar docs v3.6.4

This commit is contained in:
2026-10-19 14:05:58 -03:00
parent 9ad70d69e9
commit 6057b6d206
47 changed files with 372 additions and 232 deletions
+11 -9
View File
@@ -1,13 +1,15 @@
import random
import copy
from datetime import datetime, timedelta
from typing import List, Dict, Tuple, Optional
import logging
from datetime import datetime, timedelta, timezone
from typing import List, Dict, Tuple, Optional, Any
from dataclasses import dataclass
from app import db
from app.models.classroom import Classroom
from app.models.reservation import Reservation, ReservationStatus
from app.models.subject import Commission
logger = logging.getLogger(__name__)
@dataclass
class ReservationRequest:
@@ -19,7 +21,7 @@ class ReservationRequest:
preferred_end_time: datetime
priority: int = 1 # 1=highest, 5=lowest
flexibility_hours: int = 2 # How flexible the start time can be
subject_requirements: Dict = None # Special requirements for the subject
subject_requirements: Optional[Dict[str, Any]] = None # Special requirements for the subject
def __post_init__(self):
if self.subject_requirements is None:
@@ -145,7 +147,7 @@ class Individual:
return -conflicts * 0.5 # Penalty for each conflict
return 1.0
def _calculate_resource_score(self, classroom: Classroom, requirements: Dict) -> float:
def _calculate_resource_score(self, classroom: Classroom, requirements: Optional[Dict[str, Any]] = None) -> float:
"""Check if classroom meets subject requirements"""
if not requirements:
return 1.0
@@ -326,14 +328,14 @@ class ReservationOptimizer:
def optimize_schedule(self, commission_ids: List[int],
admin_user_id: int,
start_date: datetime = None,
end_date: datetime = None,
start_date: Optional[datetime] = None,
end_date: Optional[datetime] = None,
progress_callback = None) -> Dict:
"""Optimize reservation schedule for given commissions"""
# Default date range if not provided
if not start_date:
start_date = datetime.utcnow()
start_date = datetime.now(timezone.utc).replace(tzinfo=None)
if not end_date:
end_date = start_date + timedelta(days=30)
@@ -391,7 +393,7 @@ class ReservationOptimizer:
def _calculate_preferred_time(self, commission: Commission) -> Dict:
"""Calculate preferred time slots for a commission based on shift and schedule"""
current_date = datetime.utcnow()
current_date = datetime.now(timezone.utc).replace(tzinfo=None)
# Determine day of week from commission schedule or default to Monday
target_weekday = 0 # Monday
@@ -462,7 +464,7 @@ class ReservationOptimizer:
db.session.add(reservation)
applied_reservations.append(reservation)
else:
current_app.logger.warning(f"Conflict detected for reservation during genetic apply: {data}")
logger.warning(f"Conflict detected for reservation during genetic apply: {data}")
try:
db.session.commit()