fix(academic): commission subjects and shared careers mapping, role-based scoping and gradebook milestones (v3.8.20)

This commit is contained in:
2026-10-26 18:31:54 -03:00
parent a692c9ce67
commit 9f1ac6d670
23 changed files with 808 additions and 139 deletions
+13
View File
@@ -11,6 +11,19 @@ El formato está basado en [Keep a Changelog](https://keepachangelog.com/es-ES/1
- **Sincronización Continua Moodle (Fase 6):** Automatización de workers persistentes en background para el procesamiento continuo de la cola de Web Services Moodle 4.1.
- **Pruebas de Carga y Hardening (Fase 6):** Pruebas de estrés de concurrencia y validación final de producción.
## [3.8.20] - 2026-10-26
### Fixed & Improved
- **Gestión de Comisiones: Visualización de Asignatura y Carreras Heredadas**:
- Corregida la visualización en `admin/commissions_list`: ahora la columna "Asignatura" muestra destacadamente el nombre de la materia/asignatura (`comm.subject.name or comm.subject_name`) junto a su código y las carreras que hereda la comisión.
- Habilitada la selección de asignatura en los modales de alta y edición de comisión (`modalAddCommission` y `modalEditCommission`) cargando dinámicamente el catálogo de materias activas con sus carreras vinculadas.
- Incorporado banner informativo en vivo que detalla las carreras heredadas de la asignatura seleccionada y enlace directo a la gestión de materias.
- Enriquecido `Commission.to_dict()` en el backend con `subject_name` y `subject_code` para máxima interoperabilidad, y el endpoint `GET /commissions` ahora devuelve `subjects`, `careers` y `academic_terms`.
- **Perfiles y Control de Acceso Basado en Roles (RBAC)**:
- **Docentes**: Acceso exclusivo a sus materias y comisiones asignadas (`teacher_id`), a sus reservas correspondientes y a sus aulas virtuales sin exponer comisiones ni clases ajenas.
- **Libro de Calificaciones (Actas)**: Habilitada la programación de evaluaciones (Parciales, TPs, Finales, Recuperatorios) mediante modal con fecha, tipo y observaciones, eliminación de hitos si el acta no está cerrada, cálculo automático de notas en vivo y autosave debounced.
- **Alumnos**: Acceso a materias inscriptas, actas y libro de notas (`my_grades.html`) con condiciones académicas oficiales (Promocionado, Regular, Libre).
- Eliminados fallbacks con datos mock/relleno en toda la plataforma.
## [3.8.19] - 2026-10-26
### Added & Improved
- **Dashboard: Paginación y Filtro por Carrera en Panel de Comisiones**:
+11 -7
View File
@@ -9,13 +9,17 @@ Memoria del proyecto entre sesiones para la rama `dev`.
- Libro de Calificaciones (*Gradebook*) con actas de regularidad inmutables.
- Autenticación híbrida (Google OAuth 2.0, Moodle SSO, Local) y Modo Impersonación.
- Reinicialización segura del sistema con contraseña de Administrador.
- **Sprint Activo: Paginación y Filtro por Carrera en Comisiones, Tarjeta KPI y Gráficos de Ocupación — v3.8.19**:
- **Paginación y Filtro Interactivo por Carrera en Comisiones**: Implementada paginación de 10 elementos por página en `dashbede.html` para los 8 bloques temporales (`today`, `tomorrow`, `week`, `month` / asignadas y sin asignar) con selector de carrera dinámico `<select id="commCareerFilter">`, badges de titulación en filas y alerta de estado vacío.
- **Tarjeta KPI de Comisiones Sin Asignar**: Agregada al lado de "Aulas Sin Asignar" en la sección de Percentiles de Asignación tanto en Bedelía (`dashbede.html`) como en Administración (`dashadm.html`), con conteo dinámico y porcentaje respecto al total de comisiones del ciclo.
- **Gráficos de Torta de Ocupación en Día (Hoy)**: Implementados dos gráficos Chart.js Doughnut interactivos (`#bedeliaClassroomsPieChart` / `#bedeliaCommissionsPieChart` y análogos de administración) para Aulas (Asignadas vs Libres) y Comisiones (Con Aula vs Sin Asignar), con leyendas reactivas y tooltip con porcentajes.
- **Enriquecimiento de Backend (`dashboard_service.py`)**: `build_comm_item` provee `career_name`, `career_names` y `career_id`, y el endpoint de dashboard expone el listado global de carreras (`careers`).
- **QA & Seguridad**: 79 tests aprobados en `pytest` (100%), 0 vulnerabilidades en auditoría de seguridad (Bandit, pip-audit, njsscan, npm audit) y balance de etiquetas verificado (`diff=0`).
- **Versión Consolidada**: `v3.8.19`.
- **Sprint Activo: Corrección de Comisiones (Asignatura y Carreras Heredadas), Scoping de Roles y Libro de Calificaciones — v3.8.20**:
- **Asignatura y Carreras en Comisiones**: Corregido el mapeo en `admin/commissions_list` para que la columna "Asignatura" muestre destacadamente el nombre de la materia/asignatura real (`comm.subject.name or comm.subject_name`), junto con su código y las carreras que hereda la comisión.
- **Selector de Asignaturas en Modales de Alta y Edición**: `modalAddCommission` y `modalEditCommission` ahora cargan la lista de materias activas con sus planes y carreras asociadas, junto con un banner interactivo que previsualiza las carreras heredadas y enlace directo al catálogo de materias.
- **Enriquecimiento de Backend**: `Commission.to_dict()` expone `subject_name` y `subject_code`, y `GET /commissions` devuelve `subjects`, `careers` y `academic_terms` para evitar llamadas redundantes y asegurar dropdowns siempre poblados.
- **Scoping por Roles (Docente / Alumno / Bedelía)**:
- Docentes: Filtrado estricto en materias (`my_subjects`), reservas (`/schedule/list_reservations`) y aulas virtuales (`/classrooms/list_classrooms?view_mode=virtual`) para ver únicamente lo asignado a su usuario.
- Libro de Calificaciones: Habilitada la programación de evaluaciones (Parciales, TPs, Finales) mediante modal `#addMilestoneModal`, eliminación de hitos si el acta no está sellada, autocalculado de notas en vivo y guardado debounced.
- Alumnos: Visualización de materias inscritas y notas en `my_grades.html`.
- Eliminados fallbacks con datos mock/relleno en toda la plataforma.
- **QA & Seguridad**: 79 tests aprobados en `pytest` (100%), 0 vulnerabilidades en auditoría de seguridad (Bandit, pip-audit, njsscan, npm audit).
- **Versión Consolidada**: `v3.8.20`.
## Decisiones (y por qué)
- **Flujo Secuencial de Bedelía (9 Pasos)**: Estandarizar la carga operativa en: 1) Sede -> 2) Aula -> 3) Ciclo Lectivo -> 4) Carrera -> 5) Materia (vinculada a Carrera) -> 6) Comisión (asociada a Materia, Carrera y Ciclo) -> 7) Profesores -> 8) Alumnos -> 9) Reserva de Espacio. Esto asegura consistencia e integridad relacional.
+1 -1
View File
@@ -7,7 +7,7 @@ from typing import Any
from database import db, get_db, engine, SessionLocal, session
from config.config import Config
__version__ = "3.8.19"
__version__ = "3.8.20"
class DummyContext:
def __enter__(self):
+2
View File
@@ -189,6 +189,8 @@ class Commission(db.Model):
return {
'id': self.id,
'subject_id': self.subject_id,
'subject_name': self.subject.name if self.subject else 'Sin materia',
'subject_code': self.subject.code if self.subject else '',
'career_id': self.career_id,
'career_name': self.career_name,
'career_names': self.career_names,
@@ -40,6 +40,8 @@ class ReservationRepository(BaseRepository[Reservation]):
floor: Optional[str] = None,
shift: Optional[str] = None,
search: Optional[str] = None,
teacher_id: Optional[int] = None,
student_id: Optional[int] = None,
limit: int = 1000) -> List[Reservation]:
"""Obtiene reservas dentro de una ventana temporal con carga ansiosa y filtros en SQL."""
query = Reservation.query.options(
@@ -51,6 +53,29 @@ class ReservationRepository(BaseRepository[Reservation]):
Reservation.start_time <= end_dt
)
if teacher_id:
from app.models.subject import Commission, CommissionTeacher
teacher_comm_ids = db.session.query(Commission.id).filter(
or_(
Commission.teacher_id == teacher_id,
Commission.teachers_association.any(CommissionTeacher.user_id == teacher_id)
)
).subquery()
query = query.filter(
or_(
Reservation.user_id == teacher_id,
Reservation.commission_id.in_(teacher_comm_ids)
)
)
if student_id:
from app.models.enrollment import StudentEnrollment
student_comm_ids = db.session.query(StudentEnrollment.commission_id).filter_by(
student_id=student_id,
status='activo'
).subquery()
query = query.filter(Reservation.commission_id.in_(student_comm_ids))
if status and status.strip() and status.strip().lower() != 'all':
s_val = status.strip()
query = query.filter(Reservation.status == s_val)
+106 -2
View File
@@ -97,13 +97,22 @@ class GradebookService:
condition = 'Pendiente'
condition_badge = 'bg-warning text-dark'
# Mapa indexado por milestone_id para acceso directo en Nunjucks
grades_by_m = {g['milestone_id']: g for g in student_grades}
rows.append({
'id': student.id,
'name': student.name,
'email': student.email,
'dni': getattr(student, 'document_number', None) or f'LEG-{student.id}',
'enrollment_id': enr.id,
'student_id': student.id,
'student_name': student.name,
'student_email': student.email,
'enrollment_status': enr.status,
'grades': student_grades,
'grades': grades_by_m,
'grades_list': student_grades,
'average': avg_score,
'average_score': avg_score,
'graded_count': graded_count,
'total_milestones': total_milestones,
@@ -111,9 +120,20 @@ class GradebookService:
'condition_badge': condition_badge
})
milestone_columns = [
{
'id': m.id,
'title': m.title or m.tipo,
'tipo': m.tipo,
'date': m.date.strftime('%d/%m/%Y') if m.date else '',
'color': m.color
} for m in milestones
]
return {
'commission': comm.to_dict(),
'milestones': [m.to_dict() for m in milestones],
'milestone_columns': milestone_columns,
'students': rows,
'is_closed': bool(comm.grades_closed),
'acta_number': comm.acta_number,
@@ -326,8 +346,14 @@ class GradebookService:
has_failed = False
for m in milestones:
g = grades_by_milestone.get(m.id)
m_date_str = m.date.strftime('%d/%m/%Y') if m.date else ''
if g:
ms_results.append(g.to_dict())
ms_dict = g.to_dict()
ms_dict['milestone_title'] = m.title or m.tipo
ms_dict['milestone_date'] = m_date_str
ms_dict['milestone_type'] = m.tipo
ms_dict['milestone_color'] = m.color
ms_results.append(ms_dict)
if g.is_absent:
has_failed = True
elif g.score is not None:
@@ -338,6 +364,7 @@ class GradebookService:
ms_results.append({
'milestone_id': m.id,
'milestone_title': m.title or m.tipo,
'milestone_date': m_date_str,
'milestone_type': m.tipo,
'milestone_color': m.color,
'display_score': '-',
@@ -350,31 +377,53 @@ class GradebookService:
if not grades:
condition = 'Cursando'
academic_cond = 'PENDIENTE'
condition_badge = 'bg-secondary'
elif has_failed:
condition = 'Desaprobado'
academic_cond = 'LIBRE'
condition_badge = 'bg-danger'
elif avg_score is not None and avg_score >= 7.0 and len(grades) == len(milestones):
condition = 'Promociona'
academic_cond = 'PROMOCIONADO'
condition_badge = 'bg-success'
elif avg_score is not None and avg_score >= 4.0:
condition = 'Regular'
academic_cond = 'REGULAR'
condition_badge = 'bg-primary'
else:
condition = 'En curso'
academic_cond = 'PENDIENTE'
condition_badge = 'bg-info text-dark'
results.append({
'enrollment_id': enr.id,
'commission_id': comm.id,
'commission_code': comm.get_full_code(),
'commission': {
'id': comm.id,
'code': comm.get_full_code(),
'semester': comm.semester,
'year': comm.year,
'shift': comm.shift,
'virtual_link': comm.virtual_link
},
'subject': {
'id': comm.subject.id if comm.subject else None,
'name': comm.subject.name if comm.subject else 'Materia',
'code': comm.subject.code if comm.subject else '',
'career': getattr(comm, 'career_names', None) or (comm.subject.career_obj.name if (comm.subject and comm.subject.career_obj) else 'General')
},
'subject_name': comm.subject.name if comm.subject else 'Materia',
'subject_code': comm.subject.code if comm.subject else '',
'semester': comm.semester,
'year': comm.year,
'teacher_name': comm.teacher_name,
'milestones': ms_results,
'grades': ms_results,
'average': avg_score,
'average_score': avg_score,
'academic_condition': academic_cond,
'condition': condition,
'condition_badge': condition_badge,
'is_acta_closed': bool(comm.grades_closed),
@@ -383,6 +432,61 @@ class GradebookService:
return results
@classmethod
def create_milestone(
cls,
commission_id: int,
milestone_type_id: int,
title: str,
date_val: datetime,
notes: str = '',
classroom: str = '',
link: str = ''
) -> AcademicMilestone:
"""Crea un nuevo hito evaluativo (examen, parcial, TP) para una comisión."""
comm = Commission.query.get(commission_id)
if not comm:
raise ValueError(f'Comisión {commission_id} no encontrada.')
if comm.grades_closed:
raise ValueError('No se pueden agregar hitos a un acta cerrada.')
m_type = MilestoneType.query.get(milestone_type_id)
if not m_type:
raise ValueError(f'Tipo de evaluación {milestone_type_id} no encontrado.')
milestone = AcademicMilestone(
title=title.strip() if title else m_type.name,
materia_codigo=comm.subject.code if comm.subject else 'ASIG',
subject_id=comm.subject_id,
commission_id=comm.id,
milestone_type_id=m_type.id,
date=date_val,
classroom=classroom or (comm.virtual_link if comm.virtual_link else None),
link=link or comm.virtual_link,
notes=notes.strip() if notes else '',
is_active=True
)
db.session.add(milestone)
db.session.commit()
return milestone
@classmethod
def delete_milestone(cls, commission_id: int, milestone_id: int) -> bool:
"""Elimina un hito evaluativo de una comisión si el acta no está cerrada."""
comm = Commission.query.get(commission_id)
if not comm:
raise ValueError(f'Comisión {commission_id} no encontrada.')
if comm.grades_closed:
raise ValueError('No se pueden eliminar hitos de un acta cerrada.')
milestone = AcademicMilestone.query.filter_by(id=milestone_id, commission_id=comm.id).first()
if not milestone:
raise ValueError(f'Hito {milestone_id} no encontrado en la comisión.')
db.session.delete(milestone)
db.session.commit()
return True
@classmethod
def get_student_upcoming_milestones(cls, student_id: int, limit: int = 5) -> List[Dict[str, Any]]:
"""Obtiene las próximas evaluaciones con cálculo de cuenta regresiva para el dashboard."""
@@ -28,6 +28,8 @@ class ReservationService:
floor: Optional[str] = None,
shift: Optional[str] = None,
search: Optional[str] = None,
teacher_id: Optional[int] = None,
student_id: Optional[int] = None,
limit: int = 1000) -> List[Reservation]:
"""Obtiene reservas dentro de un rango temporal con filtros SQL."""
return self.reservation_repo.get_by_date_range(
@@ -39,6 +41,8 @@ class ReservationService:
floor=floor,
shift=shift,
search=search,
teacher_id=teacher_id,
student_id=student_id,
limit=limit
)
+104 -2
View File
@@ -409,13 +409,40 @@ def list_commissions(
career_id: Optional[str] = Query(None),
shift: Optional[str] = Query(None),
active: Optional[str] = Query(None),
teacher_id: Optional[int] = Query(None),
student_id: Optional[int] = Query(None),
mine: Optional[bool] = Query(None),
page: Optional[int] = Query(None, ge=1),
per_page: Optional[int] = Query(None, ge=1, le=200),
current_user: User = Depends(get_current_user)
):
"""Lista las comisiones académicas con soporte para filtros de búsqueda, carrera, materia, turno y paginación."""
"""Lista las comisiones académicas con soporte para filtros de búsqueda, carrera, materia, turno, docente/alumno y paginación."""
query = Commission.query
joined_subject = False
user_role = (getattr(current_user, 'role', '') or '').lower()
# Si se solicita mine=True o si se proveen filtros específicos de usuario
effective_teacher_id = teacher_id
effective_student_id = student_id
if mine:
if user_role == 'docente':
effective_teacher_id = int(getattr(current_user, 'id'))
elif user_role == 'alumno':
effective_student_id = int(getattr(current_user, 'id'))
if effective_teacher_id:
query = query.filter(
or_(
Commission.teacher_id == effective_teacher_id,
Commission.teachers_association.any(CommissionTeacher.user_id == effective_teacher_id)
)
)
if effective_student_id:
query = query.filter(
Commission.enrollments.any(StudentEnrollment.student_id == effective_student_id)
)
if search and search.strip():
s_clean = search.strip().lower()
query = query.outerjoin(Subject, Commission.subject_id == Subject.id)
@@ -460,6 +487,10 @@ def list_commissions(
has_next = False
commissions = query.order_by(Commission.year.desc(), Commission.semester.desc(), Commission.code.asc()).all()
all_subjects = Subject.query.filter_by(is_active=True).order_by(Subject.name.asc()).all()
all_careers = Career.query.order_by(Career.name.asc()).all()
all_terms = AcademicTerm.query.filter_by(is_active=True).order_by(AcademicTerm.year.desc()).all()
return {
'status': 'success',
'total': total,
@@ -468,7 +499,10 @@ def list_commissions(
'pages': pages,
'has_prev': has_prev,
'has_next': has_next,
'commissions': [c.to_dict() for c in commissions]
'commissions': [c.to_dict() for c in commissions],
'subjects': [s.to_dict() for s in all_subjects],
'careers': [car.to_dict() for car in all_careers],
'academic_terms': [t.to_dict() for t in all_terms]
}
@@ -1190,6 +1224,74 @@ async def reopen_commission_gradebook(
raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(e))
@academic_router.get("/commissions/{id}/milestones")
def list_commission_milestones(
id: int,
current_user: User = Depends(get_current_user)
):
"""Lista todos los hitos evaluativos de una comisión."""
comm = Commission.query.get(id)
if not comm:
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Comisión no encontrada.")
milestones = AcademicMilestone.query.filter_by(commission_id=id, is_active=True).order_by(AcademicMilestone.date.asc()).all()
return {'status': 'success', 'milestones': [m.to_dict() for m in milestones]}
@academic_router.post("/commissions/{id}/milestones", status_code=status.HTTP_201_CREATED)
async def create_commission_milestone(
id: int,
request: Request,
current_user: User = Depends(require_roles(["ADMIN", "BEDELIA", "DOCENTE"]))
):
"""Crea un nuevo hito evaluativo (examen, parcial, TP) para la comisión."""
data = await get_request_payload(request)
milestone_type_id = data.get('milestone_type_id')
title = data.get('title', '')
date_str = data.get('date', '')
notes = data.get('notes', '')
if not milestone_type_id or not date_str:
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="milestone_type_id y date son obligatorios.")
try:
if 'T' in date_str:
date_val = datetime.fromisoformat(date_str)
else:
date_val = datetime.strptime(date_str, '%Y-%m-%d')
except Exception:
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Formato de fecha inválido (use YYYY-MM-DD o ISO).")
try:
m = GradebookService.create_milestone(
commission_id=id,
milestone_type_id=int(milestone_type_id),
title=title,
date_val=date_val,
notes=notes
)
return {'status': 'success', 'message': 'Hito evaluativo programado exitosamente.', 'milestone': m.to_dict()}
except ValueError as e:
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=str(e))
except Exception as e:
raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(e))
@academic_router.delete("/commissions/{id}/milestones/{milestone_id}")
def delete_commission_milestone(
id: int,
milestone_id: int,
current_user: User = Depends(require_roles(["ADMIN", "BEDELIA", "DOCENTE"]))
):
"""Elimina un hito evaluativo programado si el acta aún está abierta."""
try:
GradebookService.delete_milestone(commission_id=id, milestone_id=milestone_id)
return {'status': 'success', 'message': 'Hito evaluativo eliminado exitosamente.'}
except ValueError as e:
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=str(e))
except Exception as e:
raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(e))
# =========================================================
# MILESTONE TYPES CRUD
# =========================================================
+40 -2
View File
@@ -5,6 +5,7 @@ Provides endpoints for listing, retrieving, creating, updating and toggling clas
"""
from typing import Optional
from fastapi import APIRouter, Depends, HTTPException, Query, status
from sqlalchemy import or_
from app import db
from app.models.classroom import Classroom
@@ -60,11 +61,48 @@ def list_classrooms(
@classrooms_router.get("/virtual-rooms")
def get_virtual_rooms(current_user: User = Depends(get_current_user)):
"""Retorna el catálogo consolidado de salas virtuales operativas en el Campus Virtual."""
def get_virtual_rooms(
teacher_id: Optional[int] = Query(None),
student_id: Optional[int] = Query(None),
mine: Optional[bool] = Query(None),
current_user: User = Depends(get_current_user)
):
"""Retorna el catálogo consolidado de salas virtuales operativas en el Campus Virtual con scoping por rol."""
user_role = (getattr(current_user, 'role', '') or '').lower()
user_id = getattr(current_user, 'id', None)
# Scoping automático por rol
target_teacher_id = teacher_id
target_student_id = student_id
if mine or (mine is None and user_role == 'docente'):
target_teacher_id = user_id
elif mine or (mine is None and user_role in ['alumno', 'estudiante']):
target_student_id = user_id
stats = dashboard_service.get_stats(current_user=current_user)
vrooms = stats.get('bedelia', {}).get('virtual_rooms', [])
if target_teacher_id:
from app.models.commission import Commission, CommissionTeacher
my_comm_ids = set(
c.id for c in Commission.query.filter(
or_(
Commission.teacher_id == target_teacher_id,
Commission.teachers_association.any(CommissionTeacher.user_id == target_teacher_id)
)
).all()
)
vrooms = [r for r in vrooms if r.get('commission_id') in my_comm_ids or r.get('id') in my_comm_ids]
elif target_student_id:
from app.models.academic import StudentEnrollment
enrolled_comm_ids = set(
e.commission_id for e in StudentEnrollment.query.filter(
StudentEnrollment.student_id == target_student_id,
StudentEnrollment.status.in_(['active', 'regular', 'enrolled', 'promoted'])
).all()
)
vrooms = [r for r in vrooms if r.get('commission_id') in enrolled_comm_ids or r.get('id') in enrolled_comm_ids]
today_cnt = sum(r.get('today_classes', 0) for r in vrooms)
week_cnt = sum(r.get('week_classes', 0) for r in vrooms)
month_cnt = sum(r.get('month_classes', 0) for r in vrooms)
+15
View File
@@ -36,6 +36,9 @@ def list_reservations(
floor: Optional[str] = Query(None),
shift: Optional[str] = Query(None),
search: Optional[str] = Query(None),
teacher_id: Optional[int] = Query(None),
student_id: Optional[int] = Query(None),
mine: Optional[bool] = Query(None),
limit: int = Query(1000, le=5000),
current_user: User = Depends(get_current_user)
):
@@ -44,6 +47,16 @@ def list_reservations(
effective_end = (date_to or end_date or "").strip()
now = datetime.now(timezone.utc).replace(tzinfo=None)
# Scoping de rol o usuario específico
user_role = (getattr(current_user, 'role', '') or '').lower()
effective_teacher_id = teacher_id
effective_student_id = student_id
if mine:
if user_role == 'docente':
effective_teacher_id = int(getattr(current_user, 'id'))
elif user_role == 'alumno':
effective_student_id = int(getattr(current_user, 'id'))
# Resolución inteligente de rangos según scope o filtros
if scope == 'month' and not effective_start and not effective_end:
start_dt = now.replace(day=1, hour=0, minute=0, second=0, microsecond=0)
@@ -84,6 +97,8 @@ def list_reservations(
floor=floor,
shift=shift,
search=search,
teacher_id=effective_teacher_id,
student_id=effective_student_id,
limit=limit
)
result = []
+1 -1
View File
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
setup(
name="edu-space-admin",
version="3.8.19",
version="3.8.20",
description="Administrative interface for Edu-Space Classroom Management System (FastAPI ASGI Core)",
author="Edu-Space Development Team",
author_email="admin@edu-space.com",
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "frontend",
"version": "3.8.19",
"version": "3.8.20",
"description": "",
"main": "index.js",
"scripts": {
+3 -3
View File
@@ -86,9 +86,9 @@ const env = nunjucks.configure(path.join(__dirname, '../views'), {
});
// Versiones institucionales del sistema
const APP_VERSION = '3.8.19';
const FRONTEND_VERSION = '3.8.19';
const BACKEND_VERSION = '3.8.19';
const APP_VERSION = '3.8.20';
const FRONTEND_VERSION = '3.8.20';
const BACKEND_VERSION = '3.8.20';
env.addGlobal('app_version', APP_VERSION);
env.addGlobal('frontend_version', FRONTEND_VERSION);
+64 -41
View File
@@ -1068,31 +1068,53 @@ const handleCommissionsList = async (req, res) => {
if (cRes.status === 'fulfilled' && cRes.value.data) {
total = cRes.value.data.total !== undefined ? cRes.value.data.total : (cRes.value.data.commissions || []).length;
commissions = (cRes.value.data.commissions || []).map(c => ({
...c,
get_full_code: () => c.full_code || c.code,
career_id: c.career_id,
career_name: c.career_name || 'Carrera General',
classroom_name: c.classroom_name || 'Sin Aula Asignada',
has_classroom: Boolean(c.has_classroom),
is_virtual: Boolean(c.is_virtual),
virtual_link: c.virtual_link || '',
schedule: c.schedule || 'Sin horario',
subject: {
id: c.subject_id,
name: c.subject_name,
code: c.subject_code,
career_id: c.career_id,
career_name: c.career_name || 'Carrera General'
},
teacher: c.teacher_name ? { name: c.teacher_name } : null,
teachers: c.teachers || (c.teacher_name ? [{ name: c.teacher_name, role: 'Titular' }] : [])
}));
commissions = (cRes.value.data.commissions || []).map(c => {
const subjObj = c.subject || {};
const subjName = subjObj.name || c.subject_name || 'Sin Asignatura';
const subjCode = subjObj.code || c.subject_code || '';
const carList = (c.careers && c.careers.length > 0) ? c.careers : (subjObj.careers || []);
const carName = c.career_name || subjObj.career_name || (carList.length > 0 ? carList.map(cr => cr.name).join(', ') : 'Carrera General');
return {
...c,
get_full_code: () => c.full_code || c.code,
subject_name: subjName,
subject_code: subjCode,
career_id: c.career_id || subjObj.career_id,
career_name: carName,
careers: carList,
classroom_name: c.classroom_name || 'Sin Aula Asignada',
has_classroom: Boolean(c.has_classroom),
is_virtual: Boolean(c.is_virtual),
virtual_link: c.virtual_link || '',
schedule: c.schedule || 'Sin horario',
subject: {
id: c.subject_id || subjObj.id,
name: subjName,
code: subjCode,
career_id: c.career_id || subjObj.career_id,
career_name: carName,
careers: carList
},
teacher: c.teacher_name ? { name: c.teacher_name } : null,
teachers: c.teachers || (c.teacher_name ? [{ name: c.teacher_name, role: 'Titular' }] : [])
};
});
subjects = cRes.value.data.subjects || [];
academic_terms = cRes.value.data.academic_terms || [];
careers = cRes.value.data.careers || [];
}
// Fallback robusto para subjects si no vinieron en la respuesta de commissions
if (!subjects || subjects.length === 0) {
try {
const subRes = await req.apiClient.get('/subjects', { params: { per_page: 250 } });
subjects = subRes.data?.subjects || subRes.data || [];
} catch (sErr) {
console.warn('Notice fetching subjects fallback:', sErr.message);
}
}
// Fallback para careers si no vinieron en la respuesta de commissions
if (!careers || careers.length === 0) {
try {
@@ -1151,7 +1173,27 @@ const handleCommissionsList = async (req, res) => {
const handleCommissionDetail = async (req, res) => {
const id = req.params.id || req.query.id || 1;
const roleStr = (req.user?.role || '').toLowerCase();
const isDocente = roleStr.includes('docent') || roleStr.includes('prof');
const isAlumno = roleStr.includes('alum') || roleStr.includes('estud');
const rawId = req.params.id || req.query.id;
if (!rawId || rawId === 'undefined' || rawId === 'null') {
if (isDocente || isAlumno) return res.redirect('/my_subjects/my_subjects_list');
return res.redirect('/admin/commissions_list');
}
const id = parseInt(rawId, 10);
if (isNaN(id)) {
if (isDocente || isAlumno) return res.redirect('/my_subjects/my_subjects_list');
return res.redirect('/admin/commissions_list');
}
// Si un docente o alumno intenta ingresar a la ruta de administración, redirigir a su vista
if (isDocente || isAlumno) {
return res.redirect(`/my_subjects/detail/${id}`);
}
try {
let commission = null;
let teachers = [];
@@ -1163,10 +1205,6 @@ const handleCommissionDetail = async (req, res) => {
]);
if (cRes.status === 'fulfilled' && cRes.value.data && cRes.value.data.commission) {
commission = cRes.value.data.commission;
} else {
const allRes = await req.apiClient.get('/commissions');
const list = allRes.data?.commissions || [];
commission = list.find(c => String(c.id) === String(id)) || list[0];
}
if (uRes.status === 'fulfilled' && uRes.value.data) {
teachers = uRes.value.data.teachers || uRes.value.data.users || [];
@@ -1182,22 +1220,7 @@ const handleCommissionDetail = async (req, res) => {
}
if (!commission) {
commission = {
id,
code: `COM-${id}`,
semester: '1C',
year: 2026,
shift: 'Noche',
active: true,
max_students: 40,
current_students: 25,
schedule: 'Lu y Mi 19:00 - 22:00',
virtual_link: '',
subject_name: 'Arquitectura de Software',
subject_code: 'ARQ-101',
teacher_name: 'Prof. Juan Pérez',
teachers: []
};
return res.redirect('/admin/commissions_list?error=not_found');
}
const commObj = {
+10 -3
View File
@@ -84,7 +84,13 @@ const handleClassroomsList = async (req, res) => {
let virtual_count = 0;
try {
const vRoomsRes = await req.apiClient.get('/classrooms/virtual-rooms');
const vParams = {};
if (req.user && req.user.role === 'docente') {
vParams.teacher_id = req.user.id;
} else if (req.user && (req.user.role === 'alumno' || req.user.role === 'estudiante')) {
vParams.student_id = req.user.id;
}
const vRoomsRes = await req.apiClient.get('/classrooms/virtual-rooms', { params: vParams });
if (vRoomsRes.data && vRoomsRes.data.virtual_rooms) {
virtual_rooms = vRoomsRes.data.virtual_rooms;
virtual_count = vRoomsRes.data.virtual_classrooms_count || virtual_rooms.length;
@@ -100,8 +106,9 @@ const handleClassroomsList = async (req, res) => {
console.warn('Notice fetching virtual rooms from /classrooms/virtual-rooms:', vErr.message);
}
// Fallback a /dashboard/stats si /classrooms/virtual-rooms no devolvió salas
if (virtual_rooms.length === 0) {
// Fallback a /dashboard/stats solo para administradores y bedelía si /classrooms/virtual-rooms no devolvió salas
const isStaff = ['admin', 'bedelia', 'administrador'].includes((req.user && req.user.role || '').toLowerCase());
if (virtual_rooms.length === 0 && isStaff) {
try {
const dashRes = await req.apiClient.get('/dashboard/stats');
const bData = (dashRes.data && (dashRes.data.bedelia || dashRes.data)) || {};
+53 -38
View File
@@ -7,13 +7,30 @@ router.use(requireAuth);
const handleMySubjectsList = async (req, res) => {
try {
let commissions = [];
const roleStr = (req.user?.role || '').toLowerCase();
const isDocente = roleStr.includes('docent') || roleStr.includes('prof');
const isAlumno = roleStr.includes('alum') || roleStr.includes('estud');
const params = {};
if (isDocente) {
params.teacher_id = req.user.id;
} else if (isAlumno) {
params.student_id = req.user.id;
}
try {
const resp = await req.apiClient.get('/commissions');
const resp = await req.apiClient.get('/commissions', { params });
if (resp.data && resp.data.commissions) {
commissions = resp.data.commissions.map(c => ({
...c,
full_code: c.full_code || c.code,
subject: { name: c.subject_name || c.subject?.name, code: c.subject_code || c.subject?.code }
subject: {
name: c.subject_name || c.subject?.name,
code: c.subject_code || c.subject?.code
},
teacher: (c.teacher_name && c.teacher_name !== 'TBD' && c.teacher_name !== 'Sin asignar')
? { name: c.teacher_name }
: (c.teachers && c.teachers.length > 0 ? { name: c.teachers[0].name } : null)
}));
}
} catch (e) {
@@ -32,60 +49,58 @@ const handleMySubjectsList = async (req, res) => {
title: 'Mis Materias',
commissions: [],
view_mode: 'all',
role: 'admin'
role: req.user?.role || 'admin'
});
}
};
const handleMySubjectDetail = async (req, res) => {
const id = req.params.id || req.query.id || req.params.commission_id || 1;
const rawId = req.params.id || req.query.id || req.params.commission_id;
if (!rawId || rawId === 'undefined' || rawId === 'null') {
return res.redirect('/my_subjects/my_subjects_list');
}
const id = parseInt(rawId, 10);
if (isNaN(id)) {
return res.redirect('/my_subjects/my_subjects_list');
}
try {
let commission = null;
let enrollments = [];
try {
const resp = await req.apiClient.get(`/commissions/${id}`);
if (resp.data && resp.data.commission) {
commission = resp.data.commission;
const [cResp, enrResp] = await Promise.allSettled([
req.apiClient.get(`/commissions/${id}`),
req.apiClient.get(`/commissions/${id}/enrollments`)
]);
if (cResp.status === 'fulfilled' && cResp.value.data?.commission) {
commission = cResp.value.data.commission;
}
if (enrResp.status === 'fulfilled' && enrResp.value.data?.enrollments) {
enrollments = enrResp.value.data.enrollments;
}
} catch (e) {
console.warn('Commission detail API notice:', e.message);
}
if (!commission) {
// Fallback: fetch list and find
try {
const listResp = await req.apiClient.get('/commissions');
const list = listResp.data?.commissions || [];
const found = list.find(c => String(c.id) === String(id)) || list[0];
if (found) {
commission = {
...found,
full_code: found.full_code || found.code,
subject: { name: found.subject_name, code: found.subject_code },
active: found.active !== undefined ? found.active : true
};
}
} catch (err) {}
return res.redirect('/my_subjects/my_subjects_list');
}
if (!commission) {
commission = {
id,
code: 'C1',
full_code: 'MAT-C1',
subject: { name: 'Materia', code: 'MAT' },
shift: 'Mañana',
semester: '1C',
year: 2026,
active: true,
max_students: 35,
current_students: 20
};
}
const formattedCommission = {
...commission,
full_code: commission.full_code || commission.code,
subject: commission.subject || { name: commission.subject_name, code: commission.subject_code },
teacher: (commission.teacher_name && commission.teacher_name !== 'TBD')
? { name: commission.teacher_name }
: (commission.teachers && commission.teachers.length > 0 ? { name: commission.teachers[0].name } : null)
};
res.render('my_subjects/detail', {
title: `${commission.subject?.name || 'Materia'} — ${commission.full_code || commission.code} — Edu-Space`,
commission,
enrollments: [],
title: `${formattedCommission.subject?.name || 'Materia'} — ${formattedCommission.full_code || formattedCommission.code} — Edu-Space`,
commission: formattedCommission,
enrollments,
classroom: null,
recent_reservation: null,
role: req.user?.role || 'admin'
+74 -9
View File
@@ -312,6 +312,16 @@ const handleReservationsList = async (req, res) => {
if (hide_virtual === '1' || hide_virtual === 'true') params.hide_virtual = '1';
if (only_virtual === '1' || only_virtual === 'true') params.only_virtual = '1';
const roleStr = (req.user?.role || '').toLowerCase();
const isDocente = roleStr.includes('docent') || roleStr.includes('prof');
const isAlumno = roleStr.includes('alum') || roleStr.includes('estud');
if (isDocente) {
params.teacher_id = req.user.id;
} else if (isAlumno) {
params.student_id = req.user.id;
}
// Obtener reservas y catálogo de aulas en paralelo
const [resResponse, roomsResponse] = await Promise.all([
req.apiClient.get('/reservations', { params }).catch(err => {
@@ -1014,20 +1024,75 @@ router.post(['/delete_reservation', '/delete_reservation/:id', '/reservation/:id
// 9. Libro de Calificaciones / Gradebook (Fase 3)
const handleGradebook = async (req, res) => {
const id = req.params.id || req.query.id;
let rawId = req.params.id || req.query.id;
const roleStr = (req.user?.role || '').toLowerCase();
const isDocente = roleStr.includes('docent') || roleStr.includes('prof');
// Si no se pasó un ID explícito, resolver la primera comisión asignada
if (!rawId || rawId === 'undefined' || rawId === 'null') {
try {
const commResp = await req.apiClient.get('/commissions', {
params: isDocente ? { teacher_id: req.user.id } : {}
});
const commList = commResp.data?.commissions || [];
if (commList.length > 0) {
return res.redirect(`/schedule/gradebook/${commList[0].id}`);
} else {
return res.render('schedule/gradebook', {
title: 'Libro de Calificaciones — Edu-Space',
commission: null,
milestone_columns: [],
students: [],
milestone_types: [],
all_teacher_commissions: [],
role: req.user?.role || 'docente',
empty_reason: 'No tenés comisiones asignadas actualmente para calificar.'
});
}
} catch (e) {
return res.redirect('/my_subjects/my_subjects_list');
}
}
const id = parseInt(rawId, 10);
if (isNaN(id)) {
return res.redirect('/my_subjects/my_subjects_list');
}
try {
const resp = await req.apiClient.get(`/commissions/${id}/gradebook`);
const data = resp.data || {};
const [resp, typesResp, commsResp] = await Promise.allSettled([
req.apiClient.get(`/commissions/${id}/gradebook`),
req.apiClient.get('/milestone-types'),
req.apiClient.get('/commissions', { params: isDocente ? { teacher_id: req.user.id } : {} })
]);
const rawData = (resp.status === 'fulfilled' && resp.value.data) ? resp.value.data : {};
const gradebookData = rawData.data || rawData;
const milestoneTypes = (typesResp.status === 'fulfilled' && typesResp.value.data?.milestone_types)
? typesResp.value.data.milestone_types
: [];
const allComms = (commsResp.status === 'fulfilled' && commsResp.value.data?.commissions)
? commsResp.value.data.commissions
: [];
if (!gradebookData.commission) {
return res.redirect('/my_subjects/my_subjects_list');
}
res.render('schedule/gradebook', {
title: `Libro de Calificaciones — Edu-Space`,
commission: data.commission || { id, code: 'C1' },
milestone_columns: data.milestone_columns || [],
students: data.students || [],
title: `Libro de Calificaciones — ${gradebookData.commission.full_code || gradebookData.commission.code} — Edu-Space`,
commission: gradebookData.commission,
milestone_columns: gradebookData.milestone_columns || [],
students: gradebookData.students || [],
milestone_types: milestoneTypes,
all_teacher_commissions: allComms,
role: req.user?.role || 'docente'
});
} catch (err) {
console.error('Error fetching commission gradebook:', err.message);
res.redirect(`/admin/commission_detail?id=${id}`);
res.redirect('/my_subjects/my_subjects_list');
}
};
@@ -1035,7 +1100,7 @@ const handleGradebook = async (req, res) => {
const handleMyGrades = async (req, res) => {
try {
const resp = await req.apiClient.get('/students/my-grades');
const subjects = resp.data?.subjects || [];
const subjects = resp.data?.data || resp.data?.subjects || [];
res.render('schedule/my_grades', {
title: 'Mis Calificaciones — Edu-Space',
subjects,
+14 -6
View File
@@ -64,12 +64,20 @@
{% endif %}
</div>
<div class="card-body">
<h5 class="fw-bold mb-1">{{ commission.subject.name }}</h5>
<div class="d-flex align-items-center gap-2 mb-3 flex-wrap">
<span class="badge bg-secondary-subtle text-secondary font-monospace border">{{ commission.subject.code }}</span>
<span class="badge bg-primary-subtle text-primary border">
<i class="bi bi-mortarboard me-1"></i>{{ commission.career_name or (commission.subject.career_obj.name if commission.subject.career_obj else 'Carrera General') }}
</span>
<h5 class="fw-bold mb-1">{{ commission.subject.name or commission.subject_name }}</h5>
<div class="d-flex align-items-center gap-1 mb-3 flex-wrap">
<span class="badge bg-secondary-subtle text-secondary font-monospace border">{{ commission.subject.code or commission.subject_code }}</span>
{% if commission.careers and commission.careers|length > 0 %}
{% for c_obj in commission.careers %}
<span class="badge bg-primary-subtle text-primary border" title="Carrera Vinculada">
<i class="bi bi-mortarboard me-1"></i>{{ c_obj.name }}
</span>
{% endfor %}
{% else %}
<span class="badge bg-primary-subtle text-primary border" title="Carrera">
<i class="bi bi-mortarboard me-1"></i>{{ commission.career_name or 'Carrera General' }}
</span>
{% endif %}
</div>
<div class="d-flex flex-wrap gap-2 mb-3">
+77 -11
View File
@@ -198,15 +198,17 @@
</span>
</td>
<td>
<div class="fw-semibold text-primary">{{ comm.subject.name }}</div>
<div class="fw-bold text-primary fs-6">{{ comm.subject.name or comm.subject_name }}</div>
<div class="d-flex align-items-center gap-1 mt-1 flex-wrap">
<span class="badge bg-secondary-subtle text-secondary border font-monospace">{{ comm.subject.code }}</span>
{% if comm.subject.code or comm.subject_code %}
<span class="badge bg-secondary-subtle text-secondary border font-monospace">{{ comm.subject.code or comm.subject_code }}</span>
{% endif %}
{% if comm.careers and (comm.careers | length > 0) %}
{% for c_obj in comm.careers %}
<span class="badge bg-primary-subtle text-primary border" title="Carrera"><i class="bi bi-mortarboard me-1"></i>{{ c_obj.name }}</span>
<span class="badge bg-primary-subtle text-primary border" title="Carrera Vinculada"><i class="bi bi-mortarboard me-1"></i>{{ c_obj.name }}</span>
{% endfor %}
{% else %}
<span class="badge bg-primary-subtle text-primary border" title="Carrera"><i class="bi bi-mortarboard me-1"></i>{{ comm.career_name or comm.subject.career_name or 'Carrera General' }}</span>
<span class="badge bg-primary-subtle text-primary border" title="Carrera Vinculada"><i class="bi bi-mortarboard me-1"></i>{{ comm.career_name or 'Carrera General' }}</span>
{% endif %}
<small class="text-muted ms-1">{{ comm.semester }} {{ comm.year }}</small>
</div>
@@ -403,21 +405,38 @@
<label for="add_subject_id" class="form-label fw-semibold small">
<i class="bi bi-book text-primary me-1"></i>Asignatura / Materia Asociada <span class="text-danger">*</span>
</label>
<select class="form-select" id="add_subject_id" name="subject_id" required>
<select class="form-select form-select-sm" id="add_subject_id" name="subject_id" required>
<option value="">-- Seleccione la materia a vincular... --</option>
{% for s in subjects %}
<option value="{{ s.id }}">
{{ s.code }} · {{ s.name }} ({{ s.career_name or s.career or 'Carrera General' }})
{% set car_names = [] %}
{% if s.careers and s.careers|length > 0 %}
{% for cr in s.careers %}{% set _ = car_names.push(cr.name) %}{% endfor %}
{% elif s.career_name %}
{% set _ = car_names.push(s.career_name) %}
{% endif %}
{% set car_label = car_names|join(', ') if car_names|length > 0 else 'Carrera General' %}
<option value="{{ s.id }}" data-careers="{{ car_label }}">
{{ s.code }} — {{ s.name }} [Carrera(s): {{ car_label }}]
</option>
{% endfor %}
</select>
<div class="form-text small">La comisión heredará el plan de estudios y carrera de la materia.</div>
<div id="add_subject_careers_box" class="alert alert-info py-1 px-2 small mt-2 mb-0 d-flex align-items-center justify-content-between">
<div>
<i class="bi bi-mortarboard-fill me-1 text-primary"></i>
<strong>Carrera(s) heredadas:</strong>
<span id="add_subject_careers_text" class="fw-semibold ms-1">-</span>
</div>
<a href="/admin/subjects_list" target="_blank" class="small text-decoration-none fw-semibold">
<i class="bi bi-box-arrow-up-right me-1"></i>Gestionar carreras en Materias
</a>
</div>
<div class="form-text small mt-1">La comisión hereda automáticamente todas las carreras asociadas a esta asignatura.</div>
</div>
<div class="col-md-5">
<label for="add_code" class="form-label fw-semibold small">
<i class="bi bi-tag text-secondary me-1"></i>Código / Identificador <span class="text-danger">*</span>
</label>
<input type="text" class="form-control" id="add_code" name="code" placeholder="Ej: Comisión A, B, N1, Única" required>
<input type="text" class="form-control form-control-sm" id="add_code" name="code" placeholder="Ej: Comisión A, B, N1, Única" required>
<div class="form-text small">Identificador visible para docentes y alumnos.</div>
</div>
</div>
@@ -532,9 +551,29 @@
</label>
<select class="form-select form-select-sm" id="edit_subject_id" name="subject_id" required>
{% for subj in subjects %}
<option value="{{ subj.id }}">{{ subj.code }} — {{ subj.name }} ({{ subj.career_name or 'General' }})</option>
{% set car_names = [] %}
{% if subj.careers and subj.careers|length > 0 %}
{% for cr in subj.careers %}{% set _ = car_names.push(cr.name) %}{% endfor %}
{% elif subj.career_name %}
{% set _ = car_names.push(subj.career_name) %}
{% endif %}
{% set car_label = car_names|join(', ') if car_names|length > 0 else 'Carrera General' %}
<option value="{{ subj.id }}" data-careers="{{ car_label }}">
{{ subj.code }} — {{ subj.name }} [Carrera(s): {{ car_label }}]
</option>
{% endfor %}
</select>
<div id="edit_subject_careers_box" class="alert alert-info py-1 px-2 small mt-2 mb-0 d-flex align-items-center justify-content-between">
<div>
<i class="bi bi-mortarboard-fill me-1 text-primary"></i>
<strong>Carrera(s) heredadas:</strong>
<span id="edit_subject_careers_text" class="fw-semibold ms-1">-</span>
</div>
<a href="/admin/subjects_list" target="_blank" class="small text-decoration-none fw-semibold">
<i class="bi bi-box-arrow-up-right me-1"></i>Gestionar carreras en Materias
</a>
</div>
<div class="form-text small mt-1">La comisión hereda automáticamente todas las carreras asociadas a esta asignatura.</div>
</div>
<div class="col-md-5">
<label for="edit_code" class="form-label fw-semibold small">
@@ -708,6 +747,31 @@ document.addEventListener('DOMContentLoaded', function() {
editTermSelect.addEventListener('change', () => syncTerm(editTermSelect, editYearInput, editSemSelect));
}
// Sincronización de Carreras Heredadas de la Materia
function syncSubjectCareers(selectElem, textElem) {
if (!selectElem || !textElem) return;
const opt = selectElem.options[selectElem.selectedIndex];
if (opt && opt.value) {
const careers = opt.getAttribute('data-careers') || 'Carrera General';
textElem.textContent = careers;
} else {
textElem.textContent = '-';
}
}
const addSubjectSelect = document.getElementById('add_subject_id');
const addSubjectCareersText = document.getElementById('add_subject_careers_text');
if (addSubjectSelect && addSubjectCareersText) {
addSubjectSelect.addEventListener('change', () => syncSubjectCareers(addSubjectSelect, addSubjectCareersText));
syncSubjectCareers(addSubjectSelect, addSubjectCareersText);
}
const editSubjectSelect = document.getElementById('edit_subject_id');
const editSubjectCareersText = document.getElementById('edit_subject_careers_text');
if (editSubjectSelect && editSubjectCareersText) {
editSubjectSelect.addEventListener('change', () => syncSubjectCareers(editSubjectSelect, editSubjectCareersText));
}
// Poblar Modal Editar Comisión
const modalEdit = document.getElementById('modalEditCommission');
if (modalEdit) {
@@ -716,7 +780,9 @@ document.addEventListener('DOMContentLoaded', function() {
if (!btn) return;
document.getElementById('edit_commission_id').value = btn.getAttribute('data-id') || '';
document.getElementById('edit_code').value = btn.getAttribute('data-code') || '';
document.getElementById('edit_subject_id').value = btn.getAttribute('data-subject-id') || '';
const subjSelect = document.getElementById('edit_subject_id');
subjSelect.value = btn.getAttribute('data-subject-id') || '';
syncSubjectCareers(subjSelect, editSubjectCareersText);
document.getElementById('edit_academic_term_id').value = btn.getAttribute('data-academic-term-id') || '';
document.getElementById('edit_semester').value = btn.getAttribute('data-semester') || '1C';
document.getElementById('edit_year').value = btn.getAttribute('data-year') || '2026';
+4 -2
View File
@@ -994,12 +994,14 @@
</td>
<td class="text-end">
<div class="btn-group btn-group-sm">
<a href="/schedule/edit_reservation"
{% if role in ['admin', 'bedelia', 'docente'] %}
<a href="/schedule/edit_reservation?id={{ r.id }}"
class="btn btn-sm btn-primary py-0 px-2" style="font-size: 0.72rem;"
title="Modificar Fecha, Horario, Aula o Detalles">
<i class="bi bi-pencil me-1"></i>Modificar
</a>
<a href="/schedule/view_reservation"
{% endif %}
<a href="/schedule/view_reservation?id={{ r.id }}"
class="btn btn-sm btn-outline-secondary py-0 px-2" style="font-size: 0.72rem;"
title="Ver Ficha Completa">
<i class="bi bi-eye"></i>
+14 -5
View File
@@ -121,11 +121,20 @@
</a>
{% endif %}
{% if role in ['admin', 'bedelia'] %}
{% if role in ['docente', 'admin', 'bedelia'] %}
<div class="mt-3">
<a href="/admin/commission_detail"
class="btn btn-warning btn-sm w-100" id="manage-commission-btn">
<i class="bi bi-gear me-1"></i>Gestionar Comisión
<a href="/schedule/gradebook/{{ commission.id }}"
class="btn btn-primary btn-sm w-100 shadow-sm" id="view-gradebook-btn">
<i class="bi bi-journal-check me-1"></i>Libro de Calificaciones (Actas)
</a>
</div>
{% endif %}
{% if role in ['admin', 'bedelia'] %}
<div class="mt-2">
<a href="/admin/commission_detail?id={{ commission.id }}"
class="btn btn-outline-warning btn-sm w-100" id="manage-commission-btn">
<i class="bi bi-gear me-1"></i>Gestionar Comisión (Admin)
</a>
</div>
{% endif %}
@@ -219,7 +228,7 @@
<i class="bi bi-people display-4 text-muted opacity-40"></i>
<p class="text-muted mt-3">No hay alumnos inscriptos en esta comisión todavía.</p>
{% if role in ['admin', 'bedelia'] %}
<a href="/admin/commission_detail" class="btn btn-outline-success btn-sm">
<a href="/admin/commission_detail?id={{ commission.id }}" class="btn btn-outline-success btn-sm">
<i class="bi bi-person-plus me-1"></i>Inscribir Alumnos
</a>
{% endif %}
+1 -1
View File
@@ -137,7 +137,7 @@
</div>
<div class="card-footer border-0 bg-transparent pt-0 pb-3 px-3">
<a href="/my_subjects/my_subject_detail"
<a href="/my_subjects/detail/{{ comm.id }}"
class="btn btn-primary btn-sm w-100" id="view-commission-{{ comm.id }}">
<i class="bi bi-eye me-1"></i>Ver detalle
</a>
+171 -4
View File
@@ -4,12 +4,30 @@
{% block content %}
<div class="container-fluid py-4">
{% if not commission %}
<div class="card border-0 shadow-sm text-center py-5">
<div class="card-body">
<i class="bi bi-journal-x display-3 text-muted opacity-40"></i>
<h4 class="mt-3 fw-bold">Sin Comisiones Asignadas</h4>
<p class="text-muted">{{ empty_reason or 'No tenés comisiones asignadas actualmente para calificar.' }}</p>
<a href="/my_subjects/my_subjects_list" class="btn btn-outline-primary btn-sm">
<i class="bi bi-book me-1"></i>Ir a Mis Materias
</a>
</div>
</div>
{% else %}
<!-- Breadcrumb -->
<nav aria-label="breadcrumb" class="mb-3">
<ol class="breadcrumb small">
<li class="breadcrumb-item"><a href="/dashboard">Inicio</a></li>
<li class="breadcrumb-item"><a href="/admin/commissions_list">Comisiones</a></li>
<li class="breadcrumb-item"><a href="/admin/commission_detail?id={{ commission.id }}">{{ commission.full_code or commission.code }}</a></li>
{% if role in ['admin', 'bedelia'] %}
<li class="breadcrumb-item"><a href="/admin/commissions_list">Comisiones</a></li>
<li class="breadcrumb-item"><a href="/admin/commission_detail?id={{ commission.id }}">{{ commission.full_code or commission.code }}</a></li>
{% else %}
<li class="breadcrumb-item"><a href="/my_subjects/my_subjects_list">Mis Materias</a></li>
<li class="breadcrumb-item"><a href="/my_subjects/detail/{{ commission.id }}">{{ commission.full_code or commission.code }}</a></li>
{% endif %}
<li class="breadcrumb-item active">Libro de Calificaciones</li>
</ol>
</nav>
@@ -50,6 +68,31 @@
</div>
<div class="d-flex flex-wrap align-items-center gap-2">
<!-- Conmutador entre comisiones si tiene más de 1 -->
{% if all_teacher_commissions and all_teacher_commissions|length > 1 %}
<div class="dropdown">
<button class="btn btn-outline-primary btn-sm dropdown-toggle shadow-sm" type="button" data-bs-toggle="dropdown">
<i class="bi bi-arrow-left-right me-1"></i>Cambiar Comisión
</button>
<ul class="dropdown-menu dropdown-menu-end shadow" style="max-height: 280px; overflow-y: auto;">
{% for c in all_teacher_commissions %}
<li>
<a class="dropdown-item {% if c.id == commission.id %}active{% endif %}" href="/schedule/gradebook/{{ c.id }}">
{{ c.full_code or c.code }} - {{ c.subject.name if c.subject else (c.subject_name or 'Materia') }}
</a>
</li>
{% endfor %}
</ul>
</div>
{% endif %}
<!-- Botón Programar Examen / TP -->
{% if not commission.grades_closed and role in ['docente', 'admin', 'bedelia'] %}
<button type="button" class="btn btn-success btn-sm shadow-sm" data-bs-toggle="modal" data-bs-target="#addMilestoneModal">
<i class="bi bi-calendar-plus me-1"></i>Programar Examen / TP
</button>
{% endif %}
<!-- Live Auto-save indicator -->
<div id="saveStatusIndicator" class="small px-3 py-1 rounded-pill bg-body-tertiary border text-muted d-flex align-items-center gap-2">
<i class="bi bi-cloud-check text-success fs-6" id="saveStatusIcon"></i>
@@ -162,8 +205,15 @@
<th style="min-width: 220px;">Estudiante</th>
<th style="min-width: 110px;">Legajo</th>
{% for col in milestone_columns %}
<th class="text-center" style="min-width: 130px;">
<div>{{ col.title }}</div>
<th class="text-center position-relative" style="min-width: 140px;">
<div class="d-flex align-items-center justify-content-center gap-1">
<span>{{ col.title }}</span>
{% if not commission.grades_closed and role in ['docente', 'admin', 'bedelia'] %}
<button type="button" class="btn btn-link btn-sm text-danger p-0 delete-milestone-btn" data-milestone-id="{{ col.id }}" title="Eliminar evaluación" style="text-decoration: none;">
<i class="bi bi-x-circle-fill"></i>
</button>
{% endif %}
</div>
<small class="text-muted fw-normal font-monospace">({{ col.date }})</small>
</th>
{% endfor %}
@@ -235,6 +285,53 @@
</div>
<!-- Modal: Programar Examen / TP -->
<div class="modal fade" id="addMilestoneModal" tabindex="-1" aria-labelledby="addMilestoneModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header bg-success text-white">
<h5 class="modal-title h6 fw-bold" id="addMilestoneModalLabel">
<i class="bi bi-calendar-plus me-1"></i>Programar Examen / Evaluación
</h5>
<button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<div class="mb-3">
<label class="form-label small fw-semibold">Tipo de Evaluación <span class="text-danger">*</span></label>
<select id="milestoneTypeSelect" class="form-select form-select-sm" required>
{% for mt in milestone_types %}
<option value="{{ mt.id }}">{{ mt.name }}</option>
{% else %}
<option value="1">Parcial</option>
<option value="2">Trabajo Práctico</option>
<option value="3">Recuperatorio</option>
<option value="4">Final</option>
{% endfor %}
</select>
</div>
<div class="mb-3">
<label class="form-label small fw-semibold">Título de la Evaluación <span class="text-danger">*</span></label>
<input type="text" id="milestoneTitleInput" class="form-control form-control-sm" placeholder="Ej: 1° Examen Parcial / TP N° 1" required>
</div>
<div class="mb-3">
<label class="form-label small fw-semibold">Fecha de Realización <span class="text-danger">*</span></label>
<input type="date" id="milestoneDateInput" class="form-control form-control-sm" required>
</div>
<div class="mb-3">
<label class="form-label small fw-semibold">Observaciones / Temario (Opcional):</label>
<textarea id="milestoneNotesInput" class="form-control form-control-sm" rows="2" placeholder="Temas evaluados, modalidad, etc."></textarea>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-sm btn-secondary" data-bs-dismiss="modal">Cancelar</button>
<button type="button" class="btn btn-sm btn-success" id="btnConfirmAddMilestone">
<i class="bi bi-check2-circle me-1"></i>Guardar Evaluación
</button>
</div>
</div>
</div>
</div>
<!-- Modal: Cierre Formal de Acta -->
<div class="modal fade" id="closeActaModal" tabindex="-1" aria-labelledby="closeActaModalLabel" aria-hidden="true">
<div class="modal-dialog">
@@ -522,6 +619,76 @@ document.addEventListener('DOMContentLoaded', function() {
}
});
}
// Add Milestone
const btnAddMilestone = document.getElementById('btnConfirmAddMilestone');
if (btnAddMilestone) {
btnAddMilestone.addEventListener('click', async function() {
const typeId = document.getElementById('milestoneTypeSelect').value;
const title = document.getElementById('milestoneTitleInput').value.trim();
const dateVal = document.getElementById('milestoneDateInput').value;
const notes = document.getElementById('milestoneNotesInput').value.trim();
if (!title || !dateVal) {
alert('Debe completar el título y la fecha de la evaluación.');
return;
}
this.disabled = true;
this.innerHTML = '<span class="spinner-border spinner-border-sm me-1"></span>Guardando...';
try {
const resp = await fetch(`/api/v1/commissions/${commissionId}/milestones`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({
milestone_type_id: parseInt(typeId),
title: title,
date: dateVal,
notes: notes
})
});
const data = await resp.json();
if (resp.ok && data.success) {
window.location.reload();
} else {
alert('Error al programar evaluación: ' + (data.message || 'Error del servidor'));
btnAddMilestone.disabled = false;
btnAddMilestone.innerHTML = '<i class="bi bi-check2-circle me-1"></i>Guardar Evaluación';
}
} catch (err) {
alert('Error de conexión: ' + err.message);
btnAddMilestone.disabled = false;
btnAddMilestone.innerHTML = '<i class="bi bi-check2-circle me-1"></i>Guardar Evaluación';
}
});
}
// Delete Milestone
document.querySelectorAll('.delete-milestone-btn').forEach(btn => {
btn.addEventListener('click', async function(e) {
e.stopPropagation();
const milestoneId = this.dataset.milestoneId;
if (!confirm('¿Está seguro de eliminar esta evaluación y todas sus calificaciones asociadas? Esta acción no se puede deshacer.')) {
return;
}
try {
const resp = await fetch(`/api/v1/commissions/${commissionId}/milestones/${milestoneId}`, {
method: 'DELETE'
});
const data = await resp.json();
if (resp.ok && data.success) {
window.location.reload();
} else {
alert('Error al eliminar evaluación: ' + (data.message || 'Error del servidor'));
}
} catch (err) {
alert('Error de conexión: ' + err.message);
}
});
});
});
</script>
{% endif %}
{% endblock %}