diff --git a/OnEverControl-v0.7.1-beta.apk b/OnEverControl-v0.7.1-beta.apk new file mode 100644 index 0000000..7858858 Binary files /dev/null and b/OnEverControl-v0.7.1-beta.apk differ diff --git a/OnEverControl-v0.7.2-beta.apk b/OnEverControl-v0.7.2-beta.apk new file mode 100644 index 0000000..550848b Binary files /dev/null and b/OnEverControl-v0.7.2-beta.apk differ diff --git a/frontend/android/app/src/main/java/com/oemspot/onevercontrol/MainActivity.java b/frontend/android/app/src/main/java/com/oemspot/onevercontrol/MainActivity.java index 0aeaae1..52427a0 100644 --- a/frontend/android/app/src/main/java/com/oemspot/onevercontrol/MainActivity.java +++ b/frontend/android/app/src/main/java/com/oemspot/onevercontrol/MainActivity.java @@ -1,5 +1,24 @@ package com.oemspot.onevercontrol; +import android.os.Bundle; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; import com.getcapacitor.BridgeActivity; -public class MainActivity extends BridgeActivity {} +public class MainActivity extends BridgeActivity { + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + // Prevenir que la barra de estado superior y la barra de navegación inferior del sistema tapen la app + ViewCompat.setOnApplyWindowInsetsListener(findViewById(android.R.id.content), (view, insets) -> { + int top = insets.getInsets(WindowInsetsCompat.Type.systemBars()).top; + int bottom = insets.getInsets(WindowInsetsCompat.Type.systemBars()).bottom; + int left = insets.getInsets(WindowInsetsCompat.Type.systemBars()).left; + int right = insets.getInsets(WindowInsetsCompat.Type.systemBars()).right; + + view.setPadding(left, top, right, bottom); + return insets; + }); + } +} diff --git a/frontend/android/app/src/main/res/values/styles.xml b/frontend/android/app/src/main/res/values/styles.xml index be874e5..c7c0b96 100644 --- a/frontend/android/app/src/main/res/values/styles.xml +++ b/frontend/android/app/src/main/res/values/styles.xml @@ -12,6 +12,7 @@ diff --git a/frontend/src/styles/base.css b/frontend/src/styles/base.css index 5f6ef49..a04c0f0 100644 --- a/frontend/src/styles/base.css +++ b/frontend/src/styles/base.css @@ -25,6 +25,12 @@ html, body { touch-action: manipulation; overscroll-behavior-y: contain; user-select: none; + + /* Safe Area Insets para prevenir solapamiento con la barra de estado y de navegación de Android */ + padding-top: env(safe-area-inset-top, 0px); + padding-bottom: env(safe-area-inset-bottom, 0px); + padding-left: env(safe-area-inset-left, 0px); + padding-right: env(safe-area-inset-right, 0px); } #root { @@ -647,6 +653,75 @@ button:disabled, .btn:disabled, .touch-button:disabled { border-bottom: 3px solid #2563EB; } +.desktop-menu-hamburger-btn { + background: var(--input-bg); + border: 1px solid var(--border); + border-radius: 8px; + color: var(--text-1); + padding: 6px 12px; + cursor: pointer; + display: flex; + align-items: 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; @@ -959,3 +1034,14 @@ button:disabled, .btn:disabled, .touch-button:disabled { 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); +} + + diff --git a/frontend/src/views/ControlPostView.tsx b/frontend/src/views/ControlPostView.tsx index 603c903..5321f74 100644 --- a/frontend/src/views/ControlPostView.tsx +++ b/frontend/src/views/ControlPostView.tsx @@ -134,6 +134,7 @@ export const ControlPostView: React.FC = () => { const [tipoIngresoLabel, setTipoIngresoLabel] = useState('Visita'); const [scannerInputValue, setScannerInputValue] = useState(''); const [isDocExpanded, setIsDocExpanded] = useState(false); + const [isMenuDrawerOpen, setIsMenuDrawerOpen] = useState(false); // Tickets activos y movimientos registrados en BD @@ -1152,42 +1153,10 @@ export const ControlPostView: React.FC = () => {
{/* Área Principal */}
- {/* Cabecera Superior: Usuario + Logo Infinito + Tabs Entrada/Salida + Puesto + Reloj */} + {/* Cabecera Superior: Tabs Entrada/Salida + Reloj + Menú Hamburguesa (☰) */}
-
-
- 👤 - {user?.username || 'root'} - -
- -
- OneverAccess -
-
- {/* Pestañas de Carriles: ENTRADA VISITAS / SALIDA DE VISITAS */} -
+
{laneTabs.map((tab) => { const isActive = tab.key === activeLaneTabKey; const isEntry = tab.direction === 'ENTRY'; @@ -1230,107 +1199,179 @@ export const ControlPostView: React.FC = () => { })}
- {/* Reloj, Puesto, Botón Tema y Pantalla Completa */} -
+ {/* Reloj y Botón Menú Hamburguesa (3 líneas) */} +
{actionSuccess && ( - + {actionSuccess} )} {actionError && ( - + {actionError} )} - - {/* Botón de Instalación Directa PWA (Solo visible cuando Chrome/Android detecta elegibilidad) */} - {deferredInstallPrompt && ( - - )} - - {/* Botón Selector Tema Claro / Oscuro */} - - - + {clock} + - {APP_VERSION}
+ {/* Drawer Lateral para opciones del sistema (Usuario, Puesto, Tema, Versión) */} + {isMenuDrawerOpen && ( +
setIsMenuDrawerOpen(false)} + style={{ + position: 'fixed', + top: 0, + left: 0, + right: 0, + bottom: 0, + backgroundColor: 'rgba(0, 0, 0, 0.6)', + zIndex: 9999, + display: 'flex', + justifyContent: 'flex-end', + animation: 'fadeIn 0.15s ease', + }} + > +
e.stopPropagation()} + style={{ + width: '320px', + maxWidth: '85vw', + height: '100%', + backgroundColor: 'var(--bg-surface)', + borderLeft: '1px solid var(--border)', + boxShadow: '-4px 0 24px rgba(0,0,0,0.5)', + display: 'flex', + flexDirection: 'column', + padding: '1.25rem', + gap: '1.2rem', + animation: 'slideInRight 0.2s ease', + }} + > + {/* Header Drawer */} +
+
+ Logo + OnEverControl +
+ +
+ + {/* 1. Usuario */} +
+ Operador Actual +
+
+ 👤 + {user?.username || 'root'} +
+ +
+
+ + {/* 2. Workstation */} +
+ Puesto de Control +
+
+ 🖥️ + {workstation} + ● +
+ +
+
+ + {/* 3. Selector Tema Claro / Oscuro */} +
+ Tema Visual + +
+ + {/* 4. Pantalla Completa */} +
+ Pantalla Completa + +
+ + {/* 5. Instalar PWA (si está disponible) */} + {deferredInstallPrompt && ( + + )} + + {/* Footer del Drawer con Versión y Build */} +
+ Versión: {APP_VERSION} + Compilación: {APP_BUILD} +
+
+
+ )} + {/* Notificación rápida */} {quickExitMessage && (
{
)} - {/* Cockpit 3 Columnas */} -
+ {/* ========================================================================= + FLUJO COCKPIT UNIFICADO (ORDEN EXACTO CAPTURA Y GUÍA OPERATIVA) + 1. DATOS PERSONA + 2. UBICACIÓN/DESTINO - OBSERVACIONES + 3. DOCUMENTACIÓN Y PÓLIZAS + 4. LECTOR DE DOCUMENTO/QR - CÁMARAS/IMÁGENES + 5. HISTORIAL DE ESCANEO + ========================================================================= */} +
{/* ========================================================================= - COLUMNA 1: LECTOR QR / DOCUMENTO + CÁMARAS / IMÁGENES + BLOQUE 1: DATOS PERSONA (Ancho Completo) ========================================================================= */} -
- {/* Groupbox Lector */} -
+
+ Datos Persona + + {/* Fila 1: Ingreso / Tipo Doc / Nro Doc / Radios Conductor - Peatón */} +
+
+ Ingreso: + +
+ + Nro Doc: + { + const raw = e.target.value; + const norm = normalizarDniInput(raw); + const docClean = norm.documento || raw; + setForm((prev) => ({ + ...prev, + documento: docClean, + ...(norm.sexo ? { sexo: norm.sexo } : {}), + })); + if (docClean.length >= 4) { + lookupPerson(docClean); + } + }} + onKeyDown={(e) => { + if (e.key === 'Enter') { + e.preventDefault(); + buscarPersonaOPatente(); + } + }} + /> +
+ + +
+
+ + {/* Fila 2: Nombre / Apellido */} +
+ Nombre: + setForm((prev) => ({ ...prev, nombre: e.target.value }))} + /> + Apellido: + setForm((prev) => ({ ...prev, apellido: e.target.value }))} + /> +
+ + {/* Fila 3: Entidad/Empresa / Adultos / Menores */} +
+ Entidad/Empresa: + setForm((prev) => ({ ...prev, entidad: e.target.value }))} + /> + Adultos: + setForm((prev) => ({ ...prev, cantidad_ocupantes: Math.max(1, parseInt(e.target.value) || 1) }))} + /> + Menores: + setForm((prev) => ({ ...prev, cantidad_menores: Math.max(0, parseInt(e.target.value) || 0) }))} + /> +
+ + {/* Fila 4: Patente y Botonera Operativa Integrada */} +
+ Patente: +
+ setForm((prev) => ({ ...prev, patente: e.target.value.toUpperCase() }))} + onKeyDown={(e) => { + if (e.key === 'Enter') { + e.preventDefault(); + buscarPersonaOPatente(); + } + }} + /> + +
+ +
+ + + {!isModoSalida ? ( + <> + + + + ) : ( + <> + + + + )} + + +
+
+ + {/* Fila 5: Checks Operativos (Baúl y Cacheo) */} +
+ {isModoSalida ? ( + <> + + + + + ) : ( + <> + + + + )} +
+
+ + {/* ========================================================================= + BLOQUE 2: UBICACIÓN / DESTINO - OBSERVACIONES (Fila Dual) + ========================================================================= */} +
+ {/* Ubicación / Destino */} +
+ Ubicación / Destino +
+ Lote: + setIsLotModalOpen(true)} + style={{ cursor: 'pointer' }} + /> + + +
+ + {/* Badge Estado Permiso */} +
+ {lotPermission ? `Permiso: ${lotPermission.detalle}` : 'Estado Permiso: N/A'} +
+
+ + {/* Observaciones */} +
+ Observaciones +