feat: completar fases 3 y 4 del roadmap mvp (gradebook, drag-and-drop, impersonacion) y actualizar README

This commit is contained in:
2026-09-23 12:10:31 -03:00
parent 4ebc5df4fd
commit 7ad4e3f099
38 changed files with 3804 additions and 390 deletions
+240 -29
View File
@@ -3,29 +3,29 @@
{% block title %}Reservations Calendar - Edu-Space Admin{% endblock %}
{% block content %}
<div class="container-fluid pt-5 mt-4">
<div class="container-fluid px-0">
<!-- Header -->
<div class="row mb-4 align-items-center">
<div class="row mb-3 align-items-center">
<div class="col-md-7">
<h1 class="h3 mb-1">
<h1 class="h4 mb-1 fw-bold">
<i class="bi bi-calendar3 text-primary me-2"></i>Reservations Calendar
</h1>
<p class="text-muted small mb-0">View & Manage Reservations — Horarios de cursada y asignación de aulas UniCABA</p>
<p class="text-muted small mb-0">Gestión de Reservas — Horarios de cursada y asignación de aulas UniCABA</p>
</div>
<div class="col-md-5 text-md-end mt-3 mt-md-0">
<div class="col-md-5 text-md-end mt-2 mt-md-0">
{% if user.has_permission('reservations', 'read_write') %}
<a href="/schedule/add_reservation" class="btn btn-primary me-2">
<a href="/schedule/add_reservation" class="btn btn-primary btn-sm me-2">
<i class="bi bi-plus-circle me-1"></i>Add Reservation
</a>
{% endif %}
<a href="/schedule/list_reservations" class="btn btn-outline-secondary">
<a href="/schedule/list_reservations" class="btn btn-outline-secondary btn-sm">
<i class="bi bi-list me-1"></i>List View
</a>
</div>
</div>
<!-- Filters Toolbar (Classroom & Subject Filters to prevent overlapping) -->
<div class="card border-0 shadow-sm mb-4">
<div class="card border-0 shadow-sm mb-3">
<div class="card-body p-3">
<div class="row g-2 align-items-center">
<!-- Filter by Classroom -->
@@ -141,32 +141,81 @@
</div>
</div>
<!-- Calendar Card -->
<div class="card border-0 shadow-sm">
<div class="card-header bg-body-tertiary border-0 py-3">
<div class="d-flex justify-content-between align-items-center flex-wrap gap-2">
<div class="d-flex align-items-center gap-3">
<span class="fw-bold small text-secondary text-uppercase tracking-wide">
<i class="bi bi-info-circle me-1"></i>Referencia:
<!-- Grid Layout: Panel Lateral de Comisiones Pendientes + Calendario Principal -->
<div class="row g-3">
<!-- Sidebar de Comisiones Pendientes de Aula (Drag & Drop) -->
<div class="col-xl-3 col-lg-4" id="unassignedCommissionsSidebar">
<div class="card border-0 shadow-sm h-100">
<div class="card-header bg-body-tertiary border-0 py-2 d-flex justify-content-between align-items-center">
<span class="fw-bold small text-body">
<i class="bi bi-grip-vertical text-primary me-1"></i>Comisiones por Asignar
</span>
<div class="d-flex align-items-center">
<span class="badge badge-brand me-1" style="width: 14px; height: 14px; border-radius: 4px;"></span>
<small class="text-muted">Clase Confirmada</small>
</div>
<div class="d-flex align-items-center">
<span class="badge bg-warning me-1" style="width: 14px; height: 14px; border-radius: 4px;"></span>
<small class="text-muted">Pendiente</small>
</div>
<span class="badge bg-primary rounded-pill" id="unassignedCount">{{ unassigned_commissions|length }}</span>
</div>
<div class="text-muted small">
<i class="bi bi-lightning-charge-fill text-warning me-1"></i>Haz clic en cualquier clase para ver los detalles completos
<div class="card-body p-2" style="max-height: 800px; overflow-y: auto;">
<div class="alert alert-info border-0 py-2 px-2 small mb-2 d-flex align-items-center">
<i class="bi bi-info-circle-fill me-2 fs-6"></i>
<span>Arrastra una comisión a la grilla para asignarla al aula filtrada.</span>
</div>
<div id="externalEventsContainer" class="d-flex flex-column gap-2">
{% for c in unassigned_commissions %}
<div class="fc-event-drag-item p-2 rounded-2 border shadow-sm"
data-commission-id="{{ c.id }}"
data-subject-name="{{ c.subject.name if c.subject else 'Materia' }}"
data-code="{{ c.get_full_code or c.code }}"
data-students="{{ c.current_students or 0 }}"
data-shift="{{ c.shift or 'Regular' }}"
style="cursor: grab; background-color: var(--bs-body-bg); border-left: 4px solid #B43E8E !important; user-select: none;">
<div class="d-flex justify-content-between align-items-center">
<strong class="text-primary small font-monospace">{{ c.get_full_code or c.code }}</strong>
<span class="badge bg-secondary-subtle text-secondary small"><i class="bi bi-people me-1"></i>{{ c.current_students or 0 }} al.</span>
</div>
<div class="small fw-semibold text-truncate text-body mt-1">{{ c.subject.name if c.subject else 'Materia' }}</div>
<div class="d-flex justify-content-between align-items-center mt-1">
<small class="text-muted" style="font-size: 0.72rem;">Turno: {{ c.shift or 'Regular' }}</small>
<span class="badge bg-primary-subtle text-primary border" style="font-size: 0.65rem;">Arrastrar <i class="bi bi-arrows-move"></i></span>
</div>
</div>
{% else %}
<div class="text-center py-4 text-muted small" id="noUnassignedPlaceholder">
<i class="bi bi-check2-circle fs-3 text-success d-block mb-1"></i>
Todas las comisiones tienen aula asignada.
</div>
{% endfor %}
</div>
</div>
</div>
</div>
<div class="card-body p-3">
<!-- FullCalendar Container -->
<div id="calendar"></div>
<!-- Columna del Calendario Principal -->
<div class="col-xl-9 col-lg-8" id="calendarMainCol">
<div class="card border-0 shadow-sm">
<div class="card-header bg-body-tertiary border-0 py-3">
<div class="d-flex justify-content-between align-items-center flex-wrap gap-2">
<div class="d-flex align-items-center gap-3">
<span class="fw-bold small text-secondary text-uppercase tracking-wide">
<i class="bi bi-info-circle me-1"></i>Referencia:
</span>
<div class="d-flex align-items-center">
<span class="badge badge-brand me-1" style="width: 14px; height: 14px; border-radius: 4px;"></span>
<small class="text-muted">Clase Confirmada</small>
</div>
<div class="d-flex align-items-center">
<span class="badge bg-warning me-1" style="width: 14px; height: 14px; border-radius: 4px;"></span>
<small class="text-muted">Pendiente</small>
</div>
</div>
<div class="text-muted small">
<i class="bi bi-arrows-move text-primary me-1"></i><strong>Drag & Drop activo:</strong> Mueve clases en el calendario con validación de choques en tiempo real
</div>
</div>
</div>
<div class="card-body p-3">
<!-- FullCalendar Container -->
<div id="calendar"></div>
</div>
</div>
</div>
</div>
@@ -759,6 +808,10 @@ document.addEventListener('DOMContentLoaded', function() {
initialView: 'timeGridWeek',
initialDate: todayDate,
allDaySlot: false,
editable: true,
droppable: true,
eventDurationEditable: true,
eventResizableFromStart: false,
headerToolbar: {
left: 'prev,next today',
center: 'title',
@@ -784,6 +837,17 @@ document.addEventListener('DOMContentLoaded', function() {
slotEventOverlap: true,
expandRows: true,
stickyHeaderDates: true,
/* Drag and Drop Handlers con Validación de Colisión en Tiempo Real */
eventDrop: function(info) {
handleEventDragOrResize(info, false);
},
eventResize: function(info) {
handleEventDragOrResize(info, true);
},
eventReceive: function(info) {
handleExternalDrop(info);
},
/* Dynamic Server-Side Filtered Events */
events: function(info, successCallback, failureCallback) {
@@ -1018,6 +1082,153 @@ document.addEventListener('DOMContentLoaded', function() {
modal.show();
}
});
// Soporte Drag and Drop externo para Comisiones Pendientes
var containerEl = document.getElementById('externalEventsContainer');
if (containerEl && typeof FullCalendar.Draggable !== 'undefined') {
new FullCalendar.Draggable(containerEl, {
itemSelector: '.fc-event-drag-item',
eventData: function(eventEl) {
return {
title: (eventEl.getAttribute('data-code') || 'Comisión') + ' - ' + (eventEl.getAttribute('data-subject-name') || ''),
extendedProps: {
commission_id: eventEl.getAttribute('data-commission-id'),
subject_name: eventEl.getAttribute('data-subject-name'),
is_external_commission: true
},
duration: '02:00'
};
}
});
}
function showToast(title, message, details, type) {
var toastContainer = document.querySelector('.toast-container');
if (!toastContainer) {
toastContainer = document.createElement('div');
toastContainer.className = 'toast-container position-fixed bottom-0 end-0 p-3';
toastContainer.style.zIndex = '1090';
document.body.appendChild(toastContainer);
}
var bgClass = type === 'danger' ? 'bg-danger text-white' : (type === 'warning' ? 'bg-warning text-dark' : 'bg-success text-white');
var iconClass = type === 'danger' ? 'bi-exclamation-octagon-fill' : (type === 'warning' ? 'bi-exclamation-triangle-fill' : 'bi-check-circle-fill');
var detailsHtml = '';
if (details && details.length > 0) {
detailsHtml = '<ul class="mb-0 mt-1 ps-3 small">' + details.map(function(d) { return '<li>' + d + '</li>'; }).join('') + '</ul>';
}
var toastEl = document.createElement('div');
toastEl.className = 'toast align-items-center ' + bgClass + ' border-0 shadow-lg mb-2';
toastEl.setAttribute('role', 'alert');
toastEl.setAttribute('aria-live', 'assertive');
toastEl.setAttribute('aria-atomic', 'true');
toastEl.innerHTML = '<div class="d-flex"><div class="toast-body"><div class="fw-bold"><i class="bi ' + iconClass + ' me-2"></i>' + title + '</div><div class="small">' + message + '</div>' + detailsHtml + '</div><button type="button" class="btn-close ' + (type === 'warning' ? '' : 'btn-close-white') + ' me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"></button></div>';
toastContainer.appendChild(toastEl);
var bsToast = new bootstrap.Toast(toastEl, { delay: 6000 });
bsToast.show();
toastEl.addEventListener('hidden.bs.toast', function() {
toastEl.remove();
});
}
function handleEventDragOrResize(info, isResize) {
var startIso = info.event.start ? info.event.start.toISOString() : null;
var endIso = info.event.end ? info.event.end.toISOString() : (info.event.start ? new Date(info.event.start.getTime() + 2 * 3600 * 1000).toISOString() : null);
var ext = info.event.extendedProps || {};
var classroomId = filterRoom.value ? parseInt(filterRoom.value, 10) : (ext.classroom_id || null);
fetch('/api/v1/reservations/drag-update', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({
reservation_id: parseInt(info.event.id, 10),
start_time: startIso,
end_time: endIso,
classroom_id: classroomId
})
})
.then(function(res) {
return res.json().then(function(data) {
return { status: res.status, data: data };
});
})
.then(function(result) {
if (result.status === 409 || (result.data && result.data.status === 'conflict')) {
info.revert();
var reasons = (result.data.conflicts || []).concat(result.data.block_reasons || []);
showToast('Conflicto de Horario Detectado', result.data.message || 'No se puede reubicar la clase en ese espacio/horario.', reasons, 'danger');
} else if (result.status >= 400) {
info.revert();
showToast('Error', result.data.message || 'Ocurrió un error al actualizar la reserva.', [], 'danger');
} else {
showToast('Reserva Actualizada', result.data.message || 'Horario y aula confirmados con éxito.', [], 'success');
}
})
.catch(function(err) {
info.revert();
console.error('Drag update error:', err);
showToast('Error de Conexión', 'No se pudo comunicar con el servidor.', [], 'danger');
});
}
function handleExternalDrop(info) {
var ext = info.event.extendedProps || {};
var commissionId = ext.commission_id;
var startIso = info.event.start ? info.event.start.toISOString() : null;
var endIso = info.event.end ? info.event.end.toISOString() : (info.event.start ? new Date(info.event.start.getTime() + 2 * 3600 * 1000).toISOString() : null);
var classroomId = filterRoom.value ? parseInt(filterRoom.value, 10) : null;
if (!classroomId) {
info.revert();
showToast('Aula Requerida', 'Por favor selecciona un Aula en el filtro superior antes de arrastrar comisiones a la grilla.', [], 'warning');
return;
}
fetch('/api/v1/reservations/drag-update', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({
commission_id: parseInt(commissionId, 10),
start_time: startIso,
end_time: endIso,
classroom_id: classroomId
})
})
.then(function(res) {
return res.json().then(function(data) {
return { status: res.status, data: data };
});
})
.then(function(result) {
if (result.status === 409 || (result.data && result.data.status === 'conflict')) {
info.revert();
var reasons = (result.data.conflicts || []).concat(result.data.block_reasons || []);
showToast('Conflicto al Asignar Comisión', result.data.message || 'El aula o docente no están disponibles en este horario.', reasons, 'danger');
} else if (result.status >= 400) {
info.revert();
showToast('Error', result.data.message || 'No se pudo asignar el aula a la comisión.', [], 'danger');
} else {
showToast('Comisión Asignada', result.data.message || 'Comisión asignada con éxito al aula.', [], 'success');
var draggedItem = document.querySelector('.fc-event-drag-item[data-commission-id="' + commissionId + '"]');
if (draggedItem) {
draggedItem.remove();
var countBadge = document.getElementById('unassignedCount');
if (countBadge) {
var curr = parseInt(countBadge.textContent, 10) || 1;
countBadge.textContent = Math.max(0, curr - 1);
}
}
calendar.refetchEvents();
}
})
.catch(function(err) {
info.revert();
console.error('External drop error:', err);
showToast('Error de Conexión', 'No se pudo registrar la asignación.', [], 'danger');
});
}
calendar.render();
+4 -4
View File
@@ -512,9 +512,9 @@
{% endblock %}
{% block content %}
<div class="container-fluid pt-5 mt-4">
<div class="container-fluid px-0">
<!-- Header -->
<div class="d-flex flex-column flex-md-row justify-content-between align-items-md-center gap-3 mb-4">
<div class="d-flex flex-column flex-md-row justify-content-between align-items-md-center gap-3 mb-3">
<div>
<h1 class="h3 fw-bold mb-1">
<i class="bi bi-diagram-3 text-primary me-2"></i>Gestión de Comisiones y Cursadas
@@ -720,7 +720,7 @@
<div class="d-flex flex-wrap align-items-center gap-1">
{% for m in commission.academic_milestones %}
<span class="badge comm-milestone-chip text-white d-inline-flex align-items-center py-1 px-2"
style="background-color: {{ m.color }}; font-size: 0.72rem;"
{{ ('style="background-color: ' ~ (m.color or '#6c757d') ~ '; font-size: 0.72rem;"') | safe }}
title="{{ m.title }} - {{ m.date if m.date else '' }} ({{ m.classroom or 'Campus Virtual' }})">
<i class="bi bi-flag-fill me-1" style="font-size: 0.65rem;"></i>
{{ m.title or m.tipo }}
@@ -753,7 +753,7 @@
{% set fill_pct = (commission.current_students / commission.max_students * 100) if commission.max_students > 0 else 0 %}
<div class="progress mt-1 mx-auto" style="height: 4px; width: 50px;">
<div class="progress-bar {% if fill_pct > 90 %}bg-danger{% elif fill_pct > 70 %}bg-warning{% else %}bg-success{% endif %}"
style="width: {{ [fill_pct, 100]|min }}%;"></div>
{{ ('style="width: ' ~ ([fill_pct, 100]|min) ~ '%;"') | safe }}></div>
</div>
</td>
<td class="text-end pe-4">
+527
View File
@@ -0,0 +1,527 @@
{% extends 'base.html' %}
{% block title %}Libro de Calificaciones — {{ commission.full_code or commission.code }} — Edu-Space{% endblock %}
{% block content %}
<div class="container-fluid py-4">
<!-- 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>
<li class="breadcrumb-item active">Libro de Calificaciones</li>
</ol>
</nav>
<!-- Header Banner -->
<div class="card border-0 shadow-sm mb-4 bg-body">
<div class="card-body p-4">
<div class="d-flex flex-wrap justify-content-between align-items-center gap-3">
<div>
<div class="d-flex align-items-center gap-2 mb-1">
<span class="badge bg-primary-subtle text-primary border border-primary-subtle font-monospace px-2 py-1">
{{ commission.full_code or commission.code }}
</span>
<span class="badge bg-secondary-subtle text-secondary border font-monospace">
{{ commission.semester }} {{ commission.year }}
</span>
{% if commission.grades_closed %}
<span class="badge bg-danger text-white px-2 py-1 shadow-sm">
<i class="bi bi-lock-fill me-1"></i>ACTA CERRADA ({{ commission.acta_number }})
</span>
{% else %}
<span class="badge bg-success-subtle text-success border border-success-subtle px-2 py-1">
<i class="bi bi-unlock-fill me-1"></i>CALIFICACIONES ABIERTAS
</span>
{% endif %}
</div>
<h3 class="fw-bold mb-1">{{ commission.subject.name if commission.subject else 'Materia' }}</h3>
<p class="text-muted small mb-0">
<i class="bi bi-clock me-1"></i>Turno: <strong>{{ commission.shift or 'A definir' }}</strong>
{% if commission.teachers and commission.teachers|length > 0 %}
<span class="mx-2">·</span>
<i class="bi bi-person-badge me-1"></i>Cátedra:
{% for t in commission.teachers %}
<span class="badge bg-light text-dark border me-1">{{ t.name }} ({{ t.role_in_commission or 'Docente' }})</span>
{% endfor %}
{% endif %}
</p>
</div>
<div class="d-flex flex-wrap align-items-center gap-2">
<!-- 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>
<span id="saveStatusText">Todos los cambios guardados</span>
</div>
<!-- Print / Export -->
<button type="button" class="btn btn-outline-secondary btn-sm" onclick="window.print()">
<i class="bi bi-printer me-1"></i>Imprimir Planilla
</button>
<!-- Acta Action Buttons -->
{% if commission.grades_closed %}
{% if role in ['admin', 'bedelia'] %}
<button type="button" class="btn btn-outline-danger btn-sm" data-bs-toggle="modal" data-bs-target="#reopenActaModal">
<i class="bi bi-unlock me-1"></i>Reabrir Acta
</button>
{% endif %}
{% else %}
<button type="button" class="btn btn-danger btn-sm shadow-sm" data-bs-toggle="modal" data-bs-target="#closeActaModal">
<i class="bi bi-file-earmark-lock me-1"></i>Cerrar Acta Formal
</button>
{% endif %}
</div>
</div>
</div>
</div>
<!-- KPI Summary Cards -->
<div class="row g-3 mb-4">
<div class="col-6 col-md-3">
<div class="card border-0 shadow-sm p-3 h-100">
<div class="d-flex justify-content-between align-items-center">
<div>
<span class="text-muted small fw-semibold text-uppercase">Total Inscriptos</span>
<h3 class="fw-bold mb-0 mt-1" id="kpiTotalStudents">{{ students|length }}</h3>
</div>
<div class="bg-primary bg-opacity-10 text-primary rounded-circle p-3">
<i class="bi bi-people fs-4"></i>
</div>
</div>
</div>
</div>
<div class="col-6 col-md-3">
<div class="card border-0 shadow-sm p-3 h-100">
<div class="d-flex justify-content-between align-items-center">
<div>
<span class="text-muted small fw-semibold text-uppercase">Promocionados (≥ 7)</span>
<h3 class="fw-bold mb-0 mt-1 text-success" id="kpiPromoted">0</h3>
</div>
<div class="bg-success bg-opacity-10 text-success rounded-circle p-3">
<i class="bi bi-award fs-4"></i>
</div>
</div>
</div>
</div>
<div class="col-6 col-md-3">
<div class="card border-0 shadow-sm p-3 h-100">
<div class="d-flex justify-content-between align-items-center">
<div>
<span class="text-muted small fw-semibold text-uppercase">Regulares (4 a 6.9)</span>
<h3 class="fw-bold mb-0 mt-1 text-primary" id="kpiRegular">0</h3>
</div>
<div class="bg-info bg-opacity-10 text-info rounded-circle p-3">
<i class="bi bi-check2-circle fs-4"></i>
</div>
</div>
</div>
</div>
<div class="col-6 col-md-3">
<div class="card border-0 shadow-sm p-3 h-100">
<div class="d-flex justify-content-between align-items-center">
<div>
<span class="text-muted small fw-semibold text-uppercase">Libres (< 4)</span>
<h3 class="fw-bold mb-0 mt-1 text-danger" id="kpiLibre">0</h3>
</div>
<div class="bg-danger bg-opacity-10 text-danger rounded-circle p-3">
<i class="bi bi-x-circle fs-4"></i>
</div>
</div>
</div>
</div>
</div>
<!-- Gradebook Matrix Table Card -->
<div class="card border-0 shadow-sm">
<div class="card-header bg-body-tertiary border-0 py-3 d-flex justify-content-between align-items-center flex-wrap gap-2">
<div>
<h5 class="mb-0 h6 fw-bold">
<i class="bi bi-table me-2 text-primary"></i>Matriz de Evaluaciones y Calificaciones
</h5>
<small class="text-muted">Las notas se guardan automáticamente al escribirlas. Escala: 1 a 10 (Ausente: A o vacío).</small>
</div>
<div class="d-flex align-items-center gap-2">
<input type="text" id="filterStudentInput" class="form-control form-control-sm" placeholder="Buscar alumno o legajo..." style="max-width: 220px;">
</div>
</div>
<div class="card-body p-0">
{% if students and students|length > 0 %}
<div class="table-responsive">
<table class="table table-hover align-middle mb-0" id="gradebookTable">
<thead class="table-light small">
<tr>
<th class="ps-3" style="width: 60px;">#</th>
<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>
<small class="text-muted fw-normal font-monospace">({{ col.date }})</small>
</th>
{% endfor %}
<th class="text-center" style="min-width: 110px;">Promedio</th>
<th class="text-center pe-3" style="min-width: 140px;">Condición Final</th>
</tr>
</thead>
<tbody>
{% for s in students %}
<tr data-student-id="{{ s.id }}" data-student-name="{{ s.name|lower }}" data-student-dni="{{ s.dni or '' }}">
<td class="ps-3 font-monospace text-muted small">{{ loop.index }}</td>
<td>
<div class="fw-semibold text-body">{{ s.name }}</div>
<small class="text-muted font-monospace">{{ s.email }}</small>
</td>
<td>
<span class="badge bg-secondary-subtle text-secondary font-monospace">
{{ s.dni or ('LEG-' + s.id) }}
</span>
</td>
{% for col in milestone_columns %}
{% set grade_obj = s.grades[col.id] %}
<td class="text-center">
<div class="d-flex justify-content-center align-items-center">
<input
type="number"
step="0.5"
min="1"
max="10"
class="form-control form-control-sm text-center font-monospace fw-bold grade-input"
style="max-width: 85px; font-size: 0.95rem;"
data-milestone-id="{{ col.id }}"
data-student-id="{{ s.id }}"
value="{{ grade_obj.score if grade_obj and grade_obj.score is not none else '' }}"
placeholder="-"
{% if commission.grades_closed %}disabled{% endif %}
>
</div>
</td>
{% endfor %}
<!-- Promedio calculado en vivo -->
<td class="text-center">
<span class="font-monospace fw-bold fs-6 avg-cell">-</span>
</td>
<!-- Condición académica calculada en vivo -->
<td class="text-center pe-3">
<span class="badge condition-badge font-monospace py-2 px-2">Pendiente</span>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
{% else %}
<div class="text-center py-5">
<i class="bi bi-people fs-1 text-muted d-block mb-3"></i>
<h5 class="fw-bold text-muted">No hay estudiantes inscriptos en esta comisión</h5>
<p class="text-muted small">Puede matricular alumnos desde el panel de detalle de la comisión.</p>
<a href="/admin/commission_detail?id={{ commission.id }}" class="btn btn-outline-primary btn-sm">
<i class="bi bi-person-plus me-1"></i>Ir a Matriculación
</a>
</div>
{% endif %}
</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">
<div class="modal-content">
<div class="modal-header bg-danger text-white">
<h5 class="modal-title h6 fw-bold" id="closeActaModalLabel">
<i class="bi bi-shield-lock me-1"></i>Cierre Formal de Acta de Regularidad
</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="alert alert-warning small mb-3">
<i class="bi bi-exclamation-triangle-fill me-1"></i>
<strong>Atención:</strong> Al cerrar el acta, todas las notas se congelan legalmente y se genera un número de acta único e inmutable. Sólo el personal de Bedelía o Administradores podrá reabrirla con justificación escrita.
</div>
<div class="mb-3">
<label class="form-label small fw-semibold">Observaciones o Notas de Cátedra (Opcional):</label>
<textarea id="closeActaNotes" class="form-control small" rows="3" placeholder="Ej: Cursada cerrada con 22 alumnos regulares y 5 promocionados."></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-danger" id="btnConfirmCloseActa">
<i class="bi bi-lock-fill me-1"></i>Confirmar y Sellar Acta
</button>
</div>
</div>
</div>
</div>
<!-- Modal: Reapertura de Acta (Admin / Bedelía) -->
<div class="modal fade" id="reopenActaModal" tabindex="-1" aria-labelledby="reopenActaModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header bg-warning">
<h5 class="modal-title h6 fw-bold" id="reopenActaModalLabel">
<i class="bi bi-unlock-fill me-1"></i>Reapertura Excepcional de Acta
</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<p class="small text-muted mb-3">
Esta acción quedará asentada en la bitácora inmutable de auditoría institucional.
</p>
<div class="mb-3">
<label class="form-label small fw-semibold">Motivo formal de reapertura (Obligatorio):</label>
<textarea id="reopenActaReason" class="form-control small" rows="3" placeholder="Ej: Rectificación de nota de examen recuperatorio según resolución..."></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-warning" id="btnConfirmReopenActa">
<i class="bi bi-unlock me-1"></i>Reabrir Acta
</button>
</div>
</div>
</div>
</div>
<div id="gradebookConfig" data-commission-id="{{ commission.id }}" data-is-closed="{{ 'true' if commission.grades_closed else 'false' }}" class="d-none"></div>
<script>
document.addEventListener('DOMContentLoaded', function() {
const config = document.getElementById('gradebookConfig');
const commissionId = config ? config.dataset.commissionId : '';
const isClosed = config ? config.dataset.isClosed === 'true' : false;
const statusIndicator = document.getElementById('saveStatusIndicator');
const statusIcon = document.getElementById('saveStatusIcon');
const statusText = document.getElementById('saveStatusText');
function updateStatus(state, msg) {
if (state === 'saving') {
statusIcon.className = 'spinner-border spinner-border-sm text-primary';
statusText.textContent = msg || 'Guardando calificación...';
} else if (state === 'saved') {
statusIcon.className = 'bi bi-cloud-check text-success fs-6';
statusText.textContent = msg || 'Todos los cambios guardados';
} else if (state === 'error') {
statusIcon.className = 'bi bi-exclamation-circle text-danger fs-6';
statusText.textContent = msg || 'Error al guardar';
}
}
// Recalculate row averages and condition
function recalculateAllRows() {
let countPromoted = 0;
let countRegular = 0;
let countLibre = 0;
const rows = document.querySelectorAll('#gradebookTable tbody tr');
rows.forEach(row => {
const inputs = row.querySelectorAll('.grade-input');
const avgCell = row.querySelector('.avg-cell');
const badgeCell = row.querySelector('.condition-badge');
let sum = 0;
let count = 0;
let hasGrades = false;
inputs.forEach(inp => {
const val = parseFloat(inp.value);
if (!isNaN(val) && val >= 1 && val <= 10) {
sum += val;
count++;
hasGrades = true;
inp.classList.remove('is-invalid');
} else if (inp.value.trim() !== '') {
inp.classList.add('is-invalid');
} else {
inp.classList.remove('is-invalid');
}
});
if (count > 0) {
const avg = sum / count;
avgCell.textContent = avg.toFixed(1);
if (avg >= 7) {
badgeCell.className = 'badge bg-success-subtle text-success border border-success-subtle font-monospace py-2 px-2';
badgeCell.textContent = 'PROMOCIONADO';
countPromoted++;
} else if (avg >= 4) {
badgeCell.className = 'badge bg-primary-subtle text-primary border border-primary-subtle font-monospace py-2 px-2';
badgeCell.textContent = 'REGULAR';
countRegular++;
} else {
badgeCell.className = 'badge bg-danger-subtle text-danger border border-danger-subtle font-monospace py-2 px-2';
badgeCell.textContent = 'LIBRE';
countLibre++;
}
} else {
avgCell.textContent = '-';
badgeCell.className = 'badge bg-secondary-subtle text-secondary border font-monospace py-2 px-2';
badgeCell.textContent = 'PENDIENTE';
}
});
document.getElementById('kpiPromoted').textContent = countPromoted;
document.getElementById('kpiRegular').textContent = countRegular;
document.getElementById('kpiLibre').textContent = countLibre;
}
recalculateAllRows();
// Debounced auto-save on input
let saveTimeouts = {};
document.querySelectorAll('.grade-input').forEach(input => {
input.addEventListener('input', function() {
if (isClosed) return;
recalculateAllRows();
const milestoneId = this.dataset.milestoneId;
const studentId = this.dataset.studentId;
const key = `${studentId}-${milestoneId}`;
const rawVal = this.value.trim();
updateStatus('saving', 'Escribiendo...');
if (saveTimeouts[key]) clearTimeout(saveTimeouts[key]);
saveTimeouts[key] = setTimeout(async () => {
let score = null;
let isAbsent = false;
if (rawVal === '') {
score = null;
isAbsent = false;
} else {
const num = parseFloat(rawVal);
if (isNaN(num) || num < 1 || num > 10) {
updateStatus('error', 'Nota debe ser entre 1 y 10');
return;
}
score = num;
}
try {
updateStatus('saving', 'Guardando nota...');
const resp = await fetch(`/api/v1/commissions/${commissionId}/gradebook/grades`, {
method: 'PUT',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify({
grades: [{
student_id: parseInt(studentId),
reservation_id: parseInt(milestoneId),
score: score,
is_absent: isAbsent
}]
})
});
const data = await resp.json();
if (resp.ok && data.success) {
updateStatus('saved', '✓ Guardado exitosamente');
} else {
updateStatus('error', data.message || 'Error al guardar');
}
} catch (err) {
console.error('Error auto-saving grade:', err);
updateStatus('error', 'Error de red al guardar');
}
}, 500);
});
});
// Client-side search filter
const filterInput = document.getElementById('filterStudentInput');
if (filterInput) {
filterInput.addEventListener('input', function() {
const term = this.value.toLowerCase().trim();
document.querySelectorAll('#gradebookTable tbody tr').forEach(row => {
const name = row.dataset.studentName || '';
const dni = row.dataset.studentDni || '';
if (name.includes(term) || dni.includes(term)) {
row.style.display = '';
} else {
row.style.display = 'none';
}
});
});
}
// Close Acta
const btnClose = document.getElementById('btnConfirmCloseActa');
if (btnClose) {
btnClose.addEventListener('click', async function() {
const notes = document.getElementById('closeActaNotes').value;
this.disabled = true;
this.innerHTML = '<span class="spinner-border spinner-border-sm me-1"></span>Sellando...';
try {
const resp = await fetch(`/api/v1/commissions/${commissionId}/gradebook/close`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ notes })
});
const data = await resp.json();
if (resp.ok && data.success) {
window.location.reload();
} else {
alert('Error al cerrar acta: ' + (data.message || 'Error del servidor'));
btnClose.disabled = false;
btnClose.innerHTML = '<i class="bi bi-lock-fill me-1"></i>Confirmar y Sellar Acta';
}
} catch (err) {
alert('Error de conexión: ' + err.message);
btnClose.disabled = false;
btnClose.innerHTML = '<i class="bi bi-lock-fill me-1"></i>Confirmar y Sellar Acta';
}
});
}
// Reopen Acta
const btnReopen = document.getElementById('btnConfirmReopenActa');
if (btnReopen) {
btnReopen.addEventListener('click', async function() {
const reason = document.getElementById('reopenActaReason').value;
if (!reason || reason.trim().length < 5) {
alert('Debe especificar un motivo formal para la reapertura.');
return;
}
this.disabled = true;
this.innerHTML = '<span class="spinner-border spinner-border-sm me-1"></span>Reabriendo...';
try {
const resp = await fetch(`/api/v1/commissions/${commissionId}/gradebook/reopen`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ reason })
});
const data = await resp.json();
if (resp.ok && data.success) {
window.location.reload();
} else {
alert('Error al reabrir acta: ' + (data.message || 'Error del servidor'));
btnReopen.disabled = false;
btnReopen.innerHTML = '<i class="bi bi-unlock me-1"></i>Reabrir Acta';
}
} catch (err) {
alert('Error de conexión: ' + err.message);
btnReopen.disabled = false;
btnReopen.innerHTML = '<i class="bi bi-unlock me-1"></i>Reabrir Acta';
}
});
}
});
</script>
{% endblock %}
+2 -2
View File
@@ -3,9 +3,9 @@
{% block title %}Listado de Reservas - Edu-Space Admin{% endblock %}
{% block content %}
<div class="container-fluid pt-5 mt-4">
<div class="container-fluid px-0">
<!-- Header -->
<div class="row mb-4 align-items-center">
<div class="row mb-3 align-items-center">
<div class="col-md-7">
<h1 class="h3 mb-1">
<i class="bi bi-calendar-check text-primary me-2"></i>Listado de Reservas
+176
View File
@@ -0,0 +1,176 @@
{% extends 'base.html' %}
{% block title %}Mis Calificaciones y Estado Académico — Edu-Space{% endblock %}
{% block content %}
<div class="container-fluid py-4">
<!-- 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 active">Mis Calificaciones</li>
</ol>
</nav>
<!-- Header Banner -->
<div class="card border-0 shadow-sm mb-4 bg-body">
<div class="card-body p-4">
<div class="d-flex flex-wrap justify-content-between align-items-center gap-3">
<div>
<span class="badge bg-success-subtle text-success border border-success-subtle font-monospace px-2 py-1 mb-2">
<i class="bi bi-mortarboard-fill me-1"></i>Portal del Estudiante
</span>
<h3 class="fw-bold mb-1">Mis Calificaciones y Regularidad</h3>
<p class="text-muted small mb-0">
Consulta oficial de notas por hito evaluativo, estado de cursada y actas selladas por Bedelía.
</p>
</div>
<button type="button" class="btn btn-outline-secondary btn-sm" onclick="window.print()">
<i class="bi bi-printer me-1"></i>Imprimir Certificado de Cursada
</button>
</div>
</div>
</div>
<!-- Subjects Grades Accordion / Cards -->
{% if subjects and subjects|length > 0 %}
<div class="row g-4">
{% for item in subjects %}
<div class="col-12">
<div class="card border-0 shadow-sm">
<div class="card-header bg-body-tertiary border-0 py-3 d-flex justify-content-between align-items-center flex-wrap gap-2">
<div>
<div class="d-flex align-items-center gap-2 mb-1">
<span class="badge bg-primary-subtle text-primary border font-monospace">
{{ item.commission.code }}
</span>
<span class="badge bg-secondary-subtle text-secondary border font-monospace">
{{ item.commission.semester }} {{ item.commission.year }}
</span>
{% if item.acta_number %}
<span class="badge bg-danger-subtle text-danger border border-danger-subtle font-monospace">
<i class="bi bi-lock-fill me-1"></i>Acta Cerrada: {{ item.acta_number }}
</span>
{% else %}
<span class="badge bg-info-subtle text-info border border-info-subtle">
<i class="bi bi-hourglass-split me-1"></i>Cursada en Curso
</span>
{% endif %}
</div>
<h5 class="fw-bold mb-0 text-body">{{ item.subject.name }}</h5>
<small class="text-muted">{{ item.subject.code }} · Carrera: {{ item.subject.career or 'Tecnicatura / Licenciatura' }}</small>
</div>
<div class="d-flex align-items-center gap-3">
<div class="text-end">
<span class="small text-muted d-block">Promedio General</span>
<span class="fw-bold fs-5 font-monospace text-primary">
{{ item.average if item.average is not none else '-' }}
</span>
</div>
<div>
{% if item.academic_condition == 'PROMOCIONADO' %}
<span class="badge bg-success text-white py-2 px-3 fs-6">
<i class="bi bi-award-fill me-1"></i>PROMOCIONADO
</span>
{% elif item.academic_condition == 'REGULAR' %}
<span class="badge bg-primary text-white py-2 px-3 fs-6">
<i class="bi bi-check-circle-fill me-1"></i>REGULAR
</span>
{% elif item.academic_condition == 'LIBRE' %}
<span class="badge bg-danger text-white py-2 px-3 fs-6">
<i class="bi bi-x-circle-fill me-1"></i>LIBRE
</span>
{% else %}
<span class="badge bg-secondary text-white py-2 px-3 fs-6">
PENDIENTE
</span>
{% endif %}
</div>
</div>
</div>
<div class="card-body p-0">
<div class="table-responsive">
<table class="table table-hover align-middle mb-0">
<thead class="table-light small">
<tr>
<th class="ps-3">Hito Evaluativo</th>
<th>Fecha</th>
<th>Tipo</th>
<th class="text-center">Calificación</th>
<th class="text-center">Condición</th>
<th class="pe-3">Observaciones de Cátedra</th>
</tr>
</thead>
<tbody>
{% for g in item.grades %}
<tr>
<td class="ps-3 fw-semibold text-body">
{{ g.milestone_title }}
</td>
<td class="font-monospace text-muted small">
{{ g.milestone_date }}
</td>
<td>
<span class="badge bg-light text-dark border">
{{ g.milestone_type }}
</span>
</td>
<td class="text-center">
{% if g.is_absent %}
<span class="badge bg-warning text-dark font-monospace">AUSENTE</span>
{% elif g.score is not none %}
<span class="font-monospace fw-bold fs-6 {% if g.score >= 7 %}text-success{% elif g.score >= 4 %}text-primary{% else %}text-danger{% endif %}">
{{ g.score }}
</span>
{% else %}
<span class="text-muted">-</span>
{% endif %}
</td>
<td class="text-center">
{% if g.is_absent %}
<span class="badge bg-warning-subtle text-warning border">Ausente</span>
{% elif g.score is not none %}
{% if g.score >= 7 %}
<span class="badge bg-success-subtle text-success border">Aprobado / Promoción</span>
{% elif g.score >= 4 %}
<span class="badge bg-primary-subtle text-primary border">Aprobado</span>
{% else %}
<span class="badge bg-danger-subtle text-danger border">Desaprobado</span>
{% endif %}
{% else %}
<span class="badge bg-secondary-subtle text-secondary border">Sin Calificar</span>
{% endif %}
</td>
<td class="pe-3 small text-muted">
{{ g.feedback or '-' }}
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
</div>
{% endfor %}
</div>
{% else %}
<div class="card border-0 shadow-sm">
<div class="card-body text-center py-5">
<i class="bi bi-journal-x fs-1 text-muted d-block mb-3"></i>
<h5 class="fw-bold text-muted">Aún no se registran calificaciones cargadas</h5>
<p class="text-muted small">
Tus notas aparecerán aquí a medida que los equipos docentes carguen las evaluaciones de tus materias cursadas.
</p>
<a href="/schedule/today_schedule" class="btn btn-outline-primary btn-sm">
<i class="bi bi-calendar-day me-1"></i>Ver Cartelera de Clases
</a>
</div>
</div>
{% endif %}
</div>
{% endblock %}
+2 -2
View File
@@ -3,9 +3,9 @@
{% block title %}Cartelera de Hoy - Edu-Space Admin{% endblock %}
{% block content %}
<div class="container-fluid pt-5 mt-4">
<div class="container-fluid px-0">
<!-- Header -->
<div class="row mb-4 align-items-center">
<div class="row mb-3 align-items-center">
<div class="col-md-7">
<h1 class="h3 mb-1">
<i class="bi bi-calendar-day text-info me-2"></i>Cartelera del Día
+1 -1
View File
@@ -204,7 +204,7 @@
{% set percentage = (reservation.expected_attendees / reservation.classroom.capacity * 100) %}
<div class="progress-bar bg-{% if percentage > 90 %}danger{% elif percentage > 75 %}warning{% else %}success{% endif %}"
role="progressbar"
style="{{ 'width: ' ~ ([percentage|round(1), 100]|min|string) ~ '%;' }}"></div>
{{ ('style="width: ' ~ ([percentage|round(1), 100]|min|string) ~ '%;"') | safe }}></div>
</div>
<small class="text-muted">
{{ reservation.expected_attendees }} / {{ reservation.classroom.capacity }} capacidad