feat(rbac): add benefits and reception modules to RBAC matrix and register Recepcion role (v3.8.44)
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "frontend",
|
||||
"version": "3.8.43",
|
||||
"version": "3.8.44",
|
||||
"description": "",
|
||||
"main": "index.js",
|
||||
"scripts": {
|
||||
|
||||
+3
-3
@@ -86,9 +86,9 @@ const env = nunjucks.configure(path.join(__dirname, '../views'), {
|
||||
});
|
||||
|
||||
// Versiones institucionales del sistema
|
||||
const APP_VERSION = '3.8.43';
|
||||
const FRONTEND_VERSION = '3.8.43';
|
||||
const BACKEND_VERSION = '3.8.43';
|
||||
const APP_VERSION = '3.8.44';
|
||||
const FRONTEND_VERSION = '3.8.44';
|
||||
const BACKEND_VERSION = '3.8.44';
|
||||
|
||||
env.addGlobal('app_version', APP_VERSION);
|
||||
env.addGlobal('frontend_version', FRONTEND_VERSION);
|
||||
|
||||
@@ -422,17 +422,18 @@ router.get(['/occupancy_metrics', '/occupancy-metrics', '/metrics/occupancy'], h
|
||||
// ─── 3. USERS ─────────────────────────────────────────────────────────────────
|
||||
|
||||
const MOCK_ROLES = [
|
||||
{ id: 1, name: 'Administrador', description: 'Acceso total al sistema', user_count: 2, is_system: true, permissions: { classrooms: 'read_write', schedule: 'read_write', admin: 'read_write', buildings: 'read_write' } },
|
||||
{ id: 2, name: 'Bedel', description: 'Gestión de reservas y aulas', user_count: 5, is_system: false, permissions: { classrooms: 'read_write', schedule: 'read_write', admin: 'read', buildings: 'read' } },
|
||||
{ id: 3, name: 'Docente', description: 'Visualización de horarios', user_count: 18, is_system: false, permissions: { classrooms: 'read', schedule: 'read', admin: 'none', buildings: 'read' } },
|
||||
{ id: 4, name: 'Invitado', description: 'Solo lectura', user_count: 3, is_system: false, permissions: { classrooms: 'read', schedule: 'none', admin: 'none', buildings: 'none' } }
|
||||
{ id: 1, name: 'Administrador', description: 'Acceso total al sistema', user_count: 2, is_system: true, permissions: { classrooms: 'read_write', schedule: 'read_write', admin: 'read_write', buildings: 'read_write', benefits: 'read_write', reception: 'read_write' } },
|
||||
{ id: 7, name: 'Bedelía', description: 'Gestión operativa, aulas, reservas y beneficios', user_count: 5, is_system: true, permissions: { classrooms: 'read_write', schedule: 'read_write', buildings: 'read_write', benefits: 'read_write', reception: 'read' } },
|
||||
{ id: 2, name: 'Docente', description: 'Visualización de horarios y convenios', user_count: 18, is_system: true, permissions: { classrooms: 'read', schedule: 'read', buildings: 'read', benefits: 'read', reception: 'none' } },
|
||||
{ id: 6, name: 'Alumno', description: 'Consulta de cursadas, cartelera y beneficios', user_count: 50, is_system: true, permissions: { classrooms: 'read', schedule: 'read', benefits: 'read', reception: 'none' } },
|
||||
{ id: 8, name: 'Recepción', description: 'Control de acceso institucional y validación QR en sedes', user_count: 1, is_system: true, permissions: { reception: 'read_write', classrooms: 'read', schedule: 'read', buildings: 'read', benefits: 'read', users: 'read' } }
|
||||
];
|
||||
|
||||
const MOCK_USERS = [
|
||||
{ id: 1, name: 'Admin Sistema', email: 'admin@edu-space.com', role_id: 1, role: { name: 'Administrador' }, is_active: true, created_at: '2025-01-01' },
|
||||
{ id: 2, name: 'María González', email: 'mgonzalez@edu-space.com', role_id: 2, role: { name: 'Bedel' }, is_active: true, created_at: '2025-03-15' },
|
||||
{ id: 3, name: 'Carlos Rodríguez', email: 'crodriguez@edu-space.com', role_id: 3, role: { name: 'Docente' }, is_active: true, created_at: '2025-04-10' },
|
||||
{ id: 4, name: 'Laura Martínez', email: 'lmartinez@edu-space.com', role_id: 2, role: { name: 'Bedel' }, is_active: false, created_at: '2025-05-20' }
|
||||
{ id: 2, name: 'María González', email: 'mgonzalez@edu-space.com', role_id: 7, role: { name: 'Bedelía' }, is_active: true, created_at: '2025-03-15' },
|
||||
{ id: 3, name: 'Carlos Rodríguez', email: 'crodriguez@edu-space.com', role_id: 2, role: { name: 'Docente' }, is_active: true, created_at: '2025-04-10' },
|
||||
{ id: 4, name: 'Laura Martínez', email: 'lmartinez@edu-space.com', role_id: 8, role: { name: 'Recepción' }, is_active: true, created_at: '2025-05-20' }
|
||||
];
|
||||
|
||||
const buildPagination = (page, perPage, total) => {
|
||||
@@ -462,6 +463,7 @@ const buildPagination = (page, perPage, total) => {
|
||||
const fetchRolesAndDocs = async (apiClient) => {
|
||||
let roles = [...MOCK_ROLES];
|
||||
let document_types = [];
|
||||
let modules = [...MODULES];
|
||||
try {
|
||||
const [rRes, dRes] = await Promise.allSettled([
|
||||
apiClient.get('/roles'),
|
||||
@@ -470,6 +472,9 @@ const fetchRolesAndDocs = async (apiClient) => {
|
||||
if (rRes.status === 'fulfilled' && rRes.value.data) {
|
||||
const d = rRes.value.data;
|
||||
roles = (d.roles || d) || roles;
|
||||
if (d.modules && Array.isArray(d.modules) && d.modules.length > 0) {
|
||||
modules = d.modules;
|
||||
}
|
||||
}
|
||||
if (dRes.status === 'fulfilled' && dRes.value.data) {
|
||||
document_types = dRes.value.data.document_types || [];
|
||||
@@ -490,12 +495,12 @@ const fetchRolesAndDocs = async (apiClient) => {
|
||||
{ code: 'LE', name: 'Libreta de Enrolamiento', category: 'Histórico Nacional', placeholder: 'Libreta Enrolamiento' }
|
||||
];
|
||||
}
|
||||
return { roles, document_types };
|
||||
return { roles, document_types, modules };
|
||||
};
|
||||
|
||||
const fetchUsersAndRoles = async (apiClient) => {
|
||||
const { roles, document_types } = await fetchRolesAndDocs(apiClient);
|
||||
return { users: [...MOCK_USERS], roles, document_types };
|
||||
const { roles, document_types, modules } = await fetchRolesAndDocs(apiClient);
|
||||
return { users: [...MOCK_USERS], roles, document_types, modules };
|
||||
};
|
||||
|
||||
const handleUsersList = async (req, res) => {
|
||||
@@ -519,7 +524,8 @@ const handleUsersList = async (req, res) => {
|
||||
admin: 0,
|
||||
bedelia: 0,
|
||||
docente: 0,
|
||||
alumno: 0
|
||||
alumno: 0,
|
||||
recepcion: 0
|
||||
};
|
||||
|
||||
try {
|
||||
@@ -714,21 +720,28 @@ router.post(['/users/:id/password', '/users/password', '/user_password', '/user_
|
||||
// ─── 4. ROLES ─────────────────────────────────────────────────────────────────
|
||||
|
||||
const MODULES = [
|
||||
{ id: 'classrooms', name: 'Aulas', icon: 'bi-door-open' },
|
||||
{ id: 'schedule', name: 'Horarios', icon: 'bi-calendar3' },
|
||||
{ id: 'buildings', name: 'Edificios', icon: 'bi-buildings' },
|
||||
{ id: 'admin', name: 'Admin', icon: 'bi-shield-lock' },
|
||||
{ id: 'users', name: 'Usuarios', icon: 'bi-people' },
|
||||
{ id: 'reports', name: 'Reportes', icon: 'bi-graph-up' }
|
||||
{ id: 'classrooms', name: 'Aulas y Espacios', icon: 'bi-door-open', description: 'Gestión de aulas físicas, aulas virtuales (∞) y capacidades.' },
|
||||
{ id: 'buildings', name: 'Edificios y Sedes', icon: 'bi-buildings', description: 'Administración de sede central, campus virtual, pisos y ubicaciones.' },
|
||||
{ id: 'reservations', name: 'Reservas de Aulas', icon: 'bi-calendar-check', description: 'Creación, modificación, aprobación, confirmación y cancelación de reservas.' },
|
||||
{ id: 'schedule', name: 'Cartelera y Cronograma', icon: 'bi-calendar3', description: 'Visualización de calendario interactivo, cartelera de hoy y comisiones.' },
|
||||
{ id: 'academic', name: 'Gestión Académica', icon: 'bi-book', description: 'Administración de carreras, asignaturas, códigos y comisiones.' },
|
||||
{ id: 'import', name: 'Sincronización Sheets', icon: 'bi-file-earmark-spreadsheet', description: 'Importación y sincronización de datos académicos desde Google Sheets.' },
|
||||
{ id: 'optimizer', name: 'Optimizador IA', icon: 'bi-cpu', description: 'Ejecución y configuración del algoritmo genético de asignación.' },
|
||||
{ id: 'users', name: 'Usuarios y Accesos RBAC', icon: 'bi-shield-lock', description: 'Administración de cuentas, roles y matriz granular de permisos.' },
|
||||
{ id: 'milestone_types', name: 'Tipificaciones de Hitos', icon: 'bi-tags', description: 'Catálogo dinámico de tipos de evaluaciones, parciales, TPs y eventos.' },
|
||||
{ id: 'metrics', name: 'Métricas de Ocupación', icon: 'bi-graph-up', description: 'Visualización y análisis de porcentajes de ocupación por aula.' },
|
||||
{ id: 'enrollment', name: 'Inscripciones y Cursadas', icon: 'bi-diagram-3', description: 'Gestión de inscripciones de alumnos y asignación de docentes.' },
|
||||
{ id: 'benefits', name: 'Convenios y Beneficios', icon: 'bi-tag', description: 'Gestión de convenios comerciales, descuentos y promociones.' },
|
||||
{ id: 'reception', name: 'Recepción y Control QR', icon: 'bi-qr-code-scan', description: 'Escaneo y validación de credenciales QR para control de acceso.' }
|
||||
];
|
||||
|
||||
const handleRolesList = async (req, res) => {
|
||||
try {
|
||||
const { roles } = await fetchUsersAndRoles(req.apiClient);
|
||||
const { roles, modules } = await fetchUsersAndRoles(req.apiClient);
|
||||
res.render('admin/roles/list', {
|
||||
title: 'Roles y Grupos de Acceso - Edu-Space Admin',
|
||||
roles,
|
||||
modules: MODULES
|
||||
modules: (modules && modules.length > 0) ? modules : MODULES
|
||||
});
|
||||
} catch (err) {
|
||||
console.error('Error in roles list:', err.message);
|
||||
@@ -737,24 +750,35 @@ const handleRolesList = async (req, res) => {
|
||||
};
|
||||
|
||||
const handleRoleAdd = async (req, res) => {
|
||||
res.render('admin/roles/edit', {
|
||||
title: 'Nuevo Rol - Edu-Space Admin',
|
||||
role: null,
|
||||
current_perms: {},
|
||||
modules: MODULES
|
||||
});
|
||||
try {
|
||||
const { modules } = await fetchRolesAndDocs(req.apiClient);
|
||||
res.render('admin/roles/edit', {
|
||||
title: 'Nuevo Rol - Edu-Space Admin',
|
||||
role: null,
|
||||
current_perms: {},
|
||||
modules: (modules && modules.length > 0) ? modules : MODULES
|
||||
});
|
||||
} catch (err) {
|
||||
console.error('Error in role add:', err.message);
|
||||
res.render('admin/roles/edit', {
|
||||
title: 'Nuevo Rol - Edu-Space Admin',
|
||||
role: null,
|
||||
current_perms: {},
|
||||
modules: MODULES
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
const handleRoleEdit = async (req, res) => {
|
||||
try {
|
||||
const { roles } = await fetchUsersAndRoles(req.apiClient);
|
||||
const { roles, modules } = await fetchUsersAndRoles(req.apiClient);
|
||||
const roleId = req.params.id || req.query.id;
|
||||
const targetRole = (roleId ? roles.find(r => String(r.id) === String(roleId)) : null) || roles[0] || MOCK_ROLES[0];
|
||||
res.render('admin/roles/edit', {
|
||||
title: `Editar Rol: ${targetRole.name} - Edu-Space Admin`,
|
||||
role: targetRole,
|
||||
current_perms: targetRole.permissions || {},
|
||||
modules: MODULES
|
||||
modules: (modules && modules.length > 0) ? modules : MODULES
|
||||
});
|
||||
} catch (err) {
|
||||
console.error('Error in role edit:', err.message);
|
||||
|
||||
@@ -191,6 +191,30 @@
|
||||
</div>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<!-- Recepción -->
|
||||
{% if role_counts.recepcion is defined %}
|
||||
<div class="col-6 col-md-4 col-xl">
|
||||
<a href="/admin/users_list?role=Recepcion" class="text-decoration-none text-reset d-block h-100">
|
||||
<div class="card border-0 shadow-sm h-100 p-3 transition-all {% if role_filter == 'Recepcion' or role_filter == 'recepcion' %}border-start border-secondary border-4 bg-secondary-subtle bg-opacity-25{% endif %}">
|
||||
<div class="d-flex align-items-center justify-content-between mb-2">
|
||||
<span class="text-muted small fw-semibold text-uppercase">Recepción</span>
|
||||
<div class="bg-secondary bg-opacity-10 text-secondary rounded-circle p-2">
|
||||
<i class="bi bi-qr-code-scan fs-5"></i>
|
||||
</div>
|
||||
</div>
|
||||
<div class="d-flex align-items-baseline justify-content-between">
|
||||
<h3 class="fw-bold mb-0 text-secondary">{{ role_counts.recepcion or 0 }}</h3>
|
||||
<span class="badge bg-secondary-subtle text-secondary border border-secondary-subtle small">Control QR</span>
|
||||
</div>
|
||||
<div class="small text-muted mt-2 pt-2 border-top d-flex justify-content-between align-items-center">
|
||||
<span>Acceso institucional</span>
|
||||
<i class="bi bi-arrow-right"></i>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<!-- Filters & Search -->
|
||||
|
||||
Reference in New Issue
Block a user