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,
|
||||
|
||||
Reference in New Issue
Block a user