fix(bedelia): corregir purga academica con integridad referencial, circuito agil de asignacion de aulas y documentacion v3.1.0
This commit is contained in:
@@ -332,13 +332,25 @@ const handlePostClassroom = async (req, res) => {
|
||||
targetBuilding = new_building_name;
|
||||
}
|
||||
|
||||
let bId = parseInt(targetBuilding, 10);
|
||||
if (isNaN(bId) || bId <= 0) {
|
||||
bId = (String(targetBuilding).toLowerCase().includes('virtual')) ? 2 : 1;
|
||||
}
|
||||
|
||||
const isVirtual = Boolean(
|
||||
bId === 2 ||
|
||||
String(targetBuilding).toLowerCase().includes('virtual') ||
|
||||
String(room_number).toUpperCase().includes('VIRTUAL') ||
|
||||
String(floor).toUpperCase() === 'DIGITAL'
|
||||
);
|
||||
|
||||
const payload = {
|
||||
code: room_number || `Aula-${Date.now()}`,
|
||||
capacity: (capacity === '∞' || capacity === '0' || !capacity) ? 0 : parseInt(capacity, 10),
|
||||
floor: floor || 'PB',
|
||||
building_id: (targetBuilding === '2' || targetBuilding === 'Campus Virtual') ? 2 : 1,
|
||||
capacity: (isVirtual || capacity === '∞' || capacity === '0' || !capacity) ? 0 : parseInt(capacity, 10),
|
||||
floor: floor || (isVirtual ? 'Digital' : 'PB'),
|
||||
building_id: bId,
|
||||
description: description || '',
|
||||
is_virtual: Boolean(targetBuilding === '2' || targetBuilding === 'Campus Virtual'),
|
||||
is_virtual: isVirtual,
|
||||
is_active: is_active === 'true' || is_active === 'on' || is_active === true
|
||||
};
|
||||
|
||||
@@ -529,13 +541,25 @@ const handlePostEditClassroom = async (req, res) => {
|
||||
targetBuilding = new_building_name;
|
||||
}
|
||||
|
||||
let bId = parseInt(targetBuilding, 10);
|
||||
if (isNaN(bId) || bId <= 0) {
|
||||
bId = (String(targetBuilding).toLowerCase().includes('virtual')) ? 2 : 1;
|
||||
}
|
||||
|
||||
const isVirtual = Boolean(
|
||||
bId === 2 ||
|
||||
String(targetBuilding).toLowerCase().includes('virtual') ||
|
||||
String(room_number).toUpperCase().includes('VIRTUAL') ||
|
||||
String(floor).toUpperCase() === 'DIGITAL'
|
||||
);
|
||||
|
||||
const payload = {
|
||||
code: room_number,
|
||||
capacity: (capacity === '∞' || capacity === '0' || !capacity) ? 0 : parseInt(capacity, 10),
|
||||
floor: floor || 'PB',
|
||||
building_id: (targetBuilding === '2' || targetBuilding === 'Campus Virtual') ? 2 : 1,
|
||||
capacity: (isVirtual || capacity === '∞' || capacity === '0' || !capacity) ? 0 : parseInt(capacity, 10),
|
||||
floor: floor || (isVirtual ? 'Digital' : 'PB'),
|
||||
building_id: bId,
|
||||
description: description || '',
|
||||
is_virtual: Boolean(targetBuilding === '2' || targetBuilding === 'Campus Virtual'),
|
||||
is_virtual: isVirtual,
|
||||
is_active: is_active === 'true' || is_active === 'on' || is_active === true
|
||||
};
|
||||
|
||||
|
||||
@@ -307,13 +307,33 @@ const handleAddReservation = async (req, res) => {
|
||||
};
|
||||
});
|
||||
|
||||
const commissionList = [
|
||||
{ id: 1, code: 'COM-ARQ-01', name: 'Arquitectura de Software - Comisión A', virtual_link: 'https://meet.google.com/edu-arq-01', max_students: 35 },
|
||||
{ id: 2, code: 'COM-BD-01', name: 'Bases de Datos II - Comisión Única', virtual_link: 'https://meet.google.com/edu-bd-01', max_students: 40 },
|
||||
{ id: 3, code: 'COM-PRG-01', name: 'Programación Avanzada - Comisión B', virtual_link: 'https://meet.google.com/edu-prg-01', max_students: 30 },
|
||||
{ id: 4, code: 'COM-RED-01', name: 'Redes y Telecomunicaciones - Comisión A', virtual_link: '', max_students: 28 },
|
||||
{ id: 5, code: 'COM-IA-01', name: 'Inteligencia Artificial - Comisión Tarde', virtual_link: 'https://meet.google.com/edu-ia-01', max_students: 32 }
|
||||
];
|
||||
let commissionList = [];
|
||||
try {
|
||||
const commRes = await req.apiClient.get('/commissions', { params: { active: 'true' } });
|
||||
if (commRes.data && commRes.data.commissions) {
|
||||
commissionList = commRes.data.commissions.map(c => ({
|
||||
id: c.id,
|
||||
code: c.full_code || c.code || `COM-${c.id}`,
|
||||
name: `${c.subject_name || 'Asignatura'} · ${c.code}`,
|
||||
subject_name: c.subject_name || 'Asignatura',
|
||||
max_students: c.max_students || 35,
|
||||
current_students: c.current_students || 0,
|
||||
shift: c.shift || 'Tarde',
|
||||
schedule: c.schedule || '',
|
||||
virtual_link: c.virtual_link || ''
|
||||
}));
|
||||
}
|
||||
} catch (commErr) {
|
||||
console.warn('Could not fetch real commissions:', commErr.message);
|
||||
}
|
||||
|
||||
if (commissionList.length === 0) {
|
||||
commissionList = [
|
||||
{ id: 1, code: 'COM-ARQ-01', name: 'Arquitectura de Software - Comisión A', virtual_link: 'https://meet.google.com/edu-arq-01', max_students: 35 },
|
||||
{ id: 2, code: 'COM-BD-01', name: 'Bases de Datos II - Comisión Única', virtual_link: 'https://meet.google.com/edu-bd-01', max_students: 40 },
|
||||
{ id: 3, code: 'COM-PRG-01', name: 'Programación Avanzada - Comisión B', virtual_link: 'https://meet.google.com/edu-prg-01', max_students: 30 }
|
||||
];
|
||||
}
|
||||
|
||||
const classroomOptions = [
|
||||
{ value: '', text: '-- Selecciona Aula --' },
|
||||
@@ -322,20 +342,36 @@ const handleAddReservation = async (req, res) => {
|
||||
|
||||
const commissionOptions = [
|
||||
{ value: '', text: '-- Selecciona Comisión / Materia --' },
|
||||
...commissionList.map(c => ({ value: c.id, text: `${c.code} · ${c.name} (${c.max_students} alum.)` }))
|
||||
...commissionList.map(c => ({ value: c.id, text: `${c.code} · ${c.name} (${c.max_students} alum. - ${c.shift || 'Turno'})` }))
|
||||
];
|
||||
|
||||
const initialClassroomId = req.query.classroom_id || '';
|
||||
const initialCommissionId = req.query.commission_id || '';
|
||||
let initialPurpose = 'Clase Regular';
|
||||
let initialExpectedAttendees = 30;
|
||||
let initialVirtualLink = '';
|
||||
|
||||
if (initialCommissionId) {
|
||||
const foundComm = commissionList.find(c => String(c.id) === String(initialCommissionId));
|
||||
if (foundComm) {
|
||||
initialPurpose = `${foundComm.subject_name} (${foundComm.code})`;
|
||||
initialExpectedAttendees = foundComm.max_students || 30;
|
||||
initialVirtualLink = foundComm.virtual_link || '';
|
||||
}
|
||||
}
|
||||
|
||||
const now = new Date();
|
||||
const startTimeDefault = new Date(now.getTime() + 3600000).toISOString().substring(0, 16);
|
||||
const endTimeDefault = new Date(now.getTime() + 7200000).toISOString().substring(0, 16);
|
||||
|
||||
const form = createFormMock({
|
||||
classroom_id: initialClassroomId,
|
||||
commission_id: initialCommissionId,
|
||||
start_time: startTimeDefault,
|
||||
end_time: endTimeDefault,
|
||||
expected_attendees: 30,
|
||||
purpose: 'Clase Regular'
|
||||
expected_attendees: initialExpectedAttendees,
|
||||
purpose: initialPurpose,
|
||||
virtual_link: initialVirtualLink
|
||||
}, {
|
||||
classroom_id: classroomOptions,
|
||||
commission_id: commissionOptions
|
||||
@@ -346,7 +382,9 @@ const handleAddReservation = async (req, res) => {
|
||||
form,
|
||||
classroom_list: classroomList,
|
||||
commission_list: commissionList,
|
||||
buildings: Array.from(buildingsMap.values())
|
||||
buildings: Array.from(buildingsMap.values()),
|
||||
initial_commission_id: initialCommissionId,
|
||||
initial_classroom_id: initialClassroomId
|
||||
});
|
||||
} catch (error) {
|
||||
console.error('Error rendering add reservation:', error.message);
|
||||
@@ -499,13 +537,32 @@ const handleEditReservation = async (req, res) => {
|
||||
};
|
||||
});
|
||||
|
||||
const commissionList = [
|
||||
{ id: 1, code: 'COM-ARQ-01', name: 'Arquitectura de Software - Comisión A', virtual_link: 'https://meet.google.com/edu-arq-01', max_students: 35 },
|
||||
{ id: 2, code: 'COM-BD-01', name: 'Bases de Datos II - Comisión Única', virtual_link: 'https://meet.google.com/edu-bd-01', max_students: 40 },
|
||||
{ id: 3, code: 'COM-PRG-01', name: 'Programación Avanzada - Comisión B', virtual_link: 'https://meet.google.com/edu-prg-01', max_students: 30 },
|
||||
{ id: 4, code: 'COM-RED-01', name: 'Redes y Telecomunicaciones - Comisión A', virtual_link: '', max_students: 28 },
|
||||
{ id: 5, code: 'COM-IA-01', name: 'Inteligencia Artificial - Comisión Tarde', virtual_link: 'https://meet.google.com/edu-ia-01', max_students: 32 }
|
||||
];
|
||||
let commissionList = [];
|
||||
try {
|
||||
const commRes = await req.apiClient.get('/commissions');
|
||||
if (commRes.data && commRes.data.commissions) {
|
||||
commissionList = commRes.data.commissions.map(c => ({
|
||||
id: c.id,
|
||||
code: c.full_code || c.code || `COM-${c.id}`,
|
||||
name: `${c.subject_name || 'Asignatura'} · ${c.code}`,
|
||||
subject_name: c.subject_name || 'Asignatura',
|
||||
max_students: c.max_students || 35,
|
||||
current_students: c.current_students || 0,
|
||||
shift: c.shift || 'Tarde',
|
||||
schedule: c.schedule || '',
|
||||
virtual_link: c.virtual_link || ''
|
||||
}));
|
||||
}
|
||||
} catch (commErr) {
|
||||
console.warn('Could not fetch real commissions for edit:', commErr.message);
|
||||
}
|
||||
|
||||
if (commissionList.length === 0) {
|
||||
commissionList = [
|
||||
{ id: 1, code: 'COM-ARQ-01', name: 'Arquitectura de Software - Comisión A', virtual_link: 'https://meet.google.com/edu-arq-01', max_students: 35 },
|
||||
{ id: 2, code: 'COM-BD-01', name: 'Bases de Datos II - Comisión Única', virtual_link: 'https://meet.google.com/edu-bd-01', max_students: 40 }
|
||||
];
|
||||
}
|
||||
|
||||
const classroomOptions = classroomList.map(c => ({ value: c.id, text: `${c.code} · ${c.floor_display} (Cap: ${c.capacity_display})` }));
|
||||
const commissionOptions = commissionList.map(c => ({ value: c.id, text: `${c.code} · ${c.name} (${c.max_students} alum.)` }));
|
||||
|
||||
Reference in New Issue
Block a user