fix(academic): commission subjects and shared careers mapping, role-based scoping and gradebook milestones (v3.8.20)
This commit is contained in:
@@ -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."""
|
||||
|
||||
Reference in New Issue
Block a user