feat: acople de schedule.view_reservation al BFF y creacion/asociacion de comisiones a materias
This commit is contained in:
@@ -623,20 +623,39 @@ const handleCommissionsList = async (req, res) => {
|
||||
const subject_id = req.query.subject_id || '';
|
||||
const shift = req.query.shift || '';
|
||||
const active = req.query.active || '';
|
||||
const created = req.query.created === '1';
|
||||
|
||||
let commissions = [];
|
||||
let subjects = [];
|
||||
let teachers = [];
|
||||
|
||||
try {
|
||||
const cRes = await req.apiClient.get('/commissions', { params: { search, subject_id, shift, active } });
|
||||
if (cRes.data) {
|
||||
commissions = (cRes.data.commissions || []).map(c => ({
|
||||
const [cRes, uRes] = await Promise.allSettled([
|
||||
req.apiClient.get('/commissions', { params: { search, subject_id, shift, active } }),
|
||||
req.apiClient.get('/users')
|
||||
]);
|
||||
|
||||
if (cRes.status === 'fulfilled' && cRes.value.data) {
|
||||
commissions = (cRes.value.data.commissions || []).map(c => ({
|
||||
...c,
|
||||
get_full_code: () => c.code,
|
||||
subject: { name: c.subject_name, code: c.subject_code },
|
||||
get_full_code: () => c.full_code || c.code,
|
||||
subject: {
|
||||
id: c.subject_id,
|
||||
name: c.subject_name,
|
||||
code: c.subject_code,
|
||||
career_name: c.career_name || 'Carrera General'
|
||||
},
|
||||
teacher: c.teacher_name ? { name: c.teacher_name } : null
|
||||
}));
|
||||
subjects = cRes.data.subjects || [];
|
||||
subjects = cRes.value.data.subjects || [];
|
||||
}
|
||||
|
||||
if (uRes.status === 'fulfilled' && uRes.value.data) {
|
||||
const users = uRes.value.data.users || [];
|
||||
teachers = users.filter(u => {
|
||||
const r = (u.role || '').toLowerCase();
|
||||
return r.includes('docent') || r.includes('prof') || r.includes('admin') || r.includes('bedel');
|
||||
});
|
||||
}
|
||||
} catch (apiErr) {
|
||||
console.warn('Commissions list API notice:', apiErr.message);
|
||||
@@ -646,10 +665,12 @@ const handleCommissionsList = async (req, res) => {
|
||||
title: 'Gestión de Comisiones — Edu-Space',
|
||||
commissions,
|
||||
subjects,
|
||||
teachers,
|
||||
search,
|
||||
subject_filter: subject_id ? parseInt(subject_id, 10) : '',
|
||||
shift_filter: shift,
|
||||
active_filter: active,
|
||||
created,
|
||||
pagination: { pages: 1, page: 1, total: commissions.length, has_prev: false, has_next: false }
|
||||
});
|
||||
} catch (err) {
|
||||
@@ -658,6 +679,7 @@ const handleCommissionsList = async (req, res) => {
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
const handleCommissionDetail = async (req, res) => {
|
||||
const id = req.params.id || req.query.id || 1;
|
||||
try {
|
||||
@@ -725,11 +747,25 @@ const handleCommissionDetail = async (req, res) => {
|
||||
|
||||
const handleCommissionAdd = async (req, res) => {
|
||||
try {
|
||||
await req.apiClient.post('/commissions', req.body);
|
||||
const { subject_id, code, semester, year, shift, teacher_id, max_students, schedule, virtual_link } = req.body;
|
||||
const payload = {
|
||||
subject_id: parseInt(subject_id, 10),
|
||||
code: (code || '').trim(),
|
||||
semester: semester || '1C',
|
||||
year: year ? parseInt(year, 10) : 2026,
|
||||
shift: shift || 'Mañana',
|
||||
teacher_id: teacher_id ? parseInt(teacher_id, 10) : null,
|
||||
max_students: max_students ? parseInt(max_students, 10) : 40,
|
||||
schedule: (schedule || '').trim(),
|
||||
virtual_link: (virtual_link || '').trim(),
|
||||
active: true
|
||||
};
|
||||
await req.apiClient.post('/commissions', payload);
|
||||
res.redirect('/admin/commissions_list?created=1');
|
||||
} catch (e) {
|
||||
console.warn('Commission add API notice:', e.response?.data || e.message);
|
||||
res.redirect('/admin/commissions_list');
|
||||
}
|
||||
res.redirect('/admin/commissions_list');
|
||||
};
|
||||
|
||||
const handleCommissionEdit = async (req, res) => {
|
||||
|
||||
Reference in New Issue
Block a user