feat(abm): abm completo de ciclos lectivos, aulas y reservas con proteccion de integridad y pruebas automatizadas
This commit is contained in:
@@ -1242,10 +1242,32 @@ const handleAcademicTermSetCurrent = async (req, res) => {
|
||||
res.redirect('/admin/academic_terms_list');
|
||||
};
|
||||
|
||||
const handleAcademicTermToggle = async (req, res) => {
|
||||
const id = req.params.id || req.body.id;
|
||||
try {
|
||||
await req.apiClient.post(`/academic-terms/${id}/toggle`);
|
||||
} catch (e) {
|
||||
console.warn('Academic term toggle API notice:', e.response?.data || e.message);
|
||||
}
|
||||
res.redirect('/admin/academic_terms_list');
|
||||
};
|
||||
|
||||
const handleAcademicTermDelete = async (req, res) => {
|
||||
const id = req.params.id || req.body.id;
|
||||
try {
|
||||
await req.apiClient.delete(`/academic-terms/${id}`);
|
||||
} catch (e) {
|
||||
console.warn('Academic term delete API notice:', e.response?.data || e.message);
|
||||
}
|
||||
res.redirect('/admin/academic_terms_list');
|
||||
};
|
||||
|
||||
router.get(['/academic_terms_list', '/academic_terms', '/academic-terms'], handleAcademicTermsList);
|
||||
router.post(['/academic_term_add', '/academic-terms/add'], handleAcademicTermAdd);
|
||||
router.post(['/academic_term_edit', '/academic_term_edit/:id'], handleAcademicTermEdit);
|
||||
router.post(['/academic_term_set_current', '/academic_term_set_current/:id'], handleAcademicTermSetCurrent);
|
||||
router.post(['/academic_term_toggle', '/academic_term_toggle/:id', '/academic-terms/toggle/:id'], handleAcademicTermToggle);
|
||||
router.post(['/academic_term_delete', '/academic_term_delete/:id', '/academic-terms/delete/:id'], handleAcademicTermDelete);
|
||||
|
||||
// ─── 9. MILESTONE TYPES ───────────────────────────────────────────────────────
|
||||
|
||||
|
||||
@@ -583,4 +583,28 @@ router.post('/edit/:id', handlePostEditClassroom);
|
||||
router.post('/edit_classroom/:id', handlePostEditClassroom);
|
||||
router.post('/edit_classroom', handlePostEditClassroom);
|
||||
|
||||
const handleToggleClassroom = async (req, res) => {
|
||||
const id = req.params.id || req.body.classroom_id || req.body.id || req.query.id;
|
||||
try {
|
||||
await req.apiClient.post(`/classrooms/${id}/toggle`);
|
||||
} catch (e) {
|
||||
console.warn('Error toggling classroom:', e.response?.data || e.message);
|
||||
}
|
||||
const referer = req.get('Referer') || '/classrooms/list_classrooms';
|
||||
res.redirect(referer);
|
||||
};
|
||||
|
||||
const handleDeleteClassroom = async (req, res) => {
|
||||
const id = req.params.id || req.body.classroom_id || req.body.id || req.query.id;
|
||||
try {
|
||||
await req.apiClient.delete(`/classrooms/${id}`);
|
||||
} catch (e) {
|
||||
console.warn('Error deleting classroom:', e.response?.data || e.message);
|
||||
}
|
||||
res.redirect('/classrooms/list_classrooms');
|
||||
};
|
||||
|
||||
router.post(['/toggle_classroom', '/toggle/:id', '/:id/toggle'], handleToggleClassroom);
|
||||
router.post(['/delete_classroom', '/delete/:id', '/:id/delete'], handleDeleteClassroom);
|
||||
|
||||
module.exports = router;
|
||||
|
||||
@@ -641,6 +641,16 @@ const handleCancelReservation = async (req, res) => {
|
||||
res.redirect(`/schedule/view_reservation?id=${id}`);
|
||||
};
|
||||
|
||||
const handleDeleteReservation = async (req, res) => {
|
||||
const id = req.params.id || req.body.id || req.query.id;
|
||||
try {
|
||||
await req.apiClient.post(`/reservations/${id}/delete`);
|
||||
} catch (e) {
|
||||
console.warn('Delete reservation API notice:', e.response?.data || e.message);
|
||||
}
|
||||
res.redirect('/schedule/list_reservations');
|
||||
};
|
||||
|
||||
router.get(['/view_reservation', '/view_reservation/:id', '/view/:id', '/reservation/:id/view'], handleViewReservation);
|
||||
|
||||
router.get(['/edit_reservation', '/edit_reservation/:id', '/reservation/:id/edit'], handleEditReservation);
|
||||
@@ -648,6 +658,7 @@ router.post(['/edit_reservation', '/edit_reservation/:id', '/reservation/:id/edi
|
||||
|
||||
router.post(['/confirm_reservation', '/confirm_reservation/:id', '/reservation/:id/confirm'], handleConfirmReservation);
|
||||
router.post(['/cancel_reservation', '/cancel_reservation/:id', '/reservation/:id/cancel'], handleCancelReservation);
|
||||
router.post(['/delete_reservation', '/delete_reservation/:id', '/reservation/:id/delete'], handleDeleteReservation);
|
||||
|
||||
// 9. Libro de Calificaciones / Gradebook (Fase 3)
|
||||
const handleGradebook = async (req, res) => {
|
||||
|
||||
@@ -105,6 +105,20 @@
|
||||
title="Editar Ciclo Lectivo">
|
||||
<i class="bi bi-pencil"></i>
|
||||
</button>
|
||||
{% if not term.is_current %}
|
||||
<form method="POST" action="/admin/academic_term_toggle" class="d-inline">
|
||||
<input type="hidden" name="id" value="{{ term.id }}">
|
||||
<button type="submit" class="btn btn-outline-warning py-0 px-2"
|
||||
title="{% if term.is_active %}Desactivar Ciclo{% else %}Habilitar Ciclo{% endif %}">
|
||||
<i class="bi {% if term.is_active %}bi-pause{% else %}bi-play{% endif %}"></i>
|
||||
</button>
|
||||
</form>
|
||||
<button type="button" class="btn btn-outline-danger py-0 px-2"
|
||||
data-bs-toggle="modal" data-bs-target="#modalDeleteTerm{{ term.id }}"
|
||||
title="Eliminar Ciclo Lectivo">
|
||||
<i class="bi bi-trash"></i>
|
||||
</button>
|
||||
{% endif %}
|
||||
</div>
|
||||
</td>
|
||||
{% endif %}
|
||||
@@ -190,6 +204,46 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% if not term.is_current %}
|
||||
<div class="modal fade text-start" id="modalDeleteTerm{{ term.id }}" tabindex="-1" aria-hidden="true">
|
||||
<div class="modal-dialog modal-dialog-centered">
|
||||
<div class="modal-content border-0 shadow">
|
||||
<div class="modal-header bg-danger text-white py-2">
|
||||
<h6 class="modal-title fw-bold">
|
||||
<i class="bi bi-exclamation-triangle-fill me-2"></i>Confirmar Eliminación de Ciclo Lectivo
|
||||
</h6>
|
||||
<button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||
</div>
|
||||
<div class="modal-body p-4">
|
||||
<p class="mb-2">¿Está seguro que desea eliminar el ciclo lectivo <strong>{{ term.name }}</strong> (<code>{{ term.code }}</code>)?</p>
|
||||
{% set t_stat_del = stats[term.id] or {'commissions_count': 0} %}
|
||||
{% if t_stat_del.commissions_count > 0 %}
|
||||
<div class="alert alert-warning small mb-0 mt-3 d-flex align-items-center gap-2">
|
||||
<i class="bi bi-shield-exclamation fs-5"></i>
|
||||
<div>
|
||||
Este ciclo cuenta con <strong>{{ t_stat_del.commissions_count }} comisiones asociadas</strong>. Al confirmar, será <strong>desactivado</strong> para proteger el historial académico de cursadas.
|
||||
</div>
|
||||
</div>
|
||||
{% else %}
|
||||
<div class="alert alert-secondary small mb-0 mt-3">
|
||||
<i class="bi bi-info-circle me-1"></i>No tiene comisiones vinculadas; se eliminará permanentemente de la base de datos.
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="modal-footer py-2 bg-light">
|
||||
<button type="button" class="btn btn-sm btn-secondary" data-bs-dismiss="modal">Cancelar</button>
|
||||
<form method="POST" action="/admin/academic_term_delete" class="d-inline">
|
||||
<input type="hidden" name="id" value="{{ term.id }}">
|
||||
<button type="submit" class="btn btn-sm btn-danger">
|
||||
<i class="bi bi-trash me-1"></i>Confirmar Eliminación
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
|
||||
@@ -399,6 +399,11 @@
|
||||
class="btn btn-outline-secondary py-0 px-2" title="Editar Aula" style="font-size: 0.75rem;">
|
||||
<i class="bi bi-pencil"></i>
|
||||
</a>
|
||||
<button type="button" class="btn btn-outline-danger py-0 px-2"
|
||||
data-bs-toggle="modal" data-bs-target="#modalDeleteClassroom{{ classroom.id }}"
|
||||
title="Eliminar Aula" style="font-size: 0.75rem;">
|
||||
<i class="bi bi-trash"></i>
|
||||
</button>
|
||||
</div>
|
||||
<form method="POST" action="/classrooms/toggle_classroom" class="d-inline mb-0">
|
||||
<input type="hidden" name="classroom_id" value="{{ classroom.id }}">
|
||||
@@ -501,6 +506,11 @@
|
||||
<a href="/classrooms/edit_classroom?id={{ classroom.id }}" class="btn btn-outline-secondary" title="Editar">
|
||||
<i class="bi bi-pencil"></i>
|
||||
</a>
|
||||
<button type="button" class="btn btn-outline-danger"
|
||||
data-bs-toggle="modal" data-bs-target="#modalDeleteClassroom{{ classroom.id }}"
|
||||
title="Eliminar Aula">
|
||||
<i class="bi bi-trash"></i>
|
||||
</button>
|
||||
{% endif %}
|
||||
<form method="POST" action="/classrooms/toggle_classroom" class="d-inline mb-0">
|
||||
<input type="hidden" name="classroom_id" value="{{ classroom.id }}">
|
||||
@@ -997,6 +1007,40 @@
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<!-- Modales de Eliminación de Aulas Físicas -->
|
||||
{% if classrooms and classrooms.items %}
|
||||
{% for classroom in classrooms.items %}
|
||||
<div class="modal fade text-start" id="modalDeleteClassroom{{ classroom.id }}" tabindex="-1" aria-hidden="true">
|
||||
<div class="modal-dialog modal-dialog-centered">
|
||||
<div class="modal-content border-0 shadow">
|
||||
<div class="modal-header bg-danger text-white py-2">
|
||||
<h6 class="modal-title fw-bold">
|
||||
<i class="bi bi-exclamation-triangle-fill me-2"></i>Confirmar Eliminación de Aula
|
||||
</h6>
|
||||
<button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||
</div>
|
||||
<div class="modal-body p-4">
|
||||
<p class="mb-2">¿Está seguro de que desea eliminar el aula <strong>{{ classroom.code }}</strong> ({{ classroom.building_name }} · {{ classroom.floor_display }})?</p>
|
||||
<div class="alert alert-warning small mb-0 mt-3 d-flex align-items-center gap-2">
|
||||
<i class="bi bi-shield-exclamation fs-5"></i>
|
||||
<div>
|
||||
Si el espacio cuenta con reservas históricas o cursadas registradas, se <strong>desactivará</strong> automáticamente para mantener la integridad académica del sistema.
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer py-2 bg-light">
|
||||
<button type="button" class="btn btn-sm btn-secondary" data-bs-dismiss="modal">Cancelar</button>
|
||||
<form method="POST" action="/classrooms/delete_classroom" class="d-inline">
|
||||
<input type="hidden" name="classroom_id" value="{{ classroom.id }}">
|
||||
<button type="submit" class="btn btn-sm btn-danger">
|
||||
<i class="bi bi-trash me-1"></i>Confirmar Eliminación
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
</div>
|
||||
|
||||
@@ -28,9 +28,12 @@
|
||||
</div>
|
||||
<div class="col-md-5 text-md-end mt-3 mt-md-0">
|
||||
{% if user.has_permission('classrooms', 'read_write') %}
|
||||
<a href="/classrooms/edit_classroom" class="btn btn-primary me-2">
|
||||
<a href="/classrooms/edit_classroom/{{ classroom.id }}" class="btn btn-primary me-2">
|
||||
<i class="bi bi-pencil me-1"></i>Edit Classroom
|
||||
</a>
|
||||
<button type="button" class="btn btn-outline-danger me-2" data-bs-toggle="modal" data-bs-target="#modalDeleteClassroom">
|
||||
<i class="bi bi-trash me-1"></i>Eliminar
|
||||
</button>
|
||||
{% endif %}
|
||||
<a href="/classrooms/list_classrooms" class="btn btn-outline-secondary">
|
||||
<i class="bi bi-arrow-left me-1"></i>Back to Classrooms
|
||||
@@ -169,5 +172,35 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Modal Confirmar Eliminación de Aula -->
|
||||
<div class="modal fade text-start" id="modalDeleteClassroom" tabindex="-1" aria-hidden="true">
|
||||
<div class="modal-dialog modal-dialog-centered">
|
||||
<div class="modal-content border-0 shadow">
|
||||
<div class="modal-header bg-danger text-white py-2">
|
||||
<h6 class="modal-title fw-bold">
|
||||
<i class="bi bi-exclamation-triangle-fill me-2"></i>Confirmar Eliminación de Aula
|
||||
</h6>
|
||||
<button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||
</div>
|
||||
<div class="modal-body p-4">
|
||||
<p class="mb-2">¿Está seguro de que desea eliminar el aula <strong>{{ classroom.code_display }}</strong>?</p>
|
||||
<div class="alert alert-warning small mb-0 mt-3 d-flex align-items-center gap-2">
|
||||
<i class="bi bi-shield-exclamation fs-5"></i>
|
||||
<div>
|
||||
Si el espacio cuenta con reservas históricas o cursadas registradas, se <strong>desactivará</strong> automáticamente para mantener la integridad académica del sistema.
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer py-2 bg-light">
|
||||
<button type="button" class="btn btn-sm btn-secondary" data-bs-dismiss="modal">Cancelar</button>
|
||||
<form method="POST" action="/classrooms/delete_classroom" class="d-inline">
|
||||
<input type="hidden" name="classroom_id" value="{{ classroom.id }}">
|
||||
<button type="submit" class="btn btn-sm btn-danger">
|
||||
<i class="bi bi-trash me-1"></i>Confirmar Eliminación
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
@@ -248,12 +248,19 @@
|
||||
{% if reservation.can_be_cancelled() %}
|
||||
<form method="POST" action="/schedule/cancel_reservation?id={{ reservation.id }}">
|
||||
<input type="hidden" name="id" value="{{ reservation.id }}">
|
||||
<button type="submit" class="btn btn-danger" onclick="return confirm('¿Cancelar esta reserva?')">
|
||||
<button type="submit" class="btn btn-outline-warning" onclick="return confirm('¿Cancelar esta reserva?')">
|
||||
<i class="bi bi-x-circle me-1"></i>Cancelar Reserva
|
||||
</button>
|
||||
</form>
|
||||
{% endif %}
|
||||
|
||||
<form method="POST" action="/schedule/delete_reservation?id={{ reservation.id }}" onsubmit="return confirm('¿Está seguro de que desea eliminar definitivamente esta reserva? Esta acción no se puede deshacer.');">
|
||||
<input type="hidden" name="id" value="{{ reservation.id }}">
|
||||
<button type="submit" class="btn btn-outline-danger w-100">
|
||||
<i class="bi bi-trash me-1"></i>Eliminar Reserva Definitivamente
|
||||
</button>
|
||||
</form>
|
||||
|
||||
<a href="/schedule/list_reservations" class="btn btn-outline-secondary">
|
||||
<i class="bi bi-list"></i> View All Reservations
|
||||
</a>
|
||||
|
||||
Reference in New Issue
Block a user