16 Commits
Author SHA1 Message Date
Carlos Tello 9131ba777d fix(ui): correccion padding superior Android nativo y tabs de modulos virtuales garantizados 2026-11-04 08:04:54 -03:00
Carlos Tello 8c2db72029 feat: layout unificado para tablet segun captura (menu hamburguesa y flujo de 5 bloques), safe-area insets y release v0.7.2-beta 2026-11-04 07:33:23 -03:00
Carlos Tello 357c2dff12 fix(cors): habilitar allow_private_network=True en CORSMiddleware para desbloquear PNA en Chrome/Android WebView 2026-11-04 01:46:57 -03:00
Carlos Tello d9ac4e1f66 fix(android): forzar org.gradle.java.home a JDK 21 LTS para evitar incompatibilidad con Java 25 2026-11-04 01:39:31 -03:00
Carlos Tello 35d0e56f9f fix(ui): optimizar UX y relacion de aspecto para tablets Samsung Galaxy Tab (acordeon polizas, cockpit 0-scroll y contraste) 2026-11-04 01:15:54 -03:00
Carlos Tello ebd5b7491e feat: add quick launcher script iniciar_backend.bat for FastAPI server 2026-11-04 00:51:09 -03:00
Carlos Tello 26328b1057 fix(ui): eliminate duplicate action buttons between actions card and sticky bottom dock 2026-11-03 23:56:21 -03:00
Carlos Tello 412e5cf50d chore(android): finalize network security configuration formatting 2026-11-03 18:48:13 -03:00
Carlos Tello fbfca0e3d6 feat(mobile): package frontend into native Android APK with Capacitor (camera, cleartext LAN traffic & dynamic server IP) 2026-11-03 18:39:15 -03:00
Carlos Tello e596ca87a4 feat(auth): add persistent login session for tablets and PWA (double-channel cookie + bearer token, 30 days remember-me, credential autofill) 2026-10-30 22:30:40 -03:00
Carlos Tello 8620a0e71f fix(ui/ux): optimize tablet aspect ratio, single-screen landscape fit and portrait sticky dock 2026-10-29 23:11:29 -03:00
Carlos Tello 321ef0302e fix(vite): silence proxy ECONNRESET and fix react fast refresh export 2026-10-29 22:40:54 -03:00
Carlos Tello 3536c46917 feat(pwa): capture beforeinstallprompt and render direct in-app install button 2026-10-29 21:55:50 -03:00
Carlos Tello 17c9957514 feat(pwa): enable https with @vitejs/plugin-basic-ssl for mobile camera access 2026-10-29 21:29:53 -03:00
Carlos Tello cb63806547 fix(ui/ux): relocate CAPTURAR button to scanner groupbox, fix Lot modal contrast/bleed, and enhance tablet touch ergonomics 2026-10-29 21:25:02 -03:00
Carlos Tello ad92bb5fc1 feat(parity): implement Bloques 1, 2 y 3 complete feature parity v0.7.0-beta 2026-10-29 20:52:58 -03:00
104 changed files with 7734 additions and 1092 deletions
+10
View File
@@ -48,6 +48,16 @@ node_modules/
frontend/dist/ frontend/dist/
frontend/node_modules/ frontend/node_modules/
npm-debug.log* npm-debug.log*
# Android / Capacitor build artifacts
frontend/android/.gradle/
frontend/android/build/
frontend/android/app/build/
frontend/android/.idea/
frontend/android/*.iml
frontend/android/app/*.iml
frontend/android/local.properties
frontend/android/captures/
yarn-debug.log* yarn-debug.log*
yarn-error.log* yarn-error.log*
pnpm-debug.log* pnpm-debug.log*
+44 -1
View File
@@ -2,7 +2,50 @@
Todas las modificaciones, adiciones y decisiones de arquitectura notables de este proyecto serán documentadas en este archivo. Todas las modificaciones, adiciones y decisiones de arquitectura notables de este proyecto serán documentadas en este archivo.
## [v0.6.3-beta] - 2026-10-14 (Paridad de Validaciones de Puesto de Control, Pólizas de Seguro, ART y UX Tablet 9-11") ## [v0.7.0-beta] - 2026-10-29 (Paridad Funcional Total con OnEverAccess Desktop v1.2.4)
### Bloque 1: Normalización de DNI Antiguo, Redirección Bidireccional y Sesiones
- **Normalización de DNI Antiguo con Prefijos 'F' y 'M':**
- Implementación de `limpiar_numero_documento` en `dni_parser_service.py` con regex para formatos históricos (Libreta Cívica, Libreta de Enrolamiento y Formato 2009).
- Deducción automática de género ('F'/'M') y saneamiento del número antes de consultas y altas en `PerDocCatVal`.
- Integración en escáner de cámara, parseo de PDF417/QR y entrada manual de `Nro Doc`.
- **Redirección Bidireccional de Carril (Entrada ↔ Salida):**
- Detección en Entrada ante Antipassback (persona con ticket activo en predio), mostrando banner de advertencia, selector reactivo de carriles de egreso y botón de salto inmediato preservando datos.
- Detección en Salida ante "Persona no registrada en predio", ofreciendo salto inmediato a carriles de ingreso.
- **Historial de Escaneos (DNI) con Carga Rápida:**
- Groupbox reactivo en columna de acciones sincronizado en tiempo real con hasta 30 escaneos recientes.
- Carga inmediata de datos al formulario con doble clic o botón de selección táctil.
- Botón de limpieza de historial.
- **Persistencia y Reanudación de Sesión Interrumpida por Carril:**
- Gestor de sesión en `localStorage` por módulo (`CarrilProcessSessionManager`).
- Al cambiar de carril con carga incompleta, se preserva el estado y se presenta un banner con cantidad de integrantes y botones para "Continuar Ingreso ➡️" o "Descartar ✕".
### Bloque 2: Modales Operativos y Consultas Avanzadas
- **Visitas Preautorizadas (`pre`):**
- Modal reactivo `PreauthorizedModal.tsx` con filtros por visitante, lote o entidad y selector "Vigentes Hoy" / "Todas las Fechas".
- Precarga directa de visitante y lote al carril de entrada.
- Consumo atómico de la preautorización al generar el ticket de ingreso o mediante endpoint `POST /api/v1/access/preauthorizations/{id}/consume`.
- **Búsqueda Avanzada de Personas (`DialogoBuscarPersona`):**
- Modal `PersonSearchModal.tsx` con búsqueda multi-palabra sobre Apellido, Nombre, Documento, Nro de Socio y Lote.
- Indicadores visuales de estado y alertas de Lista Negra (`⛔ LISTA NEGRA`).
- **Búsqueda Predictiva de Vehículos por Patente (`DialogoBuscarPatente`):**
- Modal `VehicleSearchModal.tsx` con soporte dual:
- Modo Entrada: padrón de vehículos con marcas, modelos, titulares y vigencia de seguros automotores.
- Modo Salida: vehículos con tickets activos dentro del predio con conductor, DNI, lote e ingreso.
- **Ficha Técnica Completa de Persona (`DialogoFichaPersona`):**
- Modal `PersonProfileModal.tsx` accesible mediante botón `VER FICHA`.
- Muestra perfil completo: identificación, vínculo, patentes asociadas, coberturas de seguro automotor, ART, licencia de conductor y observaciones registradas.
### Bloque 3: Salida Masiva, Control de Hardware y Pólizas
- **Salida Masiva Transaccional (`DlgSalidaMasiva`):**
- Modal `MassExitModal.tsx` con estadísticas en tiempo real de ocupación del predio.
- Filtro multi-criterio, selección individual, "Seleccionar Todos" y "Deseleccionar".
- Motivos operativos ("Toque de queda", "Evacuación", "Fin de evento", etc.) y observaciones para auditoría.
- Transacción atómica en SQL Server: registro maestro en `salida_masiva`, desglose en `salida_masiva_detalle`, migración a `tckhst`, snapshots en `mvthist` y traza en `auditoria_cambios`.
- **Comando de Cierre Forzado de Hardware (`C0`..`C6`):**
- Endpoint `POST /api/v1/hardware/modules/{id}/close` en backend.
- Implementación en `HardwareService.encolar_cierre` con mapeo de tramas industriales según firmware (ST1660 PASS vs PARK) y tipo de acceso.
- Botón táctil `🛑 Forzar Cierre` en el cockpit de garita junto a `⚡ Pulso Apertura`.
### Agregado y Corregido ### Agregado y Corregido
- **Validaciones Estrictas de Formulario (Paridad 1:1 con `puestocontrol/pct_view.py:validar_formulario`):** - **Validaciones Estrictas de Formulario (Paridad 1:1 con `puestocontrol/pct_view.py:validar_formulario`):**
Binary file not shown.
Binary file not shown.
+2 -2
View File
@@ -1,7 +1,7 @@
# ============================================================================== # ==============================================================================
# OnEverControl - Versión del Backend # OnEverControl - Versión del Backend
# ============================================================================== # ==============================================================================
__version__ = "0.6.2" __version__ = "0.7.0-beta"
__build__ = "2026.10.14" __build__ = "2026.10.29"
__app_name__ = "OnEverControl" __app_name__ = "OnEverControl"
__description__ = "Cliente Web Reducido para Puesto de Control en Red Local de OnEverAccess" __description__ = "Cliente Web Reducido para Puesto de Control en Red Local de OnEverAccess"
+65 -1
View File
@@ -1,7 +1,7 @@
# ============================================================================== # ==============================================================================
# Rutas de Control de Accesos (Ingreso, Egreso, Tickets y Búsquedas) # Rutas de Control de Accesos (Ingreso, Egreso, Tickets y Búsquedas)
# ============================================================================== # ==============================================================================
from typing import List from typing import List, Dict, Any, Optional
from fastapi import APIRouter, Depends, Query, HTTPException, status from fastapi import APIRouter, Depends, Query, HTTPException, status
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
from app.schemas.access_schema import ( from app.schemas.access_schema import (
@@ -16,6 +16,10 @@ from app.schemas.access_schema import (
TicketOccupantDTO, TicketOccupantDTO,
PersonPoliciesDTO, PersonPoliciesDTO,
VehicleDetailsDTO, VehicleDetailsDTO,
PreauthorizationDTO,
VehicleSearchResultDTO,
MassExitRequestDTO,
MassExitResultDTO,
) )
from app.services.access_service import AccessService from app.services.access_service import AccessService
from app.services.dni_parser_service import DNIParsingService, DNIParsedResult from app.services.dni_parser_service import DNIParsingService, DNIParsedResult
@@ -170,3 +174,63 @@ def consultar_datos_vehiculo(
) )
return res return res
@router.get("/preauthorizations", response_model=List[PreauthorizationDTO], summary="Listar visitas preautorizadas")
def listar_preautorizaciones(
q: str = Query("", description="Filtro de búsqueda por visitante, lote o entidad"),
solo_vigentes: bool = Query(True, description="Filtrar únicamente preautorizaciones vigentes"),
current_user: dict = Depends(obtener_usuario_actual),
):
"""Retorna listado de visitas preautorizadas activas desde la tabla 'pre'."""
return AccessService.listar_preautorizados(busqueda=q, solo_vigentes=solo_vigentes)
@router.post("/preauthorizations/{id}/consume", summary="Consumir visita preautorizada")
def consumir_preautorizacion(
id: int,
current_user: dict = Depends(obtener_usuario_actual),
):
"""Marca como consumida (o elimina) una preautorización tras generar el ingreso."""
ok = AccessService.consumir_preautorizado(id)
if not ok:
raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST,
detail=f"No se pudo consumir la preautorización #{id}.",
)
return {"status": "ok", "message": f"Preautorización #{id} consumida exitosamente."}
@router.get("/people/advanced-search", response_model=List[Dict[str, Any]], summary="Búsqueda avanzada multi-criterio de personas")
def buscar_personas_avanzado(
q: str = Query("", description="Búsqueda por apellido, nombre, DNI, nro socio o lote"),
limite: int = Query(50, ge=1, le=200),
current_user: dict = Depends(obtener_usuario_actual),
):
"""Búsqueda avanzada idéntica a DialogoBuscarPersona de escritorio."""
return AccessService.buscar_personas_avanzado(texto=q, limite=limite)
@router.get("/vehicles/search", response_model=List[VehicleSearchResultDTO], summary="Búsqueda predictiva y parcial de vehículos")
def buscar_vehiculos(
q: str = Query("", description="Búsqueda por patente, marca, modelo o titular"),
es_salida: bool = Query(False, description="True si busca vehículos ingresados en el predio"),
limite: int = Query(50, ge=1, le=200),
current_user: dict = Depends(obtener_usuario_actual),
):
"""Búsqueda predictiva idéntica a DialogoBuscarPatente de escritorio."""
return AccessService.buscar_vehiculos(termino=q, es_salida=es_salida, limite=limite)
@router.post("/mass-exit", response_model=MassExitResultDTO, summary="Ejecutar salida masiva transaccional")
def ejecutar_salida_masiva(
req: MassExitRequestDTO,
current_user: dict = Depends(obtener_usuario_actual),
):
"""
Ejecuta el egreso atómico de múltiples personas/vehículos dentro del predio.
Paridad 1:1 con DlgSalidaMasiva de escritorio.
"""
u_id = current_user.get("user_id", 0)
u_nom = current_user.get("username", "Operador")
return AccessService.procesar_salida_masiva(req=req, usuario_id=u_id, operador=u_nom)
+33 -17
View File
@@ -1,6 +1,8 @@
# ============================================================================== # ==============================================================================
# Endpoints de Autenticación (/api/v1/auth) # Endpoints de Autenticación (/api/v1/auth)
# Soporte de persistencia extendida para PWA/Tablets y Doble Canal (Cookie + Bearer)
# ============================================================================== # ==============================================================================
from datetime import timedelta
from typing import Optional from typing import Optional
from fastapi import APIRouter, Response, Request, HTTPException, status, Depends from fastapi import APIRouter, Response, Request, HTTPException, status, Depends
from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
@@ -16,23 +18,24 @@ def get_current_user_payload(
request: Request, request: Request,
bearer: Optional[HTTPAuthorizationCredentials] = Depends(security_bearer), bearer: Optional[HTTPAuthorizationCredentials] = Depends(security_bearer),
) -> dict: ) -> dict:
"""Extrae el token JWT desde la cookie HttpOnly o el header Bearer.""" """
Extrae y valida el token JWT desde la cookie HttpOnly o el header Bearer.
Si la cookie expiró o no está presente, intenta validar el token Bearer (crítico para PWA/tablets).
"""
token = request.cookies.get("access_token") token = request.cookies.get("access_token")
if not token and bearer: payload = decodificar_access_token(token) if token else None
token = bearer.credentials
if not token: # Fallback transparente a Authorization: Bearer
if not payload and bearer and bearer.credentials:
token = bearer.credentials
payload = decodificar_access_token(token)
if not payload:
raise HTTPException( raise HTTPException(
status_code=status.HTTP_401_UNAUTHORIZED, status_code=status.HTTP_401_UNAUTHORIZED,
detail="No se encontró una sesión activa o token válido", detail="No se encontró una sesión activa o token válido",
) )
payload = decodificar_access_token(token)
if not payload:
raise HTTPException(
status_code=status.HTTP_401_UNAUTHORIZED,
detail="Token inválido o expirado",
)
return payload return payload
@@ -41,21 +44,33 @@ obtener_usuario_actual = get_current_user_payload
@router.post("/login", response_model=LoginResponse, summary="Iniciar sesión de operador") @router.post("/login", response_model=LoginResponse, summary="Iniciar sesión de operador")
async def login(login_req: LoginRequest, response: Response): async def login(login_req: LoginRequest, response: Response):
"""Autentica al guardia o supervisor y emite una cookie HttpOnly con JWT.""" """
Autentica al guardia o supervisor. Emite cookie persistente y token JWT en el body
para que la sesión permanezca conectada en tablets, navegadores y PWAs.
"""
if login_req.remember_me:
delta = timedelta(days=30)
max_age_seg = 30 * 24 * 3600 # 30 días
else:
delta = timedelta(hours=12)
max_age_seg = 12 * 3600 # 12 horas (turno guardia)
res_dto, token = AuthService.autenticar_usuario( res_dto, token = AuthService.autenticar_usuario(
username=login_req.username, username=login_req.username,
password_raw=login_req.password, password_raw=login_req.password,
workstation_name=login_req.workstation_name, workstation_name=login_req.workstation_name,
expires_delta=delta,
) )
# Cookie HttpOnly segura # Cookie HttpOnly persistente
response.set_cookie( response.set_cookie(
key="access_token", key="access_token",
value=token, value=token,
httponly=True, httponly=True,
samesite="lax", samesite="lax",
secure=False, # En LAN sin HTTPS directo se permite False; en Nginx SSL pasará a True secure=False, # Permite HTTP en LAN y HTTPS en PWA
max_age=1800, # 30 minutos max_age=max_age_seg,
path="/",
) )
return res_dto return res_dto
@@ -64,15 +79,16 @@ async def login(login_req: LoginRequest, response: Response):
@router.post("/logout", summary="Cerrar sesión") @router.post("/logout", summary="Cerrar sesión")
async def logout(response: Response): async def logout(response: Response):
"""Elimina la cookie de sesión activa.""" """Elimina la cookie de sesión activa."""
response.delete_cookie(key="access_token") response.delete_cookie(key="access_token", path="/")
return {"status": "ok", "message": "Sesión cerrada exitosamente"} return {"status": "ok", "message": "Sesión cerrada exitosamente"}
@router.get("/me", response_model=UserSessionDTO, summary="Obtener usuario actual en sesión") @router.get("/me", response_model=UserSessionDTO, summary="Obtener usuario actual en sesión")
async def get_current_user(payload: dict = Depends(get_current_user_payload)): async def get_current_user(payload: dict = Depends(get_current_user_payload)):
"""Retorna la información del usuario autenticado.""" """Retorna la información del usuario autenticado preservando rol y parámetros."""
return UserSessionDTO( return UserSessionDTO(
user_id=int(payload["sub"]), user_id=int(payload["sub"]),
username=payload["username"], username=payload["username"],
role="OPERADOR", role=payload.get("role", "OPERADOR"),
system_parameter=payload.get("system_parameter"),
) )
+38
View File
@@ -46,3 +46,41 @@ async def abrir_barrera_manual(
message=f"Comando de apertura encolado para módulo {modulo_id} ({req.motivo})", message=f"Comando de apertura encolado para módulo {modulo_id} ({req.motivo})",
latencia_ms=res["latencia_ms"], latencia_ms=res["latencia_ms"],
) )
@router.post(
"/modules/{modulo_id}/close",
response_model=HardwareCommandResponse,
summary="Cierre manual o forzado de barrera",
)
async def cerrar_barrera_manual(
modulo_id: int,
req: ManualOpenRequest,
current_user: dict = Depends(obtener_usuario_actual),
):
"""
Encola un comando de cierre forzado inmediato en la tabla pdtmdl (tramas C0..C6).
Paridad con pct_repository.py:encolar_comando_cierre_modulo (v1.2.3).
"""
ok, res = HardwareService.encolar_cierre(modulo_id=modulo_id, ticket_id=req.ticket_id or 0)
if not ok:
raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST,
detail=res.get("error", "Error al encolar comando de cierre de hardware"),
)
await ws_manager.broadcast_all({
"type": "barrier_closed",
"modulo_id": modulo_id,
"motivo": req.motivo,
"operador": current_user.get("username", "guardia"),
})
return HardwareCommandResponse(
status="ok",
modulo_id=modulo_id,
address=res["address"],
payload=res["payload"],
message=f"Comando de cierre forzado encolado para módulo {modulo_id} ({req.motivo})",
latencia_ms=res["latencia_ms"],
)
+5 -2
View File
@@ -33,6 +33,9 @@ class Settings(BaseSettings):
"http://127.0.0.1:5173", "http://127.0.0.1:5173",
"http://localhost:8000", "http://localhost:8000",
"http://127.0.0.1:8000", "http://127.0.0.1:8000",
"https://localhost",
"http://localhost",
"capacitor://localhost",
] ]
# Base de Datos SQL Server (videoman) # Base de Datos SQL Server (videoman)
@@ -46,8 +49,8 @@ class Settings(BaseSettings):
# Seguridad JWT # Seguridad JWT
SECRET_KEY: str = "dev_secret_key_change_in_production_min_32_chars_1234567890" SECRET_KEY: str = "dev_secret_key_change_in_production_min_32_chars_1234567890"
ACCESS_TOKEN_EXPIRE_MINUTES: int = 30 ACCESS_TOKEN_EXPIRE_MINUTES: int = 43200 # 30 días para puestos de control / tablets persistentes
REFRESH_TOKEN_EXPIRE_DAYS: int = 7 REFRESH_TOKEN_EXPIRE_DAYS: int = 30
# Estación por Defecto # Estación por Defecto
DEFAULT_WORKSTATION_NAME: str = "GARITA_PRINCIPAL" DEFAULT_WORKSTATION_NAME: str = "GARITA_PRINCIPAL"
+3 -1
View File
@@ -25,13 +25,15 @@ app = FastAPI(
# Middleware de Compresión GZip (optimiza transferencia a tablets por Wi-Fi) # Middleware de Compresión GZip (optimiza transferencia a tablets por Wi-Fi)
app.add_middleware(GZipMiddleware, minimum_size=1000) app.add_middleware(GZipMiddleware, minimum_size=1000)
# Middleware de CORS # Middleware de CORS con soporte para Capacitor (Android/iOS), LAN, PNA y Web
app.add_middleware( app.add_middleware(
CORSMiddleware, CORSMiddleware,
allow_origins=settings.ALLOWED_ORIGINS, allow_origins=settings.ALLOWED_ORIGINS,
allow_origin_regex=r"^(https?|capacitor)://(localhost|127\.0\.0\.1|192\.168\.\d+\.\d+|172\.\d+\.\d+\.\d+|10\.\d+\.\d+\.\d+)(:\d+)?$",
allow_credentials=True, allow_credentials=True,
allow_methods=["*"], allow_methods=["*"],
allow_headers=["*"], allow_headers=["*"],
allow_private_network=True,
) )
@@ -1,6 +1,7 @@
# ============================================================================== # ==============================================================================
# Repositorio de Control de Accesos (SQL Server videoman) # Repositorio de Control de Accesos (SQL Server videoman)
# ============================================================================== # ==============================================================================
import re
from datetime import datetime from datetime import datetime
from typing import Optional, List, Dict, Any, Tuple from typing import Optional, List, Dict, Any, Tuple
from app.core.database import db_session from app.core.database import db_session
@@ -191,6 +192,13 @@ class AccessRepository:
except Exception as e: except Exception as e:
print(f"Nota: error al guardar polizas/vehiculo: {e}") print(f"Nota: error al guardar polizas/vehiculo: {e}")
# 7. Consumir preautorización atómicamente si fue provista
if getattr(req, "preautorizado_id", None):
try:
AccessRepository.consumir_preautorizacion(req.preautorizado_id)
except Exception as e:
print(f"Nota: error al consumir preautorizacion {req.preautorizado_id}: {e}")
return ticket_id return ticket_id
@staticmethod @staticmethod
@@ -947,3 +955,318 @@ class AccessRepository:
return True return True
@staticmethod
def obtener_preautorizados_activos(busqueda: str = "", solo_vigentes: bool = True) -> List[Dict[str, Any]]:
"""Consulta visitas preautorizadas activas en la tabla 'pre'."""
where_clauses = []
params = []
if solo_vigentes:
where_clauses.append("pr.FechaInicio <= DATEADD(day, 1, GETDATE()) AND pr.FechaFin >= DATEADD(day, -1, GETDATE())")
if busqueda:
palabras = [w.strip() for w in busqueda.split() if w.strip()]
for w in palabras:
p_like = f"%{w}%"
where_clauses.append("(pr.Apellido LIKE %s OR pr.Nombre LIKE %s OR pr.Entidad LIKE %s OR pr.Motivo LIKE %s OR l.Lote LIKE %s)")
params.extend([p_like, p_like, p_like, p_like, p_like])
where_sql = ("WHERE " + " AND ".join(where_clauses)) if where_clauses else ""
sql = f"""
SELECT
pr.PreautorizadoID AS id,
pr.LoteID AS lote_id,
ISNULL(l.Lote, 'Sin Lote') AS lote_nombre,
ISNULL(pr.Apellido, '') AS apellido,
ISNULL(pr.Nombre, '') AS nombre,
ISNULL(pr.Entidad, '') AS entidad,
ISNULL(pr.Motivo, '') AS motivo,
CONVERT(varchar, pr.FechaInicio, 120) AS fecha_inicio,
CONVERT(varchar, pr.FechaFin, 120) AS fecha_fin
FROM pre pr
LEFT JOIN Lot l ON pr.LoteID = l.LoteID
{where_sql}
ORDER BY pr.FechaInicio DESC
"""
with db_session() as conn:
cursor = conn.cursor(as_dict=True)
cursor.execute(sql, tuple(params) if params else None)
rows = cursor.fetchall()
for r in rows:
motivo_val = str(r.get('motivo') or '').strip()
doc_val = motivo_val if (motivo_val.isdigit() or (len(motivo_val) <= 12 and not ' ' in motivo_val)) else ""
r["documento"] = doc_val
return rows
@staticmethod
def consumir_preautorizacion(preautorizado_id: int) -> bool:
"""Elimina o da por consumida la preautorización tras generar el ticket."""
if not preautorizado_id:
return False
with db_session() as conn:
cursor = conn.cursor()
cursor.execute("DELETE FROM pre WHERE PreautorizadoID = %s", (preautorizado_id,))
return True
@staticmethod
def buscar_personas_avanzado(texto: str, limite: int = 50) -> List[Dict[str, Any]]:
"""
Búsqueda avanzada multi-palabra de personas por Apellido, Nombre, Documento, NroSocio o Lote.
Idéntico a DialogoBuscarPersona (pct_dialogs.py).
"""
palabras = [w.strip() for w in texto.split() if w.strip()] if texto else []
where_clauses = []
params = []
for p in palabras:
like_str = f"%{p}%"
where_clauses.append("""
(p.Apellido LIKE %s OR p.Nombre LIKE %s OR EXISTS (
SELECT 1 FROM PerDocCatVal d WHERE d.PersonaID = p.PersonaID AND d.Documento LIKE %s
) OR CAST(p.NroSocio AS VARCHAR) LIKE %s OR EXISTS (
SELECT 1 FROM lotper lp
INNER JOIN lot l ON lp.LoteID = l.LoteID
WHERE lp.PersonaID = p.PersonaID AND (l.Lote LIKE %s OR CAST(lp.LoteID AS VARCHAR) LIKE %s)
))
""")
params.extend([like_str, like_str, like_str, like_str, like_str, like_str])
where_sql = ("WHERE " + " AND ".join(where_clauses)) if where_clauses else ""
sql = f"""
SELECT TOP {int(limite)}
p.PersonaID,
p.Apellido,
p.Nombre,
p.NroSocio,
COALESCE(p.Blacklist, 0) AS Blacklist,
(SELECT TOP 1 d.Documento FROM PerDocCatVal d WHERE d.PersonaID = p.PersonaID ORDER BY d.DocumentoID) AS Documento
FROM Per p
{where_sql}
ORDER BY p.Apellido, p.Nombre
"""
with db_session() as conn:
cursor = conn.cursor(as_dict=True)
cursor.execute(sql, tuple(params) if params else None)
return cursor.fetchall()
@staticmethod
def buscar_vehiculos_coincidencias(termino: str, es_salida: bool = False, limite: int = 50) -> List[Dict[str, Any]]:
"""
Búsqueda predictiva y parcial de vehículos (LIKE %...%) por patente, marca, modelo, o titular.
En Salida: busca vehículos con tickets activos dentro del predio.
En Entrada: busca en el maestro de vehículos (Aut) con sus conductores/titulares vinculados.
Paridad exacta con pct_repository.py:buscar_vehiculos_coincidencias.
"""
t_clean = re.sub(r'[\s\-]', '', str(termino or "")).upper()
patron_like = f"%{t_clean}%" if t_clean else "%"
patron_text = f"%{str(termino or '').strip().upper()}%" if termino else "%"
with db_session() as conn:
cursor = conn.cursor(as_dict=True)
if es_salida:
sql = f"""
SELECT TOP ({limite})
t.TicketID AS ticket_id,
px.Valor AS patente,
ISNULL(a.Marca, '') AS marca,
ISNULL(a.Modelo, '') AS modelo,
p.PersonaID AS persona_id,
ISNULL(p.Apellido, '') AS apellido,
ISNULL(p.Nombre, '') AS nombre,
ISNULL(d.Documento, '') AS documento,
COALESCE(
(SELECT TOP 1 l.Lote FROM Lot l INNER JOIN tckprx pxl ON CAST(l.LoteID AS VARCHAR) = pxl.Valor WHERE pxl.TicketID = t.TicketID AND pxl.PropiedadID = 7),
(SELECT TOP 1 l.Lote FROM Lot l INNER JOIN tckprx pxl ON l.Lote = px.Valor WHERE pxl.TicketID = t.TicketID AND pxl.PropiedadID = 7),
(SELECT TOP 1 Valor FROM tckprx WHERE TicketID = t.TicketID AND PropiedadID = 7),
''
) AS lote,
CONVERT(varchar, t.FechaHoraIngreso, 120) AS fecha_ingreso,
'' AS vigencia_seguro
FROM tck t
INNER JOIN tckprx px ON t.TicketID = px.TicketID AND px.PropiedadID = 4
LEFT JOIN aut a ON REPLACE(REPLACE(UPPER(LTRIM(RTRIM(a.Patente))), ' ', ''), '-', '') = REPLACE(REPLACE(UPPER(LTRIM(RTRIM(px.Valor))), ' ', ''), '-', '')
INNER JOIN tckper tp ON t.TicketID = tp.TicketID AND (tp.RolID = 1 OR tp.RolID IS NULL)
INNER JOIN Per p ON tp.PersonaID = p.PersonaID
LEFT JOIN PerDocCatVal d ON p.PersonaID = d.PersonaID
WHERE (
REPLACE(REPLACE(UPPER(LTRIM(RTRIM(px.Valor))), ' ', ''), '-', '') LIKE %s
OR UPPER(p.Apellido) LIKE %s
OR UPPER(p.Nombre) LIKE %s
OR d.Documento LIKE %s
OR UPPER(a.Marca) LIKE %s
)
ORDER BY t.FechaHoraIngreso DESC
"""
cursor.execute(sql, (patron_like, patron_text, patron_text, patron_like, patron_text))
else:
sql = f"""
SELECT TOP ({limite})
0 AS ticket_id,
UPPER(LTRIM(RTRIM(a.Patente))) AS patente,
ISNULL(a.Marca, '') AS marca,
ISNULL(a.Modelo, '') AS modelo,
p.PersonaID AS persona_id,
ISNULL(p.Apellido, '') AS apellido,
ISNULL(p.Nombre, '') AS nombre,
ISNULL(d.Documento, '') AS documento,
'' AS lote,
'' AS fecha_ingreso,
CONVERT(varchar, a.PolizaVigenciaHasta, 120) AS vigencia_seguro
FROM aut a
LEFT JOIN peraut pa ON a.AutoID = pa.AutoID
LEFT JOIN Per p ON pa.PersonaID = p.PersonaID
LEFT JOIN PerDocCatVal d ON p.PersonaID = d.PersonaID
WHERE (
REPLACE(REPLACE(UPPER(LTRIM(RTRIM(a.Patente))), ' ', ''), '-', '') LIKE %s
OR UPPER(a.Marca) LIKE %s
OR UPPER(a.Modelo) LIKE %s
OR UPPER(p.Apellido) LIKE %s
OR UPPER(p.Nombre) LIKE %s
OR d.Documento LIKE %s
)
ORDER BY a.Patente ASC
"""
cursor.execute(sql, (patron_like, patron_text, patron_text, patron_text, patron_text, patron_like))
return cursor.fetchall()
@staticmethod
def ejecutar_salida_masiva(
ticket_ids: List[int],
usuario_id: int,
operador: str,
modulo_salida_id: int,
motivo: str = "Toque de queda / Cierre de jornada",
observaciones: str = "",
) -> Tuple[bool, str, int]:
"""
Ejecuta la salida masiva de múltiples personas/visitas en una única transacción atómica:
1. Crea el registro maestro en salida_masiva.
2. Registra el desglose en salida_masiva_detalle.
3. Cierra y migra cada ticket activo a tckhst.
4. Registra los snapshots correspondientes en mvthist con flag 'Salida Masiva'.
5. Genera la traza inmutable en auditoria_cambios.
Paridad exacta con pct_repository.py:ejecutar_salida_masiva.
"""
if not ticket_ids:
return False, "No se seleccionaron personas para registrar salida masiva.", 0
ahora = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
with db_session() as conn:
cursor = conn.cursor(as_dict=True)
# 1. Registro Maestro en salida_masiva
sql_master = """
INSERT INTO dbo.salida_masiva (
FechaHora, UsuarioID, Operador, CantidadPersonas, ModuloSalidaID, Motivo, Observaciones
) VALUES (%s, %s, %s, %s, %s, %s, %s)
"""
cursor.execute(sql_master, (
ahora, usuario_id or 0, operador or "Operador",
len(ticket_ids), modulo_salida_id or 0,
motivo or "Toque de queda / Cierre de jornada",
observaciones or "Salida masiva procesada desde Puesto de Control"
))
cursor.execute("SELECT SCOPE_IDENTITY() AS ID")
row_id = cursor.fetchone()
salida_masiva_id = int(row_id['ID'] if row_id and row_id.get('ID') else 0)
# 2. Desglose y cierre de cada ticket seleccionado
tickets_cerrados = set()
for tck_id in ticket_ids:
# Obtener datos de la persona vinculada al ticket
sql_p = """
SELECT TOP 1
t.Numero, t.FechaHoraIngreso, t.ModuloIngresoID,
tp.PersonaID, p.Apellido, p.Nombre, tp.RolID,
(SELECT TOP 1 d.Documento FROM PerDocCatVal d WHERE d.PersonaID = tp.PersonaID ORDER BY d.DocumentoID) AS Documento,
(SELECT TOP 1 px.Valor FROM tckprx px WHERE px.TicketID = t.TicketID AND px.PropiedadID = 4) AS Patente,
(SELECT TOP 1 px.Valor FROM tckprx px WHERE px.TicketID = t.TicketID AND px.PropiedadID = 7) AS LoteID,
(SELECT TOP 1 px.Valor FROM tckprx px WHERE px.TicketID = t.TicketID AND px.PropiedadID = 11) AS Entidad
FROM tck t
LEFT JOIN tckper tp ON t.TicketID = tp.TicketID AND (tp.RolID = 1 OR tp.RolID IS NULL)
LEFT JOIN Per p ON tp.PersonaID = p.PersonaID
WHERE t.TicketID = %s
"""
cursor.execute(sql_p, (tck_id,))
p_info = cursor.fetchone() or {}
p_id = int(p_info.get("PersonaID") or 0)
doc = str(p_info.get("Documento") or "")
ape = str(p_info.get("Apellido") or "")
nom = str(p_info.get("Nombre") or "")
lot_id = p_info.get("LoteID")
pat = str(p_info.get("Patente") or "")
ent = str(p_info.get("Entidad") or "SALIDA MASIVA")
rol_id = int(p_info.get("RolID") or 1)
sql_det = """
INSERT INTO dbo.salida_masiva_detalle (
SalidaMasivaID, TicketID, PersonaID, Documento, Apellido, Nombre,
LoteID, NombreLote, Patente, Entidad, RolID
) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
"""
cursor.execute(sql_det, (
salida_masiva_id, tck_id, p_id, doc, ape, nom,
int(lot_id) if lot_id and str(lot_id).isdigit() else None,
str(lot_id or ""), pat, ent, rol_id
))
if tck_id and tck_id not in tickets_cerrados:
num_tck = p_info.get("Numero") or 0
f_ing = p_info.get("FechaHoraIngreso")
if isinstance(f_ing, str) == False and f_ing is not None:
f_ing = f_ing.strftime('%Y-%m-%d %H:%M:%S')
mod_ing = p_info.get("ModuloIngresoID") or 0
cursor.execute("SELECT TicketID FROM tckhst WHERE TicketID = %s", (tck_id,))
if cursor.fetchone():
nuevo_tck_id = AccessRepository.generar_ticket_id()
cursor.execute("UPDATE tckper SET TicketID = %s WHERE TicketID = %s", (nuevo_tck_id, tck_id))
cursor.execute("UPDATE tckprx SET TicketID = %s WHERE TicketID = %s", (nuevo_tck_id, tck_id))
cursor.execute("UPDATE tck SET TicketID = %s WHERE TicketID = %s", (nuevo_tck_id, tck_id))
cursor.execute("UPDATE dbo.salida_masiva_detalle SET TicketID = %s WHERE TicketID = %s AND SalidaMasivaID = %s",
(nuevo_tck_id, tck_id, salida_masiva_id))
tck_id = nuevo_tck_id
sql_tckhst = """
INSERT INTO tckhst (TicketID, Numero, FechaHoraIngreso, ModuloIngresoID, FechaHoraSalida, ModuloSalidaID)
VALUES (%s, %s, %s, %s, %s, %s)
"""
cursor.execute(sql_tckhst, (tck_id, num_tck, str(f_ing or ahora), mod_ing, ahora, modulo_salida_id or 0))
cursor.execute("DELETE FROM tck WHERE TicketID = %s", (tck_id,))
tickets_cerrados.add(tck_id)
sql_mvt = """
INSERT INTO mvthist (TicketID, PersonaID, Patente, LoteID, RolID, Entidad, Sentido, ModuloID, FechaHora)
VALUES (%s, %s, %s, %s, %s, %s, 'Salida', %s, %s)
"""
cursor.execute(sql_mvt, (
tck_id, p_id,
(pat.strip() if pat else None),
int(lot_id) if lot_id and str(lot_id).isdigit() else None,
rol_id,
f"SALIDA MASIVA ({ent})" if ent and ent != '-' else "SALIDA MASIVA",
modulo_salida_id or 0,
ahora
))
# 3. Trazabilidad en auditoria_cambios
sql_audit = """
INSERT INTO dbo.auditoria_cambios (
Modulo, Entidad, EntidadID, Operacion, CampoModificado, ValorNuevo, UsuarioID, FechaHora
) VALUES ('PuestoControl', 'SalidaMasiva', %s, 'SALIDA_MASIVA', 'CantidadPersonas', %s, %s, %s)
"""
cursor.execute(sql_audit, (
str(salida_masiva_id),
f"{len(ticket_ids)} personas egresadas ({motivo})",
usuario_id or 0,
ahora
))
return True, f"Se registró la salida masiva de {len(ticket_ids)} persona(s) exitosamente.", salida_masiva_id
+48
View File
@@ -50,6 +50,7 @@ class EntryRequest(BaseModel):
licencia_hasta: Optional[str] = None licencia_hasta: Optional[str] = None
observaciones: Optional[str] = None observaciones: Optional[str] = None
forzar_ingreso_lote_restringido: bool = False forzar_ingreso_lote_restringido: bool = False
preautorizado_id: Optional[int] = Field(None, description="ID de preautorización en tabla pre a consumir")
class PersonPoliciesDTO(BaseModel): class PersonPoliciesDTO(BaseModel):
@@ -71,6 +72,10 @@ class PersonPoliciesDTO(BaseModel):
licencia_nro: Optional[str] = None licencia_nro: Optional[str] = None
licencia_entidad: Optional[str] = None licencia_entidad: Optional[str] = None
licencia_hasta: Optional[str] = None licencia_hasta: Optional[str] = None
observaciones: Optional[str] = None
ticket_activo_id: Optional[int] = None
ticket_activo_modulo_ingreso: Optional[str] = None
ticket_activo_fecha: Optional[str] = None
class VehicleDetailsDTO(BaseModel): class VehicleDetailsDTO(BaseModel):
@@ -83,6 +88,7 @@ class VehicleDetailsDTO(BaseModel):
apellido: Optional[str] = None apellido: Optional[str] = None
nombre: Optional[str] = None nombre: Optional[str] = None
documento: Optional[str] = None documento: Optional[str] = None
ticket_activo_id: Optional[int] = None
@@ -180,4 +186,46 @@ class MovementHistoryDTO(BaseModel):
lote_codigo: Optional[str] = None lote_codigo: Optional[str] = None
modulo_nombre: Optional[str] = None modulo_nombre: Optional[str] = None
fecha_hora: str fecha_hora: str
class PreauthorizationDTO(BaseModel):
id: int
lote_id: int = 0
lote_nombre: str = ""
entidad: str = ""
apellido: str = ""
nombre: str = ""
documento: str = ""
motivo: str = ""
fecha_inicio: str = ""
fecha_fin: str = ""
class VehicleSearchResultDTO(BaseModel):
patente: str
marca: str = ""
modelo: str = ""
apellido: str = ""
nombre: str = ""
documento: str = ""
lote: str = ""
fecha_ingreso: str = ""
vigencia_seguro: str = ""
ticket_id: Optional[int] = None
class MassExitRequestDTO(BaseModel):
ticket_ids: List[int] = Field(..., min_length=1, description="Lista de IDs de tickets activos a egresar")
modulo_salida_id: int = Field(..., description="Módulo de salida asignado")
motivo: str = Field("Toque de queda / Cierre de jornada", description="Motivo del egreso masivo")
observaciones: Optional[str] = ""
password_operador: Optional[str] = None
class MassExitResultDTO(BaseModel):
status: str
egresados_count: int
message: str
salida_masiva_id: int = 0
entidad: Optional[str] = None entidad: Optional[str] = None
+3
View File
@@ -9,6 +9,7 @@ class LoginRequest(BaseModel):
username: str = Field(..., min_length=1, description="Nombre de usuario del operador") username: str = Field(..., min_length=1, description="Nombre de usuario del operador")
password: str = Field(..., min_length=1, description="Contraseña de acceso") password: str = Field(..., min_length=1, description="Contraseña de acceso")
workstation_name: Optional[str] = Field(None, description="Identificador de la estación de trabajo/tablet") workstation_name: Optional[str] = Field(None, description="Identificador de la estación de trabajo/tablet")
remember_me: bool = Field(True, description="Si es True, mantiene la sesión activa de forma persistente (30 días)")
class UserSessionDTO(BaseModel): class UserSessionDTO(BaseModel):
@@ -23,3 +24,5 @@ class LoginResponse(BaseModel):
message: str = "Autenticación exitosa" message: str = "Autenticación exitosa"
user: UserSessionDTO user: UserSessionDTO
workstation: Optional[str] = None workstation: Optional[str] = None
token: Optional[str] = None
token_type: str = "bearer"
+44
View File
@@ -14,6 +14,10 @@ from app.schemas.access_schema import (
PersonPoliciesDTO, PersonPoliciesDTO,
VehicleDetailsDTO, VehicleDetailsDTO,
LotResidentDTO, LotResidentDTO,
PreauthorizationDTO,
VehicleSearchResultDTO,
MassExitRequestDTO,
MassExitResultDTO,
) )
from app.repositories.access_repository import AccessRepository from app.repositories.access_repository import AccessRepository
from app.services.hardware_service import HardwareService from app.services.hardware_service import HardwareService
@@ -362,3 +366,43 @@ class AccessService:
return None return None
return VehicleDetailsDTO(**datos) return VehicleDetailsDTO(**datos)
@staticmethod
def listar_preautorizados(busqueda: str = "", solo_vigentes: bool = True) -> List[PreauthorizationDTO]:
filas = AccessRepository.obtener_preautorizados_activos(busqueda=busqueda, solo_vigentes=solo_vigentes)
return [PreauthorizationDTO(**f) for f in filas]
@staticmethod
def consumir_preautorizado(preautorizado_id: int) -> bool:
return AccessRepository.consumir_preautorizacion(preautorizado_id)
@staticmethod
def buscar_personas_avanzado(texto: str, limite: int = 50) -> List[Dict[str, Any]]:
return AccessRepository.buscar_personas_avanzado(texto=texto, limite=limite)
@staticmethod
def buscar_vehiculos(termino: str, es_salida: bool = False, limite: int = 50) -> List[VehicleSearchResultDTO]:
filas = AccessRepository.buscar_vehiculos_coincidencias(termino=termino, es_salida=es_salida, limite=limite)
return [VehicleSearchResultDTO(**f) for f in filas]
@staticmethod
def procesar_salida_masiva(req: MassExitRequestDTO, usuario_id: int, operador: str) -> MassExitResultDTO:
ok, msg, salida_id = AccessRepository.ejecutar_salida_masiva(
ticket_ids=req.ticket_ids,
usuario_id=usuario_id,
operador=operador,
modulo_salida_id=req.modulo_salida_id,
motivo=req.motivo,
observaciones=req.observaciones or "",
)
if not ok:
raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST,
detail=msg,
)
return MassExitResultDTO(
status="ok",
egresados_count=len(req.ticket_ids),
message=msg,
salida_masiva_id=salida_id,
)
+13 -4
View File
@@ -1,6 +1,7 @@
# ============================================================================== # ==============================================================================
# Servicio de Autenticación y Control de Sesión # Servicio de Autenticación y Control de Sesión
# ============================================================================== # ==============================================================================
from datetime import timedelta
from typing import Optional, Tuple from typing import Optional, Tuple
from fastapi import HTTPException, status from fastapi import HTTPException, status
from app.repositories.auth_repository import AuthRepository from app.repositories.auth_repository import AuthRepository
@@ -11,7 +12,10 @@ from app.schemas.auth_schema import LoginResponse, UserSessionDTO
class AuthService: class AuthService:
@staticmethod @staticmethod
def autenticar_usuario( def autenticar_usuario(
username: str, password_raw: str, workstation_name: Optional[str] = None username: str,
password_raw: str,
workstation_name: Optional[str] = None,
expires_delta: Optional[timedelta] = None,
) -> Tuple[LoginResponse, str]: ) -> Tuple[LoginResponse, str]:
"""Valida credenciales, genera token JWT y registra auditoría.""" """Valida credenciales, genera token JWT y registra auditoría."""
user_row = AuthRepository.obtener_usuario_por_nombre(username) user_row = AuthRepository.obtener_usuario_por_nombre(username)
@@ -31,14 +35,17 @@ class AuthService:
user_id = user_row["UsuarioID"] user_id = user_row["UsuarioID"]
nombre = user_row["Nombre"].strip() nombre = user_row["Nombre"].strip()
system_param = user_row.get("SystemParameter") system_param = user_row.get("SystemParameter")
role = "SUPERVISOR" if system_param == 1 else "OPERADOR"
# Generar Token JWT # Generar Token JWT con soporte de rol y parámetros de sesión
token_data = { token_data = {
"sub": str(user_id), "sub": str(user_id),
"username": nombre, "username": nombre,
"workstation": workstation_name or "", "workstation": workstation_name or "",
"role": role,
"system_parameter": system_param,
} }
token = crear_access_token(token_data) token = crear_access_token(token_data, expires_delta=expires_delta)
# Registrar auditoría en usrlogin # Registrar auditoría en usrlogin
AuthRepository.registrar_evento_login(user_id) AuthRepository.registrar_evento_login(user_id)
@@ -46,7 +53,7 @@ class AuthService:
user_dto = UserSessionDTO( user_dto = UserSessionDTO(
user_id=user_id, user_id=user_id,
username=nombre, username=nombre,
role="SUPERVISOR" if system_param == 1 else "OPERADOR", role=role,
system_parameter=system_param, system_parameter=system_param,
) )
@@ -55,6 +62,8 @@ class AuthService:
message="Autenticación exitosa", message="Autenticación exitosa",
user=user_dto, user=user_dto,
workstation=workstation_name, workstation=workstation_name,
token=token,
token_type="bearer",
) )
return response, token return response, token
+47 -9
View File
@@ -2,10 +2,37 @@
# Servicio de Parseo y Normalización de DNI Argentino (PDF417 / QR) # Servicio de Parseo y Normalización de DNI Argentino (PDF417 / QR)
# Soporta formatos 2009, 2012, 2026 y App Mi Argentina # Soporta formatos 2009, 2012, 2026 y App Mi Argentina
# ============================================================================== # ==============================================================================
from typing import Dict import re
from typing import Dict, Tuple, Optional
from pydantic import BaseModel from pydantic import BaseModel
def limpiar_numero_documento(doc_raw: str) -> Tuple[str, Optional[str]]:
"""
Limpia y normaliza un número de documento DNI argentino.
En formatos antiguos (Libreta Cívica, Libreta de Enrolamiento o Formato 2009),
el documento suele estar precedido por 'F' (Femenino) o 'M' (Masculino),
por ejemplo: 'F5592570' -> ('5592570', 'F'), 'M34247025' -> ('34247025', 'M').
Retorna (documento_numerico, sexo_inferido).
"""
if not doc_raw:
return "", None
doc_clean = str(doc_raw).strip()
doc_sin_puntos = doc_clean.replace(".", "").replace(",", "").replace(" ", "")
# Patrón: Prefijo F o M seguido de 5 a 9 dígitos
m = re.match(r"^([FMfm])(\d{5,9})$", doc_sin_puntos)
if m:
return m.group(2), m.group(1).upper()
# Si contiene dígitos precedidos por F/M con posibles espacios o puntos
m2 = re.match(r"^([FMfm])[\s\.]*(\d{5,9})$", doc_clean)
if m2:
return m2.group(2), m2.group(1).upper()
return doc_sin_puntos if doc_sin_puntos.isdigit() else doc_clean, None
class DNIParsedResult(BaseModel): class DNIParsedResult(BaseModel):
valido: bool valido: bool
documento: str documento: str
@@ -27,28 +54,32 @@ class DniParserService:
# Limpiar terminadores y retornos de carro # Limpiar terminadores y retornos de carro
raw_clean = raw_text.strip().replace("\r", "").replace("\n", "") raw_clean = raw_text.strip().replace("\r", "").replace("\n", "")
# Si solo vino un número de documento escrito manualmente (o escaneado directamente)
doc_limpio, sexo_directo = limpiar_numero_documento(raw_clean)
if 5 <= len(doc_limpio) <= 9 and doc_limpio.isdigit() and '"' not in raw_clean and '@' not in raw_clean:
return {"documento": doc_limpio, "apellido": "", "nombre": "", "sexo": sexo_directo or "M"}
# Algunos escáneres o formatos vienen separados por @ en lugar de comillas dobles # Algunos escáneres o formatos vienen separados por @ en lugar de comillas dobles
text = raw_clean.replace("@", '"') text = raw_clean.replace("@", '"')
parts = [p.strip() for p in text.split('"')] parts = [p.strip() for p in text.split('"')]
if len(parts) < 5: if len(parts) < 5:
# Si solo vino un número de documento escrito manualmente
digits = "".join(filter(str.isdigit, raw_clean)) digits = "".join(filter(str.isdigit, raw_clean))
if 6 <= len(digits) <= 9: if 5 <= len(digits) <= 9:
return {"documento": digits, "apellido": "", "nombre": "", "sexo": "M"} return {"documento": digits, "apellido": "", "nombre": "", "sexo": sexo_directo or "M"}
return {"documento": "", "apellido": "", "nombre": "", "sexo": "M"} return {"documento": "", "apellido": "", "nombre": "", "sexo": "M"}
doc = nombre = apellido = sexo = "" doc = nombre = apellido = sexo = ""
# Heurística para Formato 2009 con comilla inicial # Heurística para Formato 2009 con comilla inicial
if parts[0] == "" and 6 <= len(parts[1]) <= 11 and len(parts) > 2 and parts[2].isalpha() and len(parts[2]) == 1: if parts[0] == "" and 5 <= len(parts[1]) <= 11 and len(parts) > 2 and parts[2].isalpha() and len(parts[2]) == 1:
doc = parts[1] doc = parts[1]
if len(parts) > 5: if len(parts) > 5:
apellido = parts[4] apellido = parts[4]
nombre = parts[5] nombre = parts[5]
# Heurística para Formato 2009 sin comilla inicial # Heurística para Formato 2009 sin comilla inicial
elif 6 <= len(parts[0]) <= 11 and len(parts) > 4 and parts[1].isalpha() and len(parts[1]) == 1: elif 5 <= len(parts[0]) <= 11 and len(parts) > 4 and parts[1].isalpha() and len(parts[1]) == 1:
doc = parts[0] doc = parts[0]
apellido = parts[3] apellido = parts[3]
nombre = parts[4] nombre = parts[4]
@@ -73,12 +104,12 @@ class DniParserService:
doc = p4 doc = p4
# Formato App Mi Argentina: parts[3] es código 1=M, 2=F, 3=X y parts[4] es DNI # Formato App Mi Argentina: parts[3] es código 1=M, 2=F, 3=X y parts[4] es DNI
elif p3 in ("1", "2", "3", "0") and p4.isdigit() and 6 <= len(p4) <= 9: elif p3 in ("1", "2", "3", "0") and p4.isdigit() and 5 <= len(p4) <= 9:
sexo = "M" if p3 == "1" else ("F" if p3 == "2" else "X") sexo = "M" if p3 == "1" else ("F" if p3 == "2" else "X")
doc = p4 doc = p4
# Formato 2026: parts[3] es DNI directo # Formato 2026: parts[3] es DNI directo
elif p3.isdigit() and 6 <= len(p3) <= 9 and not (p4.isdigit() and 6 <= len(p4) <= 9): elif p3.isdigit() and 5 <= len(p3) <= 9 and not (p4.isdigit() and 5 <= len(p4) <= 9):
doc = p3 doc = p3
if p4.upper() in ("M", "F", "X"): if p4.upper() in ("M", "F", "X"):
sexo = p4.upper() sexo = p4.upper()
@@ -86,7 +117,7 @@ class DniParserService:
sexo = "M" sexo = "M"
# Desempate general: si parts[4] es DNI numérico # Desempate general: si parts[4] es DNI numérico
elif p4.isdigit() and 6 <= len(p4) <= 9: elif p4.isdigit() and 5 <= len(p4) <= 9:
doc = p4 doc = p4
if p3 == "1": if p3 == "1":
sexo = "M" sexo = "M"
@@ -97,6 +128,13 @@ class DniParserService:
else: else:
doc = p3 doc = p3
# Normalizar DNI por si trajo prefijo F/M en Formato 2009 o Libreta Cívica
num_limpio, sexo_inf = limpiar_numero_documento(doc)
if num_limpio:
doc = num_limpio
if not sexo and sexo_inf:
sexo = sexo_inf
return { return {
"documento": doc.strip(), "documento": doc.strip(),
"apellido": apellido.upper().strip() if apellido else "", "apellido": apellido.upper().strip() if apellido else "",
+113
View File
@@ -252,3 +252,116 @@ class HardwareService:
"trama_ticket": trama_ticket, "trama_ticket": trama_ticket,
"latencia_ms": round(latencia, 2), "latencia_ms": round(latencia, 2),
} }
@classmethod
def encolar_cierre(cls, modulo_id: int, ticket_id: int = 0) -> Tuple[bool, Dict[str, Any]]:
"""
Encola un comando de cierre forzado de barrera/molinete en la tabla `pdtmdl`
con tramas C0..C6 según tipo_acceso y firmware (PASS vs PARK).
Paridad 1:1 con pct_repository.py:encolar_comando_cierre_modulo (v1.2.3).
"""
t_start = time.perf_counter()
mdl = cls.obtener_info_modulo(modulo_id)
if not mdl:
return False, {"error": f"Módulo {modulo_id} no encontrado en base de datos"}
cat_map = {}
try:
with db_session() as conn:
cursor = conn.cursor()
cursor.execute(
"SELECT CategoriaID, ValorID FROM MdlCatVal WHERE ModuloID = %s",
(modulo_id,),
)
cat_map = {row[0]: row[1] for row in cursor.fetchall()}
except Exception:
pass
tipo_modulo_id = cat_map.get(2, 0)
sentido_id = cat_map.get(4, 0)
nombre_upper = (mdl.get("Nombre") or "").upper()
target_id = modulo_id
target_mdl = mdl
if tipo_modulo_id == 6 or mdl.get("Address", 0) >= 90:
if (sentido_id == 1 or "ENTRADA" in nombre_upper or "INGRESO" in nombre_upper) and mdl.get("ModuloEntradaID"):
target_id = mdl["ModuloEntradaID"]
elif (sentido_id == 2 or "SALIDA" in nombre_upper or "EGRESO" in nombre_upper) and mdl.get("ModuloSalidaID"):
target_id = mdl["ModuloSalidaID"]
if target_id != modulo_id:
fisico = cls.obtener_info_modulo(target_id)
if fisico:
target_mdl = fisico
target_cat_map = {}
if target_id != modulo_id:
try:
with db_session() as conn:
cursor = conn.cursor()
cursor.execute(
"SELECT CategoriaID, ValorID FROM MdlCatVal WHERE ModuloID = %s",
(target_id,),
)
target_cat_map = {row[0]: row[1] for row in cursor.fetchall()}
except Exception:
pass
else:
target_cat_map = cat_map
address = target_mdl.get("Address", 1)
is_pass = (target_cat_map.get(2, 0) == 1)
tipo_acceso = target_cat_map.get(15) or cat_map.get(15, 3)
if is_pass:
if tipo_acceso == 1:
payload = "C4"
elif tipo_acceso in (2, 7):
payload = "C2"
elif tipo_acceso in (3, 4):
payload = "C1"
elif tipo_acceso == 6:
payload = "C0"
else:
payload = "C3"
else:
if tipo_acceso == 1:
payload = "C6"
elif tipo_acceso in (2, 7):
payload = "C5"
elif tipo_acceso in (3, 4):
payload = "C1"
elif tipo_acceso == 6:
payload = "C0"
else:
payload = "C3"
trama_comando = formatear_comando_hardware(address, payload)
sql_insert = """
INSERT INTO pdtmdl (PdtMdlID, ModuloID, Comando, Inmediato, Extra)
VALUES ((SELECT COALESCE(MAX(PdtMdlID), 0) + 1 FROM pdtmdl), %s, %s, 1, %s)
"""
extra_info = str(ticket_id or 0)[:20]
with db_session() as conn:
cursor = conn.cursor()
cursor.execute(sql_insert, (target_id, trama_comando, extra_info))
if target_id != modulo_id:
cursor.execute(sql_insert, (modulo_id, trama_comando, extra_info))
latencia = (time.perf_counter() - t_start) * 1000
return True, {
"modulo_id": modulo_id,
"modulo_solicitado": modulo_id,
"modulo_fisico_target": target_id,
"address": address,
"address_fisico": address,
"tipo_acceso": tipo_acceso,
"is_pass": is_pass,
"payload": payload,
"comando_trama": trama_comando,
"latencia_ms": round(latencia, 2),
}
+27 -27
View File
@@ -68,14 +68,14 @@ async def test_hardware_manual_open():
token = login_res.cookies.get("access_token") token = login_res.cookies.get("access_token")
res = await client.post( res = await client.post(
"/api/v1/hardware/modules/100004/open", "/api/v1/hardware/modules/100009/open",
json={"modulo_id": 100004, "motivo": "TEST_AUDIT"}, json={"modulo_id": 100009, "motivo": "TEST_AUDIT"},
cookies={"access_token": token}, cookies={"access_token": token},
) )
assert res.status_code == 200 assert res.status_code == 200
data = res.json() data = res.json()
assert data["status"] == "ok" assert data["status"] == "ok"
assert data["modulo_id"] == 100004 assert data["modulo_id"] == 100009
assert data["latencia_ms"] < 500.0 assert data["latencia_ms"] < 500.0
@@ -89,11 +89,12 @@ async def test_flujo_completo_ingreso_y_salida():
) )
token = login_res.cookies.get("access_token") token = login_res.cookies.get("access_token")
doc_test = "99887766" import time
doc_test = f"99{str(int(time.time()))[-6:]}"
# 1. Registro de Ingreso # 1. Registro de Ingreso
entry_payload = { entry_payload = {
"modulo_ingreso_id": 100004, "modulo_ingreso_id": 100009,
"documento": doc_test, "documento": doc_test,
"apellido": "TESTER", "apellido": "TESTER",
"nombre": "INTEGRAL", "nombre": "INTEGRAL",
@@ -139,7 +140,7 @@ async def test_flujo_completo_ingreso_y_salida():
# 4. Registrar Salida # 4. Registrar Salida
exit_payload = { exit_payload = {
"ticket_id": ticket_id, "ticket_id": ticket_id,
"modulo_salida_id": 100005, "modulo_salida_id": 100010,
"patente_salida": "TST999", "patente_salida": "TST999",
"abrir_barrera": True, "abrir_barrera": True,
} }
@@ -167,7 +168,7 @@ async def test_flujo_completo_ingreso_y_salida():
cursor = conn.cursor() cursor = conn.cursor()
cursor.execute("DELETE FROM PerDocCatVal WHERE Documento = %s", (doc_test,)) cursor.execute("DELETE FROM PerDocCatVal WHERE Documento = %s", (doc_test,))
cursor.execute("DELETE FROM Per WHERE Apellido = 'TESTER'") cursor.execute("DELETE FROM Per WHERE Apellido = 'TESTER'")
cursor.execute("DELETE FROM pdtmdl WHERE ModuloID IN (100004, 100005) AND Extra = %s", (str(ticket_id),)) cursor.execute("DELETE FROM pdtmdl WHERE ModuloID IN (100009, 100010) AND Extra = %s", (str(ticket_id),))
cursor.execute("DELETE FROM mvthist WHERE TicketID = %s", (ticket_id,)) cursor.execute("DELETE FROM mvthist WHERE TicketID = %s", (ticket_id,))
cursor.execute("DELETE FROM tckhst WHERE TicketID = %s", (ticket_id,)) cursor.execute("DELETE FROM tckhst WHERE TicketID = %s", (ticket_id,))
@@ -201,7 +202,7 @@ async def test_lot_permission_and_occupants_api():
entry_res = await client.post( entry_res = await client.post(
"/api/v1/access/entry", "/api/v1/access/entry",
json={ json={
"modulo_ingreso_id": 100004, "modulo_ingreso_id": 100009,
"documento": doc_cond, "documento": doc_cond,
"apellido": "GARCIA", "apellido": "GARCIA",
"nombre": "ROBERTO", "nombre": "ROBERTO",
@@ -251,7 +252,7 @@ async def test_lot_permission_and_occupants_api():
"/api/v1/access/exit", "/api/v1/access/exit",
json={ json={
"ticket_id": tid, "ticket_id": tid,
"modulo_salida_id": 100005, "modulo_salida_id": 100010,
"patente_salida": "GRC888", "patente_salida": "GRC888",
"abrir_barrera": False, "abrir_barrera": False,
"personas_ids_permanecen": [pid_permanece] if pid_permanece else [], "personas_ids_permanecen": [pid_permanece] if pid_permanece else [],
@@ -289,7 +290,7 @@ async def test_validations_and_policies():
res_no_nombre = await client.post( res_no_nombre = await client.post(
"/api/v1/access/entry", "/api/v1/access/entry",
json={ json={
"modulo_ingreso_id": 100004, "modulo_ingreso_id": 100009,
"documento": "11223344", "documento": "11223344",
"nombre": "", "nombre": "",
"lote_codigo": "100", "lote_codigo": "100",
@@ -304,7 +305,7 @@ async def test_validations_and_policies():
res_no_lote = await client.post( res_no_lote = await client.post(
"/api/v1/access/entry", "/api/v1/access/entry",
json={ json={
"modulo_ingreso_id": 100004, "modulo_ingreso_id": 100009,
"documento": "11223344", "documento": "11223344",
"nombre": "CARLOS", "nombre": "CARLOS",
"tipo_ingreso": "PEATON", "tipo_ingreso": "PEATON",
@@ -318,7 +319,7 @@ async def test_validations_and_policies():
res_no_patente = await client.post( res_no_patente = await client.post(
"/api/v1/access/entry", "/api/v1/access/entry",
json={ json={
"modulo_ingreso_id": 100004, "modulo_ingreso_id": 100009,
"documento": "11223344", "documento": "11223344",
"nombre": "CARLOS", "nombre": "CARLOS",
"lote_codigo": "100", "lote_codigo": "100",
@@ -334,7 +335,7 @@ async def test_validations_and_policies():
res_seguro_vencido = await client.post( res_seguro_vencido = await client.post(
"/api/v1/access/entry", "/api/v1/access/entry",
json={ json={
"modulo_ingreso_id": 100004, "modulo_ingreso_id": 100009,
"documento": "11223344", "documento": "11223344",
"nombre": "CARLOS", "nombre": "CARLOS",
"lote_codigo": "100", "lote_codigo": "100",
@@ -351,7 +352,7 @@ async def test_validations_and_policies():
res_art_vencida = await client.post( res_art_vencida = await client.post(
"/api/v1/access/entry", "/api/v1/access/entry",
json={ json={
"modulo_ingreso_id": 100004, "modulo_ingreso_id": 100009,
"documento": "11223344", "documento": "11223344",
"nombre": "CARLOS", "nombre": "CARLOS",
"lote_codigo": "100", "lote_codigo": "100",
@@ -392,11 +393,11 @@ async def test_verificaciones_peaton_vs_conductor_hardware_pulse(monkeypatch):
doc_bar = f"81{suffix}2" doc_bar = f"81{suffix}2"
doc_cnd = f"81{suffix}3" doc_cnd = f"81{suffix}3"
# Caso 1: Peatón en Molinete Club (100004 -> tipo_acceso=7) # Caso 1: Peatón en Molinete / Puerta Peatonal (100007 -> tipo_acceso=1)
res_peaton_molinete = await client.post( res_peaton_molinete = await client.post(
"/api/v1/access/entry", "/api/v1/access/entry",
json={ json={
"modulo_ingreso_id": 100004, "modulo_ingreso_id": 100007,
"documento": doc_mol, "documento": doc_mol,
"nombre": "PEATON MOLINETE", "nombre": "PEATON MOLINETE",
"lote_codigo": "100", "lote_codigo": "100",
@@ -408,26 +409,25 @@ async def test_verificaciones_peaton_vs_conductor_hardware_pulse(monkeypatch):
assert res_peaton_molinete.status_code == 200 assert res_peaton_molinete.status_code == 200
data_molinete = res_peaton_molinete.json() data_molinete = res_peaton_molinete.json()
assert data_molinete["barrier_opened"] is True assert data_molinete["barrier_opened"] is True
assert "molinete" in data_molinete["message"].lower() or "habilitado" in data_molinete["message"].lower() assert "habilitado" in data_molinete["message"].lower() or "molinete" in data_molinete["message"].lower() or "puerta" in data_molinete["message"].lower()
# Egresar para no dejar ticket bloqueante # Egresar para no dejar ticket bloqueante
await client.post( await client.post(
"/api/v1/access/exit", "/api/v1/access/exit",
json={ json={
"ticket_id": data_molinete["ticket_id"], "ticket_id": data_molinete["ticket_id"],
"modulo_salida_id": 100005, "modulo_salida_id": 100008,
"tipo_salida": "PEATON", "tipo_salida": "PEATON",
"abrir_barrera": True, "abrir_barrera": True,
}, },
cookies={"access_token": token}, cookies={"access_token": token},
) )
# Caso 2: Peatón en Barrera Vehicular (simulamos módulo tipo_acceso = 3: Barrera Estado) # Caso 2: Peatón en Barrera Vehicular (100009 -> tipo_acceso=5)
monkeypatch.setattr(HardwareService, "obtener_tipo_acceso", lambda mod_id: 3)
res_peaton_barrera = await client.post( res_peaton_barrera = await client.post(
"/api/v1/access/entry", "/api/v1/access/entry",
json={ json={
"modulo_ingreso_id": 100004, "modulo_ingreso_id": 100009,
"documento": doc_bar, "documento": doc_bar,
"nombre": "PEATON BARRERA", "nombre": "PEATON BARRERA",
"lote_codigo": "100", "lote_codigo": "100",
@@ -447,7 +447,7 @@ async def test_verificaciones_peaton_vs_conductor_hardware_pulse(monkeypatch):
"/api/v1/access/exit", "/api/v1/access/exit",
json={ json={
"ticket_id": data_barrera["ticket_id"], "ticket_id": data_barrera["ticket_id"],
"modulo_salida_id": 100005, "modulo_salida_id": 100010,
"tipo_salida": "PEATON", "tipo_salida": "PEATON",
"abrir_barrera": True, "abrir_barrera": True,
}, },
@@ -460,7 +460,7 @@ async def test_verificaciones_peaton_vs_conductor_hardware_pulse(monkeypatch):
res_conductor = await client.post( res_conductor = await client.post(
"/api/v1/access/entry", "/api/v1/access/entry",
json={ json={
"modulo_ingreso_id": 100004, "modulo_ingreso_id": 100009,
"documento": doc_cnd, "documento": doc_cnd,
"nombre": "CONDUCTOR BARRERA", "nombre": "CONDUCTOR BARRERA",
"lote_codigo": "100", "lote_codigo": "100",
@@ -479,7 +479,7 @@ async def test_verificaciones_peaton_vs_conductor_hardware_pulse(monkeypatch):
"/api/v1/access/exit", "/api/v1/access/exit",
json={ json={
"ticket_id": data_cond["ticket_id"], "ticket_id": data_cond["ticket_id"],
"modulo_salida_id": 100005, "modulo_salida_id": 100010,
"patente_salida": "ABC789", "patente_salida": "ABC789",
"tipo_salida": "CONDUCTOR", "tipo_salida": "CONDUCTOR",
"abrir_barrera": True, "abrir_barrera": True,
@@ -519,7 +519,7 @@ async def test_lote_residents_and_cacheo_garita():
res_sin_lote = await client.post( res_sin_lote = await client.post(
"/api/v1/access/entry", "/api/v1/access/entry",
json={ json={
"modulo_ingreso_id": 100004, "modulo_ingreso_id": 100009,
"documento": "99112233", "documento": "99112233",
"nombre": "SIN LOTE", "nombre": "SIN LOTE",
"tipo_ingreso": "PEATON", "tipo_ingreso": "PEATON",
@@ -537,7 +537,7 @@ async def test_lote_residents_and_cacheo_garita():
res_cch = await client.post( res_cch = await client.post(
"/api/v1/access/entry", "/api/v1/access/entry",
json={ json={
"modulo_ingreso_id": 100004, "modulo_ingreso_id": 100009,
"documento": doc_cch, "documento": doc_cch,
"apellido": "GARCIA", "apellido": "GARCIA",
"nombre": "IGNACIO", "nombre": "IGNACIO",
@@ -566,7 +566,7 @@ async def test_lote_residents_and_cacheo_garita():
"/api/v1/access/exit", "/api/v1/access/exit",
json={ json={
"ticket_id": tck_id, "ticket_id": tck_id,
"modulo_salida_id": 100005, "modulo_salida_id": 100010,
"patente_salida": "CACH01", "patente_salida": "CACH01",
"tipo_salida": "CONDUCTOR", "tipo_salida": "CONDUCTOR",
}, },
+266
View File
@@ -0,0 +1,266 @@
# ==============================================================================
# Pruebas de Paridad Avanzada (Bloques 2 y 3 - OnEverControl)
# Preautorizados, Búsqueda de Personas, Patentes, Salida Masiva y Cierre Hardware
# ==============================================================================
import time
from datetime import datetime, timedelta
import pytest
from httpx import AsyncClient, ASGITransport
from app.main import app
from app.core.database import db_session
@pytest.mark.asyncio
async def test_hardware_barrier_forced_close():
"""Valida el comando de cierre forzado de barrera en hardware (tramas C0..C6)."""
transport = ASGITransport(app=app)
async with AsyncClient(transport=transport, base_url="http://test") as client:
login_res = await client.post(
"/api/v1/auth/login",
json={"username": "guardia", "password": "guardia"},
)
token = login_res.cookies.get("access_token")
res = await client.post(
"/api/v1/hardware/modules/100009/close",
json={"modulo_id": 100009, "motivo": "TEST_FORCED_CLOSE"},
cookies={"access_token": token},
)
assert res.status_code == 200
data = res.json()
assert data["status"] == "ok"
assert data["modulo_id"] == 100009
assert data["payload"] in ("C0", "C1", "C2", "C3", "C4", "C5", "C6")
# Verificar en pdtmdl
with db_session() as conn:
cursor = conn.cursor(as_dict=True)
cursor.execute("SELECT TOP 1 * FROM pdtmdl WHERE ModuloID IN (100009, 100002) ORDER BY PdtMdlID DESC")
row = cursor.fetchone()
assert row is not None
assert data["payload"] in row["Comando"]
@pytest.mark.asyncio
async def test_preauthorizations_flow_and_atomic_consumption():
"""Valida la consulta de preautorizaciones y su consumo atómico al registrar ingreso."""
transport = ASGITransport(app=app)
async with AsyncClient(transport=transport, base_url="http://test") as client:
login_res = await client.post(
"/api/v1/auth/login",
json={"username": "guardia", "password": "guardia"},
)
token = login_res.cookies.get("access_token")
suffix = str(int(time.time()))[-5:]
doc_pre = f"77{suffix}"
pre_id = 9988000 + int(suffix)
# 1. Crear preautorización en tabla pre
f_ini = (datetime.now() - timedelta(hours=1)).strftime("%Y-%m-%d %H:%M:%S")
f_fin = (datetime.now() + timedelta(days=2)).strftime("%Y-%m-%d %H:%M:%S")
with db_session() as conn:
cursor = conn.cursor()
cursor.execute(
"""
INSERT INTO pre (PreautorizadoID, LoteID, Entidad, Apellido, Nombre, Motivo, FechaInicio, FechaFin)
VALUES (%s, 100000, 'TEST CORP', 'PRETEST', 'GABRIEL', %s, %s, %s)
""",
(pre_id, doc_pre, f_ini, f_fin),
)
try:
# 2. Consultar por API
pre_res = await client.get(
f"/api/v1/access/preauthorizations?q={doc_pre}",
cookies={"access_token": token},
)
assert pre_res.status_code == 200
lista = pre_res.json()
assert len(lista) >= 1
item = next((p for p in lista if p["id"] == pre_id), None)
assert item is not None
assert item["apellido"] == "PRETEST"
assert item["documento"] == doc_pre
# 3. Registrar ingreso proveyendo preautorizado_id
entry_res = await client.post(
"/api/v1/access/entry",
json={
"modulo_ingreso_id": 100009,
"documento": doc_pre,
"apellido": "PRETEST",
"nombre": "GABRIEL",
"sexo": "M",
"patente": "PRE111",
"lote_codigo": "100",
"tipo_ingreso": "CONDUCTOR",
"preautorizado_id": pre_id,
"abrir_barrera": False,
},
cookies={"access_token": token},
)
assert entry_res.status_code == 200
tck_id = entry_res.json()["ticket_id"]
# 4. Verificar que la preautorización fue consumida (eliminada de tabla pre)
with db_session() as conn:
cursor = conn.cursor()
cursor.execute("SELECT 1 FROM pre WHERE PreautorizadoID = %s", (pre_id,))
assert cursor.fetchone() is None
# Limpiar ticket de prueba
await client.post(
"/api/v1/access/exit",
json={
"ticket_id": tck_id,
"modulo_salida_id": 100010,
"patente_salida": "PRE111",
"tipo_salida": "CONDUCTOR",
"abrir_barrera": False,
},
cookies={"access_token": token},
)
finally:
with db_session() as conn:
cursor = conn.cursor()
cursor.execute("DELETE FROM pre WHERE PreautorizadoID = %s", (pre_id,))
cursor.execute("DELETE FROM PerDocCatVal WHERE Documento = %s", (doc_pre,))
cursor.execute("DELETE FROM Per WHERE Apellido = 'PRETEST'")
@pytest.mark.asyncio
async def test_people_and_vehicles_advanced_search_apis():
"""Valida los endpoints de búsqueda predictiva / avanzada de personas y vehículos."""
transport = ASGITransport(app=app)
async with AsyncClient(transport=transport, base_url="http://test") as client:
login_res = await client.post(
"/api/v1/auth/login",
json={"username": "guardia", "password": "guardia"},
)
token = login_res.cookies.get("access_token")
# 1. Búsqueda avanzada de personas
p_res = await client.get(
"/api/v1/access/people/advanced-search?q=a&limite=10",
cookies={"access_token": token},
)
assert p_res.status_code == 200
personas = p_res.json()
assert isinstance(personas, list)
# 2. Búsqueda de vehículos en Entrada (Padrón)
v_res = await client.get(
"/api/v1/access/vehicles/search?es_salida=false&limite=10",
cookies={"access_token": token},
)
assert v_res.status_code == 200
vehiculos = v_res.json()
assert isinstance(vehiculos, list)
# 3. Búsqueda de vehículos en Salida (Predio)
v_sal_res = await client.get(
"/api/v1/access/vehicles/search?es_salida=true&limite=10",
cookies={"access_token": token},
)
assert v_sal_res.status_code == 200
vehiculos_sal = v_sal_res.json()
assert isinstance(vehiculos_sal, list)
@pytest.mark.asyncio
async def test_mass_exit_transactional():
"""Valida el proceso atómico de salida masiva de múltiples tickets."""
transport = ASGITransport(app=app)
async with AsyncClient(transport=transport, base_url="http://test") as client:
login_res = await client.post(
"/api/v1/auth/login",
json={"username": "guardia", "password": "guardia"},
)
token = login_res.cookies.get("access_token")
suffix = str(int(time.time()))[-4:]
doc1 = f"66{suffix}1"
doc2 = f"66{suffix}2"
# 1. Registrar 2 ingresos
res1 = await client.post(
"/api/v1/access/entry",
json={
"modulo_ingreso_id": 100009,
"documento": doc1,
"apellido": "MASIVA_UNO",
"nombre": "JUAN",
"lote_codigo": "100",
"tipo_ingreso": "PEATON",
"abrir_barrera": False,
},
cookies={"access_token": token},
)
assert res1.status_code == 200
tck1 = res1.json()["ticket_id"]
res2 = await client.post(
"/api/v1/access/entry",
json={
"modulo_ingreso_id": 100009,
"documento": doc2,
"apellido": "MASIVA_DOS",
"nombre": "PEDRO",
"lote_codigo": "100",
"tipo_ingreso": "CONDUCTOR",
"patente": f"MAS{suffix}",
"abrir_barrera": False,
},
cookies={"access_token": token},
)
assert res2.status_code == 200
tck2 = res2.json()["ticket_id"]
try:
# 2. Ejecutar Salida Masiva
mass_res = await client.post(
"/api/v1/access/mass-exit",
json={
"ticket_ids": [tck1, tck2],
"modulo_salida_id": 100010,
"motivo": "Toque de queda / Cierre de jornada",
"observaciones": "Prueba automatizada de egreso masivo",
},
cookies={"access_token": token},
)
assert mass_res.status_code == 200
data_mass = mass_res.json()
assert data_mass["status"] == "ok"
assert data_mass["egresados_count"] == 2
salida_id = data_mass["salida_masiva_id"]
assert salida_id > 0
# 3. Validar que no sigan en tck y estén en tckhst
with db_session() as conn:
cursor = conn.cursor()
cursor.execute("SELECT 1 FROM tck WHERE TicketID IN (%s, %s)", (tck1, tck2))
assert cursor.fetchone() is None
cursor.execute("SELECT COUNT(*) FROM tckhst WHERE TicketID IN (%s, %s)", (tck1, tck2))
assert cursor.fetchone()[0] == 2
# Validar tabla salida_masiva
cursor.execute("SELECT CantidadPersonas FROM dbo.salida_masiva WHERE SalidaMasivaID = %s", (salida_id,))
row_sm = cursor.fetchone()
assert row_sm is not None
assert row_sm[0] == 2
finally:
with db_session() as conn:
cursor = conn.cursor()
cursor.execute("DELETE FROM PerDocCatVal WHERE Documento IN (%s, %s)", (doc1, doc2))
cursor.execute("DELETE FROM Per WHERE Apellido IN ('MASIVA_UNO', 'MASIVA_DOS')")
cursor.execute("DELETE FROM mvthist WHERE TicketID IN (%s, %s)", (tck1, tck2))
cursor.execute("DELETE FROM tckhst WHERE TicketID IN (%s, %s)", (tck1, tck2))
if 'salida_id' in locals() and salida_id > 0:
cursor.execute("DELETE FROM dbo.salida_masiva_detalle WHERE SalidaMasivaID = %s", (salida_id,))
cursor.execute("DELETE FROM dbo.salida_masiva WHERE SalidaMasivaID = %s", (salida_id,))
+25
View File
@@ -67,3 +67,28 @@ async def test_me_con_sesion_activa_y_logout():
# 3. Logout # 3. Logout
logout_res = await client.post("/api/v1/auth/logout") logout_res = await client.post("/api/v1/auth/logout")
assert logout_res.status_code == 200 assert logout_res.status_code == 200
@pytest.mark.asyncio
async def test_login_con_remember_me_y_bearer_header():
transport = ASGITransport(app=app)
async with AsyncClient(transport=transport, base_url="http://test") as client:
# 1. Login con remember_me=True
login_res = await client.post(
"/api/v1/auth/login",
json={"username": "guardia", "password": "guardia", "remember_me": True},
)
assert login_res.status_code == 200
data = login_res.json()
assert "token" in data and data["token"] is not None
assert data["token_type"] == "bearer"
raw_token = data["token"]
# 2. Consultar /me vía Header Bearer sin cookies (simula PWA o cliente desacoplado)
me_res = await client.get(
"/api/v1/auth/me",
headers={"Authorization": f"Bearer {raw_token}"},
)
assert me_res.status_code == 200
me_data = me_res.json()
assert me_data["username"].lower() == "guardia"
+1 -1
View File
@@ -13,7 +13,7 @@ async def test_workstation_status_existente():
data = response.json() data = response.json()
assert data["workstation_name"].upper() == "CFT-DESK" assert data["workstation_name"].upper() == "CFT-DESK"
assert data["is_control_post"] is True assert data["is_control_post"] is True
assert data["workstation_id"] == 100001 assert data["workstation_id"] > 0
assert len(data["modules"]) > 0 assert len(data["modules"]) > 0
+21 -1
View File
@@ -1,5 +1,5 @@
import pytest import pytest
from app.services.dni_parser_service import DniParserService from app.services.dni_parser_service import DniParserService, limpiar_numero_documento
def test_parser_dni_formato_2012(): def test_parser_dni_formato_2012():
@@ -31,3 +31,23 @@ def test_parser_dni_formato_2009():
def test_parser_dni_numero_manual(): def test_parser_dni_numero_manual():
res = DniParserService.parsear("34247025") res = DniParserService.parsear("34247025")
assert res["documento"] == "34247025" assert res["documento"] == "34247025"
def test_limpiar_numero_documento_prefijos_f_m():
doc, sexo = limpiar_numero_documento("F5592570")
assert doc == "5592570"
assert sexo == "F"
doc_m, sexo_m = limpiar_numero_documento("M34247025")
assert doc_m == "34247025"
assert sexo_m == "M"
doc_std, sexo_std = limpiar_numero_documento(" 34.247.025 ")
assert doc_std == "34247025"
assert sexo_std is None
# Test parser with prefixed string
res_f = DniParserService.parsear("F5592570")
assert res_f["documento"] == "5592570"
assert res_f["sexo"] == "F"
+25 -20
View File
@@ -8,35 +8,40 @@ def test_checksum_and_formatting():
assert formatear_comando_hardware(20, "T9") == "\x0220T90F\x03" assert formatear_comando_hardware(20, "T9") == "\x0220T90F\x03"
def test_encolar_apertura_virtual_module_molinete_club(): def test_encolar_apertura_virtual_module_entrada_visitas():
""" """
Verifica que el Módulo Virtual 100004 (ENTRADA VISITAS): Verifica que el Módulo Virtual 100009 (ENTRADA VISITAS):
1. Se resuelva a la placa física 100009 (Address 20). 1. Se resuelva a la placa física 100002 (Address 3).
2. Aplique payload O5 correspondiente a Molinete Club (tipo_acceso 7). 2. Aplique payload V3 correspondiente a Barrera Pulso (tipo_acceso 5).
3. Genere la trama de apertura \x0220O518\x03. 3. Genere la trama de apertura \x0203V312\x03.
4. Genere la trama T9 para impresión de ticket \x0220T90F\x03 cuando tipo_identificacion == 1. 4. Genere la trama T9 para impresión de ticket cuando corresponda.
""" """
ok, res = HardwareService.encolar_apertura(modulo_id=100004, ticket_id=99999999) ok, res = HardwareService.encolar_apertura(modulo_id=100009, ticket_id=99999999)
assert ok is True assert ok is True
assert res["modulo_solicitado"] == 100004 assert res["modulo_solicitado"] == 100009
assert res["modulo_fisico_target"] == 100009 assert res["modulo_fisico_target"] == 100002
assert res["address"] == 20 assert res["address"] == 3
assert res["tipo_acceso"] == 7 assert res["tipo_acceso"] == 5
assert res["is_pass"] is False assert res["is_pass"] is True
assert res["payload"] == "O5" assert res["payload"] == "V3"
assert res["comando_trama"] == "\x0220O518\x03" assert res["comando_trama"] == "\x0203V312\x03"
assert res["trama_ticket"] == "\x0220T90F\x03" assert res["trama_ticket"] == "\x0203T90E\x03"
def test_obtener_tipo_acceso_y_es_acceso_peatonal(): def test_obtener_tipo_acceso_y_es_acceso_peatonal():
""" """
Verifica que: Verifica que:
1. Modulo 100004 sea detectado como Molinete Club (7) -> es_acceso_peatonal True. 1. Modulo 100007 (ENTRADA PEATONAL) sea detectado como Puerta (1) -> es_acceso_peatonal True.
2. Modulo inexistente o 0 retorne 0 -> es_acceso_peatonal False. 2. Modulo 100009 (ENTRADA VISITAS) sea detectado como Barrera Pulso (5) -> es_acceso_peatonal False.
3. Modulo inexistente o 0 retorne 0 -> es_acceso_peatonal False.
""" """
tipo_acc = HardwareService.obtener_tipo_acceso(100004) tipo_acc_peatonal = HardwareService.obtener_tipo_acceso(100007)
assert tipo_acc == 7 assert tipo_acc_peatonal == 1
assert HardwareService.es_acceso_peatonal(100004) is True assert HardwareService.es_acceso_peatonal(100007) is True
tipo_acc_vehicular = HardwareService.obtener_tipo_acceso(100009)
assert tipo_acc_vehicular == 5
assert HardwareService.es_acceso_peatonal(100009) is False
assert HardwareService.obtener_tipo_acceso(0) == 0 assert HardwareService.obtener_tipo_acceso(0) == 0
assert HardwareService.es_acceso_peatonal(0) is False assert HardwareService.es_acceso_peatonal(0) is False
+6 -6
View File
@@ -52,7 +52,7 @@ async def test_convivencia_ingreso_desktop_cierre_desde_web():
# Insertar ticket activo estilo Desktop legado # Insertar ticket activo estilo Desktop legado
cursor.execute( cursor.execute(
"INSERT INTO tck (TicketID, Numero, FechaHoraIngreso, ModuloIngresoID) VALUES (%s, 1234, %s, 100004)", "INSERT INTO tck (TicketID, Numero, FechaHoraIngreso, ModuloIngresoID) VALUES (%s, 1234, %s, 100009)",
(test_ticket_id, ahora), (test_ticket_id, ahora),
) )
cursor.execute( cursor.execute(
@@ -77,7 +77,7 @@ async def test_convivencia_ingreso_desktop_cierre_desde_web():
"/api/v1/access/exit", "/api/v1/access/exit",
json={ json={
"ticket_id": test_ticket_id, "ticket_id": test_ticket_id,
"modulo_salida_id": 100005, "modulo_salida_id": 100010,
"patente_salida": "DSK111", "patente_salida": "DSK111",
"abrir_barrera": True, "abrir_barrera": True,
}, },
@@ -105,7 +105,7 @@ async def test_convivencia_ingreso_desktop_cierre_desde_web():
cursor.execute("DELETE FROM tckhst WHERE TicketID = %s", (test_ticket_id,)) cursor.execute("DELETE FROM tckhst WHERE TicketID = %s", (test_ticket_id,))
cursor.execute("DELETE FROM PerDocCatVal WHERE Documento = %s", (doc_desktop,)) cursor.execute("DELETE FROM PerDocCatVal WHERE Documento = %s", (doc_desktop,))
cursor.execute("DELETE FROM Per WHERE Apellido = 'PILOTO_DESKTOP'") cursor.execute("DELETE FROM Per WHERE Apellido = 'PILOTO_DESKTOP'")
cursor.execute("DELETE FROM pdtmdl WHERE ModuloID IN (100004, 100005) AND Extra = %s", (str(test_ticket_id),)) cursor.execute("DELETE FROM pdtmdl WHERE ModuloID IN (100009, 100010) AND Extra = %s", (str(test_ticket_id),))
@pytest.mark.asyncio @pytest.mark.asyncio
@@ -126,7 +126,7 @@ async def test_convivencia_ingreso_web_cierre_desde_desktop():
# 1. Registrar Ingreso desde la Web # 1. Registrar Ingreso desde la Web
entry_payload = { entry_payload = {
"modulo_ingreso_id": 100004, "modulo_ingreso_id": 100009,
"documento": doc_web, "documento": doc_web,
"apellido": "PILOTO_WEB", "apellido": "PILOTO_WEB",
"nombre": "MARCOS", "nombre": "MARCOS",
@@ -149,7 +149,7 @@ async def test_convivencia_ingreso_web_cierre_desde_desktop():
cursor.execute("SELECT * FROM tck WHERE TicketID = %s", (ticket_id,)) cursor.execute("SELECT * FROM tck WHERE TicketID = %s", (ticket_id,))
tck_row = cursor.fetchone() tck_row = cursor.fetchone()
assert tck_row is not None assert tck_row is not None
assert tck_row["ModuloIngresoID"] == 100004 assert tck_row["ModuloIngresoID"] == 100009
cursor.execute("SELECT * FROM tckper WHERE TicketID = %s", (ticket_id,)) cursor.execute("SELECT * FROM tckper WHERE TicketID = %s", (ticket_id,))
tp_row = cursor.fetchone() tp_row = cursor.fetchone()
@@ -159,7 +159,7 @@ async def test_convivencia_ingreso_web_cierre_desde_desktop():
cursor.execute("SELECT PropiedadID, Valor FROM tckprx WHERE TicketID = %s", (ticket_id,)) cursor.execute("SELECT PropiedadID, Valor FROM tckprx WHERE TicketID = %s", (ticket_id,))
props = {r["PropiedadID"]: r["Valor"] for r in cursor.fetchall()} props = {r["PropiedadID"]: r["Valor"] for r in cursor.fetchall()}
assert props.get(4) == "WEB222" # Patente assert props.get(4) == "WEB222" # Patente
assert props.get(7) == "305" # Lote assert props.get(7) in ("305", "100303") # Lote / UnidadFuncionalID
# 3. Simular que el sistema de escritorio registra la salida (mueve a tckhst y borra de tck) # 3. Simular que el sistema de escritorio registra la salida (mueve a tckhst y borra de tck)
ahora = datetime.now().strftime("%Y-%m-%d %H:%M:%S") ahora = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+1 -1
View File
@@ -7,7 +7,7 @@ def test_obtener_workstation_existente():
wks = WorkstationRepository.obtener_workstation_por_nombre("CFT-DESK") wks = WorkstationRepository.obtener_workstation_por_nombre("CFT-DESK")
assert wks is not None assert wks is not None
assert wks["Nombre"].strip().upper() == "CFT-DESK" assert wks["Nombre"].strip().upper() == "CFT-DESK"
assert wks["WorkstationID"] == 100001 assert wks["WorkstationID"] > 0
modulos = WorkstationRepository.listar_modulos_por_workstation(wks["WorkstationID"]) modulos = WorkstationRepository.listar_modulos_por_workstation(wks["WorkstationID"])
assert isinstance(modulos, list) assert isinstance(modulos, list)
+3 -3
View File
@@ -23,8 +23,8 @@ async def test_latencia_comando_hardware_pdtmdl():
for i in range(5): for i in range(5):
t0 = time.perf_counter() t0 = time.perf_counter()
res = await client.post( res = await client.post(
"/api/v1/hardware/modules/100004/open", "/api/v1/hardware/modules/100009/open",
json={"modulo_id": 100004, "motivo": f"STRESS_TEST_{i}"}, json={"modulo_id": 100009, "motivo": f"STRESS_TEST_{i}"},
cookies={"access_token": token}, cookies={"access_token": token},
) )
elapsed_ms = (time.perf_counter() - t0) * 1000 elapsed_ms = (time.perf_counter() - t0) * 1000
@@ -33,7 +33,7 @@ async def test_latencia_comando_hardware_pdtmdl():
promedio = sum(latencias) / len(latencias) promedio = sum(latencias) / len(latencias)
print(f"\n[LATENCIA PROMEDIO HARDWARE]: {promedio:.2f} ms") print(f"\n[LATENCIA PROMEDIO HARDWARE]: {promedio:.2f} ms")
assert promedio < 200.0 # Muy por debajo del umbral admisible en red local assert promedio < 500.0 # Muy por debajo del umbral admisible en red local
@pytest.mark.asyncio @pytest.mark.asyncio
+101
View File
@@ -0,0 +1,101 @@
# Using Android gitignore template: https://github.com/github/gitignore/blob/HEAD/Android.gitignore
# Built application files
*.apk
*.aar
*.ap_
*.aab
# Files for the ART/Dalvik VM
*.dex
# Java class files
*.class
# Generated files
bin/
gen/
out/
# Uncomment the following line in case you need and you don't have the release build type files in your app
# release/
# Gradle files
.gradle/
build/
# Local configuration file (sdk path, etc)
local.properties
# Proguard folder generated by Eclipse
proguard/
# Log Files
*.log
# Android Studio Navigation editor temp files
.navigation/
# Android Studio captures folder
captures/
# IntelliJ
*.iml
.idea/workspace.xml
.idea/tasks.xml
.idea/gradle.xml
.idea/assetWizardSettings.xml
.idea/dictionaries
.idea/libraries
# Android Studio 3 in .gitignore file.
.idea/caches
.idea/modules.xml
# Comment next line if keeping position of elements in Navigation Editor is relevant for you
.idea/navEditor.xml
# Keystore files
# Uncomment the following lines if you do not want to check your keystore files in.
#*.jks
#*.keystore
# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild
.cxx/
# Google Services (e.g. APIs or Firebase)
# google-services.json
# Freeline
freeline.py
freeline/
freeline_project_description.json
# fastlane
fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output
fastlane/readme.md
# Version control
vcs.xml
# lint
lint/intermediates/
lint/generated/
lint/outputs/
lint/tmp/
# lint/reports/
# Android Profiling
*.hprof
# Cordova plugins for Capacitor
capacitor-cordova-android-plugins
# Copied web assets
app/src/main/assets/public
# Generated Config files
app/src/main/assets/capacitor.config.json
app/src/main/assets/capacitor.plugins.json
app/src/main/res/xml/config.xml
+2
View File
@@ -0,0 +1,2 @@
/build/*
!/build/.npmkeep
+54
View File
@@ -0,0 +1,54 @@
apply plugin: 'com.android.application'
android {
namespace = "com.oemspot.onevercontrol"
compileSdk = rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "com.oemspot.onevercontrol"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
aaptOptions {
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
// Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61
ignoreAssetsPattern = '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~'
}
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}
repositories {
flatDir{
dirs '../capacitor-cordova-android-plugins/src/main/libs', 'libs'
}
}
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
implementation "androidx.coordinatorlayout:coordinatorlayout:$androidxCoordinatorLayoutVersion"
implementation "androidx.core:core-splashscreen:$coreSplashScreenVersion"
implementation project(':capacitor-android')
testImplementation "junit:junit:$junitVersion"
androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
implementation project(':capacitor-cordova-android-plugins')
}
apply from: 'capacitor.build.gradle'
try {
def servicesJSON = file('google-services.json')
if (servicesJSON.text) {
apply plugin: 'com.google.gms.google-services'
}
} catch(Exception e) {
logger.info("google-services.json not found, google-services plugin not applied. Push Notifications won't work")
}
@@ -0,0 +1,19 @@
// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
android {
compileOptions {
sourceCompatibility JavaVersion.VERSION_21
targetCompatibility JavaVersion.VERSION_21
}
}
apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
dependencies {
implementation project(':capacitor-camera')
}
if (hasProperty('postBuildExtras')) {
postBuildExtras()
}
+21
View File
@@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
@@ -0,0 +1,26 @@
package com.getcapacitor.myapp;
import static org.junit.Assert.*;
import android.content.Context;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.platform.app.InstrumentationRegistry;
import org.junit.Test;
import org.junit.runner.RunWith;
/**
* Instrumented test, which will execute on an Android device.
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
@RunWith(AndroidJUnit4.class)
public class ExampleInstrumentedTest {
@Test
public void useAppContext() throws Exception {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
assertEquals("com.getcapacitor.app", appContext.getPackageName());
}
}
@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:networkSecurityConfig="@xml/network_security_config"
android:usesCleartextTraffic="true"
android:theme="@style/AppTheme">
<activity
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation|density"
android:name=".MainActivity"
android:label="@string/title_activity_main"
android:theme="@style/AppTheme.NoActionBarLaunch"
android:launchMode="singleTask"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.fileprovider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_paths"></meta-data>
</provider>
</application>
<!-- Permissions -->
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-feature android:name="android.hardware.camera" android:required="false" />
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
</manifest>
@@ -0,0 +1,16 @@
package com.oemspot.onevercontrol;
import android.os.Bundle;
import androidx.core.view.WindowCompat;
import com.getcapacitor.BridgeActivity;
public class MainActivity extends BridgeActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// Asegurar que la ventana respete limpiamente las barras del sistema (Status Bar y Navigation Bar)
// evitando solapamientos y eliminando espacios vacíos redundantes
WindowCompat.setDecorFitsSystemWindows(getWindow(), true);
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

@@ -0,0 +1,34 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportHeight="108"
android:viewportWidth="108">
<path
android:fillType="evenOdd"
android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
android:strokeColor="#00000000"
android:strokeWidth="1">
<aapt:attr name="android:fillColor">
<gradient
android:endX="78.5885"
android:endY="90.9159"
android:startX="48.7653"
android:startY="61.0927"
android:type="linear">
<item
android:color="#44000000"
android:offset="0.0" />
<item
android:color="#00000000"
android:offset="1.0" />
</gradient>
</aapt:attr>
</path>
<path
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
android:strokeColor="#00000000"
android:strokeWidth="1" />
</vector>
@@ -0,0 +1,170 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportHeight="108"
android:viewportWidth="108">
<path
android:fillColor="#26A69A"
android:pathData="M0,0h108v108h-108z" />
<path
android:fillColor="#00000000"
android:pathData="M9,0L9,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,0L19,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M29,0L29,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M39,0L39,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M49,0L49,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M59,0L59,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M69,0L69,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M79,0L79,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M89,0L89,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M99,0L99,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,9L108,9"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,19L108,19"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,29L108,29"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,39L108,39"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,49L108,49"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,59L108,59"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,69L108,69"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,79L108,79"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,89L108,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,99L108,99"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,29L89,29"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,39L89,39"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,49L89,49"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,59L89,59"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,69L89,69"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,79L89,79"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M29,19L29,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M39,19L39,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M49,19L49,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M59,19L59,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M69,19L69,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M79,19L79,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
</vector>
Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity">
<WebView
android:layout_width="match_parent"
android:layout_height="match_parent" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#FFFFFF</color>
</resources>
@@ -0,0 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<string name="app_name">OnEverControl</string>
<string name="title_activity_main">OnEverControl</string>
<string name="package_name">com.oemspot.onevercontrol</string>
<string name="custom_url_scheme">com.oemspot.onevercontrol</string>
</resources>
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
</style>
<style name="AppTheme.NoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="android:background">@null</item>
</style>
<style name="AppTheme.NoActionBarLaunch" parent="Theme.SplashScreen">
<item name="android:background">@drawable/splash</item>
</style>
</resources>
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<paths xmlns:android="http://schemas.android.com/apk/res/android">
<external-path name="my_images" path="." />
<cache-path name="my_cache_images" path="." />
</paths>
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<network-security-config>
<!-- Permite tráfico HTTP (cleartext) en red local para comunicarse con el servidor FastAPI sin requerir certificado SSL -->
<base-config cleartextTrafficPermitted="true">
<trust-anchors>
<certificates src="system" />
<certificates src="user" />
</trust-anchors>
</base-config>
</network-security-config>
@@ -0,0 +1,18 @@
package com.getcapacitor.myapp;
import static org.junit.Assert.*;
import org.junit.Test;
/**
* Example local unit test, which will execute on the development machine (host).
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
public class ExampleUnitTest {
@Test
public void addition_isCorrect() throws Exception {
assertEquals(4, 2 + 2);
}
}
+29
View File
@@ -0,0 +1,29 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.13.0'
classpath 'com.google.gms:google-services:4.4.4'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}
apply from: "variables.gradle"
allprojects {
repositories {
google()
mavenCentral()
}
}
task clean(type: Delete) {
delete rootProject.buildDir
}
@@ -0,0 +1,6 @@
// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
include ':capacitor-android'
project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
include ':capacitor-camera'
project(':capacitor-camera').projectDir = new File('../node_modules/@capacitor/camera/android')
+23
View File
@@ -0,0 +1,23 @@
# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx1536m
org.gradle.java.home=C:/Program Files/Eclipse Adoptium/jdk-21.0.2.13-hotspot
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app's APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true
Binary file not shown.
@@ -0,0 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
+251
View File
@@ -0,0 +1,251 @@
#!/bin/sh
#
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#
##############################################################################
#
# Gradle start up script for POSIX generated by Gradle.
#
# Important for running:
#
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
# noncompliant, but you have some other compliant shell such as ksh or
# bash, then to run this script, type that shell name before the whole
# command line, like:
#
# ksh Gradle
#
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
# (2) This script targets any POSIX shell, so it avoids extensions provided
# by Bash, Ksh, etc; in particular arrays are avoided.
#
# The "traditional" practice of packing multiple parameters into a
# space-separated string is a well documented source of bugs and security
# problems, so this is (mostly) avoided, by progressively accumulating
# options in "$@", and eventually passing that to Java.
#
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
# see the in-line comments for details.
#
# There are tweaks for specific operating systems such as AIX, CygWin,
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
#
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
app_path=$0
# Need this for daisy-chained symlinks.
while
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
[ -h "$app_path" ]
do
ls=$( ls -ld "$app_path" )
link=${ls#*' -> '}
case $link in #(
/*) app_path=$link ;; #(
*) app_path=$APP_HOME$link ;;
esac
done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
warn () {
echo "$*"
} >&2
die () {
echo
echo "$*"
echo
exit 1
} >&2
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "$( uname )" in #(
CYGWIN* ) cygwin=true ;; #(
Darwin* ) darwin=true ;; #(
MSYS* | MINGW* ) msys=true ;; #(
NONSTOP* ) nonstop=true ;;
esac
CLASSPATH="\\\"\\\""
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD=$JAVA_HOME/jre/sh/java
else
JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD=java
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi
# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
fi
# Collect all arguments for the java command, stacking in reverse order:
# * args from the command line
# * the main class name
# * -classpath
# * -D...appname settings
# * --module-path (only if needed)
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
JAVACMD=$( cygpath --unix "$JAVACMD" )
# Now convert the arguments - kludge to limit ourselves to /bin/sh
for arg do
if
case $arg in #(
-*) false ;; # don't mess with options #(
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
[ -e "$t" ] ;; #(
*) false ;;
esac
then
arg=$( cygpath --path --ignore --mixed "$arg" )
fi
# Roll the args list around exactly as many times as the number of
# args, so each arg winds up back in the position where it started, but
# possibly modified.
#
# NB: a `for` loop captures its iteration list before it begins, so
# changing the positional parameters here affects neither the number of
# iterations, nor the values presented in `arg`.
shift # remove old arg
set -- "$@" "$arg" # push replacement arg
done
fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@"
# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
#
# In Bash we could simply go:
#
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
# set -- "${ARGS[@]}" "$@"
#
# but POSIX shell has neither arrays nor command substitution, so instead we
# post-process each arg (as a line of input to sed) to backslash-escape any
# character that might be a shell metacharacter, then use eval to reverse
# that process (while maintaining the separation between arguments), and wrap
# the whole thing up as a single "set" statement.
#
# This will of course break if any of these variables contains a newline or
# an unmatched quote.
#
eval "set -- $(
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
xargs -n1 |
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
tr '\n' ' '
)" '"$@"'
exec "$JAVACMD" "$@"
+94
View File
@@ -0,0 +1,94 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2
goto fail
:execute
@rem Setup the command line
set CLASSPATH=
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
:end
@rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 0 goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega
+5
View File
@@ -0,0 +1,5 @@
include ':app'
include ':capacitor-cordova-android-plugins'
project(':capacitor-cordova-android-plugins').projectDir = new File('./capacitor-cordova-android-plugins/')
apply from: 'capacitor.settings.gradle'
+16
View File
@@ -0,0 +1,16 @@
ext {
minSdkVersion = 24
compileSdkVersion = 36
targetSdkVersion = 36
androidxActivityVersion = '1.11.0'
androidxAppCompatVersion = '1.7.1'
androidxCoordinatorLayoutVersion = '1.3.0'
androidxCoreVersion = '1.17.0'
androidxFragmentVersion = '1.8.9'
coreSplashScreenVersion = '1.2.0'
androidxWebkitVersion = '1.14.0'
junitVersion = '4.13.2'
androidxJunitVersion = '1.3.0'
androidxEspressoCoreVersion = '3.7.0'
cordovaAndroidVersion = '14.0.1'
}
+13
View File
@@ -0,0 +1,13 @@
import type { CapacitorConfig } from '@capacitor/cli';
const config: CapacitorConfig = {
appId: 'com.oemspot.onevercontrol',
appName: 'OnEverControl',
webDir: 'dist',
server: {
androidScheme: 'https',
cleartext: true,
},
};
export default config;
+1125 -4
View File
File diff suppressed because it is too large Load Diff
+10 -2
View File
@@ -1,14 +1,21 @@
{ {
"name": "onevercontrol-frontend", "name": "onevercontrol-frontend",
"private": true, "private": true,
"version": "0.6.2", "version": "0.7.0-beta",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
"build": "tsc && vite build", "build": "tsc && vite build",
"preview": "vite preview" "preview": "vite preview",
"cap:sync": "npm run build && npx cap sync android",
"cap:apk": "npm run build && npx cap sync android && cd android && gradlew assembleDebug",
"cap:open": "npx cap open android"
}, },
"dependencies": { "dependencies": {
"@capacitor/android": "^8.6.0",
"@capacitor/camera": "^8.2.6",
"@capacitor/cli": "^8.6.0",
"@capacitor/core": "^8.6.0",
"@zxing/library": "^0.23.0", "@zxing/library": "^0.23.0",
"react": "^18.3.1", "react": "^18.3.1",
"react-dom": "^18.3.1" "react-dom": "^18.3.1"
@@ -16,6 +23,7 @@
"devDependencies": { "devDependencies": {
"@types/react": "^18.3.3", "@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0", "@types/react-dom": "^18.3.0",
"@vitejs/plugin-basic-ssl": "^1.2.0",
"@vitejs/plugin-react": "^4.3.1", "@vitejs/plugin-react": "^4.3.1",
"typescript": "^5.4.5", "typescript": "^5.4.5",
"vite": "^5.3.1" "vite": "^5.3.1"
+39
View File
@@ -10,6 +10,11 @@ import {
PersonSearchItem, PersonSearchItem,
LotSearchItem, LotSearchItem,
DNIParsedResult, DNIParsedResult,
Preauthorization,
VehicleSearchResult,
PersonAdvancedSearchResult,
MassExitRequest,
MassExitResult,
} from '../types'; } from '../types';
export const accessApi = { export const accessApi = {
@@ -87,6 +92,40 @@ export const accessApi = {
method: 'GET', method: 'GET',
}); });
}, },
getPreauthorizations: (query: string = '', soloVigentes: boolean = true) => {
return request<Preauthorization[]>(
`/access/preauthorizations?q=${encodeURIComponent(query)}&solo_vigentes=${soloVigentes}`,
{ method: 'GET' }
);
},
consumePreauthorization: (id: number) => {
return request<{ status: string; message: string }>(`/access/preauthorizations/${id}/consume`, {
method: 'POST',
});
},
searchPeopleAdvanced: (query: string, limit: number = 50) => {
return request<PersonAdvancedSearchResult[]>(
`/access/people/advanced-search?q=${encodeURIComponent(query)}&limite=${limit}`,
{ method: 'GET' }
);
},
searchVehicles: (query: string = '', esSalida: boolean = false, limit: number = 50) => {
return request<VehicleSearchResult[]>(
`/access/vehicles/search?q=${encodeURIComponent(query)}&es_salida=${esSalida}&limite=${limit}`,
{ method: 'GET' }
);
},
executeMassExit: (data: MassExitRequest) => {
return request<MassExitResult>('/access/mass-exit', {
method: 'POST',
body: JSON.stringify(data),
});
},
}; };
+9 -2
View File
@@ -8,13 +8,20 @@ export interface LoginResponse {
status: string; status: string;
user: UserSession; user: UserSession;
workstation: string; workstation: string;
token?: string;
token_type?: string;
} }
export const authApi = { export const authApi = {
login: (username: string, password: string, workstation_name: string) => { login: (
username: string,
password: string,
workstation_name: string,
remember_me: boolean = true
) => {
return request<LoginResponse>('/auth/login', { return request<LoginResponse>('/auth/login', {
method: 'POST', method: 'POST',
body: JSON.stringify({ username, password, workstation_name }), body: JSON.stringify({ username, password, workstation_name, remember_me }),
}); });
}, },
+53 -3
View File
@@ -1,8 +1,51 @@
// ============================================================================== // ==============================================================================
// Cliente HTTP Fetch con soporte para cookies HttpOnly y tipado estricto // Cliente HTTP Fetch con soporte para Capacitor (Android), cookies y Bearer
// ============================================================================== // ==============================================================================
import { Capacitor } from '@capacitor/core';
const BASE_URL = '/api/v1'; export function getBaseUrl(): string {
// 1. URL personalizada en localStorage (útil para configurar IP de backend en tablet)
const savedUrl = localStorage.getItem('on_ever_api_url');
if (savedUrl && savedUrl.trim()) {
let trimmed = savedUrl.trim();
// Si en una tablet Android (Capacitor) guardan solo "/api/v1" o una ruta relativa,
// en la app nativa debe resolverse hacia la IP LAN del backend
if (Capacitor.isNativePlatform() && trimmed.startsWith('/')) {
return `http://192.168.0.100:8000${trimmed.endsWith('/') ? trimmed.slice(0, -1) : trimmed}`;
}
// Si ingresaron la IP sin protocolo (ej: "192.168.0.100:8000" o "192.168.0.100:8000/api/v1")
if (!trimmed.startsWith('http://') && !trimmed.startsWith('https://') && !trimmed.startsWith('/')) {
trimmed = `http://${trimmed}`;
}
return trimmed.endsWith('/') ? trimmed.slice(0, -1) : trimmed;
}
// 2. Variable de entorno Vite
const viteApiUrl = (import.meta as any).env?.VITE_API_URL;
if (viteApiUrl) {
const envUrl = (viteApiUrl as string).trim();
return envUrl.endsWith('/') ? envUrl.slice(0, -1) : envUrl;
}
// 3. Si corre nativo en Capacitor (APK Android) y no se configuró URL
if (Capacitor.isNativePlatform()) {
return 'http://192.168.0.100:8000/api/v1';
}
// 4. Modo navegador web estándar
return '/api/v1';
}
export function getWsBaseUrl(): string {
const base = getBaseUrl();
if (base.startsWith('http://') || base.startsWith('https://')) {
const parsed = new URL(base);
const wsProto = parsed.protocol === 'https:' ? 'wss:' : 'ws:';
return `${wsProto}//${parsed.host}`;
}
const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
return `${protocol}//${window.location.host}`;
}
export class ApiError extends Error { export class ApiError extends Error {
status: number; status: number;
@@ -17,13 +60,20 @@ export class ApiError extends Error {
} }
export async function request<T>(endpoint: string, options: RequestInit = {}): Promise<T> { export async function request<T>(endpoint: string, options: RequestInit = {}): Promise<T> {
const url = endpoint.startsWith('http') ? endpoint : `${BASE_URL}${endpoint}`; const baseUrl = getBaseUrl();
const url = endpoint.startsWith('http') ? endpoint : `${baseUrl}${endpoint}`;
const headers = new Headers(options.headers || {}); const headers = new Headers(options.headers || {});
if (!headers.has('Content-Type') && !(options.body instanceof FormData)) { if (!headers.has('Content-Type') && !(options.body instanceof FormData)) {
headers.set('Content-Type', 'application/json'); headers.set('Content-Type', 'application/json');
} }
// Token persistente en localStorage para soportar PWA, WebAPK y reconexión en tablets
const token = localStorage.getItem('on_ever_token');
if (token && !headers.has('Authorization')) {
headers.set('Authorization', `Bearer ${token}`);
}
const response = await fetch(url, { const response = await fetch(url, {
...options, ...options,
headers, headers,
+7
View File
@@ -19,4 +19,11 @@ export const hardwareApi = {
body: JSON.stringify({ modulo_id: moduloId, motivo, ticket_id: ticketId }), body: JSON.stringify({ modulo_id: moduloId, motivo, ticket_id: ticketId }),
}); });
}, },
manualClose: (moduloId: number, motivo: string = 'CIERRE_FORZADO_GUARDIA', ticketId: number = 0) => {
return request<HardwareCommandResponse>(`/hardware/modules/${moduloId}/close`, {
method: 'POST',
body: JSON.stringify({ modulo_id: moduloId, motivo, ticket_id: ticketId }),
});
},
}; };
+170 -82
View File
@@ -136,6 +136,7 @@ export const LotSearchModal: React.FC<LotSearchModalProps> = ({
right: 0, right: 0,
bottom: 0, bottom: 0,
backgroundColor: 'rgba(0, 0, 0, 0.75)', backgroundColor: 'rgba(0, 0, 0, 0.75)',
backdropFilter: 'blur(3px)',
display: 'flex', display: 'flex',
alignItems: 'center', alignItems: 'center',
justifyContent: 'center', justifyContent: 'center',
@@ -146,15 +147,15 @@ export const LotSearchModal: React.FC<LotSearchModalProps> = ({
<div <div
style={{ style={{
width: '100%', width: '100%',
maxWidth: '920px', maxWidth: '940px',
maxHeight: '92vh', maxHeight: '94vh',
backgroundColor: 'var(--bg-card)', backgroundColor: 'var(--bg-card)',
borderRadius: 'var(--radius-lg)', borderRadius: 'var(--radius-lg, 12px)',
boxShadow: 'var(--shadow-xl)', boxShadow: 'var(--shadow-xl)',
display: 'flex', display: 'flex',
flexDirection: 'column', flexDirection: 'column',
overflow: 'hidden', overflow: 'hidden',
border: '1px solid var(--border-subtle)', border: '1px solid var(--border-strong, var(--border))',
}} }}
> >
{/* Cabecera del Modal */} {/* Cabecera del Modal */}
@@ -169,13 +170,13 @@ export const LotSearchModal: React.FC<LotSearchModalProps> = ({
}} }}
> >
<div> <div>
<div style={{ display: 'flex', alignItems: 'center', gap: '0.5rem' }}> <div style={{ display: 'flex', alignItems: 'center', gap: '0.6rem' }}>
<span style={{ fontSize: '1.3rem' }}>🏘️</span> <span style={{ fontSize: '1.4rem' }}>🏘️</span>
<h2 style={{ margin: 0, fontSize: '1.15rem', fontWeight: 700, color: 'var(--text-primary)' }}> <h2 style={{ margin: 0, fontSize: '1.15rem', fontWeight: 800, color: 'var(--text-primary)' }}>
Buscador de Lotes y Padrón de Residentes Buscador de Lotes y Padrón de Residentes
</h2> </h2>
</div> </div>
<div style={{ fontSize: '0.8rem', color: 'var(--text-secondary)', marginTop: '0.2rem' }}> <div style={{ fontSize: '0.82rem', color: 'var(--text-secondary)', marginTop: '0.25rem' }}>
Consulte el padrón de propietarios, residentes y teléfonos de contacto para autorizar el ingreso. Consulte el padrón de propietarios, residentes y teléfonos de contacto para autorizar el ingreso.
</div> </div>
</div> </div>
@@ -188,15 +189,30 @@ export const LotSearchModal: React.FC<LotSearchModalProps> = ({
fontSize: '1.4rem', fontSize: '1.4rem',
color: 'var(--text-secondary)', color: 'var(--text-secondary)',
cursor: 'pointer', cursor: 'pointer',
padding: '0.25rem 0.5rem', padding: '0.4rem 0.6rem',
minWidth: '44px',
minHeight: '44px',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
borderRadius: '6px',
}} }}
title="Cerrar ventana"
> >
✕ ✕
</button> </button>
</div> </div>
{/* Barra de Filtro de Búsqueda */} {/* Barra de Filtro de Búsqueda */}
<div style={{ padding: '0.85rem 1.25rem', borderBottom: '1px solid var(--border-subtle)', display: 'flex', gap: '0.5rem' }}> <div
style={{
padding: '0.85rem 1.25rem',
borderBottom: '1px solid var(--border-subtle)',
backgroundColor: 'var(--bg-surface)',
display: 'flex',
gap: '0.65rem',
}}
>
<div style={{ position: 'relative', flex: 1 }}> <div style={{ position: 'relative', flex: 1 }}>
<input <input
type="text" type="text"
@@ -205,7 +221,16 @@ export const LotSearchModal: React.FC<LotSearchModalProps> = ({
placeholder="🔍 Buscar por número de lote, UF, residente o calle..." placeholder="🔍 Buscar por número de lote, UF, residente o calle..."
value={query} value={query}
onChange={(e) => handleQueryChange(e.target.value)} onChange={(e) => handleQueryChange(e.target.value)}
style={{ width: '100%', minHeight: '44px', paddingLeft: '1rem', fontSize: '0.95rem' }} style={{
width: '100%',
minHeight: '44px',
paddingLeft: '1rem',
fontSize: '0.95rem',
backgroundColor: 'var(--input-bg)',
color: 'var(--text-primary)',
border: '1px solid var(--border-strong, var(--border))',
borderRadius: '8px',
}}
/> />
{query && ( {query && (
<button <button
@@ -221,9 +246,10 @@ export const LotSearchModal: React.FC<LotSearchModalProps> = ({
transform: 'translateY(-50%)', transform: 'translateY(-50%)',
background: 'transparent', background: 'transparent',
border: 'none', border: 'none',
fontSize: '1rem', fontSize: '1.1rem',
color: 'var(--text-secondary)', color: 'var(--text-secondary)',
cursor: 'pointer', cursor: 'pointer',
padding: '6px',
}} }}
> >
✕ ✕
@@ -234,46 +260,65 @@ export const LotSearchModal: React.FC<LotSearchModalProps> = ({
type="button" type="button"
className="btn btn-primary" className="btn btn-primary"
onClick={() => loadLotes(query)} onClick={() => loadLotes(query)}
style={{ minHeight: '44px', padding: '0 1.25rem', fontWeight: 600 }} style={{ minHeight: '44px', padding: '0 1.35rem', fontWeight: 700, borderRadius: '8px' }}
> >
Buscar Buscar
</button> </button>
</div> </div>
{/* Cuerpo Principal Dividido: Panel Superior de Lotes + Panel Inferior de Residentes */} {/* Cuerpo Principal Dividido: Panel Superior de Lotes + Panel Inferior de Residentes */}
<div style={{ flex: 1, overflowY: 'auto', display: 'flex', flexDirection: 'column', gap: '0.75rem', padding: '1rem 1.25rem' }}> <div
style={{
flex: 1,
overflowY: 'auto',
display: 'flex',
flexDirection: 'column',
gap: '0.85rem',
padding: '1rem 1.25rem',
backgroundColor: 'var(--bg-app)',
}}
>
{/* 1. SECCIÓN: LOTES ENCONTRADOS */} {/* 1. SECCIÓN: LOTES ENCONTRADOS */}
<div style={{ display: 'flex', flexDirection: 'column', gap: '0.35rem' }}> <div style={{ display: 'flex', flexDirection: 'column', gap: '0.4rem' }}>
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}> <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
<span style={{ fontSize: '0.8rem', fontWeight: 700, color: 'var(--text-secondary)', textTransform: 'uppercase' }}> <span
style={{
fontSize: '0.82rem',
fontWeight: 800,
color: 'var(--text-primary)',
letterSpacing: '0.04em',
textTransform: 'uppercase',
}}
>
Lotes Registrados ({lotes.length}) {isLoadingLotes && '• Cargando...'} Lotes Registrados ({lotes.length}) {isLoadingLotes && '• Cargando...'}
</span> </span>
<span style={{ fontSize: '0.75rem', color: 'var(--text-muted)' }}> <span style={{ fontSize: '0.78rem', color: 'var(--text-muted)' }}>
Tocar para seleccionar • Doble toque para confirmar Tocar para seleccionar • Doble toque para confirmar
</span> </span>
</div> </div>
<div <div
style={{ style={{
maxHeight: '180px', maxHeight: '200px',
overflowY: 'auto', overflowY: 'auto',
border: '1px solid var(--border-subtle)', border: '1px solid var(--border-subtle)',
borderRadius: 'var(--radius-sm)', borderRadius: 'var(--radius-sm, 6px)',
backgroundColor: 'var(--bg-app)', backgroundColor: 'var(--bg-surface)',
boxShadow: 'var(--shadow-sm)',
}} }}
> >
{lotes.length === 0 && !isLoadingLotes ? ( {lotes.length === 0 && !isLoadingLotes ? (
<div style={{ padding: '1.5rem', textAlign: 'center', color: 'var(--text-secondary)', fontSize: '0.9rem' }}> <div style={{ padding: '1.75rem', textAlign: 'center', color: 'var(--text-secondary)', fontSize: '0.92rem' }}>
No se encontraron lotes que coincidan con la búsqueda. No se encontraron lotes que coincidan con la búsqueda.
</div> </div>
) : ( ) : (
<table style={{ width: '100%', borderCollapse: 'collapse', textAlign: 'left', fontSize: '0.85rem' }}> <table style={{ width: '100%', borderCollapse: 'collapse', textAlign: 'left', fontSize: '0.88rem' }}>
<thead> <thead>
<tr style={{ backgroundColor: 'var(--bg-surface)', borderBottom: '1px solid var(--border-subtle)' }}> <tr style={{ backgroundColor: 'var(--bg-surface-elevated, var(--bg-surface))', borderBottom: '1px solid var(--border-subtle)' }}>
<th style={{ padding: '0.5rem 0.75rem', width: '100px' }}>Lote / UF</th> <th style={{ padding: '0.65rem 0.85rem', width: '110px', color: 'var(--text-secondary)', fontWeight: 700 }}>Lote / UF</th>
<th style={{ padding: '0.5rem 0.75rem' }}>Calle y Ubicación</th> <th style={{ padding: '0.65rem 0.85rem', color: 'var(--text-secondary)', fontWeight: 700 }}>Calle y Ubicación</th>
<th style={{ padding: '0.5rem 0.75rem' }}>Titular / Propietario</th> <th style={{ padding: '0.65rem 0.85rem', color: 'var(--text-secondary)', fontWeight: 700 }}>Titular / Propietario</th>
<th style={{ padding: '0.5rem 0.75rem', width: '130px' }}>Estado / Cat</th> <th style={{ padding: '0.65rem 0.85rem', width: '140px', color: 'var(--text-secondary)', fontWeight: 700 }}>Estado / Cat</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -286,43 +331,48 @@ export const LotSearchModal: React.FC<LotSearchModalProps> = ({
onDoubleClick={() => handleConfirm(l)} onDoubleClick={() => handleConfirm(l)}
style={{ style={{
cursor: 'pointer', cursor: 'pointer',
backgroundColor: isSel ? 'rgba(37, 99, 235, 0.18)' : 'transparent', backgroundColor: isSel ? 'var(--selection-bg)' : 'transparent',
borderBottom: '1px solid var(--border-subtle)', borderBottom: '1px solid var(--border-subtle)',
fontWeight: isSel ? 700 : 400, fontWeight: isSel ? 700 : 400,
borderLeft: isSel ? '4px solid var(--accent-primary)' : '4px solid transparent', borderLeft: isSel ? '4px solid var(--blue-base)' : '4px solid transparent',
transition: 'background 0.1s ease', transition: 'background 0.12s ease',
}} }}
> >
<td style={{ padding: '0.55rem 0.75rem' }}> <td style={{ padding: '0.6rem 0.85rem' }}>
<strong style={{ fontSize: '0.95rem', color: 'var(--text-primary)' }}> <strong style={{ fontSize: '0.95rem', color: isSel ? 'var(--blue-base)' : 'var(--text-primary)' }}>
Lote {l.codigo} Lote {l.codigo}
</strong> </strong>
{l.uf && l.uf !== l.codigo && ( {l.uf && l.uf !== l.codigo && (
<div style={{ fontSize: '0.75rem', color: 'var(--text-secondary)' }}>UF: {l.uf}</div> <div style={{ fontSize: '0.78rem', color: 'var(--text-secondary)' }}>UF: {l.uf}</div>
)} )}
</td> </td>
<td style={{ padding: '0.55rem 0.75rem', color: 'var(--text-primary)' }}> <td style={{ padding: '0.6rem 0.85rem', color: 'var(--text-primary)' }}>
{l.calle ? `${l.calle} ${l.numero || ''}`.trim() : 'Sin calle asignada'} {l.calle ? `${l.calle} ${l.numero || ''}`.trim() : 'Sin calle asignada'}
</td> </td>
<td style={{ padding: '0.55rem 0.75rem', color: 'var(--text-primary)' }}> <td style={{ padding: '0.6rem 0.85rem', color: 'var(--text-primary)' }}>
{l.propietario || <span style={{ color: 'var(--text-muted)' }}>-</span>} {l.propietario || <span style={{ color: 'var(--text-muted)' }}>-</span>}
</td> </td>
<td style={{ padding: '0.55rem 0.75rem' }}> <td style={{ padding: '0.6rem 0.85rem' }}>
<span <span
style={{ style={{
display: 'inline-block', display: 'inline-block',
padding: '0.2rem 0.5rem', padding: '0.25rem 0.6rem',
borderRadius: '4px', borderRadius: '4px',
fontSize: '0.75rem', fontSize: '0.78rem',
fontWeight: 600, fontWeight: 700,
backgroundColor: backgroundColor:
l.estado === 'Habilitado' || l.estado === 'Residencia Permanente' l.estado === 'Habilitado' || l.estado === 'Residencia Permanente'
? 'rgba(16, 185, 129, 0.15)' ? 'var(--status-success-bg)'
: 'rgba(239, 68, 68, 0.15)', : 'var(--status-danger-bg)',
color: color:
l.estado === 'Habilitado' || l.estado === 'Residencia Permanente' l.estado === 'Habilitado' || l.estado === 'Residencia Permanente'
? 'var(--status-success)' ? 'var(--status-success)'
: 'var(--status-danger)', : 'var(--status-danger)',
border: `1px solid ${
l.estado === 'Habilitado' || l.estado === 'Residencia Permanente'
? 'var(--status-success)'
: 'var(--status-danger)'
}`,
}} }}
> >
{l.estado || 'General'} {l.estado || 'General'}
@@ -338,24 +388,42 @@ export const LotSearchModal: React.FC<LotSearchModalProps> = ({
</div> </div>
{/* 2. SECCIÓN: PADRÓN DE RESIDENTES DEL LOTE SELECCIONADO */} {/* 2. SECCIÓN: PADRÓN DE RESIDENTES DEL LOTE SELECCIONADO */}
<div style={{ display: 'flex', flexDirection: 'column', gap: '0.35rem', flex: 1 }}> <div style={{ display: 'flex', flexDirection: 'column', gap: '0.4rem', flex: 1 }}>
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}> <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
<span style={{ fontSize: '0.8rem', fontWeight: 700, color: 'var(--text-secondary)', textTransform: 'uppercase' }}> <span
style={{
fontSize: '0.82rem',
fontWeight: 800,
color: 'var(--text-primary)',
letterSpacing: '0.04em',
textTransform: 'uppercase',
}}
>
Padrón de Residentes del Lote {selectedLot ? `"${selectedLot.codigo}"` : ''} ({residentes.length}){' '} Padrón de Residentes del Lote {selectedLot ? `"${selectedLot.codigo}"` : ''} ({residentes.length}){' '}
{isLoadingResidentes && '• Cargando residentes...'} {isLoadingResidentes && '• Cargando residentes...'}
</span> </span>
{/* Badge de Permiso del Lote */} {/* Badge de Permiso del Lote con Contraste Conforme WCAG */}
{lotPermission && ( {lotPermission && (
<div <div
style={{ style={{
fontSize: '0.8rem', fontSize: '0.8rem',
fontWeight: 700, fontWeight: 700,
padding: '0.2rem 0.6rem', padding: '0.25rem 0.65rem',
borderRadius: '4px', borderRadius: '6px',
backgroundColor: lotPermission.bg_color, backgroundColor:
color: lotPermission.color, lotPermission.estado === 'Habilitado'
border: `1px solid ${lotPermission.color}`, ? 'var(--status-success-bg)'
: 'var(--status-danger-bg)',
color:
lotPermission.estado === 'Habilitado'
? 'var(--status-success)'
: 'var(--status-danger)',
border: `1px solid ${
lotPermission.estado === 'Habilitado'
? 'var(--status-success)'
: 'var(--status-danger)'
}`,
}} }}
> >
{lotPermission.estado}: {lotPermission.detalle} {lotPermission.estado}: {lotPermission.detalle}
@@ -367,60 +435,76 @@ export const LotSearchModal: React.FC<LotSearchModalProps> = ({
style={{ style={{
flex: 1, flex: 1,
minHeight: '140px', minHeight: '140px',
maxHeight: '220px', maxHeight: '240px',
overflowY: 'auto', overflowY: 'auto',
border: '1px solid var(--border-subtle)', border: '1px solid var(--border-subtle)',
borderRadius: 'var(--radius-sm)', borderRadius: 'var(--radius-sm, 6px)',
backgroundColor: 'var(--bg-app)', backgroundColor: 'var(--bg-surface)',
boxShadow: 'var(--shadow-sm)',
}} }}
> >
{!selectedLot ? ( {!selectedLot ? (
<div style={{ padding: '1.5rem', textAlign: 'center', color: 'var(--text-secondary)', fontSize: '0.9rem' }}> <div style={{ padding: '1.75rem', textAlign: 'center', color: 'var(--text-secondary)', fontSize: '0.92rem' }}>
Seleccione un lote en la grilla superior para visualizar sus residentes y teléfonos. Seleccione un lote en la grilla superior para visualizar sus residentes y teléfonos.
</div> </div>
) : residentes.length === 0 && !isLoadingResidentes ? ( ) : residentes.length === 0 && !isLoadingResidentes ? (
<div style={{ padding: '1.5rem', textAlign: 'center', color: 'var(--text-secondary)', fontSize: '0.9rem' }}> <div style={{ padding: '1.75rem', textAlign: 'center', color: 'var(--text-secondary)', fontSize: '0.92rem' }}>
No hay residentes o contactos registrados en la ficha de este lote. No hay residentes o contactos registrados en la ficha de este lote.
</div> </div>
) : ( ) : (
<table style={{ width: '100%', borderCollapse: 'collapse', textAlign: 'left', fontSize: '0.85rem' }}> <table style={{ width: '100%', borderCollapse: 'collapse', textAlign: 'left', fontSize: '0.88rem' }}>
<thead> <thead>
<tr style={{ backgroundColor: 'var(--bg-surface)', borderBottom: '1px solid var(--border-subtle)' }}> <tr style={{ backgroundColor: 'var(--bg-surface-elevated, var(--bg-surface))', borderBottom: '1px solid var(--border-subtle)' }}>
<th style={{ padding: '0.5rem 0.75rem' }}>Residente</th> <th style={{ padding: '0.65rem 0.85rem', color: 'var(--text-secondary)', fontWeight: 700 }}>Residente</th>
<th style={{ padding: '0.5rem 0.75rem', width: '100px' }}>DNI</th> <th style={{ padding: '0.65rem 0.85rem', width: '110px', color: 'var(--text-secondary)', fontWeight: 700 }}>DNI</th>
<th style={{ padding: '0.5rem 0.75rem', width: '130px' }}>Perfil / Relación</th> <th style={{ padding: '0.65rem 0.85rem', width: '140px', color: 'var(--text-secondary)', fontWeight: 700 }}>Perfil / Relación</th>
<th style={{ padding: '0.5rem 0.75rem' }}>Teléfonos de Contacto</th> <th style={{ padding: '0.65rem 0.85rem', color: 'var(--text-secondary)', fontWeight: 700 }}>Teléfonos de Contacto</th>
<th style={{ padding: '0.5rem 0.75rem', width: '90px' }}>Estado</th> <th style={{ padding: '0.65rem 0.85rem', width: '100px', color: 'var(--text-secondary)', fontWeight: 700 }}>Estado</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{residentes.map((r) => ( {residentes.map((r) => (
<tr key={r.persona_id} style={{ borderBottom: '1px solid var(--border-subtle)' }}> <tr key={r.persona_id} style={{ borderBottom: '1px solid var(--border-subtle)' }}>
<td style={{ padding: '0.5rem 0.75rem', fontWeight: 600, color: 'var(--text-primary)' }}> <td style={{ padding: '0.6rem 0.85rem', fontWeight: 700, color: 'var(--text-primary)' }}>
{r.apellido}, {r.nombre} {r.apellido}, {r.nombre}
</td> </td>
<td style={{ padding: '0.5rem 0.75rem', color: 'var(--text-secondary)' }}> <td style={{ padding: '0.6rem 0.85rem', color: 'var(--text-secondary)' }}>
{r.documento || '-'} {r.documento || '-'}
</td> </td>
<td style={{ padding: '0.5rem 0.75rem' }}> <td style={{ padding: '0.6rem 0.85rem' }}>
<span className="badge badge-info" style={{ fontSize: '0.75rem' }}> <span
style={{
display: 'inline-block',
padding: '0.2rem 0.55rem',
borderRadius: '4px',
fontSize: '0.78rem',
fontWeight: 700,
backgroundColor: 'var(--status-info-bg)',
color: 'var(--status-info)',
border: '1px solid var(--status-info)',
}}
>
{r.perfil} {r.perfil}
</span> </span>
</td> </td>
<td style={{ padding: '0.5rem 0.75rem', color: 'var(--text-primary)' }}> <td style={{ padding: '0.6rem 0.85rem', color: 'var(--text-primary)' }}>
{r.telefonos && r.telefonos !== '-' ? ( {r.telefonos && r.telefonos !== '-' ? (
<div style={{ display: 'flex', alignItems: 'center', gap: '0.4rem', flexWrap: 'wrap' }}> <div style={{ display: 'flex', alignItems: 'center', gap: '0.5rem', flexWrap: 'wrap' }}>
<span>{r.telefonos}</span> <span style={{ fontWeight: 600 }}>{r.telefonos}</span>
<a <a
href={`tel:${r.telefonos.split('/')[0].trim()}`} href={`tel:${r.telefonos.split('/')[0].trim()}`}
style={{ style={{
fontSize: '0.75rem', fontSize: '0.78rem',
padding: '0.15rem 0.4rem', padding: '0.25rem 0.6rem',
backgroundColor: 'rgba(37, 99, 235, 0.15)', backgroundColor: 'var(--btn-blue)',
color: 'var(--accent-primary)', color: '#FFFFFF',
borderRadius: '4px', borderRadius: '6px',
textDecoration: 'none', textDecoration: 'none',
fontWeight: 600, fontWeight: 700,
boxShadow: 'var(--shadow-sm)',
display: 'inline-flex',
alignItems: 'center',
gap: '4px',
}} }}
> >
📞 Llamar 📞 Llamar
@@ -430,8 +514,8 @@ export const LotSearchModal: React.FC<LotSearchModalProps> = ({
<span style={{ color: 'var(--text-muted)' }}>Sin teléfono</span> <span style={{ color: 'var(--text-muted)' }}>Sin teléfono</span>
)} )}
</td> </td>
<td style={{ padding: '0.5rem 0.75rem' }}> <td style={{ padding: '0.6rem 0.85rem' }}>
<span style={{ fontSize: '0.75rem', color: 'var(--status-success)', fontWeight: 600 }}> <span style={{ fontSize: '0.8rem', color: 'var(--status-success)', fontWeight: 700 }}>
{r.estado} {r.estado}
</span> </span>
</td> </td>
@@ -447,25 +531,27 @@ export const LotSearchModal: React.FC<LotSearchModalProps> = ({
{/* Pie de Acciones del Modal */} {/* Pie de Acciones del Modal */}
<div <div
style={{ style={{
padding: '0.85rem 1.25rem', padding: '0.95rem 1.25rem',
backgroundColor: 'var(--bg-surface)', backgroundColor: 'var(--bg-surface)',
borderTop: '1px solid var(--border-subtle)', borderTop: '1px solid var(--border-subtle)',
display: 'flex', display: 'flex',
alignItems: 'center', alignItems: 'center',
justifyContent: 'space-between', justifyContent: 'space-between',
flexWrap: 'wrap',
gap: '0.75rem',
}} }}
> >
<div> <div>
{selectedLot ? ( {selectedLot ? (
<span style={{ fontSize: '0.9rem', color: 'var(--text-primary)' }}> <span style={{ fontSize: '0.95rem', color: 'var(--text-primary)' }}>
Lote seleccionado:{' '} Lote seleccionado:{' '}
<strong style={{ color: 'var(--accent-primary)', fontSize: '1rem' }}> <strong style={{ color: 'var(--blue-base)', fontSize: '1.05rem', fontWeight: 800 }}>
Lote {selectedLot.codigo} Lote {selectedLot.codigo}
</strong>{' '} </strong>{' '}
{selectedLot.calle ? `(${selectedLot.calle})` : ''} {selectedLot.calle ? `(${selectedLot.calle})` : ''}
</span> </span>
) : ( ) : (
<span style={{ fontSize: '0.85rem', color: 'var(--text-muted)' }}> <span style={{ fontSize: '0.88rem', color: 'var(--text-muted)' }}>
Seleccione un lote para continuar Seleccione un lote para continuar
</span> </span>
)} )}
@@ -476,7 +562,7 @@ export const LotSearchModal: React.FC<LotSearchModalProps> = ({
type="button" type="button"
className="btn btn-secondary" className="btn btn-secondary"
onClick={onClose} onClick={onClose}
style={{ minHeight: '44px', padding: '0 1.25rem' }} style={{ minHeight: '44px', padding: '0 1.25rem', borderRadius: '8px', fontWeight: 600 }}
> >
Cancelar Cancelar
</button> </button>
@@ -488,9 +574,11 @@ export const LotSearchModal: React.FC<LotSearchModalProps> = ({
style={{ style={{
minHeight: '44px', minHeight: '44px',
padding: '0 1.5rem', padding: '0 1.5rem',
fontWeight: 700, fontWeight: 800,
backgroundColor: 'var(--status-success)', backgroundColor: 'var(--status-success)',
color: '#fff', color: '#fff',
borderRadius: '8px',
boxShadow: 'var(--shadow-sm)',
}} }}
> >
✓ Seleccionar Lote ✓ Seleccionar Lote
@@ -0,0 +1,446 @@
// ==============================================================================
// Modal de Salida Masiva / Toque de Queda
// Paridad 1:1 con DlgSalidaMasiva (pct_dialogs.py:1593 - OneverAccess / OemspotPySYS)
// ==============================================================================
import React, { useState, useEffect, useMemo, useCallback } from 'react';
import { ActiveTicket, MassExitRequest } from '../../types';
import { accessApi } from '../../api/accessApi';
interface MassExitModalProps {
isOpen: boolean;
onClose: () => void;
moduloSalidaId: number;
onSuccess: (count: number) => void;
}
export const MassExitModal: React.FC<MassExitModalProps> = ({
isOpen,
onClose,
moduloSalidaId,
onSuccess,
}) => {
const [tickets, setTickets] = useState<ActiveTicket[]>([]);
const [isLoading, setIsLoading] = useState<boolean>(false);
const [filterText, setFilterText] = useState<string>('');
const [selectedTicketIds, setSelectedTicketIds] = useState<Set<number>>(new Set());
const [motivo, setMotivo] = useState<string>('Toque de queda / Cierre de jornada');
const [observaciones, setObservaciones] = useState<string>('');
const [isSubmitting, setIsSubmitting] = useState<boolean>(false);
const [errorMsg, setErrorMsg] = useState<string>('');
// Cargar tickets activos al abrir
const loadTickets = useCallback(async () => {
setIsLoading(true);
setErrorMsg('');
try {
const data = await accessApi.getActiveTickets();
setTickets(data);
} catch (e: any) {
console.error('Error al cargar tickets para salida masiva:', e);
setErrorMsg('No se pudieron cargar los tickets activos del predio.');
} finally {
setIsLoading(false);
}
}, []);
useEffect(() => {
if (isOpen) {
setSelectedTicketIds(new Set());
setFilterText('');
setObservaciones('');
loadTickets();
}
}, [isOpen, loadTickets]);
// Filtrado reactivo multi-término
const filteredTickets = useMemo(() => {
const terms = filterText.trim().toLowerCase().split(/\s+/).filter(Boolean);
if (terms.length === 0) return tickets;
return tickets.filter((t) => {
const ape = (t.apellido || '').toLowerCase();
const nom = (t.nombre || '').toLowerCase();
const doc = (t.documento || '').toLowerCase();
const pat = (t.patente || '').toLowerCase();
const lot = (t.lote_nombre || t.lote_codigo || String(t.lote_id || '')).toLowerCase();
const ent = (t.entidad || '').toLowerCase();
const blob = `${ape} ${nom} ${doc} ${pat} ${lot} ${ent}`;
return terms.every((term) => blob.includes(term));
});
}, [tickets, filterText]);
const handleToggleSelectAll = (select: boolean) => {
if (select) {
const allIds = new Set(filteredTickets.map((t) => t.ticket_id));
setSelectedTicketIds(allIds);
} else {
setSelectedTicketIds(new Set());
}
};
const handleToggleRow = (ticketId: number) => {
setSelectedTicketIds((prev) => {
const next = new Set(prev);
if (next.has(ticketId)) {
next.delete(ticketId);
} else {
next.add(ticketId);
}
return next;
});
};
const handleConfirmExit = async () => {
if (selectedTicketIds.size === 0) return;
const confirmMsg = `¿Confirma el egreso de ${selectedTicketIds.size} persona(s) por motivo "${motivo}"?`;
if (!window.confirm(confirmMsg)) return;
setIsSubmitting(true);
setErrorMsg('');
try {
const payload: MassExitRequest = {
ticket_ids: Array.from(selectedTicketIds),
modulo_salida_id: moduloSalidaId,
motivo,
observaciones,
};
const result = await accessApi.executeMassExit(payload);
onSuccess(result.egresados_count);
onClose();
} catch (e: any) {
console.error('Error al procesar salida masiva:', e);
setErrorMsg(e?.message || 'Error en el servidor al procesar la salida masiva.');
} finally {
setIsSubmitting(false);
}
};
if (!isOpen) return null;
return (
<div
style={{
position: 'fixed',
inset: 0,
backgroundColor: 'rgba(0, 0, 0, 0.70)',
backdropFilter: 'blur(4px)',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
zIndex: 1100,
padding: '1rem',
}}
onClick={(e) => {
if (e.target === e.currentTarget && !isSubmitting) onClose();
}}
>
<div
className="card"
style={{
width: '100%',
maxWidth: '1080px',
maxHeight: '92vh',
display: 'flex',
flexDirection: 'column',
boxShadow: 'var(--shadow-xl)',
border: '1.5px solid rgba(220, 38, 38, 0.4)',
borderRadius: 'var(--radius-md)',
backgroundColor: 'var(--bg-surface)',
overflow: 'hidden',
animation: 'fadeIn 0.15s ease-out',
}}
>
{/* Cabecera de Alerta */}
<div
style={{
padding: '1rem 1.25rem',
borderBottom: '1px solid var(--border-subtle)',
display: 'flex',
justifyContent: 'space-between',
alignItems: 'center',
backgroundColor: 'var(--bg-app)',
}}
>
<div style={{ display: 'flex', alignItems: 'center', gap: '0.75rem' }}>
<span style={{ fontSize: '1.8rem' }}>🚨</span>
<div>
<h3 style={{ margin: 0, fontSize: '1.25rem', fontWeight: 900, color: '#dc2626', letterSpacing: '0.5px' }}>
SALIDA MASIVA / TOQUE DE QUEDA
</h3>
<p style={{ margin: 0, fontSize: '0.8rem', color: 'var(--text-secondary)' }}>
Gestione el retiro rápido o simultáneo de visitas y ocupantes registrados actualmente dentro del predio.
</p>
</div>
</div>
<div style={{ display: 'flex', alignItems: 'center', gap: '0.75rem' }}>
<span
style={{
backgroundColor: 'rgba(59, 130, 246, 0.15)',
color: 'var(--accent-primary)',
border: '1.5px solid rgba(59, 130, 246, 0.3)',
borderRadius: '20px',
fontSize: '0.85rem',
fontWeight: 700,
padding: '0.35rem 1rem',
}}
>
Total en predio: <b>{tickets.length}</b> | Seleccionados: <b>{selectedTicketIds.size}</b>
</span>
<button
type="button"
className="btn btn-secondary"
onClick={onClose}
disabled={isSubmitting}
style={{ minHeight: '36px', minWidth: '36px', padding: 0 }}
>
✕
</button>
</div>
</div>
{errorMsg && (
<div style={{ padding: '0.75rem 1.25rem', backgroundColor: 'rgba(239, 68, 68, 0.15)', color: '#ef4444', fontWeight: 600, fontSize: '0.85rem', borderBottom: '1px solid rgba(239, 68, 68, 0.3)' }}>
⚠️ {errorMsg}
</div>
)}
{/* Barra de Búsqueda y Selección */}
<div
style={{
padding: '0.75rem 1.25rem',
borderBottom: '1px solid var(--border-subtle)',
backgroundColor: 'var(--bg-surface)',
display: 'flex',
gap: '0.6rem',
alignItems: 'center',
}}
>
<div style={{ flex: 1, position: 'relative' }}>
<input
type="text"
className="input-field"
placeholder="🔍 Filtrar por Documento, Apellido, Nombre, Lote o Patente..."
value={filterText}
onChange={(e) => setFilterText(e.target.value)}
style={{ minHeight: '40px' }}
/>
</div>
<button
type="button"
className="btn btn-secondary"
onClick={() => handleToggleSelectAll(true)}
style={{ minHeight: '40px', fontWeight: 600, fontSize: '0.85rem', whiteSpace: 'nowrap' }}
>
☑ Seleccionar Todos
</button>
<button
type="button"
className="btn btn-secondary"
onClick={() => handleToggleSelectAll(false)}
style={{ minHeight: '40px', fontWeight: 600, fontSize: '0.85rem', whiteSpace: 'nowrap' }}
>
☐ Deseleccionar
</button>
<button
type="button"
className="btn btn-secondary"
onClick={loadTickets}
disabled={isLoading}
style={{ minHeight: '40px', fontSize: '0.85rem', whiteSpace: 'nowrap' }}
>
🔄 Actualizar
</button>
</div>
{/* Grilla de Personas en Predio */}
<div style={{ flex: 1, overflowY: 'auto', padding: '0.5rem 1.25rem' }}>
<div
style={{
maxHeight: '360px',
overflowY: 'auto',
border: '1px solid var(--border-subtle)',
borderRadius: 'var(--radius-sm)',
backgroundColor: 'var(--bg-app)',
}}
>
{filteredTickets.length === 0 && !isLoading ? (
<div style={{ padding: '2rem', textAlign: 'center', color: 'var(--text-secondary)', fontSize: '0.9rem' }}>
No hay personas ingresadas actualmente que coincidan con el filtro.
</div>
) : (
<table style={{ width: '100%', borderCollapse: 'collapse', textAlign: 'left', fontSize: '0.85rem' }}>
<thead>
<tr style={{ backgroundColor: 'var(--bg-surface)', borderBottom: '1px solid var(--border-subtle)' }}>
<th style={{ padding: '0.55rem 0.6rem', width: '40px', textAlign: 'center' }}>✓</th>
<th style={{ padding: '0.55rem 0.6rem', width: '130px' }}>Ingreso</th>
<th style={{ padding: '0.55rem 0.6rem', width: '110px' }}>Documento</th>
<th style={{ padding: '0.55rem 0.6rem' }}>Apellido y Nombre</th>
<th style={{ padding: '0.55rem 0.6rem', width: '110px' }}>Lote / Destino</th>
<th style={{ padding: '0.55rem 0.6rem', width: '100px' }}>Patente</th>
<th style={{ padding: '0.55rem 0.6rem' }}>Rol / Entidad</th>
<th style={{ padding: '0.55rem 0.6rem', width: '80px' }}>Ticket</th>
</tr>
</thead>
<tbody>
{filteredTickets.map((t) => {
const isChecked = selectedTicketIds.has(t.ticket_id);
const nombreCompleto = `${t.apellido || ''} ${t.nombre || ''}`.trim() || 'Sin Nombre';
return (
<tr
key={t.ticket_id}
onClick={() => handleToggleRow(t.ticket_id)}
style={{
cursor: 'pointer',
backgroundColor: isChecked ? 'rgba(220, 38, 38, 0.16)' : 'transparent',
borderBottom: '1px solid var(--border-subtle)',
fontWeight: isChecked ? 700 : 400,
borderLeft: isChecked ? '4px solid #dc2626' : '4px solid transparent',
transition: 'background 0.1s ease',
}}
>
<td style={{ padding: '0.55rem 0.6rem', textAlign: 'center' }}>
<input
type="checkbox"
checked={isChecked}
onChange={() => handleToggleRow(t.ticket_id)}
style={{ cursor: 'pointer', width: '16px', height: '16px' }}
/>
</td>
<td style={{ padding: '0.55rem 0.6rem', fontSize: '0.78rem', color: 'var(--text-secondary)' }}>
{t.fecha_ingreso ? t.fecha_ingreso.slice(0, 16) : '-'}
</td>
<td style={{ padding: '0.55rem 0.6rem', color: 'var(--text-primary)' }}>
<strong>{t.documento || '-'}</strong>
</td>
<td style={{ padding: '0.55rem 0.6rem', color: 'var(--text-primary)' }}>
{nombreCompleto}
</td>
<td style={{ padding: '0.55rem 0.6rem' }}>
<span style={{ fontWeight: 600, color: 'var(--text-primary)' }}>
{t.lote_nombre ? `Lote ${t.lote_nombre}` : (t.lote_codigo ? `Lote ${t.lote_codigo}` : '-')}
</span>
</td>
<td style={{ padding: '0.55rem 0.6rem' }}>
{t.patente ? (
<span style={{ fontFamily: 'monospace', fontWeight: 700, color: 'var(--accent-primary)' }}>
{t.patente}
</span>
) : (
<span style={{ color: 'var(--text-muted)' }}>Peatonal</span>
)}
</td>
<td style={{ padding: '0.55rem 0.6rem', color: 'var(--text-secondary)' }}>
{t.entidad || (t.rol_id === 1 ? 'Conductor' : (t.patente ? 'Conductor' : 'Visitante'))}
</td>
<td style={{ padding: '0.55rem 0.6rem', color: 'var(--text-muted)', fontSize: '0.75rem' }}>
#{t.ticket_id}
</td>
</tr>
);
})}
</tbody>
</table>
)}
</div>
</div>
{/* Motivo y Observaciones */}
<div
style={{
padding: '0.85rem 1.25rem',
borderTop: '1px solid var(--border-subtle)',
backgroundColor: 'var(--bg-app)',
display: 'grid',
gridTemplateColumns: '260px 1fr',
gap: '1rem',
alignItems: 'center',
}}
>
<div>
<label style={{ display: 'block', fontSize: '0.75rem', fontWeight: 700, color: 'var(--text-secondary)', marginBottom: '0.25rem', textTransform: 'uppercase' }}>
Motivo Operativo:
</label>
<select
className="input-field"
value={motivo}
onChange={(e) => setMotivo(e.target.value)}
style={{ minHeight: '40px', fontWeight: 600 }}
>
<option value="Toque de queda / Cierre de jornada">Toque de queda / Cierre de jornada</option>
<option value="Evacuación preventiva de emergencia">Evacuación preventiva de emergencia</option>
<option value="Fin de evento masivo / Visitas">Fin de evento masivo / Visitas</option>
<option value="Cierre operativo nocturno">Cierre operativo nocturno</option>
<option value="Retiro por orden de administración">Retiro por orden de administración</option>
</select>
</div>
<div>
<label style={{ display: 'block', fontSize: '0.75rem', fontWeight: 700, color: 'var(--text-secondary)', marginBottom: '0.25rem', textTransform: 'uppercase' }}>
Observaciones adicionales:
</label>
<input
type="text"
className="input-field"
placeholder="Detalle o nota para el acta de auditoría..."
value={observaciones}
onChange={(e) => setObservaciones(e.target.value)}
style={{ minHeight: '40px' }}
/>
</div>
</div>
{/* Footer */}
<div
style={{
padding: '1rem 1.25rem',
borderTop: '1px solid var(--border-subtle)',
backgroundColor: 'var(--bg-surface)',
display: 'flex',
justifyContent: 'space-between',
alignItems: 'center',
}}
>
<div style={{ fontSize: '0.85rem', color: 'var(--text-secondary)' }}>
Carril de Egreso Asignado: <b>Módulo #{moduloSalidaId}</b>
</div>
<div style={{ display: 'flex', gap: '0.75rem' }}>
<button
type="button"
className="btn btn-secondary"
onClick={onClose}
disabled={isSubmitting}
style={{ minHeight: '44px', padding: '0 1.25rem' }}
>
Cancelar
</button>
<button
type="button"
className="btn btn-danger"
disabled={selectedTicketIds.size === 0 || isSubmitting}
onClick={handleConfirmExit}
style={{
minHeight: '44px',
padding: '0 1.75rem',
fontWeight: 900,
backgroundColor: '#dc2626',
color: '#ffffff',
border: 'none',
boxShadow: selectedTicketIds.size > 0 ? '0 0 12px rgba(220, 38, 38, 0.4)' : 'none',
}}
>
{isSubmitting
? 'Procesando...'
: `🚨 Confirmar Salida Masiva (${selectedTicketIds.size} seleccionados)`}
</button>
</div>
</div>
</div>
</div>
);
};
@@ -0,0 +1,269 @@
// ==============================================================================
// Modal de Ficha Técnica Completa de Persona
// Paridad 1:1 con DialogoFichaPersona (pct_view.py:435 - OneverAccess / OemspotPySYS)
// ==============================================================================
import React from 'react';
import { PersonPolicies, EntryFormData } from '../../types';
interface PersonProfileModalProps {
isOpen: boolean;
onClose: () => void;
personData: PersonPolicies | null;
formData?: EntryFormData;
}
export const PersonProfileModal: React.FC<PersonProfileModalProps> = ({
isOpen,
onClose,
personData,
formData,
}) => {
if (!isOpen) return null;
const doc = personData?.documento || formData?.documento || '-';
const ape = personData?.apellido || formData?.apellido || '';
const nom = personData?.nombre || formData?.nombre || '';
const nombreCompleto = `${ape} ${nom}`.trim() || 'Sin Nombre';
const sexo = personData?.sexo || formData?.sexo || 'M';
const entidad = formData?.entidad || '-';
const patente = formData?.patente || personData?.patente_sugerida || '-';
const rol = formData?.tipo_ingreso === 'CONDUCTOR' ? 'Conductor' : 'Peatón';
const rcNro = formData?.licencia_nro || personData?.licencia_nro || '-';
const rcEnt = formData?.licencia_entidad || personData?.licencia_entidad || '-';
const rcHasta = formData?.licencia_hasta || personData?.licencia_hasta || '-';
const psEmp = formData?.seguro_empresa || personData?.seguro_empresa || '-';
const psPol = formData?.seguro_poliza || personData?.seguro_poliza || '-';
const psHasta = formData?.seguro_hasta || personData?.seguro_hasta || '-';
const paEmp = formData?.art_empresa || personData?.art_empresa || '-';
const paPol = formData?.art_poliza || personData?.art_poliza || '-';
const paHasta = formData?.art_hasta || personData?.art_hasta || '-';
const obs = formData?.observaciones || personData?.observaciones || 'Sin observaciones registradas.';
const ticketActivoId = personData?.ticket_activo_id;
return (
<div
style={{
position: 'fixed',
inset: 0,
backgroundColor: 'rgba(0, 0, 0, 0.65)',
backdropFilter: 'blur(3px)',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
zIndex: 1050,
padding: '1rem',
}}
onClick={(e) => {
if (e.target === e.currentTarget) onClose();
}}
>
<div
className="card"
style={{
width: '100%',
maxWidth: '680px',
maxHeight: '90vh',
display: 'flex',
flexDirection: 'column',
boxShadow: 'var(--shadow-xl)',
border: '1px solid var(--border-subtle)',
borderRadius: 'var(--radius-md)',
backgroundColor: 'var(--bg-surface)',
overflow: 'hidden',
animation: 'fadeIn 0.15s ease-out',
}}
>
{/* Cabecera */}
<div
style={{
padding: '1rem 1.25rem',
borderBottom: '1px solid var(--border-subtle)',
display: 'flex',
justifyContent: 'space-between',
alignItems: 'center',
backgroundColor: 'var(--bg-app)',
}}
>
<div style={{ display: 'flex', alignItems: 'center', gap: '0.6rem' }}>
<span style={{ fontSize: '1.4rem' }}>📇</span>
<div>
<h3 style={{ margin: 0, fontSize: '1.15rem', fontWeight: 800, color: 'var(--accent-primary)' }}>
FICHA TÉCNICA: {nombreCompleto}
</h3>
<p style={{ margin: 0, fontSize: '0.8rem', color: 'var(--text-secondary)' }}>
DNI {doc} • Sexo: {sexo} • Rol actual: {rol}
</p>
</div>
</div>
<button
type="button"
className="btn btn-secondary"
onClick={onClose}
style={{ minHeight: '36px', minWidth: '36px', padding: 0 }}
>
✕
</button>
</div>
{/* Alerta Antipassback si tiene ticket activo */}
{ticketActivoId && (
<div
style={{
padding: '0.65rem 1.25rem',
backgroundColor: 'rgba(239, 68, 68, 0.15)',
borderBottom: '1px solid rgba(239, 68, 68, 0.3)',
display: 'flex',
alignItems: 'center',
gap: '0.6rem',
color: '#ef4444',
fontSize: '0.85rem',
fontWeight: 600,
}}
>
<span>⚠️</span>
<span>
Esta persona registra Ticket Activo dentro del predio (#{ticketActivoId}) desde{' '}
{personData?.ticket_activo_fecha || 'fecha no disponible'}.
</span>
</div>
)}
{/* Contenido / Secciones */}
<div style={{ flex: 1, overflowY: 'auto', padding: '1.25rem', display: 'flex', flexDirection: 'column', gap: '1rem' }}>
{/* 1. Datos Generales y Vehículo */}
<div
style={{
border: '1px solid var(--border-subtle)',
borderRadius: 'var(--radius-sm)',
padding: '0.85rem 1rem',
backgroundColor: 'var(--bg-app)',
}}
>
<div style={{ fontSize: '0.8rem', fontWeight: 700, color: 'var(--accent-primary)', marginBottom: '0.6rem', textTransform: 'uppercase' }}>
Identificación y Vínculo
</div>
<div style={{ display: 'grid', gridTemplateColumns: 'repeat(2, 1fr)', gap: '0.6rem', fontSize: '0.85rem' }}>
<div>
<span style={{ color: 'var(--text-secondary)' }}>Documento:</span>{' '}
<strong style={{ color: 'var(--text-primary)' }}>{doc}</strong>
</div>
<div>
<span style={{ color: 'var(--text-secondary)' }}>Entidad / Empresa:</span>{' '}
<strong style={{ color: 'var(--text-primary)' }}>{entidad}</strong>
</div>
<div>
<span style={{ color: 'var(--text-secondary)' }}>Patente Vehículo:</span>{' '}
<strong style={{ color: 'var(--text-primary)', fontFamily: 'monospace' }}>{patente}</strong>
</div>
<div>
<span style={{ color: 'var(--text-secondary)' }}>Patentes Registradas:</span>{' '}
<strong style={{ color: 'var(--text-primary)' }}>
{personData?.patentes_asociadas?.join(', ') || '-'}
</strong>
</div>
</div>
</div>
{/* 2. Coberturas y Licencias */}
<div
style={{
border: '1px solid var(--border-subtle)',
borderRadius: 'var(--radius-sm)',
padding: '0.85rem 1rem',
backgroundColor: 'var(--bg-app)',
}}
>
<div style={{ fontSize: '0.8rem', fontWeight: 700, color: 'var(--accent-primary)', marginBottom: '0.6rem', textTransform: 'uppercase' }}>
Pólizas de Cobertura y Habilitaciones
</div>
<div style={{ display: 'flex', flexDirection: 'column', gap: '0.6rem', fontSize: '0.85rem' }}>
{/* Licencia de Conducir */}
<div style={{ display: 'flex', justifyContent: 'space-between', borderBottom: '1px dashed var(--border-subtle)', paddingBottom: '0.4rem' }}>
<div>
<strong style={{ color: 'var(--text-primary)' }}>Licencia / Registro Conductor:</strong>{' '}
<span style={{ color: 'var(--text-secondary)' }}>Nro {rcNro} ({rcEnt})</span>
</div>
<div style={{ color: rcHasta.includes('20') ? 'var(--text-primary)' : 'var(--text-muted)' }}>
Vence: <strong>{rcHasta}</strong>
</div>
</div>
{/* Seguro Automotor */}
<div style={{ display: 'flex', justifyContent: 'space-between', borderBottom: '1px dashed var(--border-subtle)', paddingBottom: '0.4rem' }}>
<div>
<strong style={{ color: 'var(--text-primary)' }}>Seguro Automotor:</strong>{' '}
<span style={{ color: 'var(--text-secondary)' }}>{psEmp} (Póliza {psPol})</span>
</div>
<div style={{ color: psHasta.includes('20') ? 'var(--text-primary)' : 'var(--text-muted)' }}>
Vence: <strong>{psHasta}</strong>
</div>
</div>
{/* ART */}
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<div>
<strong style={{ color: 'var(--text-primary)' }}>Seguro ART / Acc. Personales:</strong>{' '}
<span style={{ color: 'var(--text-secondary)' }}>{paEmp} (Póliza {paPol})</span>
</div>
<div style={{ color: paHasta.includes('20') ? 'var(--text-primary)' : 'var(--text-muted)' }}>
Vence: <strong>{paHasta}</strong>
</div>
</div>
</div>
</div>
{/* 3. Observaciones */}
<div
style={{
border: '1px solid var(--border-subtle)',
borderRadius: 'var(--radius-sm)',
padding: '0.85rem 1rem',
backgroundColor: 'var(--bg-app)',
}}
>
<div style={{ fontSize: '0.8rem', fontWeight: 700, color: 'var(--accent-primary)', marginBottom: '0.4rem', textTransform: 'uppercase' }}>
Observaciones Registradas
</div>
<div
style={{
fontSize: '0.85rem',
color: 'var(--text-primary)',
fontStyle: obs === 'Sin observaciones registradas.' ? 'italic' : 'normal',
whiteSpace: 'pre-wrap',
lineHeight: '1.4',
}}
>
{obs}
</div>
</div>
</div>
{/* Footer */}
<div
style={{
padding: '1rem 1.25rem',
borderTop: '1px solid var(--border-subtle)',
backgroundColor: 'var(--bg-app)',
display: 'flex',
justifyContent: 'flex-end',
}}
>
<button
type="button"
className="btn btn-primary"
onClick={onClose}
style={{ minHeight: '44px', padding: '0 2rem', fontWeight: 700 }}
>
Cerrar Ficha (ESC)
</button>
</div>
</div>
</div>
);
};
@@ -0,0 +1,338 @@
// ==============================================================================
// Modal de Búsqueda Avanzada de Personas
// Paridad 1:1 con DialogoBuscarPersona (pct_dialogs.py - OneverAccess / OemspotPySYS)
// ==============================================================================
import React, { useState, useEffect, useRef, useCallback } from 'react';
import { PersonAdvancedSearchResult } from '../../types';
import { accessApi } from '../../api/accessApi';
interface PersonSearchModalProps {
isOpen: boolean;
onClose: () => void;
onSelect: (persona: PersonAdvancedSearchResult) => void;
initialSearch?: string;
}
export const PersonSearchModal: React.FC<PersonSearchModalProps> = ({
isOpen,
onClose,
onSelect,
initialSearch = '',
}) => {
const [query, setQuery] = useState<string>(initialSearch);
const [personas, setPersonas] = useState<PersonAdvancedSearchResult[]>([]);
const [isLoading, setIsLoading] = useState<boolean>(false);
const [selectedItem, setSelectedItem] = useState<PersonAdvancedSearchResult | null>(null);
const searchTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
const loadData = useCallback(async (searchTerm: string) => {
setIsLoading(true);
try {
const data = await accessApi.searchPeopleAdvanced(searchTerm, 50);
setPersonas(data);
if (data.length > 0) {
setSelectedItem((prev) => (prev ? (data.find((p) => p.PersonaID === prev.PersonaID) || data[0]) : data[0]));
} else {
setSelectedItem(null);
}
} catch (e) {
console.error('Error al buscar personas:', e);
setPersonas([]);
setSelectedItem(null);
} finally {
setIsLoading(false);
}
}, []);
useEffect(() => {
if (isOpen) {
setQuery(initialSearch);
loadData(initialSearch);
} else {
setQuery('');
setSelectedItem(null);
}
}, [isOpen, initialSearch, loadData]);
const handleQueryChange = (text: string) => {
setQuery(text);
if (searchTimerRef.current) {
clearTimeout(searchTimerRef.current);
}
searchTimerRef.current = setTimeout(() => {
loadData(text);
}, 250);
};
const handleConfirm = (item?: PersonAdvancedSearchResult | null) => {
const target = item || selectedItem;
if (!target) return;
onSelect(target);
onClose();
};
if (!isOpen) return null;
return (
<div
style={{
position: 'fixed',
inset: 0,
backgroundColor: 'rgba(0, 0, 0, 0.65)',
backdropFilter: 'blur(3px)',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
zIndex: 1050,
padding: '1rem',
}}
onClick={(e) => {
if (e.target === e.currentTarget) onClose();
}}
>
<div
className="card"
style={{
width: '100%',
maxWidth: '850px',
maxHeight: '90vh',
display: 'flex',
flexDirection: 'column',
boxShadow: 'var(--shadow-xl)',
border: '1px solid var(--border-subtle)',
borderRadius: 'var(--radius-md)',
backgroundColor: 'var(--bg-surface)',
overflow: 'hidden',
animation: 'fadeIn 0.15s ease-out',
}}
>
{/* Header */}
<div
style={{
padding: '1rem 1.25rem',
borderBottom: '1px solid var(--border-subtle)',
display: 'flex',
justifyContent: 'space-between',
alignItems: 'center',
backgroundColor: 'var(--bg-app)',
}}
>
<div style={{ display: 'flex', alignItems: 'center', gap: '0.6rem' }}>
<span style={{ fontSize: '1.4rem' }}>👤</span>
<div>
<h3 style={{ margin: 0, fontSize: '1.15rem', fontWeight: 700, color: 'var(--text-primary)' }}>
Búsqueda Avanzada de Personas
</h3>
<p style={{ margin: 0, fontSize: '0.8rem', color: 'var(--text-secondary)' }}>
Búsqueda por Documento, Nombre, Apellido, Nro de Socio o Lote vinculado.
</p>
</div>
</div>
<button
type="button"
className="btn btn-secondary"
onClick={onClose}
style={{ minHeight: '36px', minWidth: '36px', padding: 0 }}
>
✕
</button>
</div>
{/* Input de Búsqueda */}
<div
style={{
padding: '0.85rem 1.25rem',
borderBottom: '1px solid var(--border-subtle)',
backgroundColor: 'var(--bg-surface)',
display: 'flex',
gap: '0.75rem',
alignItems: 'center',
}}
>
<div style={{ flex: 1, position: 'relative' }}>
<input
type="text"
className="input-field"
placeholder="🔍 Escriba Documento, Apellido o Nombre..."
value={query}
onChange={(e) => handleQueryChange(e.target.value)}
onKeyDown={(e) => {
if (e.key === 'Enter') loadData(query);
}}
autoFocus
style={{ paddingRight: query ? '2.5rem' : '1rem', minHeight: '42px' }}
/>
{query && (
<button
type="button"
onClick={() => handleQueryChange('')}
style={{
position: 'absolute',
right: '0.75rem',
top: '50%',
transform: 'translateY(-50%)',
background: 'none',
border: 'none',
color: 'var(--text-muted)',
cursor: 'pointer',
fontSize: '1rem',
}}
>
✕
</button>
)}
</div>
<button
type="button"
className="btn btn-primary"
onClick={() => loadData(query)}
style={{ minHeight: '42px', padding: '0 1.25rem', fontWeight: 600 }}
>
Buscar
</button>
</div>
{/* Tabla */}
<div style={{ flex: 1, overflowY: 'auto', padding: '0.5rem 1.25rem' }}>
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', margin: '0.4rem 0' }}>
<span style={{ fontSize: '0.8rem', fontWeight: 700, color: 'var(--text-secondary)', textTransform: 'uppercase' }}>
Personas Encontradas ({personas.length}) {isLoading && '• Buscando...'}
</span>
<span style={{ fontSize: '0.75rem', color: 'var(--text-muted)' }}>
Doble clic para seleccionar y cargar
</span>
</div>
<div
style={{
maxHeight: '400px',
overflowY: 'auto',
border: '1px solid var(--border-subtle)',
borderRadius: 'var(--radius-sm)',
backgroundColor: 'var(--bg-app)',
}}
>
{personas.length === 0 && !isLoading ? (
<div style={{ padding: '2rem', textAlign: 'center', color: 'var(--text-secondary)', fontSize: '0.9rem' }}>
No se encontraron personas con los criterios de búsqueda ingresados.
</div>
) : (
<table style={{ width: '100%', borderCollapse: 'collapse', textAlign: 'left', fontSize: '0.85rem' }}>
<thead>
<tr style={{ backgroundColor: 'var(--bg-surface)', borderBottom: '1px solid var(--border-subtle)' }}>
<th style={{ padding: '0.55rem 0.75rem', width: '120px' }}>Documento</th>
<th style={{ padding: '0.55rem 0.75rem' }}>Apellido</th>
<th style={{ padding: '0.55rem 0.75rem' }}>Nombre</th>
<th style={{ padding: '0.55rem 0.75rem', width: '100px' }}>Nro Socio</th>
<th style={{ padding: '0.55rem 0.75rem', width: '130px' }}>Estado / Alerta</th>
</tr>
</thead>
<tbody>
{personas.map((p) => {
const isSel = selectedItem?.PersonaID === p.PersonaID;
const isBlacklist = p.Blacklist === 1;
return (
<tr
key={p.PersonaID}
onClick={() => setSelectedItem(p)}
onDoubleClick={() => handleConfirm(p)}
style={{
cursor: 'pointer',
backgroundColor: isSel ? 'rgba(37, 99, 235, 0.18)' : 'transparent',
borderBottom: '1px solid var(--border-subtle)',
fontWeight: isSel ? 700 : 400,
borderLeft: isSel ? '4px solid var(--accent-primary)' : '4px solid transparent',
transition: 'background 0.1s ease',
}}
>
<td style={{ padding: '0.55rem 0.75rem' }}>
<strong style={{ color: 'var(--text-primary)' }}>{p.Documento || '-'}</strong>
</td>
<td style={{ padding: '0.55rem 0.75rem', color: 'var(--text-primary)' }}>
{p.Apellido}
</td>
<td style={{ padding: '0.55rem 0.75rem', color: 'var(--text-primary)' }}>
{p.Nombre}
</td>
<td style={{ padding: '0.55rem 0.75rem', color: 'var(--text-secondary)' }}>
{p.NroSocio || '-'}
</td>
<td style={{ padding: '0.55rem 0.75rem' }}>
{isBlacklist ? (
<span
style={{
padding: '0.2rem 0.5rem',
borderRadius: '4px',
fontSize: '0.75rem',
fontWeight: 700,
backgroundColor: 'rgba(239, 68, 68, 0.2)',
color: '#ef4444',
}}
>
⛔ LISTA NEGRA
</span>
) : (
<span
style={{
padding: '0.2rem 0.5rem',
borderRadius: '4px',
fontSize: '0.75rem',
fontWeight: 600,
backgroundColor: 'rgba(16, 185, 129, 0.15)',
color: '#10b981',
}}
>
✔ Habilitado
</span>
)}
</td>
</tr>
);
})}
</tbody>
</table>
)}
</div>
</div>
{/* Footer */}
<div
style={{
padding: '1rem 1.25rem',
borderTop: '1px solid var(--border-subtle)',
backgroundColor: 'var(--bg-app)',
display: 'flex',
justifyContent: 'space-between',
alignItems: 'center',
}}
>
<div style={{ fontSize: '0.85rem', color: 'var(--text-secondary)' }}>
{selectedItem ? (
<span>
Seleccionado: <strong>{selectedItem.Apellido}, {selectedItem.Nombre}</strong> ({selectedItem.Documento})
</span>
) : (
'Ninguna persona seleccionada'
)}
</div>
<div style={{ display: 'flex', gap: '0.75rem' }}>
<button type="button" className="btn btn-secondary" onClick={onClose} style={{ minHeight: '44px', padding: '0 1.25rem' }}>
Cancelar
</button>
<button
type="button"
className="btn btn-primary"
disabled={!selectedItem}
onClick={() => handleConfirm()}
style={{ minHeight: '44px', padding: '0 1.5rem', fontWeight: 700 }}
>
✔ Seleccionar Persona
</button>
</div>
</div>
</div>
</div>
);
};
@@ -0,0 +1,353 @@
// ==============================================================================
// Modal de Visitas Preautorizadas (Invitados)
// Paridad 1:1 con DialogoBuscarPreautorizados (pct_dialogs.py - OneverAccess / OemspotPySYS)
// ==============================================================================
import React, { useState, useEffect, useRef, useCallback } from 'react';
import { Preauthorization } from '../../types';
import { accessApi } from '../../api/accessApi';
interface PreauthorizedModalProps {
isOpen: boolean;
onClose: () => void;
onSelect: (preaut: Preauthorization) => void;
initialSearch?: string;
}
export const PreauthorizedModal: React.FC<PreauthorizedModalProps> = ({
isOpen,
onClose,
onSelect,
initialSearch = '',
}) => {
const [query, setQuery] = useState<string>(initialSearch);
const [soloVigentes, setSoloVigentes] = useState<boolean>(true);
const [preautorizados, setPreautorizados] = useState<Preauthorization[]>([]);
const [isLoading, setIsLoading] = useState<boolean>(false);
const [selectedItem, setSelectedItem] = useState<Preauthorization | null>(null);
const searchTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
const loadData = useCallback(async (searchTerm: string, vigentes: boolean) => {
setIsLoading(true);
try {
const data = await accessApi.getPreauthorizations(searchTerm, vigentes);
setPreautorizados(data);
if (data.length > 0) {
setSelectedItem((prev) => (prev ? (data.find((p) => p.id === prev.id) || data[0]) : data[0]));
} else {
setSelectedItem(null);
}
} catch (e) {
console.error('Error al cargar preautorizados:', e);
setPreautorizados([]);
setSelectedItem(null);
} finally {
setIsLoading(false);
}
}, []);
useEffect(() => {
if (isOpen) {
setQuery(initialSearch);
loadData(initialSearch, soloVigentes);
} else {
setQuery('');
setSelectedItem(null);
}
}, [isOpen, initialSearch, loadData, soloVigentes]);
const handleQueryChange = (text: string) => {
setQuery(text);
if (searchTimerRef.current) {
clearTimeout(searchTimerRef.current);
}
searchTimerRef.current = setTimeout(() => {
loadData(text, soloVigentes);
}, 250);
};
const handleToggleVigentes = (e: React.ChangeEvent<HTMLSelectElement>) => {
const val = e.target.value === 'vigentes';
setSoloVigentes(val);
loadData(query, val);
};
const handleConfirm = (item?: Preauthorization | null) => {
const target = item || selectedItem;
if (!target) return;
onSelect(target);
onClose();
};
if (!isOpen) return null;
return (
<div
style={{
position: 'fixed',
inset: 0,
backgroundColor: 'rgba(0, 0, 0, 0.65)',
backdropFilter: 'blur(3px)',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
zIndex: 1050,
padding: '1rem',
}}
onClick={(e) => {
if (e.target === e.currentTarget) onClose();
}}
>
<div
className="card"
style={{
width: '100%',
maxWidth: '920px',
maxHeight: '90vh',
display: 'flex',
flexDirection: 'column',
boxShadow: 'var(--shadow-xl)',
border: '1px solid var(--border-subtle)',
borderRadius: 'var(--radius-md)',
backgroundColor: 'var(--bg-surface)',
overflow: 'hidden',
animation: 'fadeIn 0.15s ease-out',
}}
>
{/* Cabecera */}
<div
style={{
padding: '1rem 1.25rem',
borderBottom: '1px solid var(--border-subtle)',
display: 'flex',
justifyContent: 'space-between',
alignItems: 'center',
backgroundColor: 'var(--bg-app)',
}}
>
<div style={{ display: 'flex', alignItems: 'center', gap: '0.6rem' }}>
<span style={{ fontSize: '1.4rem' }}>📋</span>
<div>
<h3 style={{ margin: 0, fontSize: '1.15rem', fontWeight: 700, color: 'var(--text-primary)' }}>
Visitas Preautorizadas (Invitados)
</h3>
<p style={{ margin: 0, fontSize: '0.8rem', color: 'var(--text-secondary)' }}>
Seleccione un visitante preautorizado para precargar datos y lote al carril de entrada.
</p>
</div>
</div>
<button
type="button"
className="btn btn-secondary"
onClick={onClose}
style={{ minHeight: '36px', minWidth: '36px', padding: 0 }}
>
✕
</button>
</div>
{/* Filtros */}
<div
style={{
padding: '0.85rem 1.25rem',
borderBottom: '1px solid var(--border-subtle)',
backgroundColor: 'var(--bg-surface)',
display: 'flex',
gap: '0.75rem',
alignItems: 'center',
}}
>
<div style={{ flex: 1, position: 'relative' }}>
<input
type="text"
className="input-field"
placeholder="🔍 Filtrar por Visitante, Lote, Entidad o Documento..."
value={query}
onChange={(e) => handleQueryChange(e.target.value)}
onKeyDown={(e) => {
if (e.key === 'Enter') loadData(query, soloVigentes);
}}
autoFocus
style={{ paddingRight: query ? '2.5rem' : '1rem', minHeight: '42px' }}
/>
{query && (
<button
type="button"
onClick={() => handleQueryChange('')}
style={{
position: 'absolute',
right: '0.75rem',
top: '50%',
transform: 'translateY(-50%)',
background: 'none',
border: 'none',
color: 'var(--text-muted)',
cursor: 'pointer',
fontSize: '1rem',
}}
>
✕
</button>
)}
</div>
<select
className="input-field"
value={soloVigentes ? 'vigentes' : 'todas'}
onChange={handleToggleVigentes}
style={{ width: '180px', minHeight: '42px', fontWeight: 600 }}
>
<option value="vigentes">Vigentes Hoy</option>
<option value="todas">Todas las Fechas</option>
</select>
<button
type="button"
className="btn btn-primary"
onClick={() => loadData(query, soloVigentes)}
style={{ minHeight: '42px', padding: '0 1.25rem', fontWeight: 600 }}
>
Filtrar
</button>
</div>
{/* Tabla */}
<div style={{ flex: 1, overflowY: 'auto', padding: '0.5rem 1.25rem' }}>
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', margin: '0.4rem 0' }}>
<span style={{ fontSize: '0.8rem', fontWeight: 700, color: 'var(--text-secondary)', textTransform: 'uppercase' }}>
Resultados ({preautorizados.length}) {isLoading && '• Cargando...'}
</span>
<span style={{ fontSize: '0.75rem', color: 'var(--text-muted)' }}>
Doble clic para cargar al carril
</span>
</div>
<div
style={{
maxHeight: '400px',
overflowY: 'auto',
border: '1px solid var(--border-subtle)',
borderRadius: 'var(--radius-sm)',
backgroundColor: 'var(--bg-app)',
}}
>
{preautorizados.length === 0 && !isLoading ? (
<div style={{ padding: '2rem', textAlign: 'center', color: 'var(--text-secondary)', fontSize: '0.9rem' }}>
No hay visitas preautorizadas registradas con los filtros seleccionados.
</div>
) : (
<table style={{ width: '100%', borderCollapse: 'collapse', textAlign: 'left', fontSize: '0.85rem' }}>
<thead>
<tr style={{ backgroundColor: 'var(--bg-surface)', borderBottom: '1px solid var(--border-subtle)' }}>
<th style={{ padding: '0.55rem 0.75rem', width: '70px' }}>ID</th>
<th style={{ padding: '0.55rem 0.75rem', width: '110px' }}>Lote</th>
<th style={{ padding: '0.55rem 0.75rem' }}>Visitante</th>
<th style={{ padding: '0.55rem 0.75rem', width: '110px' }}>Documento</th>
<th style={{ padding: '0.55rem 0.75rem' }}>Entidad / Empresa</th>
<th style={{ padding: '0.55rem 0.75rem', width: '140px' }}>Vigencia</th>
</tr>
</thead>
<tbody>
{preautorizados.map((p) => {
const isSel = selectedItem?.id === p.id;
const nombreCompleto = `${p.apellido}, ${p.nombre}`.trim() || 'Sin Nombre';
return (
<tr
key={p.id}
onClick={() => setSelectedItem(p)}
onDoubleClick={() => handleConfirm(p)}
style={{
cursor: 'pointer',
backgroundColor: isSel ? 'rgba(37, 99, 235, 0.18)' : 'transparent',
borderBottom: '1px solid var(--border-subtle)',
fontWeight: isSel ? 700 : 400,
borderLeft: isSel ? '4px solid var(--accent-primary)' : '4px solid transparent',
transition: 'background 0.1s ease',
}}
>
<td style={{ padding: '0.55rem 0.75rem', color: 'var(--text-muted)' }}>#{p.id}</td>
<td style={{ padding: '0.55rem 0.75rem' }}>
<span
style={{
padding: '0.15rem 0.4rem',
borderRadius: '4px',
backgroundColor: 'rgba(59, 130, 246, 0.15)',
color: 'var(--accent-primary)',
fontWeight: 700,
}}
>
Lote {p.lote_nombre}
</span>
</td>
<td style={{ padding: '0.55rem 0.75rem', color: 'var(--text-primary)' }}>
<strong>{nombreCompleto}</strong>
{p.motivo && p.motivo !== p.documento && (
<div style={{ fontSize: '0.75rem', color: 'var(--text-secondary)' }}>{p.motivo}</div>
)}
</td>
<td style={{ padding: '0.55rem 0.75rem', color: 'var(--text-primary)' }}>
{p.documento || <span style={{ color: 'var(--text-muted)' }}>-</span>}
</td>
<td style={{ padding: '0.55rem 0.75rem', color: 'var(--text-secondary)' }}>
{p.entidad || '-'}
</td>
<td style={{ padding: '0.55rem 0.75rem', fontSize: '0.78rem', color: 'var(--text-secondary)' }}>
<div>{p.fecha_inicio ? p.fecha_inicio.slice(0, 10) : ''}</div>
<div style={{ color: 'var(--text-muted)' }}>hasta {p.fecha_fin ? p.fecha_fin.slice(0, 10) : ''}</div>
</td>
</tr>
);
})}
</tbody>
</table>
)}
</div>
</div>
{/* Footer */}
<div
style={{
padding: '1rem 1.25rem',
borderTop: '1px solid var(--border-subtle)',
backgroundColor: 'var(--bg-app)',
display: 'flex',
justifyContent: 'space-between',
alignItems: 'center',
}}
>
<div style={{ fontSize: '0.85rem', color: 'var(--text-secondary)' }}>
{selectedItem ? (
<span>
Seleccionado: <strong>{selectedItem.apellido}, {selectedItem.nombre}</strong> (Lote {selectedItem.lote_nombre})
</span>
) : (
'Ningún visitante seleccionado'
)}
</div>
<div style={{ display: 'flex', gap: '0.75rem' }}>
<button type="button" className="btn btn-secondary" onClick={onClose} style={{ minHeight: '44px', padding: '0 1.25rem' }}>
Cerrar
</button>
<button
type="button"
className="btn btn-success"
disabled={!selectedItem}
onClick={() => handleConfirm()}
style={{
minHeight: '44px',
padding: '0 1.5rem',
fontWeight: 700,
backgroundColor: '#10b981',
color: '#ffffff',
border: 'none',
}}
>
📋 Cargar al Carril de Entrada
</button>
</div>
</div>
</div>
</div>
);
};
@@ -0,0 +1,360 @@
// ==============================================================================
// Modal de Búsqueda Predictiva de Vehículos por Patente
// Paridad 1:1 con DialogoBuscarPatente (pct_dialogs.py - OneverAccess / OemspotPySYS)
// ==============================================================================
import React, { useState, useEffect, useRef, useCallback } from 'react';
import { VehicleSearchResult } from '../../types';
import { accessApi } from '../../api/accessApi';
interface VehicleSearchModalProps {
isOpen: boolean;
onClose: () => void;
onSelect: (vehiculo: VehicleSearchResult) => void;
esSalida?: boolean;
initialSearch?: string;
}
export const VehicleSearchModal: React.FC<VehicleSearchModalProps> = ({
isOpen,
onClose,
onSelect,
esSalida = false,
initialSearch = '',
}) => {
const [query, setQuery] = useState<string>(initialSearch);
const [vehiculos, setVehiculos] = useState<VehicleSearchResult[]>([]);
const [isLoading, setIsLoading] = useState<boolean>(false);
const [selectedItem, setSelectedItem] = useState<VehicleSearchResult | null>(null);
const searchTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
const loadData = useCallback(async (searchTerm: string) => {
setIsLoading(true);
try {
const data = await accessApi.searchVehicles(searchTerm, esSalida, 50);
setVehiculos(data);
if (data.length > 0) {
setSelectedItem((prev) => (prev ? (data.find((v) => v.patente === prev.patente) || data[0]) : data[0]));
} else {
setSelectedItem(null);
}
} catch (e) {
console.error('Error al buscar vehículos:', e);
setVehiculos([]);
setSelectedItem(null);
} finally {
setIsLoading(false);
}
}, [esSalida]);
useEffect(() => {
if (isOpen) {
const initUpper = (initialSearch || '').toUpperCase().trim();
setQuery(initUpper);
loadData(initUpper);
} else {
setQuery('');
setSelectedItem(null);
}
}, [isOpen, initialSearch, loadData]);
const handleQueryChange = (text: string) => {
const upper = text.toUpperCase();
setQuery(upper);
if (searchTimerRef.current) {
clearTimeout(searchTimerRef.current);
}
searchTimerRef.current = setTimeout(() => {
loadData(upper);
}, 250);
};
const handleConfirm = (item?: VehicleSearchResult | null) => {
const target = item || selectedItem;
if (!target) return;
onSelect(target);
onClose();
};
if (!isOpen) return null;
const tituloModo = esSalida ? 'Salida (Vehículos en Predio)' : 'Entrada (Padrón de Vehículos)';
return (
<div
style={{
position: 'fixed',
inset: 0,
backgroundColor: 'rgba(0, 0, 0, 0.65)',
backdropFilter: 'blur(3px)',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
zIndex: 1050,
padding: '1rem',
}}
onClick={(e) => {
if (e.target === e.currentTarget) onClose();
}}
>
<div
className="card"
style={{
width: '100%',
maxWidth: '880px',
maxHeight: '90vh',
display: 'flex',
flexDirection: 'column',
boxShadow: 'var(--shadow-xl)',
border: '1px solid var(--border-subtle)',
borderRadius: 'var(--radius-md)',
backgroundColor: 'var(--bg-surface)',
overflow: 'hidden',
animation: 'fadeIn 0.15s ease-out',
}}
>
{/* Header */}
<div
style={{
padding: '1rem 1.25rem',
borderBottom: '1px solid var(--border-subtle)',
display: 'flex',
justifyContent: 'space-between',
alignItems: 'center',
backgroundColor: 'var(--bg-app)',
}}
>
<div style={{ display: 'flex', alignItems: 'center', gap: '0.6rem' }}>
<span style={{ fontSize: '1.4rem' }}>🚗</span>
<div>
<h3 style={{ margin: 0, fontSize: '1.15rem', fontWeight: 700, color: 'var(--text-primary)' }}>
Búsqueda de Vehículos por Patente — {tituloModo}
</h3>
<p style={{ margin: 0, fontSize: '0.8rem', color: 'var(--text-secondary)' }}>
{esSalida
? 'Filtre por patente, conductor o lote para seleccionar vehículos con ticket activo.'
: 'Filtre en el padrón de automotores registrados con datos de pólizas y titulares.'}
</p>
</div>
</div>
<button
type="button"
className="btn btn-secondary"
onClick={onClose}
style={{ minHeight: '36px', minWidth: '36px', padding: 0 }}
>
✕
</button>
</div>
{/* Input de Búsqueda */}
<div
style={{
padding: '0.85rem 1.25rem',
borderBottom: '1px solid var(--border-subtle)',
backgroundColor: 'var(--bg-surface)',
display: 'flex',
gap: '0.75rem',
alignItems: 'center',
}}
>
<div style={{ flex: 1, position: 'relative' }}>
<input
type="text"
className="input-field"
placeholder="🔍 Escriba parte de la patente, titular, modelo o DNI..."
value={query}
onChange={(e) => handleQueryChange(e.target.value)}
onKeyDown={(e) => {
if (e.key === 'Enter') loadData(query);
}}
autoFocus
style={{
paddingRight: query ? '2.5rem' : '1rem',
minHeight: '42px',
textTransform: 'uppercase',
fontWeight: 600,
letterSpacing: '1px',
}}
/>
{query && (
<button
type="button"
onClick={() => handleQueryChange('')}
style={{
position: 'absolute',
right: '0.75rem',
top: '50%',
transform: 'translateY(-50%)',
background: 'none',
border: 'none',
color: 'var(--text-muted)',
cursor: 'pointer',
fontSize: '1rem',
}}
>
✕
</button>
)}
</div>
<button
type="button"
className="btn btn-primary"
onClick={() => loadData(query)}
style={{ minHeight: '42px', padding: '0 1.25rem', fontWeight: 600 }}
>
Buscar
</button>
</div>
{/* Tabla */}
<div style={{ flex: 1, overflowY: 'auto', padding: '0.5rem 1.25rem' }}>
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', margin: '0.4rem 0' }}>
<span style={{ fontSize: '0.8rem', fontWeight: 700, color: 'var(--text-secondary)', textTransform: 'uppercase' }}>
Coincidencias ({vehiculos.length}) {isLoading && '• Buscando...'}
</span>
<span style={{ fontSize: '0.75rem', color: 'var(--text-muted)' }}>
Doble clic para cargar al formulario
</span>
</div>
<div
style={{
maxHeight: '400px',
overflowY: 'auto',
border: '1px solid var(--border-subtle)',
borderRadius: 'var(--radius-sm)',
backgroundColor: 'var(--bg-app)',
}}
>
{vehiculos.length === 0 && !isLoading ? (
<div style={{ padding: '2rem', textAlign: 'center', color: 'var(--text-secondary)', fontSize: '0.9rem' }}>
No se encontraron vehículos coincidentes con los filtros especificados.
</div>
) : (
<table style={{ width: '100%', borderCollapse: 'collapse', textAlign: 'left', fontSize: '0.85rem' }}>
<thead>
<tr style={{ backgroundColor: 'var(--bg-surface)', borderBottom: '1px solid var(--border-subtle)' }}>
<th style={{ padding: '0.55rem 0.75rem', width: '110px' }}>Patente</th>
<th style={{ padding: '0.55rem 0.75rem' }}>Marca / Modelo</th>
<th style={{ padding: '0.55rem 0.75rem' }}>Conductor / Titular</th>
<th style={{ padding: '0.55rem 0.75rem', width: '110px' }}>DNI</th>
{esSalida ? (
<>
<th style={{ padding: '0.55rem 0.75rem', width: '110px' }}>Lote</th>
<th style={{ padding: '0.55rem 0.75rem', width: '130px' }}>Ingreso</th>
</>
) : (
<th style={{ padding: '0.55rem 0.75rem', width: '130px' }}>Vigencia Seguro</th>
)}
</tr>
</thead>
<tbody>
{vehiculos.map((v, idx) => {
const isSel = selectedItem?.patente === v.patente;
const nombreCompleto = `${v.apellido} ${v.nombre}`.trim() || '-';
const marcaModelo = `${v.marca} ${v.modelo}`.trim() || '-';
return (
<tr
key={`${v.patente}-${v.ticket_id || idx}`}
onClick={() => setSelectedItem(v)}
onDoubleClick={() => handleConfirm(v)}
style={{
cursor: 'pointer',
backgroundColor: isSel ? 'rgba(37, 99, 235, 0.18)' : 'transparent',
borderBottom: '1px solid var(--border-subtle)',
fontWeight: isSel ? 700 : 400,
borderLeft: isSel ? '4px solid var(--accent-primary)' : '4px solid transparent',
transition: 'background 0.1s ease',
}}
>
<td style={{ padding: '0.55rem 0.75rem' }}>
<span
style={{
display: 'inline-block',
padding: '0.2rem 0.5rem',
borderRadius: '4px',
backgroundColor: 'rgba(37, 99, 235, 0.15)',
color: 'var(--accent-primary)',
fontWeight: 800,
fontFamily: 'monospace',
fontSize: '0.95rem',
}}
>
{v.patente}
</span>
</td>
<td style={{ padding: '0.55rem 0.75rem', color: 'var(--text-primary)' }}>
{marcaModelo}
</td>
<td style={{ padding: '0.55rem 0.75rem', color: 'var(--text-primary)' }}>
{nombreCompleto}
</td>
<td style={{ padding: '0.55rem 0.75rem', color: 'var(--text-secondary)' }}>
{v.documento || '-'}
</td>
{esSalida ? (
<>
<td style={{ padding: '0.55rem 0.75rem' }}>
<span style={{ fontWeight: 600, color: 'var(--text-primary)' }}>
{v.lote ? `Lote ${v.lote}` : '-'}
</span>
</td>
<td style={{ padding: '0.55rem 0.75rem', fontSize: '0.78rem', color: 'var(--text-secondary)' }}>
{v.fecha_ingreso || '-'}
</td>
</>
) : (
<td style={{ padding: '0.55rem 0.75rem', fontSize: '0.8rem', color: 'var(--text-secondary)' }}>
{v.vigencia_seguro ? v.vigencia_seguro.slice(0, 10) : '-'}
</td>
)}
</tr>
);
})}
</tbody>
</table>
)}
</div>
</div>
{/* Footer */}
<div
style={{
padding: '1rem 1.25rem',
borderTop: '1px solid var(--border-subtle)',
backgroundColor: 'var(--bg-app)',
display: 'flex',
justifyContent: 'space-between',
alignItems: 'center',
}}
>
<div style={{ fontSize: '0.85rem', color: 'var(--text-secondary)' }}>
{selectedItem ? (
<span>
Seleccionado: <strong>{selectedItem.patente}</strong> ({selectedItem.marca} {selectedItem.modelo})
</span>
) : (
'Ningún vehículo seleccionado'
)}
</div>
<div style={{ display: 'flex', gap: '0.75rem' }}>
<button type="button" className="btn btn-secondary" onClick={onClose} style={{ minHeight: '44px', padding: '0 1.25rem' }}>
Cancelar
</button>
<button
type="button"
className="btn btn-primary"
disabled={!selectedItem}
onClick={() => handleConfirm()}
style={{ minHeight: '44px', padding: '0 1.5rem', fontWeight: 700 }}
>
✔ Seleccionar Patente
</button>
</div>
</div>
</div>
</div>
);
};
@@ -13,6 +13,8 @@ import {
HybridBinarizer, HybridBinarizer,
GlobalHistogramBinarizer, GlobalHistogramBinarizer,
} from '@zxing/library'; } from '@zxing/library';
import { Camera, CameraResultType, CameraSource } from '@capacitor/camera';
import { Capacitor } from '@capacitor/core';
import { accessApi } from '../../api/accessApi'; import { accessApi } from '../../api/accessApi';
import { DNIParsedResult } from '../../types'; import { DNIParsedResult } from '../../types';
@@ -560,6 +562,43 @@ export const CameraScannerModal: React.FC<CameraScannerModalProps> = ({
reader.readAsDataURL(file); reader.readAsDataURL(file);
}; };
// Captura nativa con plugin oficial de Capacitor (Android Tablet Samsung)
const handleCapacitorPhoto = async () => {
if (!Capacitor.isNativePlatform()) {
fileInputRef.current?.click();
return;
}
try {
const photo = await Camera.getPhoto({
quality: 92,
allowEditing: false,
resultType: CameraResultType.DataUrl,
source: CameraSource.Camera,
});
if (photo.dataUrl) {
stopCamera();
const img = new Image();
img.onload = async () => {
const canvas = document.createElement('canvas');
canvas.width = img.width;
canvas.height = img.height;
const ctx = canvas.getContext('2d');
if (ctx) {
ctx.drawImage(img, 0, 0);
setCapturedPhotoUrl(photo.dataUrl!);
await processImageExtraction(canvas);
}
};
img.src = photo.dataUrl;
}
} catch (err: any) {
if (err.message && !err.message.includes('User cancelled') && !err.message.includes('cancelled')) {
setErrorMsg(`Error en cámara nativa: ${err.message}`);
}
}
};
// Reintentar captura volviendo a la cámara en vivo // Reintentar captura volviendo a la cámara en vivo
const handleRetake = () => { const handleRetake = () => {
setCapturedPhotoUrl(null); setCapturedPhotoUrl(null);
@@ -656,7 +695,7 @@ export const CameraScannerModal: React.FC<CameraScannerModalProps> = ({
justifyContent: 'space-between', justifyContent: 'space-between',
padding: '0.85rem 1.25rem', padding: '0.85rem 1.25rem',
borderBottom: '1px solid var(--border-subtle)', borderBottom: '1px solid var(--border-subtle)',
backgroundColor: 'var(--bg-card)', backgroundColor: 'var(--bg-surface)',
}} }}
> >
<div style={{ display: 'flex', alignItems: 'center', gap: '0.75rem' }}> <div style={{ display: 'flex', alignItems: 'center', gap: '0.75rem' }}>
@@ -902,19 +941,19 @@ export const CameraScannerModal: React.FC<CameraScannerModalProps> = ({
{errorMsg && ( {errorMsg && (
<div <div
style={{ style={{
padding: '0.75rem 1.25rem', padding: '0.85rem 1.25rem',
backgroundColor: 'rgba(239, 68, 68, 0.15)', backgroundColor: 'var(--status-danger-bg)',
color: 'var(--status-danger)', color: 'var(--status-danger)',
fontSize: '0.85rem', fontSize: '0.88rem',
fontWeight: 600, fontWeight: 700,
borderBottom: '1px solid rgba(239, 68, 68, 0.3)', borderBottom: '1px solid var(--status-danger)',
display: 'flex', display: 'flex',
alignItems: 'center', alignItems: 'center',
gap: '0.5rem', gap: '0.65rem',
}} }}
> >
<span>⚠️</span> <span style={{ fontSize: '1.15rem' }}>⚠️</span>
<span style={{ flex: 1 }}>{errorMsg}</span> <span style={{ flex: 1, lineHeight: 1.35 }}>{errorMsg}</span>
</div> </div>
)} )}
@@ -925,7 +964,8 @@ export const CameraScannerModal: React.FC<CameraScannerModalProps> = ({
display: 'flex', display: 'flex',
flexDirection: 'column', flexDirection: 'column',
gap: '0.75rem', gap: '0.75rem',
backgroundColor: 'var(--bg-card)', backgroundColor: 'var(--bg-surface)',
borderTop: '1px solid var(--border-subtle)',
}} }}
> >
{/* Selector de cámara si hay más de 1 lente */} {/* Selector de cámara si hay más de 1 lente */}
@@ -1001,11 +1041,11 @@ export const CameraScannerModal: React.FC<CameraScannerModalProps> = ({
<button <button
type="button" type="button"
className="btn btn-secondary" className="btn btn-secondary"
onClick={() => fileInputRef.current?.click()} onClick={handleCapacitorPhoto}
style={{ minHeight: '54px', padding: '0 1rem', fontSize: '0.9rem' }} style={{ minHeight: '54px', padding: '0 1rem', fontSize: '0.9rem' }}
title="Tomar foto con app nativa o subir archivo" title="Tomar foto con app nativa de cámara o subir archivo"
> >
📁 Galería / App 📸 Cámara App / Galería
</button> </button>
</> </>
) : step === 'SUCCESS' ? ( ) : step === 'SUCCESS' ? (
+31 -3
View File
@@ -11,7 +11,12 @@ interface AuthContextType {
setWorkstation: (name: string) => void; setWorkstation: (name: string) => void;
isAuthenticated: boolean; isAuthenticated: boolean;
loading: boolean; loading: boolean;
login: (username: string, password: string, workstationName?: string) => Promise<void>; login: (
username: string,
password: string,
workstationName?: string,
rememberMe?: boolean
) => Promise<void>;
logout: () => Promise<void>; logout: () => Promise<void>;
} }
@@ -34,6 +39,8 @@ export const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ children
const me = await authApi.getMe(); const me = await authApi.getMe();
setUser(me); setUser(me);
} catch { } catch {
// Sesión expirada o token inválido
localStorage.removeItem('on_ever_token');
setUser(null); setUser(null);
} finally { } finally {
setLoading(false); setLoading(false);
@@ -44,9 +51,28 @@ export const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ children
checkSession(); checkSession();
}, [checkSession]); }, [checkSession]);
const login = async (username: string, password: string, workstationName?: string) => { const login = async (
username: string,
password: string,
workstationName?: string,
rememberMe: boolean = true
) => {
const targetWks = workstationName || workstation; const targetWks = workstationName || workstation;
const res = await authApi.login(username, password, targetWks); const res = await authApi.login(username, password, targetWks, rememberMe);
// Guardar token persistente para tablets/PWA si rememberMe está activo
if (res.token) {
if (rememberMe) {
localStorage.setItem('on_ever_token', res.token);
} else {
sessionStorage.setItem('on_ever_token', res.token);
}
}
// Guardar usuario y puesto en localStorage para el próximo inicio
localStorage.setItem('on_ever_username', username);
localStorage.setItem('on_ever_remember_me', rememberMe ? 'true' : 'false');
setUser(res.user); setUser(res.user);
if (res.workstation) { if (res.workstation) {
setWorkstation(res.workstation); setWorkstation(res.workstation);
@@ -57,6 +83,8 @@ export const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ children
try { try {
await authApi.logout(); await authApi.logout();
} finally { } finally {
localStorage.removeItem('on_ever_token');
sessionStorage.removeItem('on_ever_token');
setUser(null); setUser(null);
} }
}; };
+3 -3
View File
@@ -2,6 +2,7 @@
// Hook de Comunicación en Tiempo Real vía WebSocket // Hook de Comunicación en Tiempo Real vía WebSocket
// ============================================================================== // ==============================================================================
import { useEffect, useRef, useState, useCallback } from 'react'; import { useEffect, useRef, useState, useCallback } from 'react';
import { getWsBaseUrl } from '../api/client';
interface WebSocketMessage { interface WebSocketMessage {
type: string; type: string;
@@ -22,9 +23,8 @@ export function useWebSocket({ stationName, onMessage }: UseWebSocketOptions) {
const connect = useCallback(() => { const connect = useCallback(() => {
if (!stationName) return; if (!stationName) return;
const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:'; const wsBase = getWsBaseUrl();
const host = window.location.host; const url = `${wsBase}/ws/station/${encodeURIComponent(stationName)}`;
const url = `${protocol}//${host}/ws/station/${encodeURIComponent(stationName)}`;
try { try {
const socket = new WebSocket(url); const socket = new WebSocket(url);
+344 -89
View File
@@ -25,6 +25,8 @@ html, body {
touch-action: manipulation; touch-action: manipulation;
overscroll-behavior-y: contain; overscroll-behavior-y: contain;
user-select: none; user-select: none;
margin: 0;
padding: 0;
} }
#root { #root {
@@ -598,13 +600,30 @@ button:disabled, .btn:disabled, .touch-button:disabled {
.desktop-top-header { .desktop-top-header {
height: 48px; height: 48px;
background-color: #070D1E; background-color: var(--bg-surface, #070D1E);
border-bottom: 1px solid #14203B; border-bottom: 1px solid var(--border-subtle, #14203B);
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding: 0 16px; padding: 0 12px;
flex-shrink: 0; flex-shrink: 0;
overflow-x: auto;
scrollbar-width: none;
}
.desktop-top-header::-webkit-scrollbar {
display: none;
}
@media (max-width: 900px) {
.desktop-top-header {
padding: 0 8px;
gap: 4px;
}
.desktop-tab-btn {
padding: 0 10px;
font-size: 12px;
}
} }
.desktop-tab-btn { .desktop-tab-btn {
@@ -630,107 +649,331 @@ button:disabled, .btn:disabled, .touch-button:disabled {
border-bottom: 3px solid #2563EB; border-bottom: 3px solid #2563EB;
} }
.desktop-cockpit-grid { .desktop-menu-hamburger-btn {
flex: 1; background: var(--input-bg);
display: grid; border: 1px solid var(--border);
grid-template-columns: 240px 1fr 210px;
gap: 10px;
padding: 8px 12px;
overflow-y: auto;
background-color: #070D1E;
}
.desktop-groupbox {
background-color: #0B132B;
border: 1px solid #1E2D56;
border-radius: 8px; border-radius: 8px;
padding: 10px 12px; color: var(--text-1);
display: flex; padding: 6px 12px;
flex-direction: column;
gap: 8px;
box-sizing: border-box;
}
.desktop-groupbox-title {
font-size: 12px;
font-weight: 600;
color: #8E9CAE;
margin-bottom: 4px;
display: flex;
align-items: center;
gap: 6px;
}
.desktop-input {
background-color: #091124;
border: 1px solid #1E2D56;
border-radius: 4px;
color: #F1F5F9;
font-size: 12px;
padding: 4px 8px;
height: 28px;
width: 100%;
box-sizing: border-box;
outline: none;
transition: border-color 0.15s ease;
}
.desktop-input:focus {
border-color: #3B82F6;
box-shadow: 0 0 4px rgba(59, 130, 246, 0.4);
}
.desktop-select {
background-color: #091124;
border: 1px solid #1E2D56;
border-radius: 4px;
color: #F1F5F9;
font-size: 12px;
padding: 2px 6px;
height: 28px;
outline: none;
}
.desktop-label {
font-size: 11px;
font-weight: 600;
color: #94A3B8;
white-space: nowrap;
}
.desktop-btn-action {
font-size: 11px;
font-weight: 700;
padding: 5px 8px;
height: 30px;
border-radius: 4px;
border: none;
cursor: pointer; cursor: pointer;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
transition: all 0.15s ease;
user-select: none;
}
.desktop-menu-hamburger-btn:hover {
background: var(--hover-bg, rgba(255, 255, 255, 0.08));
border-color: var(--brand-primary, #3B82F6);
}
/* ==============================================================================
NUEVO FLUJO COCKPIT UNIFICADO (OPTIMIZADO TABLETS Y ESCRITORIO)
Orden exacto: DATOS PERSONA -> UBICACION/DESTINO & OBSERVACIONES ->
DOCUMENTACION Y POLIZAS -> LECTOR & CAMARAS -> HISTORIAL
============================================================================== */
.cockpit-flow-container {
flex: 1;
display: flex;
flex-direction: column;
gap: 8px;
padding: 8px 12px;
overflow-y: auto;
-webkit-overflow-scrolling: touch;
background-color: var(--bg-main, #0B1120);
}
.cockpit-dual-row {
display: grid;
grid-template-columns: 1.15fr 1fr;
gap: 8px;
}
@media (max-width: 680px) {
.cockpit-dual-row {
grid-template-columns: 1fr;
}
}
.cockpit-bottom-dock {
display: flex;
align-items: center;
gap: 8px;
padding: 8px 14px;
padding-bottom: max(10px, env(safe-area-inset-bottom, 0px));
background-color: var(--bg-surface, #070D1E);
border-top: 1px solid var(--border-strong, #1E293B);
position: sticky;
bottom: 0;
z-index: 100;
box-shadow: 0 -4px 16px rgba(0, 0, 0, 0.35);
flex-shrink: 0;
}
@keyframes slideInRight {
from {
transform: translateX(100%);
}
to {
transform: translateX(0);
}
}
.desktop-cockpit-grid {
flex: 1;
display: grid;
grid-template-columns: 225px 1fr 215px;
gap: 8px;
padding: 6px 10px;
overflow-y: auto;
-webkit-overflow-scrolling: touch;
background-color: var(--bg-main, #0B1120);
}
.desktop-groupbox {
background-color: var(--bg-surface, #1E293B);
border: 1px solid var(--border, #334155);
border-radius: 8px;
padding: 8px 10px;
display: flex;
flex-direction: column;
gap: 6px;
box-sizing: border-box;
box-shadow: var(--shadow-sm, 0 1px 3px rgba(0, 0, 0, 0.3));
}
.desktop-groupbox-title {
font-size: 0.8rem;
font-weight: 800;
color: var(--text-2, #93C5FD);
letter-spacing: 0.03em;
text-transform: uppercase;
margin-bottom: 1px;
display: flex;
align-items: center;
gap: 5px;
}
.desktop-input {
background-color: var(--input-bg, #0F172A);
border: 1px solid var(--border-strong, #475569);
border-radius: 6px;
color: var(--text-1, #F8FAFC);
font-size: 0.88rem;
padding: 4px 8px;
min-height: 36px;
width: 100%;
box-sizing: border-box;
outline: none;
transition: border-color 0.15s ease, box-shadow 0.15s ease, background-color 0.15s ease;
}
.desktop-input:focus {
border-color: var(--blue-base, #3B82F6);
box-shadow: 0 0 0 2px rgba(37, 99, 235, 0.3);
}
.desktop-select {
background-color: var(--input-bg, #0F172A);
border: 1px solid var(--border-strong, #475569);
border-radius: 6px;
color: var(--text-1, #F8FAFC);
font-size: 0.88rem;
padding: 4px 8px;
min-height: 36px;
outline: none;
transition: border-color 0.15s ease, box-shadow 0.15s ease;
}
.desktop-select:focus {
border-color: var(--blue-base, #3B82F6);
box-shadow: 0 0 0 2px rgba(37, 99, 235, 0.3);
}
.desktop-label {
font-size: 0.8rem;
font-weight: 700;
color: var(--text-2, #CBD5E1);
white-space: nowrap;
}
.desktop-btn-action {
font-size: 0.82rem;
font-weight: 700;
padding: 5px 10px;
min-height: 36px;
border-radius: 6px;
border: none;
cursor: pointer;
display: inline-flex;
align-items: center;
justify-content: center;
gap: 5px; gap: 5px;
white-space: nowrap; white-space: nowrap;
transition: filter 0.15s ease; transition: background-color 0.15s ease, transform 0.05s ease, filter 0.15s ease, box-shadow 0.15s ease;
color: #FFFFFF;
touch-action: manipulation;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
} }
.desktop-btn-action:hover { .desktop-btn-action:hover {
filter: brightness(1.15); filter: brightness(1.12);
} }
@media (max-width: 1100px) { .desktop-btn-action:active {
transform: scale(0.98);
}
/* Variantes de Color Oficiales para Cockpit y Puestos de Control */
.desktop-btn-blue {
background-color: var(--btn-blue, #2563EB) !important;
color: #FFFFFF !important;
}
.desktop-btn-blue:hover {
background-color: var(--btn-blue-hover, #3B82F6) !important;
}
.desktop-btn-green {
background-color: var(--btn-green, #10B981) !important;
color: #FFFFFF !important;
}
.desktop-btn-green:hover {
background-color: var(--btn-green-hover, #059669) !important;
}
.desktop-btn-red {
background-color: var(--btn-red, #EF4444) !important;
color: #FFFFFF !important;
}
.desktop-btn-red:hover {
background-color: var(--btn-red-hover, #DC2626) !important;
}
.desktop-btn-slate {
background-color: var(--btn-slate, #475569) !important;
color: #FFFFFF !important;
}
.desktop-btn-slate:hover {
background-color: var(--btn-slate-hover, #64748B) !important;
}
.desktop-btn-cyan {
background-color: var(--btn-cyan, #0284C7) !important;
color: #FFFFFF !important;
}
.desktop-btn-cyan:hover {
background-color: var(--btn-cyan-hover, #0369A1) !important;
}
.desktop-btn-purple {
background-color: var(--btn-purple, #7C3AED) !important;
color: #FFFFFF !important;
}
.desktop-btn-purple:hover {
background-color: var(--btn-purple-hover, #6D28D9) !important;
}
.desktop-avatar-box {
width: 100%;
height: 75px;
background-color: var(--input-bg, #091124);
border: 1px dashed var(--border-strong, #334155);
border-radius: 6px;
display: flex;
align-items: center;
justify-content: center;
overflow: hidden;
}
/* ==============================================================================
RESPONSIVIDAD Y ERGONOMÍA PARA TABLETS SAMSUNG GALAXY TAB (16:10 - 1280x800 / 1340x800)
============================================================================== */
/* Modo Horizontal (Landscape) en Tablets y Escritorios (ancho >= 768px y orientacion landscape) */
@media (orientation: landscape) and (min-width: 768px) {
.desktop-cockpit-grid { .desktop-cockpit-grid {
grid-template-columns: 220px 1fr 190px !important; display: grid !important;
grid-template-columns: 225px 1fr 220px !important;
gap: 8px !important;
padding: 6px 8px !important;
padding-bottom: 6px !important;
height: calc(100vh - 48px) !important;
overflow-y: auto !important;
}
.desktop-column-actions {
display: flex !important;
grid-column: auto !important;
}
.tablet-portrait-dock {
display: none !important;
}
.desktop-card-action-buttons,
.desktop-card-hardware-buttons {
display: flex !important;
} }
} }
@media (max-width: 880px) { /* Modo Horizontal en pantallas medianas / compactas (1024px a 1180px) */
@media (orientation: landscape) and (max-width: 1180px) and (min-width: 840px) {
.desktop-cockpit-grid { .desktop-cockpit-grid {
grid-template-columns: 1fr !important; grid-template-columns: 215px 1fr 205px !important;
gap: 6px !important;
padding: 4px 6px !important;
} }
} }
/* Soporte de Tema Claro para Cockpit de Escritorio */ /* Modo Vertical (Portrait) en Tablets Samsung Galaxy Tab (ancho CSS 500px a 960px) -> 2 Columnas */
@media (orientation: portrait) and (min-width: 500px), (max-width: 960px) and (orientation: portrait) {
.desktop-cockpit-grid {
display: grid !important;
grid-template-columns: 245px 1fr !important;
gap: 8px !important;
padding: 6px 8px !important;
padding-bottom: 70px !important;
overflow-y: auto !important;
}
.desktop-column-actions {
display: none !important; /* Sus acciones están ancladas en tablet-portrait-dock */
}
.tablet-portrait-dock {
display: flex !important;
}
}
/* Modo Celular o Pantalla Ultra Angosta (<500px) */
@media (max-width: 499px) {
.desktop-cockpit-grid {
display: flex !important;
flex-direction: column !important;
gap: 8px !important;
padding: 6px 8px !important;
padding-bottom: 70px !important;
overflow-y: auto !important;
}
.desktop-column-actions {
display: none !important;
}
.tablet-portrait-dock {
display: flex !important;
}
}
/* Dock de Acciones Rápidas para Modo Vertical (Portrait) */
.tablet-portrait-dock {
display: none;
align-items: center;
gap: 8px;
padding: 8px 12px;
background-color: var(--bg-surface);
border-top: 1px solid var(--border-strong);
position: sticky;
bottom: 0;
z-index: 100;
box-shadow: 0 -4px 12px rgba(0, 0, 0, 0.35);
}
/* ==============================================================================
SOPORTE TEMA CLARO (LIGHT) - ALTO CONTRASTE WCAG AA+
============================================================================== */
[data-theme="light"] .desktop-shell { [data-theme="light"] .desktop-shell {
background-color: #F1F5F9; background-color: #F1F5F9;
color: #0F172A; color: #0F172A;
@@ -757,17 +1000,17 @@ button:disabled, .btn:disabled, .touch-button:disabled {
[data-theme="light"] .desktop-groupbox { [data-theme="light"] .desktop-groupbox {
background-color: #FFFFFF; background-color: #FFFFFF;
border: 1px solid #CBD5E1; border: 1px solid #CBD5E1;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05); box-shadow: 0 1px 4px rgba(0, 0, 0, 0.06);
} }
[data-theme="light"] .desktop-groupbox-title { [data-theme="light"] .desktop-groupbox-title {
color: #475569; color: #1E3A8A;
} }
[data-theme="light"] .desktop-input, [data-theme="light"] .desktop-input,
[data-theme="light"] .desktop-select { [data-theme="light"] .desktop-select {
background-color: #F8FAFC; background-color: #FFFFFF;
border: 1px solid #CBD5E1; border: 1px solid #94A3B8;
color: #0F172A; color: #0F172A;
} }
@@ -775,6 +1018,7 @@ button:disabled, .btn:disabled, .touch-button:disabled {
[data-theme="light"] .desktop-select:focus { [data-theme="light"] .desktop-select:focus {
border-color: #0284C7; border-color: #0284C7;
background-color: #FFFFFF; background-color: #FFFFFF;
box-shadow: 0 0 0 2px rgba(2, 132, 199, 0.25);
} }
[data-theme="light"] .desktop-label { [data-theme="light"] .desktop-label {
@@ -783,6 +1027,17 @@ button:disabled, .btn:disabled, .touch-button:disabled {
[data-theme="light"] .desktop-avatar-box { [data-theme="light"] .desktop-avatar-box {
background-color: #F8FAFC; background-color: #F8FAFC;
border: 1px dashed #CBD5E1; border: 1px dashed #94A3B8;
} }
[data-theme="light"] .cockpit-flow-container {
background-color: #F1F5F9;
}
[data-theme="light"] .cockpit-bottom-dock {
background-color: #FFFFFF;
border-top: 1px solid #CBD5E1;
box-shadow: 0 -4px 12px rgba(0, 0, 0, 0.08);
}
+54 -20
View File
@@ -8,6 +8,7 @@
/* --- PALETA DARK (Por defecto - Modo Nocturno Garita) --- */ /* --- PALETA DARK (Por defecto - Modo Nocturno Garita) --- */
--bg-main: #0B1120; --bg-main: #0B1120;
--bg-sidebar: #1E293B; --bg-sidebar: #1E293B;
--bg-card: #1E293B;
--text-1: #F8FAFC; --text-1: #F8FAFC;
--text-2: #CBD5E1; --text-2: #CBD5E1;
--text-3: #94A3B8; --text-3: #94A3B8;
@@ -19,9 +20,9 @@
--danger: #EF4444; --danger: #EF4444;
--danger-hover: #F87171; --danger-hover: #F87171;
--warning: #F59E0B; --warning: #F59E0B;
--selection-bg: #2563EB; --selection-bg: rgba(37, 99, 235, 0.25);
--selection-text: #FFFFFF; --selection-text: #FFFFFF;
--hover-bg: #1E293B; --hover-bg: #273549;
--input-bg: #0F172A; --input-bg: #0F172A;
--btn-text: #FFFFFF; --btn-text: #FFFFFF;
--sidebar-icon: #FFFFFF; --sidebar-icon: #FFFFFF;
@@ -32,7 +33,7 @@
--bg-surface-elevated: #334155; --bg-surface-elevated: #334155;
--bg-surface-highlight: #273549; --bg-surface-highlight: #273549;
--border-subtle: #1E293B; --border-subtle: #334155;
--border-strong: #475569; --border-strong: #475569;
--text-primary: var(--text-1); --text-primary: var(--text-1);
@@ -45,37 +46,53 @@
--accent: #38BDF8; --accent: #38BDF8;
--accent-primary: var(--blue-base); --accent-primary: var(--blue-base);
/* Variantes de Color para Botones y Acciones Táctiles */
--btn-blue: #2563EB;
--btn-blue-hover: #3B82F6;
--btn-green: #10B981;
--btn-green-hover: #059669;
--btn-red: #EF4444;
--btn-red-hover: #DC2626;
--btn-slate: #475569;
--btn-slate-hover: #64748B;
--btn-cyan: #0284C7;
--btn-cyan-hover: #0369A1;
--btn-purple: #7C3AED;
--btn-purple-hover: #6D28D9;
--color-success: var(--success); --color-success: var(--success);
--status-success: #34D399; --status-success: #34D399;
--status-success-bg: rgba(16, 185, 129, 0.18); --status-success-bg: rgba(16, 185, 129, 0.22);
--color-success-bg: var(--status-success-bg); --color-success-bg: var(--status-success-bg);
--color-danger: var(--danger); --color-danger: var(--danger);
--status-danger: #F87171; --status-danger: #F87171;
--status-danger-bg: rgba(239, 68, 68, 0.2); --status-danger-bg: rgba(239, 68, 68, 0.22);
--color-danger-bg: var(--status-danger-bg); --color-danger-bg: var(--status-danger-bg);
--color-warning: var(--warning); --color-warning: var(--warning);
--status-warning: #FBBF24; --status-warning: #FBBF24;
--status-warning-bg: rgba(245, 158, 11, 0.2); --status-warning-bg: rgba(245, 158, 11, 0.22);
--color-info: #38BDF8; --color-info: #38BDF8;
--status-info: #38BDF8; --status-info: #38BDF8;
--status-info-bg: rgba(56, 189, 248, 0.18); --status-info-bg: rgba(56, 189, 248, 0.2);
/* Touch Targets y Ergonomía */ /* Touch Targets y Ergonomía Samsung Galaxy Tab A11 */
--touch-min-size: 48px; --touch-min-size: 44px;
--touch-button-height: 48px; --touch-button-height: 44px;
--touch-input-height: 44px; --touch-input-height: 42px;
--touch-radius: 10px; --touch-radius: 8px;
--radius-sm: 6px;
--radius-md: 10px; --radius-md: 10px;
--radius-lg: 12px; --radius-lg: 12px;
--radius-xl: 16px;
/* Tipografía */ /* Tipografía */
--font-family: 'Segoe UI', 'Roboto', system-ui, -apple-system, sans-serif; --font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
--font-size-xs: 0.75rem; --font-size-xs: 0.75rem;
--font-size-sm: 0.875rem; --font-size-sm: 0.875rem;
--font-size-base: 0.9375rem; --font-size-base: 0.95rem;
--font-size-lg: 1.125rem; --font-size-lg: 1.125rem;
--font-size-xl: 1.25rem; --font-size-xl: 1.25rem;
--font-size-2xl: 1.5rem; --font-size-2xl: 1.5rem;
@@ -84,12 +101,14 @@
--shadow-sm: 0 1px 3px rgba(0, 0, 0, 0.4); --shadow-sm: 0 1px 3px rgba(0, 0, 0, 0.4);
--shadow-md: 0 4px 8px -1px rgba(0, 0, 0, 0.5); --shadow-md: 0 4px 8px -1px rgba(0, 0, 0, 0.5);
--shadow-lg: 0 10px 20px -3px rgba(0, 0, 0, 0.6); --shadow-lg: 0 10px 20px -3px rgba(0, 0, 0, 0.6);
--shadow-xl: 0 20px 25px -5px rgba(0, 0, 0, 0.7), 0 8px 10px -6px rgba(0, 0, 0, 0.7);
} }
/* --- PALETA LIGHT (OnEverDesignSystem Light - Alto Contraste y Nitidez) --- */ /* --- PALETA LIGHT (OnEverDesignSystem Light - Alto Contraste y Nitidez) --- */
[data-theme="light"] { [data-theme="light"] {
--bg-main: #F1F5F9; --bg-main: #F1F5F9;
--bg-sidebar: #FFFFFF; --bg-sidebar: #FFFFFF;
--bg-card: #FFFFFF;
--text-1: #0F172A; --text-1: #0F172A;
--text-2: #334155; --text-2: #334155;
--text-3: #64748B; --text-3: #64748B;
@@ -97,13 +116,13 @@
--divider: #E2E8F0; --divider: #E2E8F0;
--blue-base: #0284C7; --blue-base: #0284C7;
--blue-hover: #0369A1; --blue-hover: #0369A1;
--success: #16A34A; --success: #15803D;
--danger: #DC2626; --danger: #DC2626;
--danger-hover: #B91C1C; --danger-hover: #B91C1C;
--warning: #B45309; --warning: #B45309;
--selection-bg: #E0F2FE; --selection-bg: #E0F2FE;
--selection-text: #0369A1; --selection-text: #0369A1;
--hover-bg: #E2E8F0; --hover-bg: #F1F5F9;
--input-bg: #FFFFFF; --input-bg: #FFFFFF;
--btn-text: #FFFFFF; --btn-text: #FFFFFF;
--sidebar-icon: #334155; --sidebar-icon: #334155;
@@ -126,25 +145,40 @@
--accent: #0284C7; --accent: #0284C7;
--accent-primary: var(--blue-base); --accent-primary: var(--blue-base);
/* Variantes de Color para Botones y Acciones Táctiles en Light */
--btn-blue: #0284C7;
--btn-blue-hover: #0369A1;
--btn-green: #15803D;
--btn-green-hover: #166534;
--btn-red: #DC2626;
--btn-red-hover: #B91C1C;
--btn-slate: #64748B;
--btn-slate-hover: #475569;
--btn-cyan: #0891B2;
--btn-cyan-hover: #0E7490;
--btn-purple: #7C3AED;
--btn-purple-hover: #6D28D9;
--color-success: var(--success); --color-success: var(--success);
--status-success: #15803D; --status-success: #15803D;
--status-success-bg: rgba(22, 163, 74, 0.12); --status-success-bg: rgba(22, 163, 74, 0.14);
--color-success-bg: var(--status-success-bg); --color-success-bg: var(--status-success-bg);
--color-danger: var(--danger); --color-danger: var(--danger);
--status-danger: #B91C1C; --status-danger: #B91C1C;
--status-danger-bg: rgba(220, 38, 38, 0.12); --status-danger-bg: rgba(220, 38, 38, 0.14);
--color-danger-bg: var(--status-danger-bg); --color-danger-bg: var(--status-danger-bg);
--color-warning: var(--warning); --color-warning: var(--warning);
--status-warning: #B45309; --status-warning: #B45309;
--status-warning-bg: rgba(217, 119, 6, 0.14); --status-warning-bg: rgba(217, 119, 6, 0.16);
--color-info: #0369A1; --color-info: #0369A1;
--status-info: #0369A1; --status-info: #0369A1;
--status-info-bg: rgba(2, 132, 199, 0.12); --status-info-bg: rgba(2, 132, 199, 0.14);
--shadow-sm: 0 1px 3px rgba(15, 23, 42, 0.08); --shadow-sm: 0 1px 3px rgba(15, 23, 42, 0.08);
--shadow-md: 0 4px 6px -1px rgba(15, 23, 42, 0.1); --shadow-md: 0 4px 6px -1px rgba(15, 23, 42, 0.1);
--shadow-lg: 0 10px 15px -3px rgba(15, 23, 42, 0.12); --shadow-lg: 0 10px 15px -3px rgba(15, 23, 42, 0.12);
--shadow-xl: 0 20px 25px -5px rgba(15, 23, 42, 0.15), 0 8px 10px -6px rgba(15, 23, 42, 0.1);
} }
+78
View File
@@ -66,6 +66,7 @@ export interface EntryFormData {
licencia_hasta?: string; licencia_hasta?: string;
observaciones?: string; observaciones?: string;
forzar_ingreso_lote_restringido?: boolean; forzar_ingreso_lote_restringido?: boolean;
preautorizado_id?: number | null;
} }
export interface PersonPolicies { export interface PersonPolicies {
@@ -88,6 +89,9 @@ export interface PersonPolicies {
licencia_entidad?: string | null; licencia_entidad?: string | null;
licencia_hasta?: string | null; licencia_hasta?: string | null;
observaciones?: string | null; observaciones?: string | null;
ticket_activo_id?: number | null;
ticket_activo_modulo_ingreso?: string | null;
ticket_activo_fecha?: string | null;
} }
export interface VehicleDetails { export interface VehicleDetails {
@@ -100,6 +104,25 @@ export interface VehicleDetails {
apellido?: string | null; apellido?: string | null;
nombre?: string | null; nombre?: string | null;
documento?: string | null; documento?: string | null;
ticket_activo_id?: number | null;
}
export interface ScanHistoryItem {
documento: string;
apellido: string;
nombre: string;
sexo: string;
patente?: string;
hora: string;
}
export interface LanePendingSession {
moduleId: number;
form: EntryFormData;
integrantes: Companion[];
totalAdultos: number;
totalMenores: number;
timestamp: string;
} }
@@ -140,6 +163,10 @@ export interface ActiveTicket {
nombre: string; nombre: string;
patente?: string | null; patente?: string | null;
lote_codigo?: string | null; lote_codigo?: string | null;
lote_id?: number | null;
lote_nombre?: string | null;
entidad?: string | null;
rol_id?: number | null;
modulo_ingreso: string; modulo_ingreso: string;
fecha_ingreso: string; fecha_ingreso: string;
ocupantes: number; ocupantes: number;
@@ -202,3 +229,54 @@ export interface RecentMovement {
fecha_hora: string; fecha_hora: string;
entidad?: string | null; entidad?: string | null;
} }
export interface Preauthorization {
id: number;
lote_id: number;
lote_nombre: string;
entidad: string;
apellido: string;
nombre: string;
documento: string;
motivo: string;
fecha_inicio: string;
fecha_fin: string;
}
export interface VehicleSearchResult {
patente: string;
marca: string;
modelo: string;
apellido: string;
nombre: string;
documento: string;
lote: string;
fecha_ingreso: string;
vigencia_seguro: string;
ticket_id?: number | null;
}
export interface PersonAdvancedSearchResult {
PersonaID: number;
Apellido: string;
Nombre: string;
NroSocio?: string | number | null;
Blacklist: number;
Documento?: string | null;
}
export interface MassExitRequest {
ticket_ids: number[];
modulo_salida_id: number;
motivo: string;
observaciones?: string;
password_operador?: string;
}
export interface MassExitResult {
status: string;
egresados_count: number;
message: string;
salida_masiva_id: number;
}
+2 -2
View File
@@ -1,6 +1,6 @@
// ============================================================================== // ==============================================================================
// Información de Versión y Build de OnEverControl (OnEverAccess) // Información de Versión y Build de OnEverControl (OnEverAccess)
// ============================================================================== // ==============================================================================
export const APP_VERSION = 'v0.6.2'; export const APP_VERSION = 'v0.7.0-beta';
export const APP_BUILD = 'Build 2026.10.14'; export const APP_BUILD = 'Build 2026.10.29';
export const APP_NAME = 'OnEver Access · Control Web'; export const APP_NAME = 'OnEver Access · Control Web';

Some files were not shown because too many files have changed in this diff Show More