feat: implementacion de dashboards por rol, soporte de clases virtuales concurrentes en importador de sheets y cartelera del dia
This commit is contained in:
@@ -0,0 +1,519 @@
|
||||
const express = require('express');
|
||||
const router = express.Router();
|
||||
const { requireAuth } = require('../middlewares/authMiddleware');
|
||||
|
||||
router.use(requireAuth);
|
||||
|
||||
const handleClassroomsList = async (req, res) => {
|
||||
try {
|
||||
const response = await req.apiClient.get('/classrooms');
|
||||
const allClassrooms = (response.data && response.data.classrooms) || [];
|
||||
|
||||
const view_mode = (req.query.view_mode || 'physical').toLowerCase();
|
||||
const search = (req.query.search || '').toLowerCase().trim();
|
||||
const building_filter = req.query.building_id || '';
|
||||
const floor_filter = req.query.floor || '';
|
||||
const active_only = req.query.active_only !== 'false';
|
||||
|
||||
// Filter based on view mode (physical vs virtual)
|
||||
let filtered = allClassrooms.filter(c => {
|
||||
const isVirt = Boolean(c.is_virtual || (c.code && c.code.includes('VIRTUAL')) || (c.building && c.building.toLowerCase().includes('virtual')));
|
||||
if (view_mode === 'virtual') return isVirt;
|
||||
return !isVirt;
|
||||
});
|
||||
|
||||
// Additional filters
|
||||
if (search) {
|
||||
filtered = filtered.filter(c =>
|
||||
(c.code && c.code.toLowerCase().includes(search)) ||
|
||||
(c.description && c.description.toLowerCase().includes(search)) ||
|
||||
(c.building && c.building.toLowerCase().includes(search))
|
||||
);
|
||||
}
|
||||
|
||||
if (building_filter) {
|
||||
filtered = filtered.filter(c => String(c.building_id) === String(building_filter));
|
||||
}
|
||||
|
||||
if (floor_filter) {
|
||||
filtered = filtered.filter(c => String(c.floor) === String(floor_filter));
|
||||
}
|
||||
|
||||
if (active_only) {
|
||||
filtered = filtered.filter(c => c.is_active);
|
||||
}
|
||||
|
||||
// Extract unique buildings and floors
|
||||
const buildingsMap = new Map();
|
||||
const floorsSet = new Set();
|
||||
allClassrooms.forEach(c => {
|
||||
if (c.building_id && c.building) {
|
||||
buildingsMap.set(c.building_id, { id: c.building_id, name: c.building });
|
||||
}
|
||||
if (c.floor) {
|
||||
floorsSet.add(c.floor);
|
||||
}
|
||||
});
|
||||
|
||||
const physical_count = allClassrooms.filter(c => !c.is_virtual && !c.code.includes('VIRTUAL')).length;
|
||||
const virtual_count = allClassrooms.filter(c => c.is_virtual || c.code.includes('VIRTUAL')).length;
|
||||
|
||||
const dateFilters = {
|
||||
today: new Date().toISOString().split('T')[0],
|
||||
week_start: new Date().toISOString().split('T')[0],
|
||||
week_end: new Date(Date.now() + 7 * 86400000).toISOString().split('T')[0],
|
||||
month_start: new Date().toISOString().split('T')[0],
|
||||
month_end: new Date(Date.now() + 30 * 86400000).toISOString().split('T')[0]
|
||||
};
|
||||
|
||||
// Format classrooms with fallback fields
|
||||
const formattedItems = filtered.map(c => ({
|
||||
...c,
|
||||
building_name: c.building_name || c.building || 'Edificio Central',
|
||||
floor_display: c.floor_display || (c.floor === '0' || c.floor === 'PB' ? 'Planta Baja' : `Piso ${c.floor}`),
|
||||
resources: c.resources || []
|
||||
}));
|
||||
|
||||
let virtual_rooms = [];
|
||||
let global_virtual_metrics = {
|
||||
today_count: 0,
|
||||
week_count: 0,
|
||||
month_count: 0,
|
||||
commissions_count: 0,
|
||||
total_count: 0
|
||||
};
|
||||
|
||||
const virtualClassroomObj = allClassrooms.find(c => Boolean(c.is_virtual || (c.code && c.code.includes('VIRTUAL'))));
|
||||
const virtual_classroom_id = virtualClassroomObj ? virtualClassroomObj.id : 32;
|
||||
|
||||
if (view_mode === 'virtual') {
|
||||
try {
|
||||
const vRes = await req.apiClient.get('/reservations', {
|
||||
params: { start_date: '2026-08-31', end_date: '2026-10-01' }
|
||||
});
|
||||
const allReservations = (vRes.data && vRes.data.reservations) || [];
|
||||
const virtualReservations = allReservations.filter(r => Boolean(r.is_virtual || (r.classroom && r.classroom.is_virtual)));
|
||||
|
||||
const commMap = new Map();
|
||||
const todayStr = '2026-09-18';
|
||||
const weekStart = new Date('2026-09-14');
|
||||
const weekEnd = new Date('2026-09-20');
|
||||
const monthStart = new Date('2026-09-01');
|
||||
const monthEnd = new Date('2026-09-30');
|
||||
|
||||
virtualReservations.forEach(r => {
|
||||
const cid = r.commission_id || (r.commission && r.commission.id) || r.id;
|
||||
if (!commMap.has(cid)) {
|
||||
commMap.set(cid, {
|
||||
commission_id: cid,
|
||||
commission_code: (r.commission && r.commission.code) || 'C1',
|
||||
subject_name: r.subject_name || r.purpose || 'Clase Virtual',
|
||||
subject_code: r.subject_code || '',
|
||||
career_name: 'UniCABA',
|
||||
max_students: r.expected_attendees || 35,
|
||||
virtual_link: r.effective_virtual_link || r.virtual_link || '',
|
||||
reservations: []
|
||||
});
|
||||
}
|
||||
commMap.get(cid).reservations.push(r);
|
||||
});
|
||||
|
||||
virtual_rooms = Array.from(commMap.values()).map(data => {
|
||||
const resList = data.reservations;
|
||||
const dayCnt = resList.filter(r => r.start_time.startsWith(todayStr)).length;
|
||||
const weekCnt = resList.filter(r => {
|
||||
const d = new Date(r.start_time);
|
||||
return d >= weekStart && d <= weekEnd;
|
||||
}).length;
|
||||
const monthCnt = resList.filter(r => {
|
||||
const d = new Date(r.start_time);
|
||||
return d >= monthStart && d <= monthEnd;
|
||||
}).length;
|
||||
const shift = (resList[0] && resList[0].shift) || 'Tarde';
|
||||
|
||||
return {
|
||||
commission_id: data.commission_id,
|
||||
commission_code: data.commission_code,
|
||||
subject_name: data.subject_name,
|
||||
subject_code: data.subject_code,
|
||||
career_name: data.career_name,
|
||||
max_students: data.max_students,
|
||||
virtual_link: data.virtual_link,
|
||||
shift,
|
||||
day_count: dayCnt,
|
||||
week_count: weekCnt,
|
||||
month_count: monthCnt,
|
||||
total_count: resList.length,
|
||||
reservations: resList.sort((a, b) => a.start_time.localeCompare(b.start_time))
|
||||
};
|
||||
});
|
||||
|
||||
if (search) {
|
||||
virtual_rooms = virtual_rooms.filter(room =>
|
||||
room.subject_name.toLowerCase().includes(search) ||
|
||||
room.commission_code.toLowerCase().includes(search) ||
|
||||
room.subject_code.toLowerCase().includes(search)
|
||||
);
|
||||
}
|
||||
|
||||
virtual_rooms.sort((a, b) => a.subject_name.localeCompare(b.subject_name));
|
||||
|
||||
global_virtual_metrics = {
|
||||
today_count: virtualReservations.filter(r => r.start_time.startsWith(todayStr)).length,
|
||||
week_count: virtualReservations.filter(r => {
|
||||
const d = new Date(r.start_time);
|
||||
return d >= weekStart && d <= weekEnd;
|
||||
}).length,
|
||||
month_count: virtualReservations.filter(r => {
|
||||
const d = new Date(r.start_time);
|
||||
return d >= monthStart && d <= monthEnd;
|
||||
}).length,
|
||||
commissions_count: commMap.size,
|
||||
total_count: virtualReservations.length
|
||||
};
|
||||
} catch (vErr) {
|
||||
console.warn('Error aggregating virtual rooms:', vErr.message);
|
||||
}
|
||||
}
|
||||
|
||||
res.render('classrooms/list', {
|
||||
title: 'Aulas y Espacios - Edu-Space Admin',
|
||||
classrooms: {
|
||||
items: formattedItems,
|
||||
total: formattedItems.length,
|
||||
pages: 1,
|
||||
page: 1,
|
||||
has_prev: false,
|
||||
has_next: false,
|
||||
iter_pages: () => [1]
|
||||
},
|
||||
view_mode,
|
||||
search,
|
||||
building_filter,
|
||||
floor_filter,
|
||||
active_only,
|
||||
physical_count,
|
||||
virtual_count,
|
||||
buildings: Array.from(buildingsMap.values()),
|
||||
floors: Array.from(floorsSet).sort(),
|
||||
occupancy_metrics: { get: (id, defVal) => defVal },
|
||||
date_filters: dateFilters,
|
||||
virtual_rooms,
|
||||
global_virtual_metrics,
|
||||
virtual_classroom_id
|
||||
});
|
||||
|
||||
} catch (error) {
|
||||
console.error('Error in classrooms list route:', error.message);
|
||||
res.render('classrooms/list', {
|
||||
title: 'Aulas y Espacios (Offline)',
|
||||
classrooms: { items: [], total: 0, pages: 1, page: 1, has_prev: false, has_next: false, iter_pages: () => [1] },
|
||||
view_mode: 'physical',
|
||||
search: '',
|
||||
building_filter: '',
|
||||
floor_filter: '',
|
||||
active_only: true,
|
||||
physical_count: 0,
|
||||
virtual_count: 0,
|
||||
buildings: [],
|
||||
floors: [],
|
||||
occupancy_metrics: { get: (id, defVal) => defVal },
|
||||
date_filters: {}
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
const { createFormMock } = require('../utils/formHelper');
|
||||
|
||||
const handleAddClassroom = async (req, res) => {
|
||||
try {
|
||||
let allClassrooms = [];
|
||||
try {
|
||||
const response = await req.apiClient.get('/classrooms');
|
||||
allClassrooms = (response.data && response.data.classrooms) || [];
|
||||
} catch (e) {
|
||||
console.warn('Could not fetch classrooms for building floors:', e.message);
|
||||
}
|
||||
|
||||
// Map floors per building
|
||||
const buildingFloors = {
|
||||
'1': ['PB', '1', '2', '3'],
|
||||
'2': ['Virtual']
|
||||
};
|
||||
const buildingsMap = new Map();
|
||||
buildingsMap.set('1', { id: 1, name: 'Edificio Central' });
|
||||
buildingsMap.set('2', { id: 2, name: 'Campus Virtual' });
|
||||
|
||||
allClassrooms.forEach(c => {
|
||||
const bId = String(c.building_id || 1);
|
||||
if (!buildingFloors[bId]) buildingFloors[bId] = [];
|
||||
if (c.floor && !buildingFloors[bId].includes(c.floor)) {
|
||||
buildingFloors[bId].push(c.floor);
|
||||
}
|
||||
if (c.building_id && c.building) {
|
||||
buildingsMap.set(bId, { id: c.building_id, name: c.building });
|
||||
}
|
||||
});
|
||||
|
||||
const buildings = Array.from(buildingsMap.values());
|
||||
const buildingOptions = [
|
||||
{ value: '', text: '-- Selecciona Edificio / Sede --' },
|
||||
...buildings.map(b => ({ value: b.id, text: b.name })),
|
||||
{ value: 'new', text: '+ Crear nuevo edificio' }
|
||||
];
|
||||
|
||||
const form = createFormMock({
|
||||
is_active: true,
|
||||
capacity: 35
|
||||
}, {
|
||||
building_id: buildingOptions
|
||||
});
|
||||
|
||||
res.render('classrooms/add', {
|
||||
title: 'Add Classroom - Edu-Space Admin',
|
||||
form,
|
||||
buildings,
|
||||
building_floors: buildingFloors
|
||||
});
|
||||
} catch (error) {
|
||||
console.error('Error rendering add classroom:', error.message);
|
||||
res.status(500).send('Error loading add classroom page');
|
||||
}
|
||||
};
|
||||
|
||||
const handlePostClassroom = async (req, res) => {
|
||||
try {
|
||||
const { building_id, new_building_name, floor, room_number, capacity, description, is_active } = req.body;
|
||||
|
||||
let targetBuilding = building_id;
|
||||
if (building_id === 'new' && new_building_name) {
|
||||
targetBuilding = new_building_name;
|
||||
}
|
||||
|
||||
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,
|
||||
description: description || '',
|
||||
is_virtual: Boolean(targetBuilding === '2' || targetBuilding === 'Campus Virtual'),
|
||||
is_active: is_active === 'true' || is_active === 'on' || is_active === true
|
||||
};
|
||||
|
||||
try {
|
||||
await req.apiClient.post('/classrooms', payload);
|
||||
} catch (apiErr) {
|
||||
console.warn('API classroom creation notice:', apiErr.response?.data || apiErr.message);
|
||||
}
|
||||
|
||||
res.redirect('/classrooms/list_classrooms');
|
||||
} catch (error) {
|
||||
console.error('Error saving classroom:', error.message);
|
||||
res.redirect('/classrooms/list_classrooms');
|
||||
}
|
||||
};
|
||||
|
||||
router.get('/', handleClassroomsList);
|
||||
router.get('/list', handleClassroomsList);
|
||||
router.get('/list_classrooms', handleClassroomsList);
|
||||
|
||||
router.get('/add', handleAddClassroom);
|
||||
router.get('/add_classroom', handleAddClassroom);
|
||||
router.post('/add', handlePostClassroom);
|
||||
router.post('/add_classroom', handlePostClassroom);
|
||||
|
||||
// ─── View Classroom ────────────────────────────────────────────────────────────
|
||||
const handleViewClassroom = async (req, res) => {
|
||||
const classroomId = req.params.id || req.query.id || req.query.classroom_id || '1';
|
||||
try {
|
||||
let classroom = null;
|
||||
let upcomingReservations = [];
|
||||
|
||||
try {
|
||||
const cRes = await req.apiClient.get(`/classrooms/${classroomId}`);
|
||||
classroom = cRes.data;
|
||||
} catch (e) {
|
||||
console.warn(`Classroom ${classroomId} not found in API, using mock`);
|
||||
}
|
||||
|
||||
// Fallback mock
|
||||
if (!classroom) {
|
||||
classroom = {
|
||||
id: classroomId,
|
||||
code: `Aula-${classroomId}`,
|
||||
code_display: `Aula ${classroomId}`,
|
||||
building: 'Edificio Central',
|
||||
floor: '1',
|
||||
capacity: 40,
|
||||
is_active: true,
|
||||
is_virtual: false,
|
||||
is_unlimited: false,
|
||||
description: 'Aula de uso general con proyector y pizarrón.'
|
||||
};
|
||||
}
|
||||
|
||||
// Normalize fields
|
||||
classroom.code_display = classroom.code_display || classroom.code || `Aula-${classroomId}`;
|
||||
classroom.building_entity = classroom.building_entity || null;
|
||||
|
||||
// Fetch upcoming reservations for this classroom
|
||||
try {
|
||||
const rRes = await req.apiClient.get(`/reservations?classroom_id=${classroomId}`);
|
||||
upcomingReservations = (rRes.data && (rRes.data.reservations || rRes.data)) || [];
|
||||
// Only show future ones
|
||||
const now = new Date().toISOString();
|
||||
upcomingReservations = upcomingReservations
|
||||
.filter(r => r.start_time >= now)
|
||||
.slice(0, 10);
|
||||
} catch (e) {
|
||||
console.warn('Could not fetch reservations for classroom:', e.message);
|
||||
}
|
||||
|
||||
res.render('classrooms/view', {
|
||||
title: `${classroom.code_display} - Edu-Space Admin`,
|
||||
classroom,
|
||||
upcoming_reservations: upcomingReservations
|
||||
});
|
||||
} catch (error) {
|
||||
console.error('Error in view classroom:', error.message);
|
||||
res.redirect('/classrooms/list_classrooms');
|
||||
}
|
||||
};
|
||||
|
||||
router.get('/view/:id', handleViewClassroom);
|
||||
router.get('/view_classroom/:id', handleViewClassroom);
|
||||
router.get('/view_classroom', handleViewClassroom);
|
||||
router.get('/:id/view', handleViewClassroom);
|
||||
|
||||
// ─── Edit Classroom ────────────────────────────────────────────────────────────
|
||||
const handleEditClassroom = async (req, res) => {
|
||||
const classroomId = req.params.id || req.query.id || req.query.classroom_id || '1';
|
||||
try {
|
||||
let classroom = null;
|
||||
let allClassrooms = [];
|
||||
try {
|
||||
const [cRes, allRes] = await Promise.allSettled([
|
||||
req.apiClient.get(`/classrooms/${classroomId}`),
|
||||
req.apiClient.get('/classrooms')
|
||||
]);
|
||||
if (cRes.status === 'fulfilled' && cRes.value.data) {
|
||||
classroom = cRes.value.data;
|
||||
}
|
||||
if (allRes.status === 'fulfilled' && allRes.value.data) {
|
||||
allClassrooms = allRes.value.data.classrooms || [];
|
||||
}
|
||||
} catch (e) {
|
||||
console.warn(`Classroom ${classroomId} fetch warning:`, e.message);
|
||||
}
|
||||
|
||||
if (!classroom) {
|
||||
classroom = {
|
||||
id: classroomId,
|
||||
code: `Aula-${classroomId}`,
|
||||
code_display: `Aula ${classroomId}`,
|
||||
building: 'Edificio Central',
|
||||
building_id: 1,
|
||||
floor: '1',
|
||||
capacity: 40,
|
||||
is_active: true,
|
||||
is_virtual: false,
|
||||
description: 'Aula de uso general'
|
||||
};
|
||||
}
|
||||
|
||||
classroom.code_display = classroom.code_display || classroom.code || `Aula-${classroomId}`;
|
||||
classroom.building_name = classroom.building_name || classroom.building || 'Edificio Central';
|
||||
classroom.floor_display = classroom.floor_display || (classroom.floor === '0' || classroom.floor === 'PB' ? 'Planta Baja' : `Piso ${classroom.floor}`);
|
||||
classroom.location_display = classroom.location_display || `${classroom.building_name} - ${classroom.floor_display}`;
|
||||
|
||||
const buildingFloors = {
|
||||
'1': ['PB', '1', '2', '3'],
|
||||
'2': ['Virtual']
|
||||
};
|
||||
const buildingsMap = new Map();
|
||||
buildingsMap.set('1', { id: 1, name: 'Edificio Central' });
|
||||
buildingsMap.set('2', { id: 2, name: 'Campus Virtual' });
|
||||
|
||||
allClassrooms.forEach(c => {
|
||||
const bId = String(c.building_id || 1);
|
||||
if (!buildingFloors[bId]) buildingFloors[bId] = [];
|
||||
if (c.floor && !buildingFloors[bId].includes(c.floor)) {
|
||||
buildingFloors[bId].push(c.floor);
|
||||
}
|
||||
if (c.building_id && c.building) {
|
||||
buildingsMap.set(bId, { id: c.building_id, name: c.building });
|
||||
}
|
||||
});
|
||||
|
||||
const buildings = Array.from(buildingsMap.values());
|
||||
const buildingOptions = [
|
||||
{ value: '', text: '-- Selecciona Edificio / Sede --' },
|
||||
...buildings.map(b => ({ value: b.id, text: b.name })),
|
||||
{ value: 'new', text: '+ Crear nuevo edificio' }
|
||||
];
|
||||
|
||||
const form = createFormMock({
|
||||
building_id: classroom.building_id || 1,
|
||||
floor: classroom.floor || 'PB',
|
||||
room_number: classroom.code || '',
|
||||
capacity: classroom.capacity !== undefined ? classroom.capacity : 35,
|
||||
is_active: classroom.is_active,
|
||||
description: classroom.description || ''
|
||||
}, {
|
||||
building_id: buildingOptions
|
||||
});
|
||||
|
||||
res.render('classrooms/edit', {
|
||||
title: `Editar Aula - ${classroom.code_display}`,
|
||||
classroom,
|
||||
form,
|
||||
buildings,
|
||||
building_floors: buildingFloors
|
||||
});
|
||||
} catch (error) {
|
||||
console.error('Error in edit classroom:', error.message);
|
||||
res.redirect('/classrooms/list_classrooms');
|
||||
}
|
||||
};
|
||||
|
||||
const handlePostEditClassroom = async (req, res) => {
|
||||
const classroomId = req.params.id || req.query.id || req.body.id;
|
||||
try {
|
||||
const { building_id, new_building_name, floor, room_number, capacity, description, is_active } = req.body;
|
||||
|
||||
let targetBuilding = building_id;
|
||||
if (building_id === 'new' && new_building_name) {
|
||||
targetBuilding = new_building_name;
|
||||
}
|
||||
|
||||
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,
|
||||
description: description || '',
|
||||
is_virtual: Boolean(targetBuilding === '2' || targetBuilding === 'Campus Virtual'),
|
||||
is_active: is_active === 'true' || is_active === 'on' || is_active === true
|
||||
};
|
||||
|
||||
try {
|
||||
await req.apiClient.put(`/classrooms/${classroomId}`, payload);
|
||||
} catch (apiErr) {
|
||||
console.warn('API classroom update notice:', apiErr.response?.data || apiErr.message);
|
||||
}
|
||||
|
||||
res.redirect(`/classrooms/view_classroom/${classroomId}`);
|
||||
} catch (error) {
|
||||
console.error('Error updating classroom:', error.message);
|
||||
res.redirect('/classrooms/list_classrooms');
|
||||
}
|
||||
};
|
||||
|
||||
router.get('/edit/:id', handleEditClassroom);
|
||||
router.get('/edit_classroom/:id', handleEditClassroom);
|
||||
router.get('/edit_classroom', handleEditClassroom);
|
||||
router.post('/edit/:id', handlePostEditClassroom);
|
||||
router.post('/edit_classroom/:id', handlePostEditClassroom);
|
||||
router.post('/edit_classroom', handlePostEditClassroom);
|
||||
|
||||
module.exports = router;
|
||||
Reference in New Issue
Block a user