fix(academic): commission subjects and shared careers mapping, role-based scoping and gradebook milestones (v3.8.20)

This commit is contained in:
2026-10-26 18:31:54 -03:00
parent a692c9ce67
commit 9f1ac6d670
23 changed files with 808 additions and 139 deletions
+64 -41
View File
@@ -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 = {