fix(academic): commission subjects and shared careers mapping, role-based scoping and gradebook milestones (v3.8.20)
This commit is contained in:
+3
-3
@@ -86,9 +86,9 @@ const env = nunjucks.configure(path.join(__dirname, '../views'), {
|
||||
});
|
||||
|
||||
// Versiones institucionales del sistema
|
||||
const APP_VERSION = '3.8.19';
|
||||
const FRONTEND_VERSION = '3.8.19';
|
||||
const BACKEND_VERSION = '3.8.19';
|
||||
const APP_VERSION = '3.8.20';
|
||||
const FRONTEND_VERSION = '3.8.20';
|
||||
const BACKEND_VERSION = '3.8.20';
|
||||
|
||||
env.addGlobal('app_version', APP_VERSION);
|
||||
env.addGlobal('frontend_version', FRONTEND_VERSION);
|
||||
|
||||
@@ -1068,31 +1068,53 @@ const handleCommissionsList = async (req, res) => {
|
||||
|
||||
if (cRes.status === 'fulfilled' && cRes.value.data) {
|
||||
total = cRes.value.data.total !== undefined ? cRes.value.data.total : (cRes.value.data.commissions || []).length;
|
||||
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',
|
||||
classroom_name: c.classroom_name || 'Sin Aula Asignada',
|
||||
has_classroom: Boolean(c.has_classroom),
|
||||
is_virtual: Boolean(c.is_virtual),
|
||||
virtual_link: c.virtual_link || '',
|
||||
schedule: c.schedule || 'Sin horario',
|
||||
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,
|
||||
teachers: c.teachers || (c.teacher_name ? [{ name: c.teacher_name, role: 'Titular' }] : [])
|
||||
}));
|
||||
commissions = (cRes.value.data.commissions || []).map(c => {
|
||||
const subjObj = c.subject || {};
|
||||
const subjName = subjObj.name || c.subject_name || 'Sin Asignatura';
|
||||
const subjCode = subjObj.code || c.subject_code || '';
|
||||
const carList = (c.careers && c.careers.length > 0) ? c.careers : (subjObj.careers || []);
|
||||
const carName = c.career_name || subjObj.career_name || (carList.length > 0 ? carList.map(cr => cr.name).join(', ') : 'Carrera General');
|
||||
|
||||
return {
|
||||
...c,
|
||||
get_full_code: () => c.full_code || c.code,
|
||||
subject_name: subjName,
|
||||
subject_code: subjCode,
|
||||
career_id: c.career_id || subjObj.career_id,
|
||||
career_name: carName,
|
||||
careers: carList,
|
||||
classroom_name: c.classroom_name || 'Sin Aula Asignada',
|
||||
has_classroom: Boolean(c.has_classroom),
|
||||
is_virtual: Boolean(c.is_virtual),
|
||||
virtual_link: c.virtual_link || '',
|
||||
schedule: c.schedule || 'Sin horario',
|
||||
subject: {
|
||||
id: c.subject_id || subjObj.id,
|
||||
name: subjName,
|
||||
code: subjCode,
|
||||
career_id: c.career_id || subjObj.career_id,
|
||||
career_name: carName,
|
||||
careers: carList
|
||||
},
|
||||
teacher: c.teacher_name ? { name: c.teacher_name } : null,
|
||||
teachers: c.teachers || (c.teacher_name ? [{ name: c.teacher_name, role: 'Titular' }] : [])
|
||||
};
|
||||
});
|
||||
subjects = cRes.value.data.subjects || [];
|
||||
academic_terms = cRes.value.data.academic_terms || [];
|
||||
careers = cRes.value.data.careers || [];
|
||||
}
|
||||
|
||||
// Fallback robusto para subjects si no vinieron en la respuesta de commissions
|
||||
if (!subjects || subjects.length === 0) {
|
||||
try {
|
||||
const subRes = await req.apiClient.get('/subjects', { params: { per_page: 250 } });
|
||||
subjects = subRes.data?.subjects || subRes.data || [];
|
||||
} catch (sErr) {
|
||||
console.warn('Notice fetching subjects fallback:', sErr.message);
|
||||
}
|
||||
}
|
||||
|
||||
// Fallback para careers si no vinieron en la respuesta de commissions
|
||||
if (!careers || careers.length === 0) {
|
||||
try {
|
||||
@@ -1151,7 +1173,27 @@ const handleCommissionsList = async (req, res) => {
|
||||
|
||||
|
||||
const handleCommissionDetail = async (req, res) => {
|
||||
const id = req.params.id || req.query.id || 1;
|
||||
const roleStr = (req.user?.role || '').toLowerCase();
|
||||
const isDocente = roleStr.includes('docent') || roleStr.includes('prof');
|
||||
const isAlumno = roleStr.includes('alum') || roleStr.includes('estud');
|
||||
|
||||
const rawId = req.params.id || req.query.id;
|
||||
if (!rawId || rawId === 'undefined' || rawId === 'null') {
|
||||
if (isDocente || isAlumno) return res.redirect('/my_subjects/my_subjects_list');
|
||||
return res.redirect('/admin/commissions_list');
|
||||
}
|
||||
|
||||
const id = parseInt(rawId, 10);
|
||||
if (isNaN(id)) {
|
||||
if (isDocente || isAlumno) return res.redirect('/my_subjects/my_subjects_list');
|
||||
return res.redirect('/admin/commissions_list');
|
||||
}
|
||||
|
||||
// Si un docente o alumno intenta ingresar a la ruta de administración, redirigir a su vista
|
||||
if (isDocente || isAlumno) {
|
||||
return res.redirect(`/my_subjects/detail/${id}`);
|
||||
}
|
||||
|
||||
try {
|
||||
let commission = null;
|
||||
let teachers = [];
|
||||
@@ -1163,10 +1205,6 @@ const handleCommissionDetail = async (req, res) => {
|
||||
]);
|
||||
if (cRes.status === 'fulfilled' && cRes.value.data && cRes.value.data.commission) {
|
||||
commission = cRes.value.data.commission;
|
||||
} else {
|
||||
const allRes = await req.apiClient.get('/commissions');
|
||||
const list = allRes.data?.commissions || [];
|
||||
commission = list.find(c => String(c.id) === String(id)) || list[0];
|
||||
}
|
||||
if (uRes.status === 'fulfilled' && uRes.value.data) {
|
||||
teachers = uRes.value.data.teachers || uRes.value.data.users || [];
|
||||
@@ -1182,22 +1220,7 @@ const handleCommissionDetail = async (req, res) => {
|
||||
}
|
||||
|
||||
if (!commission) {
|
||||
commission = {
|
||||
id,
|
||||
code: `COM-${id}`,
|
||||
semester: '1C',
|
||||
year: 2026,
|
||||
shift: 'Noche',
|
||||
active: true,
|
||||
max_students: 40,
|
||||
current_students: 25,
|
||||
schedule: 'Lu y Mi 19:00 - 22:00',
|
||||
virtual_link: '',
|
||||
subject_name: 'Arquitectura de Software',
|
||||
subject_code: 'ARQ-101',
|
||||
teacher_name: 'Prof. Juan Pérez',
|
||||
teachers: []
|
||||
};
|
||||
return res.redirect('/admin/commissions_list?error=not_found');
|
||||
}
|
||||
|
||||
const commObj = {
|
||||
|
||||
@@ -84,7 +84,13 @@ const handleClassroomsList = async (req, res) => {
|
||||
let virtual_count = 0;
|
||||
|
||||
try {
|
||||
const vRoomsRes = await req.apiClient.get('/classrooms/virtual-rooms');
|
||||
const vParams = {};
|
||||
if (req.user && req.user.role === 'docente') {
|
||||
vParams.teacher_id = req.user.id;
|
||||
} else if (req.user && (req.user.role === 'alumno' || req.user.role === 'estudiante')) {
|
||||
vParams.student_id = req.user.id;
|
||||
}
|
||||
const vRoomsRes = await req.apiClient.get('/classrooms/virtual-rooms', { params: vParams });
|
||||
if (vRoomsRes.data && vRoomsRes.data.virtual_rooms) {
|
||||
virtual_rooms = vRoomsRes.data.virtual_rooms;
|
||||
virtual_count = vRoomsRes.data.virtual_classrooms_count || virtual_rooms.length;
|
||||
@@ -100,8 +106,9 @@ const handleClassroomsList = async (req, res) => {
|
||||
console.warn('Notice fetching virtual rooms from /classrooms/virtual-rooms:', vErr.message);
|
||||
}
|
||||
|
||||
// Fallback a /dashboard/stats si /classrooms/virtual-rooms no devolvió salas
|
||||
if (virtual_rooms.length === 0) {
|
||||
// Fallback a /dashboard/stats solo para administradores y bedelía si /classrooms/virtual-rooms no devolvió salas
|
||||
const isStaff = ['admin', 'bedelia', 'administrador'].includes((req.user && req.user.role || '').toLowerCase());
|
||||
if (virtual_rooms.length === 0 && isStaff) {
|
||||
try {
|
||||
const dashRes = await req.apiClient.get('/dashboard/stats');
|
||||
const bData = (dashRes.data && (dashRes.data.bedelia || dashRes.data)) || {};
|
||||
|
||||
@@ -7,13 +7,30 @@ router.use(requireAuth);
|
||||
const handleMySubjectsList = async (req, res) => {
|
||||
try {
|
||||
let commissions = [];
|
||||
const roleStr = (req.user?.role || '').toLowerCase();
|
||||
const isDocente = roleStr.includes('docent') || roleStr.includes('prof');
|
||||
const isAlumno = roleStr.includes('alum') || roleStr.includes('estud');
|
||||
|
||||
const params = {};
|
||||
if (isDocente) {
|
||||
params.teacher_id = req.user.id;
|
||||
} else if (isAlumno) {
|
||||
params.student_id = req.user.id;
|
||||
}
|
||||
|
||||
try {
|
||||
const resp = await req.apiClient.get('/commissions');
|
||||
const resp = await req.apiClient.get('/commissions', { params });
|
||||
if (resp.data && resp.data.commissions) {
|
||||
commissions = resp.data.commissions.map(c => ({
|
||||
...c,
|
||||
full_code: c.full_code || c.code,
|
||||
subject: { name: c.subject_name || c.subject?.name, code: c.subject_code || c.subject?.code }
|
||||
subject: {
|
||||
name: c.subject_name || c.subject?.name,
|
||||
code: c.subject_code || c.subject?.code
|
||||
},
|
||||
teacher: (c.teacher_name && c.teacher_name !== 'TBD' && c.teacher_name !== 'Sin asignar')
|
||||
? { name: c.teacher_name }
|
||||
: (c.teachers && c.teachers.length > 0 ? { name: c.teachers[0].name } : null)
|
||||
}));
|
||||
}
|
||||
} catch (e) {
|
||||
@@ -32,60 +49,58 @@ const handleMySubjectsList = async (req, res) => {
|
||||
title: 'Mis Materias',
|
||||
commissions: [],
|
||||
view_mode: 'all',
|
||||
role: 'admin'
|
||||
role: req.user?.role || 'admin'
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
const handleMySubjectDetail = async (req, res) => {
|
||||
const id = req.params.id || req.query.id || req.params.commission_id || 1;
|
||||
const rawId = req.params.id || req.query.id || req.params.commission_id;
|
||||
if (!rawId || rawId === 'undefined' || rawId === 'null') {
|
||||
return res.redirect('/my_subjects/my_subjects_list');
|
||||
}
|
||||
const id = parseInt(rawId, 10);
|
||||
if (isNaN(id)) {
|
||||
return res.redirect('/my_subjects/my_subjects_list');
|
||||
}
|
||||
|
||||
try {
|
||||
let commission = null;
|
||||
let enrollments = [];
|
||||
|
||||
try {
|
||||
const resp = await req.apiClient.get(`/commissions/${id}`);
|
||||
if (resp.data && resp.data.commission) {
|
||||
commission = resp.data.commission;
|
||||
const [cResp, enrResp] = await Promise.allSettled([
|
||||
req.apiClient.get(`/commissions/${id}`),
|
||||
req.apiClient.get(`/commissions/${id}/enrollments`)
|
||||
]);
|
||||
|
||||
if (cResp.status === 'fulfilled' && cResp.value.data?.commission) {
|
||||
commission = cResp.value.data.commission;
|
||||
}
|
||||
if (enrResp.status === 'fulfilled' && enrResp.value.data?.enrollments) {
|
||||
enrollments = enrResp.value.data.enrollments;
|
||||
}
|
||||
} catch (e) {
|
||||
console.warn('Commission detail API notice:', e.message);
|
||||
}
|
||||
|
||||
if (!commission) {
|
||||
// Fallback: fetch list and find
|
||||
try {
|
||||
const listResp = await req.apiClient.get('/commissions');
|
||||
const list = listResp.data?.commissions || [];
|
||||
const found = list.find(c => String(c.id) === String(id)) || list[0];
|
||||
if (found) {
|
||||
commission = {
|
||||
...found,
|
||||
full_code: found.full_code || found.code,
|
||||
subject: { name: found.subject_name, code: found.subject_code },
|
||||
active: found.active !== undefined ? found.active : true
|
||||
};
|
||||
}
|
||||
} catch (err) {}
|
||||
return res.redirect('/my_subjects/my_subjects_list');
|
||||
}
|
||||
|
||||
if (!commission) {
|
||||
commission = {
|
||||
id,
|
||||
code: 'C1',
|
||||
full_code: 'MAT-C1',
|
||||
subject: { name: 'Materia', code: 'MAT' },
|
||||
shift: 'Mañana',
|
||||
semester: '1C',
|
||||
year: 2026,
|
||||
active: true,
|
||||
max_students: 35,
|
||||
current_students: 20
|
||||
};
|
||||
}
|
||||
const formattedCommission = {
|
||||
...commission,
|
||||
full_code: commission.full_code || commission.code,
|
||||
subject: commission.subject || { name: commission.subject_name, code: commission.subject_code },
|
||||
teacher: (commission.teacher_name && commission.teacher_name !== 'TBD')
|
||||
? { name: commission.teacher_name }
|
||||
: (commission.teachers && commission.teachers.length > 0 ? { name: commission.teachers[0].name } : null)
|
||||
};
|
||||
|
||||
res.render('my_subjects/detail', {
|
||||
title: `${commission.subject?.name || 'Materia'} — ${commission.full_code || commission.code} — Edu-Space`,
|
||||
commission,
|
||||
enrollments: [],
|
||||
title: `${formattedCommission.subject?.name || 'Materia'} — ${formattedCommission.full_code || formattedCommission.code} — Edu-Space`,
|
||||
commission: formattedCommission,
|
||||
enrollments,
|
||||
classroom: null,
|
||||
recent_reservation: null,
|
||||
role: req.user?.role || 'admin'
|
||||
|
||||
@@ -312,6 +312,16 @@ const handleReservationsList = async (req, res) => {
|
||||
if (hide_virtual === '1' || hide_virtual === 'true') params.hide_virtual = '1';
|
||||
if (only_virtual === '1' || only_virtual === 'true') params.only_virtual = '1';
|
||||
|
||||
const roleStr = (req.user?.role || '').toLowerCase();
|
||||
const isDocente = roleStr.includes('docent') || roleStr.includes('prof');
|
||||
const isAlumno = roleStr.includes('alum') || roleStr.includes('estud');
|
||||
|
||||
if (isDocente) {
|
||||
params.teacher_id = req.user.id;
|
||||
} else if (isAlumno) {
|
||||
params.student_id = req.user.id;
|
||||
}
|
||||
|
||||
// Obtener reservas y catálogo de aulas en paralelo
|
||||
const [resResponse, roomsResponse] = await Promise.all([
|
||||
req.apiClient.get('/reservations', { params }).catch(err => {
|
||||
@@ -1014,20 +1024,75 @@ router.post(['/delete_reservation', '/delete_reservation/:id', '/reservation/:id
|
||||
|
||||
// 9. Libro de Calificaciones / Gradebook (Fase 3)
|
||||
const handleGradebook = async (req, res) => {
|
||||
const id = req.params.id || req.query.id;
|
||||
let rawId = req.params.id || req.query.id;
|
||||
const roleStr = (req.user?.role || '').toLowerCase();
|
||||
const isDocente = roleStr.includes('docent') || roleStr.includes('prof');
|
||||
|
||||
// Si no se pasó un ID explícito, resolver la primera comisión asignada
|
||||
if (!rawId || rawId === 'undefined' || rawId === 'null') {
|
||||
try {
|
||||
const commResp = await req.apiClient.get('/commissions', {
|
||||
params: isDocente ? { teacher_id: req.user.id } : {}
|
||||
});
|
||||
const commList = commResp.data?.commissions || [];
|
||||
if (commList.length > 0) {
|
||||
return res.redirect(`/schedule/gradebook/${commList[0].id}`);
|
||||
} else {
|
||||
return res.render('schedule/gradebook', {
|
||||
title: 'Libro de Calificaciones — Edu-Space',
|
||||
commission: null,
|
||||
milestone_columns: [],
|
||||
students: [],
|
||||
milestone_types: [],
|
||||
all_teacher_commissions: [],
|
||||
role: req.user?.role || 'docente',
|
||||
empty_reason: 'No tenés comisiones asignadas actualmente para calificar.'
|
||||
});
|
||||
}
|
||||
} catch (e) {
|
||||
return res.redirect('/my_subjects/my_subjects_list');
|
||||
}
|
||||
}
|
||||
|
||||
const id = parseInt(rawId, 10);
|
||||
if (isNaN(id)) {
|
||||
return res.redirect('/my_subjects/my_subjects_list');
|
||||
}
|
||||
|
||||
try {
|
||||
const resp = await req.apiClient.get(`/commissions/${id}/gradebook`);
|
||||
const data = resp.data || {};
|
||||
const [resp, typesResp, commsResp] = await Promise.allSettled([
|
||||
req.apiClient.get(`/commissions/${id}/gradebook`),
|
||||
req.apiClient.get('/milestone-types'),
|
||||
req.apiClient.get('/commissions', { params: isDocente ? { teacher_id: req.user.id } : {} })
|
||||
]);
|
||||
|
||||
const rawData = (resp.status === 'fulfilled' && resp.value.data) ? resp.value.data : {};
|
||||
const gradebookData = rawData.data || rawData;
|
||||
|
||||
const milestoneTypes = (typesResp.status === 'fulfilled' && typesResp.value.data?.milestone_types)
|
||||
? typesResp.value.data.milestone_types
|
||||
: [];
|
||||
|
||||
const allComms = (commsResp.status === 'fulfilled' && commsResp.value.data?.commissions)
|
||||
? commsResp.value.data.commissions
|
||||
: [];
|
||||
|
||||
if (!gradebookData.commission) {
|
||||
return res.redirect('/my_subjects/my_subjects_list');
|
||||
}
|
||||
|
||||
res.render('schedule/gradebook', {
|
||||
title: `Libro de Calificaciones — Edu-Space`,
|
||||
commission: data.commission || { id, code: 'C1' },
|
||||
milestone_columns: data.milestone_columns || [],
|
||||
students: data.students || [],
|
||||
title: `Libro de Calificaciones — ${gradebookData.commission.full_code || gradebookData.commission.code} — Edu-Space`,
|
||||
commission: gradebookData.commission,
|
||||
milestone_columns: gradebookData.milestone_columns || [],
|
||||
students: gradebookData.students || [],
|
||||
milestone_types: milestoneTypes,
|
||||
all_teacher_commissions: allComms,
|
||||
role: req.user?.role || 'docente'
|
||||
});
|
||||
} catch (err) {
|
||||
console.error('Error fetching commission gradebook:', err.message);
|
||||
res.redirect(`/admin/commission_detail?id=${id}`);
|
||||
res.redirect('/my_subjects/my_subjects_list');
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1035,7 +1100,7 @@ const handleGradebook = async (req, res) => {
|
||||
const handleMyGrades = async (req, res) => {
|
||||
try {
|
||||
const resp = await req.apiClient.get('/students/my-grades');
|
||||
const subjects = resp.data?.subjects || [];
|
||||
const subjects = resp.data?.data || resp.data?.subjects || [];
|
||||
res.render('schedule/my_grades', {
|
||||
title: 'Mis Calificaciones — Edu-Space',
|
||||
subjects,
|
||||
|
||||
Reference in New Issue
Block a user