feat(bedelia): associate careers to commissions and subjects, clean dashboard mock fallbacks, and update SSD documentation
This commit is contained in:
@@ -830,6 +830,7 @@ const handleCommissionsList = async (req, res) => {
|
||||
try {
|
||||
const search = (req.query.search || '').trim();
|
||||
const subject_id = req.query.subject_id || '';
|
||||
const career_id = req.query.career_id || '';
|
||||
const shift = req.query.shift || '';
|
||||
const active = req.query.active || '';
|
||||
const created = req.query.created === '1';
|
||||
@@ -838,10 +839,11 @@ const handleCommissionsList = async (req, res) => {
|
||||
let subjects = [];
|
||||
let teachers = [];
|
||||
let academic_terms = [];
|
||||
let careers = [];
|
||||
|
||||
try {
|
||||
const [cRes, uRes] = await Promise.allSettled([
|
||||
req.apiClient.get('/commissions', { params: { search, subject_id, shift, active } }),
|
||||
req.apiClient.get('/commissions', { params: { search, subject_id, career_id, shift, active } }),
|
||||
req.apiClient.get('/users')
|
||||
]);
|
||||
|
||||
@@ -849,10 +851,13 @@ const handleCommissionsList = async (req, res) => {
|
||||
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',
|
||||
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,
|
||||
@@ -860,6 +865,15 @@ const handleCommissionsList = async (req, res) => {
|
||||
}));
|
||||
subjects = cRes.value.data.subjects || [];
|
||||
academic_terms = cRes.value.data.academic_terms || [];
|
||||
careers = cRes.value.data.careers || [];
|
||||
}
|
||||
|
||||
// Fallback para careers si no vinieron en la respuesta de commissions
|
||||
if (!careers || careers.length === 0) {
|
||||
try {
|
||||
const carRes = await req.apiClient.get('/careers');
|
||||
careers = carRes.data?.careers || [];
|
||||
} catch (carErr) {}
|
||||
}
|
||||
|
||||
// Si por alguna razón no vinieron academic_terms en commissions, intentar fallback
|
||||
@@ -887,8 +901,10 @@ const handleCommissionsList = async (req, res) => {
|
||||
subjects,
|
||||
teachers,
|
||||
academic_terms,
|
||||
careers,
|
||||
search,
|
||||
subject_filter: subject_id ? parseInt(subject_id, 10) : '',
|
||||
career_filter: career_id ? parseInt(career_id, 10) : '',
|
||||
shift_filter: shift,
|
||||
active_filter: active,
|
||||
created,
|
||||
|
||||
@@ -108,74 +108,21 @@ router.get('/', async (req, res) => {
|
||||
};
|
||||
} else if (role === 'bedelia') {
|
||||
role_data = {
|
||||
pending_reservations: apiPending || [
|
||||
{
|
||||
id: 101,
|
||||
start_time: '08:00',
|
||||
end_time: '12:00',
|
||||
classroom: { code: 'Aula 101' },
|
||||
subject_name: 'Arquitectura de Computadoras',
|
||||
user: { name: 'Prof. Gabriel Martínez' }
|
||||
},
|
||||
{
|
||||
id: 102,
|
||||
start_time: '14:00',
|
||||
end_time: '18:00',
|
||||
classroom: { code: 'Lab Informática 2' },
|
||||
subject_name: 'Bases de Datos II',
|
||||
user: { name: 'Dra. Laura Blanco' }
|
||||
},
|
||||
{
|
||||
id: 103,
|
||||
start_time: '18:30',
|
||||
end_time: '22:00',
|
||||
classroom: { code: 'Aula Magna' },
|
||||
subject_name: 'Seminario de Ciberseguridad',
|
||||
user: { name: 'Lic. Fernando Gómez' }
|
||||
}
|
||||
],
|
||||
today_schedule_list: apiTodaySchedule || [
|
||||
{ start_time: '08:00', end_time: '12:00', classroom: { code: 'Aula 102' }, subject_name: 'Algoritmos y Estructuras de Datos', user: { name: 'Prof. Ana Vega' } },
|
||||
{ start_time: '08:30', end_time: '12:30', classroom: { code: 'Aula 204' }, subject_name: 'Matemática Discreta', user: { name: 'Prof. Carlos López' } },
|
||||
{ start_time: '14:00', end_time: '18:00', classroom: { code: 'Lab Redes' }, subject_name: 'Redes y Telecomunicaciones', user: { name: 'Ing. Marcos Ruiz' } }
|
||||
],
|
||||
pending_reservations: apiPending || [],
|
||||
today_schedule_list: apiTodaySchedule || [],
|
||||
unassigned_commissions_week: bedeliaData.unassigned_commissions_week || [],
|
||||
unassigned_commissions_month: bedeliaData.unassigned_commissions_month || [],
|
||||
available_classrooms_week: bedeliaData.available_classrooms_week || [],
|
||||
available_classrooms_month: bedeliaData.available_classrooms_month || []
|
||||
};
|
||||
} else if (role === 'docente') {
|
||||
const myClasses = apiTodaySchedule ? apiTodaySchedule.slice(0, 3) : null;
|
||||
const myClasses = apiTodaySchedule ? apiTodaySchedule.slice(0, 3) : [];
|
||||
role_data = {
|
||||
my_today_classes: myClasses || [
|
||||
{
|
||||
id: 201,
|
||||
start_time: '08:30',
|
||||
end_time: '12:00',
|
||||
subject_name: 'Algoritmos y Estructuras de Datos',
|
||||
subject_code: 'AED-102',
|
||||
commission: { code: 'COM-A' },
|
||||
classroom: { is_virtual: false, location_display: 'Piso 1 · Aula 104' },
|
||||
virtual_link: ''
|
||||
},
|
||||
{
|
||||
id: 202,
|
||||
start_time: '18:30',
|
||||
end_time: '22:00',
|
||||
subject_name: 'Programación Concurrente y Distribuida',
|
||||
subject_code: 'PCD-301',
|
||||
commission: { code: 'COM-D' },
|
||||
classroom: { is_virtual: true, location_display: 'Campus Virtual' },
|
||||
virtual_link: 'https://meet.google.com/edu-space-pcd'
|
||||
}
|
||||
],
|
||||
virtual_classrooms: [
|
||||
{ code: 'Sala Virtual 1', link: 'https://meet.google.com/edu-space-v1' },
|
||||
{ code: 'Sala Virtual 2', link: 'https://meet.google.com/edu-space-v2' }
|
||||
]
|
||||
my_today_classes: myClasses,
|
||||
virtual_classrooms: []
|
||||
};
|
||||
} else if (role === 'alumno') {
|
||||
const studentClasses = apiTodaySchedule ? apiTodaySchedule.slice(0, 4) : null;
|
||||
const studentClasses = apiTodaySchedule ? apiTodaySchedule.slice(0, 4) : [];
|
||||
let upcomingMilestonesList = [];
|
||||
try {
|
||||
const mResp = await req.apiClient.get('/students/my-upcoming-milestones');
|
||||
@@ -196,75 +143,13 @@ router.get('/', async (req, res) => {
|
||||
console.warn('Student milestones fetch notice:', e.message);
|
||||
}
|
||||
|
||||
if (upcomingMilestonesList.length === 0) {
|
||||
upcomingMilestonesList = [
|
||||
{
|
||||
title: 'Primer Examen Parcial',
|
||||
materia_codigo: 'BDR-201',
|
||||
subject_name: 'Bases de Datos Relacionales',
|
||||
date: '25/09/2026',
|
||||
days_remaining: 2,
|
||||
type_obj: { name: 'Examen Parcial', color: '#dc3545' },
|
||||
milestone_type: { name: 'Examen Parcial', color: '#dc3545' },
|
||||
notes: 'Traer DNI y calculadora',
|
||||
classroom: 'Piso 2 · Aula 204'
|
||||
},
|
||||
{
|
||||
title: 'Entrega TP Grupal Nº 2',
|
||||
materia_codigo: 'AED-102',
|
||||
subject_name: 'Algoritmos y Estructuras de Datos',
|
||||
date: '30/09/2026',
|
||||
days_remaining: 7,
|
||||
type_obj: { name: 'Trabajo Práctico', color: '#198754' },
|
||||
milestone_type: { name: 'Trabajo Práctico', color: '#198754' },
|
||||
notes: 'Subir código al repositorio',
|
||||
classroom: 'Campus Virtual',
|
||||
link: 'https://campus.edu-space.com/tps'
|
||||
},
|
||||
{
|
||||
title: 'Recuperatorio Parcial 1',
|
||||
materia_codigo: 'RYT-302',
|
||||
subject_name: 'Redes y Telecomunicaciones',
|
||||
date: '08/10/2026',
|
||||
days_remaining: 15,
|
||||
type_obj: { name: 'Recuperatorio', color: '#fd7e14' },
|
||||
milestone_type: { name: 'Recuperatorio', color: '#fd7e14' },
|
||||
notes: 'Piso 2 · Aula 204',
|
||||
classroom: 'Piso 2 · Aula 204'
|
||||
}
|
||||
];
|
||||
}
|
||||
|
||||
role_data = {
|
||||
today_classes: studentClasses || [
|
||||
{
|
||||
start_time: '08:00',
|
||||
end_time: '12:00',
|
||||
subject_name: 'Bases de Datos Relacionales',
|
||||
subject_code: 'BDR-201',
|
||||
commission: { code: 'COM-1' },
|
||||
classroom: { is_virtual: false, location_display: 'Piso 2 · Laboratorio 3' },
|
||||
virtual_link: ''
|
||||
},
|
||||
{
|
||||
start_time: '18:30',
|
||||
end_time: '22:30',
|
||||
subject_name: 'Redes y Telecomunicaciones',
|
||||
subject_code: 'RYT-302',
|
||||
commission: { code: 'COM-2' },
|
||||
classroom: { is_virtual: true, location_display: 'Campus Virtual (Google Meet)' },
|
||||
virtual_link: 'https://meet.google.com/edu-space-demo'
|
||||
}
|
||||
],
|
||||
today_classes: studentClasses,
|
||||
upcoming_milestones: upcomingMilestonesList
|
||||
};
|
||||
}
|
||||
|
||||
const upcoming_reservations = apiUpcoming || [
|
||||
{ start_time: '08:00', end_time: '12:00', date_display: '22/09', subject_name: 'Matemática Discreta', subject_code: 'MAT-101', shift: 'Mañana', commission: { code: 'COM-1' }, status: 'CONFIRMED', classroom: { code: 'Aula 101' }, user: { name: 'Prof. Carlos López' } },
|
||||
{ start_time: '14:00', end_time: '18:00', date_display: '23/09', subject_name: 'Sistemas Operativos', subject_code: 'SO-202', shift: 'Tarde', commission: { code: 'COM-2' }, status: 'CONFIRMED', classroom: { code: 'Lab 2' }, user: { name: 'Dra. Ana Vega' } },
|
||||
{ start_time: '18:30', end_time: '22:30', date_display: '24/09', subject_name: 'Ingeniería de Software', subject_code: 'IS-301', shift: 'Noche', commission: { code: 'COM-3' }, status: 'PENDING', classroom: { code: 'Aula Magna' }, user: { name: 'Ing. Marcos Ruiz' } }
|
||||
];
|
||||
const upcoming_reservations = apiUpcoming || [];
|
||||
|
||||
let show_role_banner = true;
|
||||
if (apiData && apiData.ui && apiData.ui.show_role_banner !== undefined) {
|
||||
|
||||
@@ -65,9 +65,12 @@
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<h5 class="fw-bold mb-1">{{ commission.subject.name }}</h5>
|
||||
<p class="text-muted small mb-3">{{ commission.subject.code }}
|
||||
{% if commission.subject.career_obj %}— {{ commission.subject.career_obj.name }}{% endif %}
|
||||
</p>
|
||||
<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>
|
||||
</div>
|
||||
|
||||
<div class="d-flex flex-wrap gap-2 mb-3">
|
||||
{% if commission.shift %}
|
||||
|
||||
@@ -102,6 +102,19 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-6 col-md-3">
|
||||
<label class="form-label small fw-semibold mb-1">
|
||||
<i class="bi bi-mortarboard text-primary me-1"></i>Carrera
|
||||
</label>
|
||||
<select name="career_id" class="form-select form-select-sm" id="career-filter" onchange="this.form.submit()">
|
||||
<option value="">Todas las carreras</option>
|
||||
{% for car in careers %}
|
||||
<option value="{{ car.id }}" {% if career_filter == car.id %}selected{% endif %}>
|
||||
{{ car.name }}
|
||||
</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-6 col-md-2">
|
||||
<label class="form-label small fw-semibold mb-1">Asignatura</label>
|
||||
<select name="subject_id" class="form-select form-select-sm" id="subject-filter">
|
||||
<option value="">Todas</option>
|
||||
@@ -112,7 +125,7 @@
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-6 col-md-2">
|
||||
<div class="col-6 col-md-1">
|
||||
<label class="form-label small fw-semibold mb-1">Turno</label>
|
||||
<select name="shift" class="form-select form-select-sm" id="shift-filter">
|
||||
<option value="">Todos</option>
|
||||
@@ -121,7 +134,7 @@
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-6 col-md-2">
|
||||
<div class="col-6 col-md-1">
|
||||
<label class="form-label small fw-semibold mb-1">Estado</label>
|
||||
<select name="active" class="form-select form-select-sm" id="active-filter">
|
||||
<option value="true" {% if active_filter == 'true' %}selected{% endif %}>Activas</option>
|
||||
@@ -129,11 +142,11 @@
|
||||
<option value="" {% if not active_filter %}selected{% endif %}>Todas</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-6 col-md-2 d-flex gap-2">
|
||||
<div class="col-12 col-md-2 d-flex gap-2">
|
||||
<button type="submit" class="btn btn-primary btn-sm flex-fill" id="filter-btn">
|
||||
<i class="bi bi-funnel me-1"></i>Filtrar
|
||||
</button>
|
||||
<a href="/admin/commissions_list" class="btn btn-outline-secondary btn-sm">
|
||||
<a href="/admin/commissions_list" class="btn btn-outline-secondary btn-sm" title="Limpiar filtros">
|
||||
<i class="bi bi-x"></i>
|
||||
</a>
|
||||
</div>
|
||||
@@ -177,7 +190,7 @@
|
||||
<div class="fw-semibold text-primary">{{ 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>
|
||||
<span class="badge bg-body-tertiary text-muted border">{{ comm.subject.career_name or 'Carrera General' }}</span>
|
||||
<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>
|
||||
<small class="text-muted ms-1">{{ comm.semester }} {{ comm.year }}</small>
|
||||
</div>
|
||||
</td>
|
||||
|
||||
@@ -969,12 +969,50 @@
|
||||
|
||||
{% elif user_role == 'bedelia' %}
|
||||
<!-- BEDELIA -->
|
||||
<li class="nav-item"><a class="nav-link" href="/dashboard"><i class="bi bi-speedometer2 text-warning"></i> <span class="nav-text">Panel Bedelía</span></a></li>
|
||||
<li class="nav-item"><a class="nav-link" href="/classrooms/list_classrooms"><i class="bi bi-door-open text-primary"></i> <span class="nav-text">Aulas y Espacios</span></a></li>
|
||||
<li class="nav-item"><a class="nav-link" href="/schedule/today_schedule"><i class="bi bi-calendar-day text-info"></i> <span class="nav-text">Cartelera Diaria</span></a></li>
|
||||
<li class="nav-item"><a class="nav-link" href="/schedule/list_reservations"><i class="bi bi-list-check text-success"></i> <span class="nav-text">Gestión Reservas</span></a></li>
|
||||
<li class="nav-item"><a class="nav-link" href="/schedule/add_reservation"><i class="bi bi-plus-circle text-success"></i> <span class="nav-text">Nueva Reserva</span></a></li>
|
||||
<li class="nav-item"><a class="nav-link" href="/admin/commissions_list"><i class="bi bi-diagram-3 text-primary"></i> <span class="nav-text">Comisiones</span></a></li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="/dashboard"><i class="bi bi-speedometer2 text-warning"></i> <span class="nav-text">Panel Bedelía</span></a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link collapsed" href="#menuEspaciosBedelia" data-bs-toggle="collapse" role="button" aria-expanded="false">
|
||||
<i class="bi bi-door-open text-info"></i> <span class="nav-text flex-grow-1">Espacios & Sedes</span> <i class="bi bi-chevron-down nav-caret ms-auto fs-6"></i>
|
||||
</a>
|
||||
<div class="collapse" id="menuEspaciosBedelia" data-bs-parent="#sidebarNav">
|
||||
<ul class="sidebar-submenu">
|
||||
<li><a class="nav-link" href="/buildings/list_buildings"><i class="bi bi-building me-1"></i>Sedes / Edificios</a></li>
|
||||
<li><a class="nav-link" href="/classrooms/list_classrooms"><i class="bi bi-door-closed me-1"></i>Catálogo de Aulas</a></li>
|
||||
<li><a class="nav-link" href="/classrooms/list_classrooms?view_mode=physical">Presenciales</a></li>
|
||||
<li><a class="nav-link" href="/classrooms/list_classrooms?view_mode=virtual">Virtuales</a></li>
|
||||
<li><a class="nav-link text-success" href="/classrooms/add_classroom"><i class="bi bi-plus-circle me-1"></i>Nueva Aula</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link collapsed" href="#menuAcademicaBedelia" data-bs-toggle="collapse" role="button" aria-expanded="false">
|
||||
<i class="bi bi-mortarboard text-success"></i> <span class="nav-text flex-grow-1">Académica</span> <i class="bi bi-chevron-down nav-caret ms-auto fs-6"></i>
|
||||
</a>
|
||||
<div class="collapse" id="menuAcademicaBedelia" data-bs-parent="#sidebarNav">
|
||||
<ul class="sidebar-submenu">
|
||||
<li><a class="nav-link" href="/admin/academic_terms_list"><i class="bi bi-calendar-range me-1"></i>Ciclos Lectivos</a></li>
|
||||
<li><a class="nav-link" href="/admin/careers_list"><i class="bi bi-mortarboard me-1"></i>Carreras</a></li>
|
||||
<li><a class="nav-link" href="/admin/subjects_list"><i class="bi bi-book me-1"></i>Asignaturas</a></li>
|
||||
<li><a class="nav-link" href="/admin/commissions_list"><i class="bi bi-diagram-3 me-1"></i>Comisiones</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link collapsed" href="#menuReservasBedelia" data-bs-toggle="collapse" role="button" aria-expanded="false">
|
||||
<i class="bi bi-calendar3 text-warning"></i> <span class="nav-text flex-grow-1">Reservas & Horarios</span> <i class="bi bi-chevron-down nav-caret ms-auto fs-6"></i>
|
||||
</a>
|
||||
<div class="collapse" id="menuReservasBedelia" data-bs-parent="#sidebarNav">
|
||||
<ul class="sidebar-submenu">
|
||||
<li><a class="nav-link" href="/schedule/calendar_view"><i class="bi bi-calendar-week me-1"></i>Calendario Semanal</a></li>
|
||||
<li><a class="nav-link" href="/schedule/today_schedule"><i class="bi bi-calendar-day me-1"></i>Cartelera del Día</a></li>
|
||||
<li><a class="nav-link text-success" href="/schedule/add_reservation"><i class="bi bi-plus-circle me-1"></i>Nueva Reserva</a></li>
|
||||
<li><a class="nav-link" href="/schedule/list_reservations"><i class="bi bi-list-check me-1"></i>Gestión de Reservas</a></li>
|
||||
<li><a class="nav-link text-info fw-semibold" href="/genetic_algorithm_web/genetic_optimizer"><i class="bi bi-cpu me-1"></i>Optimizador IA</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
{% elif user_role == 'docente' %}
|
||||
<!-- DOCENTE -->
|
||||
|
||||
Reference in New Issue
Block a user