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