feat(real-data): carga dinamica de workstations y tickets/movimientos reales desde SQL Server

This commit is contained in:
Carlos Tello
2026-10-13 16:41:20 -03:00
parent c3810a6525
commit e5b2b98d41
17 changed files with 564 additions and 147 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "onevercontrol-frontend",
"private": true,
"version": "0.6.0-beta",
"version": "0.6.1-beta",
"type": "module",
"scripts": {
"dev": "vite",
+6
View File
@@ -51,4 +51,10 @@ export const accessApi = {
body: JSON.stringify({ raw_data: rawData }),
});
},
getRecentMovements: (limit: number = 30) => {
return request<any[]>(`/access/movements/recent?limit=${limit}`, {
method: 'GET',
});
},
};
+11
View File
@@ -4,10 +4,21 @@
import { request } from './client';
import { WorkstationConfig } from '../types';
export interface WorkstationListItem {
id: number;
name: string;
}
export const workstationApi = {
getConfig: (workstationName: string) => {
return request<WorkstationConfig>(`/control-posts/${encodeURIComponent(workstationName)}/config`, {
method: 'GET',
});
},
getAvailableWorkstations: () => {
return request<WorkstationListItem[]>('/control-posts/workstations', {
method: 'GET',
});
},
};
+13
View File
@@ -99,3 +99,16 @@ export interface TicketResponse {
barrier_opened: boolean;
fecha_hora: string;
}
export interface RecentMovement {
mvt_hist_id: number;
ticket_id: number;
sentido: string;
patente?: string | null;
apellido?: string | null;
nombre?: string | null;
documento?: string | null;
modulo_nombre?: string | null;
fecha_hora: string;
entidad?: string | null;
}
+242 -81
View File
@@ -25,8 +25,10 @@ export const ControlPostView: React.FC = () => {
const [selectedEntryModuleId, setSelectedEntryModuleId] = useState<number>(0);
const [selectedExitModuleId, setSelectedExitModuleId] = useState<number>(0);
// Tickets activos en el predio
// Tickets activos y movimientos registrados en BD
const [activeTickets, setActiveTickets] = useState<ActiveTicket[]>([]);
const [recentMovements, setRecentMovements] = useState<any[]>([]);
const [viewTab, setViewTab] = useState<'active' | 'movements'>('active');
const [filterQuery, setFilterQuery] = useState<string>('');
const [isLoadingTickets, setIsLoadingTickets] = useState<boolean>(false);
@@ -73,24 +75,28 @@ export const ControlPostView: React.FC = () => {
try {
const wksConfig = await workstationApi.getConfig(workstation);
setConfig(wksConfig);
if (wksConfig.entry_modules.length > 0) {
if (wksConfig.entry_modules && wksConfig.entry_modules.length > 0) {
setSelectedEntryModuleId(wksConfig.entry_modules[0].id);
setForm((prev) => ({ ...prev, modulo_ingreso_id: wksConfig.entry_modules[0].id }));
}
if (wksConfig.exit_modules.length > 0) {
if (wksConfig.exit_modules && wksConfig.exit_modules.length > 0) {
setSelectedExitModuleId(wksConfig.exit_modules[0].id);
}
} catch (err: any) {
setActionError(`Error al cargar configuración de ${workstation}: ${err.message}`);
console.warn(`Configuración de ${workstation}:`, err);
}
}, [workstation]);
// Carga de tickets activos
// Carga de tickets activos y movimientos reales
const loadActiveTickets = useCallback(async () => {
setIsLoadingTickets(true);
try {
const tickets = await accessApi.getActiveTickets();
const [tickets, movements] = await Promise.all([
accessApi.getActiveTickets(),
accessApi.getRecentMovements(30).catch(() => []),
]);
setActiveTickets(tickets);
setRecentMovements(movements);
} catch (err: any) {
console.error('Error al listar tickets:', err);
} finally {
@@ -266,6 +272,20 @@ export const ControlPostView: React.FC = () => {
);
}, [activeTickets, filterQuery]);
// Filtro de movimientos historicos de la BD
const filteredMovements = useMemo(() => {
if (!filterQuery.trim()) return recentMovements;
const q = filterQuery.toLowerCase().trim();
return recentMovements.filter(
(m: any) =>
(m.documento && m.documento.toLowerCase().includes(q)) ||
(m.apellido && m.apellido.toLowerCase().includes(q)) ||
(m.nombre && m.nombre.toLowerCase().includes(q)) ||
(m.patente && m.patente.toLowerCase().includes(q)) ||
(m.modulo_nombre && m.modulo_nombre.toLowerCase().includes(q))
);
}, [recentMovements, filterQuery]);
const toggleFullscreen = () => {
if (!document.fullscreenElement) {
document.documentElement.requestFullscreen().catch(() => {});
@@ -723,10 +743,66 @@ export const ControlPostView: React.FC = () => {
overflow: 'hidden',
}}
>
{/* Pestañas de Selección: Activos vs Historial BD */}
<div
style={{
padding: '0.5rem 1.25rem 0',
backgroundColor: 'var(--bg-surface)',
borderBottom: '1px solid var(--border-subtle)',
display: 'flex',
gap: '0.75rem',
}}
>
<button
type="button"
onClick={() => setViewTab('active')}
style={{
padding: '0.65rem 1.25rem',
border: 'none',
borderBottom: viewTab === 'active' ? '3px solid var(--brand-primary)' : '3px solid transparent',
backgroundColor: 'transparent',
fontWeight: viewTab === 'active' ? 700 : 500,
color: viewTab === 'active' ? 'var(--brand-primary)' : 'var(--text-secondary)',
cursor: 'pointer',
fontSize: '0.95rem',
display: 'flex',
alignItems: 'center',
gap: '0.5rem',
}}
>
<span>🟢 En Predio (Activos)</span>
<span className="badge badge-info" style={{ fontSize: '0.8rem' }}>
{activeTickets.length}
</span>
</button>
<button
type="button"
onClick={() => setViewTab('movements')}
style={{
padding: '0.65rem 1.25rem',
border: 'none',
borderBottom: viewTab === 'movements' ? '3px solid var(--brand-primary)' : '3px solid transparent',
backgroundColor: 'transparent',
fontWeight: viewTab === 'movements' ? 700 : 500,
color: viewTab === 'movements' ? 'var(--brand-primary)' : 'var(--text-secondary)',
cursor: 'pointer',
fontSize: '0.95rem',
display: 'flex',
alignItems: 'center',
gap: '0.5rem',
}}
>
<span>📜 Historial Movimientos BD</span>
<span className="badge badge-neutral" style={{ fontSize: '0.8rem' }}>
{recentMovements.length}
</span>
</button>
</div>
{/* Barra de Filtros y Módulo de Salida */}
<div
style={{
padding: '1rem 1.25rem',
padding: '0.75rem 1.25rem',
backgroundColor: 'var(--bg-surface)',
borderBottom: '1px solid var(--border-subtle)',
display: 'flex',
@@ -739,18 +815,27 @@ export const ControlPostView: React.FC = () => {
<input
type="text"
className="input-touch"
placeholder="🔍 Filtrar por patente, DNI o apellido..."
placeholder={viewTab === 'active' ? "🔍 Filtrar por patente, DNI o apellido..." : "🔍 Filtrar historial..."}
value={filterQuery}
onChange={(e) => setFilterQuery(e.target.value)}
style={{ maxWidth: '380px' }}
/>
<span className="badge badge-info" style={{ fontSize: '0.9rem', padding: '0.4rem 0.8rem' }}>
{filteredTickets.length} dentro del predio
<button
type="button"
className="btn btn-secondary"
onClick={() => loadActiveTickets()}
title="Refrescar datos de la Base de Datos"
style={{ minHeight: '40px', padding: '0 0.8rem', fontSize: '0.85rem' }}
>
🔄 Actualizar
</button>
<span className="badge badge-info" style={{ fontSize: '0.85rem', padding: '0.35rem 0.7rem' }}>
{viewTab === 'active' ? `${filteredTickets.length} ocupantes` : `${filteredMovements.length} registros`}
</span>
</div>
{/* Módulo de Salida para Egresos */}
{config && config.exit_modules.length > 0 && (
{/* Módulo de Salida para Egresos (solo visible en pestaña Activos) */}
{viewTab === 'active' && config && config.exit_modules.length > 0 && (
<div style={{ display: 'flex', alignItems: 'center', gap: '0.5rem' }}>
<span style={{ fontSize: '0.75rem', fontWeight: 600, color: 'var(--text-secondary)' }}>
BARRERA SALIDA:
@@ -771,81 +856,157 @@ export const ControlPostView: React.FC = () => {
)}
</div>
{/* Grilla / Lista de Tickets Activos */}
{/* Grilla / Lista de Contenido Según Pestaña */}
<div style={{ flex: 1, overflowY: 'auto', padding: '1.25rem' }}>
{isLoadingTickets && activeTickets.length === 0 ? (
{isLoadingTickets && activeTickets.length === 0 && recentMovements.length === 0 ? (
<div style={{ textAlign: 'center', padding: '2rem', color: 'var(--text-muted)' }}>
Cargando ocupantes del predio...
Cargando datos desde la base de datos...
</div>
) : filteredTickets.length === 0 ? (
<div style={{ textAlign: 'center', padding: '3rem', color: 'var(--text-muted)' }}>
{filterQuery ? 'No se encontraron coincidencias para la búsqueda.' : 'No hay visitas ni vehículos activos en el predio actualmente.'}
</div>
) : (
<div style={{ display: 'flex', flexDirection: 'column', gap: '0.75rem' }}>
{filteredTickets.map((t) => (
<div
key={t.ticket_id}
className="card"
style={{
display: 'flex',
alignItems: 'center',
justifyContent: 'space-between',
padding: '0.85rem 1.25rem',
backgroundColor: 'var(--bg-surface)',
borderRadius: 'var(--radius-md)',
boxShadow: 'var(--shadow-sm)',
border: '1px solid var(--border-subtle)',
}}
>
<div style={{ display: 'flex', alignItems: 'center', gap: '1.25rem' }}>
<div
style={{
backgroundColor: t.patente ? 'var(--status-info-bg)' : 'var(--status-warning-bg)',
color: t.patente ? 'var(--status-info)' : 'var(--status-warning)',
padding: '0.5rem 0.75rem',
borderRadius: '8px',
fontWeight: 700,
fontSize: '1.1rem',
minWidth: '95px',
textAlign: 'center',
}}
>
{t.patente || 'PEATÓN'}
</div>
<div>
<div style={{ fontSize: '1rem', fontWeight: 600 }}>
{t.apellido}, {t.nombre}{' '}
<span style={{ fontSize: '0.8rem', fontWeight: 400, color: 'var(--text-muted)' }}>
(DNI: {t.documento})
</span>
</div>
<div style={{ fontSize: '0.8rem', color: 'var(--text-secondary)', marginTop: '0.2rem' }}>
Destino: <strong>Lote {t.lote_codigo || 'S/D'}</strong> • Ingreso:{' '}
{t.fecha_ingreso} ({t.modulo_ingreso})
</div>
</div>
</div>
<button
type="button"
className="btn"
onClick={() => handleRegisterExit(t)}
) : viewTab === 'active' ? (
/* TAB 1: TICKETS ACTIVOS EN PREDIO */
filteredTickets.length === 0 ? (
<div style={{ textAlign: 'center', padding: '3rem', color: 'var(--text-muted)' }}>
{filterQuery ? 'No se encontraron coincidencias para la búsqueda.' : 'No hay visitas ni vehículos activos en el predio actualmente.'}
</div>
) : (
<div style={{ display: 'flex', flexDirection: 'column', gap: '0.75rem' }}>
{filteredTickets.map((t) => (
<div
key={t.ticket_id}
className="card"
style={{
backgroundColor: 'var(--status-danger)',
color: '#fff',
fontWeight: 600,
minHeight: '48px',
padding: '0 1.25rem',
fontSize: '0.95rem',
display: 'flex',
alignItems: 'center',
justifyContent: 'space-between',
padding: '0.85rem 1.25rem',
backgroundColor: 'var(--bg-surface)',
borderRadius: 'var(--radius-md)',
boxShadow: 'var(--shadow-sm)',
border: '1px solid var(--border-subtle)',
}}
>
DAR SALIDA
</button>
</div>
))}
</div>
<div style={{ display: 'flex', alignItems: 'center', gap: '1.25rem' }}>
<div
style={{
backgroundColor: t.patente ? 'var(--status-info-bg)' : 'var(--status-warning-bg)',
color: t.patente ? 'var(--status-info)' : 'var(--status-warning)',
padding: '0.5rem 0.75rem',
borderRadius: '8px',
fontWeight: 700,
fontSize: '1.1rem',
minWidth: '95px',
textAlign: 'center',
}}
>
{t.patente || 'PEATÓN'}
</div>
<div>
<div style={{ fontSize: '1rem', fontWeight: 600 }}>
{t.apellido}, {t.nombre}{' '}
<span style={{ fontSize: '0.8rem', fontWeight: 400, color: 'var(--text-muted)' }}>
(DNI: {t.documento})
</span>
</div>
<div style={{ fontSize: '0.8rem', color: 'var(--text-secondary)', marginTop: '0.2rem' }}>
Destino: <strong>Lote {t.lote_codigo || 'S/D'}</strong> • Ingreso:{' '}
{t.fecha_ingreso} ({t.modulo_ingreso})
</div>
</div>
</div>
<button
type="button"
className="btn"
onClick={() => handleRegisterExit(t)}
style={{
backgroundColor: 'var(--status-danger)',
color: '#fff',
fontWeight: 600,
minHeight: '48px',
padding: '0 1.25rem',
fontSize: '0.95rem',
}}
>
DAR SALIDA
</button>
</div>
))}
</div>
)
) : (
/* TAB 2: HISTORIAL DE MOVIMIENTOS REALES EN BASE DE DATOS */
filteredMovements.length === 0 ? (
<div style={{ textAlign: 'center', padding: '3rem', color: 'var(--text-muted)' }}>
{filterQuery ? 'No se encontraron movimientos que coincidan.' : 'No hay movimientos registrados en la base de datos.'}
</div>
) : (
<div style={{ display: 'flex', flexDirection: 'column', gap: '0.75rem' }}>
{filteredMovements.map((m: any, idx: number) => {
const isIngreso = (m.sentido || '').toUpperCase() === 'INGRESO' || (m.sentido || '').toUpperCase() === 'ENTRADA';
return (
<div
key={`${m.hist_id || idx}-${m.fecha_hora}`}
className="card"
style={{
display: 'flex',
alignItems: 'center',
justifyContent: 'space-between',
padding: '0.85rem 1.25rem',
backgroundColor: 'var(--bg-surface)',
borderRadius: 'var(--radius-md)',
boxShadow: 'var(--shadow-sm)',
border: '1px solid var(--border-subtle)',
}}
>
<div style={{ display: 'flex', alignItems: 'center', gap: '1.25rem' }}>
<span
className={isIngreso ? 'badge badge-success' : 'badge badge-warning'}
style={{ fontSize: '0.85rem', fontWeight: 700, minWidth: '85px', textAlign: 'center' }}
>
{m.sentido || 'MOVIMIENTO'}
</span>
<div
style={{
backgroundColor: m.patente ? 'var(--status-info-bg)' : 'var(--border-subtle)',
color: m.patente ? 'var(--status-info)' : 'var(--text-secondary)',
padding: '0.4rem 0.65rem',
borderRadius: '6px',
fontWeight: 700,
fontSize: '0.95rem',
minWidth: '85px',
textAlign: 'center',
}}
>
{m.patente || 'PEATÓN'}
</div>
<div>
<div style={{ fontSize: '0.95rem', fontWeight: 600 }}>
{m.apellido || m.nombre ? `${m.apellido || ''}, ${m.nombre || ''}` : 'S/D'}{' '}
{m.documento && (
<span style={{ fontSize: '0.8rem', fontWeight: 400, color: 'var(--text-muted)' }}>
(DNI: {m.documento})
</span>
)}
</div>
<div style={{ fontSize: '0.8rem', color: 'var(--text-secondary)', marginTop: '0.15rem' }}>
Módulo: <strong>{m.modulo_nombre || `ID ${m.modulo_id}`}</strong> • Motivo: {m.motivo || 'N/A'}
</div>
</div>
</div>
<div style={{ textAlign: 'right' }}>
<span style={{ fontSize: '0.85rem', fontWeight: 600, color: 'var(--text-primary)' }}>
{m.fecha_hora ? new Date(m.fecha_hora).toLocaleString('es-AR') : 'S/F'}
</span>
</div>
</div>
);
})}
</div>
)
)}
</div>
+33 -7
View File
@@ -2,17 +2,38 @@
// Vista de Inicio de Sesión de Operador / Guardia
// Optimizado para uso táctil en tablets Samsung Galaxy Tab (Touch-First)
// ==============================================================================
import React, { useState } from 'react';
import React, { useState, useEffect } from 'react';
import { useAuth } from '../context/AuthContext';
import { workstationApi, WorkstationListItem } from '../api/workstationApi';
export const LoginView: React.FC = () => {
const { login, workstation, setWorkstation } = useAuth();
const [username, setUsername] = useState<string>('guardia');
const [password, setPassword] = useState<string>('');
const [selectedWks, setSelectedWks] = useState<string>(workstation || 'CFT-DESK');
const [availableWorkstations, setAvailableWorkstations] = useState<WorkstationListItem[]>([]);
const [isLoading, setIsLoading] = useState<boolean>(false);
const [errorMsg, setErrorMsg] = useState<string | null>(null);
useEffect(() => {
// Carga de Workstations reales desde SQL Server
workstationApi.getAvailableWorkstations()
.then((list) => {
if (list && list.length > 0) {
setAvailableWorkstations(list);
const currentMatch = list.find((w) => w.name.toUpperCase() === (workstation || 'CFT-DESK').toUpperCase());
if (currentMatch) {
setSelectedWks(currentMatch.name);
} else {
setSelectedWks(list[0].name);
}
}
})
.catch((err) => {
console.warn('No se pudieron listar estaciones desde DB:', err);
});
}, [workstation]);
const handleSubmit = async (e: React.FormEvent) => {
e.preventDefault();
if (!username.trim() || !password) {
@@ -98,7 +119,7 @@ export const LoginView: React.FC = () => {
)}
<form onSubmit={handleSubmit} style={{ display: 'flex', flexDirection: 'column', gap: '1.25rem' }}>
{/* Selector de Workstation / Garita */}
{/* Selector de Workstation Real desde SQL Server */}
<div>
<label
style={{
@@ -117,10 +138,15 @@ export const LoginView: React.FC = () => {
onChange={(e) => setSelectedWks(e.target.value)}
style={{ width: '100%' }}
>
<option value="CFT-DESK">CFT-DESK (Garita Principal)</option>
<option value="GARITA_SUR">GARITA_SUR</option>
<option value="GARITA_NORTE">GARITA_NORTE</option>
<option value="ACCESO_PROVEEDORES">ACCESO_PROVEEDORES</option>
{availableWorkstations.length > 0 ? (
availableWorkstations.map((w) => (
<option key={w.id} value={w.name}>
{w.name} (ID {w.id})
</option>
))
) : (
<option value="CFT-DESK">CFT-DESK (ID 100001)</option>
)}
</select>
</div>
@@ -192,7 +218,7 @@ export const LoginView: React.FC = () => {
</form>
<div style={{ marginTop: '2rem', textAlign: 'center', fontSize: '0.75rem', color: 'var(--text-muted)' }}>
OnEverControl Web v0.5.0-beta • Samsung Galaxy Tab Ready
OnEverControl Web v0.6.0-beta • Conectado a Microsoft SQL Server videoman
</div>
</div>
</div>