feat(f6.8): harden offline field flow and act documents

Unifica Tipo de instalación en un desplegable con buscador y corrige el payload de atributos técnicos para usar IDs de definición. Android CI: 26 pruebas, lint y compilaciones debug/release aprobadas. CI general y auditoría de dependencias aprobadas.

.github/workflows/android.yml

@@ -1,5 +1,5 @@
 name: Android CI / RC
-# F6.1 presentation barrier: lint + real tests + debug artifact + release compile.
+# F6.8 offline/document barrier: lint + real tests + debug artifact + release compile.
 
 on:
   push:
@@ -43,6 +43,8 @@ jobs:
 
       - name: Android SDK
         uses: android-actions/setup-android@v3
+        with:
+          packages: platform-tools
 
       - name: Android API 36
         run: sdkmanager 'platforms;android-36' 'build-tools;36.0.0'
@@ -109,7 +111,7 @@ jobs:
           cp android-app/app/build/outputs/apk/debug/app-debug.apk "$apk"
           sha256sum "$apk" > "${apk}.sha256"
           {
-            echo "phase=F6.1"
+            echo "phase=F6.8"
             echo "version=$version"
             echo "versionCode=$code"
             echo "commit=$GITHUB_SHA"

android-app/FINAL_RELEASE_CHECKLIST.md

@@ -1,4 +1,4 @@
-# Checklist final Android 0.19.2
+# Checklist final Android 0.19.3
 
 La candidata sólo se promueve si el mismo SHA cumple:
 
@@ -8,6 +8,10 @@ La candidata sólo se promueve si el mismo SHA cumple:
 - exigir GPS + fotografía para Inventario nacido en campo antes de Hallazgos;
 - registrar Hallazgos sobre el elemento seleccionado;
 - al cerrar el contenido, exigir Urgente/No urgente, persistir esa decisión y mostrar **Pendiente de firma**;
+- exigir por cada Acta los datos del **Representante de la empresa**: nombres y apellidos, DNI, cargo/función y email;
+- permitir precargar esos datos desde el Acta anterior de la misma Inspección, pero exigir confirmación y firma nueva en cada Acta;
+- resolver por Acta **firma en conformidad**, **firma en disconformidad con motivo** o **negativa a firmar con motivo**;
+- verificar que la urgencia existe sólo a nivel **Acta** y nunca a nivel Hallazgo;
 - completar firma del Inspector y manifestación/firma o negativa de la empresa;
 - mostrar el Acta como **Firmada y cerrada**;
 - permitir cerrar la Inspección sólo con todas las Actas activas firmadas y cerradas;

android-app/RELEASE.md

@@ -1,19 +1,41 @@
-# DH Inspección Android · release final de campo 0.19.2
+# DH Inspección Android · release final de campo 0.19.10
 
 ## Candidata vigente
 
 - Fase funcional: **Flujo final de campo · Inspección → Acta → Hallazgos → Firma**.
-- `versionName`: **0.19.2**.
+- `versionName`: **0.19.10**.
-- `versionCode`: **30**.
+- `versionCode`: **38**.
 - Application ID release: `com.korexlabs.dhinspeccion`.
 - Application ID debug/QA: `com.korexlabs.dhinspeccion.debug`.
 - API: `https://dhv2.korexlabs.com/api/v3/`.
+- Servidor compatible de esta candidata: **API 0.29.0-8 / WEB 0.23.0-5**.
 
 La variante debug es independiente de la app productiva y puede instalarse para QA/presentación sin sobrescribir una instalación release histórica.
 
+### Ajustes 0.19.10
+
+- **Trabajo offline seguro:** Room conserva operaciones pendientes y WorkManager las sincroniza cuando vuelve la red, respetando el orden en que fueron creadas.
+- La cola offline queda separada por usuario autenticado para impedir que una sesión sincronice trabajo de otra persona en el mismo dispositivo.
+- Inspecciones, Actas, Inventario, Hallazgos, fotos, representante, manifestación y cierre conservan una identidad de cliente estable para reintentos idempotentes.
+- Las listas de trabajo, Inventario, Actas, cierres, Hallazgos y estado de firma usan caché local por usuario para poder consultar contexto ya descargado sin conectividad.
+- Antes de incorporar una foto de Hallazgo se muestra **Revisar fotografía** con **Usar esta foto**, **Volver a tomar** y **Eliminar foto**.
+- Corrige el cierre que enviaba `uploadMode=ONLINE`; el contrato vigente usa `IMMEDIATE` o `DEFERRED`.
+- La APK consulta el estado real de la firma reutilizable del Inspector y no afirma que existe cuando todavía no fue configurada.
+- El Dashboard de Actas prioriza el **PDF real del Acta** y muestra directamente las fotografías de Hallazgos y del Inventario relacionado.
+- En toda la interfaz activa, la antigua expresión “clasificación técnica” se presenta como **Tipo de instalación** o **Tipo de subinstalación**.
+
+- Corrige el cierre de Actas evitando `NaN` en el versionado de LOCKED/SEALED.
+- El cierre pasa a **Para firmar**; la APK captura sólo la manifestación/firma del acompañante.
+- La firma del Inspector se guarda una vez en Mi perfil y se copia de forma inmutable al sellar cada Acta.
+- Elimina la tarjeta duplicada del Acta seleccionada y simplifica la jerarquía visual inspirada en la referencia Figma.
+
+- El encabezado de **Mis inspecciones** separa las acciones para que **Salir** nunca se comprima ni se corte en pantallas angostas.
+- El alta de Hallazgos corrige la captura de versión que podía transformar el número en `NaN` después del INSERT y devolver error 500.
+- Un Hallazgo admite **múltiples fotografías con GPS**; después de cada captura queda disponible **Agregar otra foto con GPS** y se muestra el contador.
+
 ## Procedimiento operativo validado
 
-La APK 0.19.2 fija como recorrido principal de campo:
+La APK 0.19.10 fija como recorrido principal de campo:
 
 1. **Iniciar Inspección**. Al iniciarla se habilita el circuito de **Actas y Hallazgos**; Inventario no es una acción independiente de la Inspección.
 2. **Crear o abrir un Acta**. Puede haber varias Actas dentro de una misma Inspección, pero sólo una puede permanecer en elaboración al mismo tiempo. La urgencia todavía no se define.
@@ -21,9 +43,10 @@ La APK 0.19.2 fija como recorrido principal de campo:
 4. Si el elemento ya existe, se lo selecciona desde el Inventario del Área/Yacimiento de la Inspección.
 5. Si no existe, se da de alta desde campo sin abandonar el Acta.
 6. Un elemento nuevo debe completar **GPS + fotografía** antes de poder recibir Hallazgos.
-7. Al terminar el contenido del Acta se elige **Urgente / No urgente** y luego se usa **Cerrar Acta y dejar pendiente de firma**. La urgencia queda fijada con el cierre; desde ese momento el contenido queda inmutable y el estado visible es **Pendiente de firma**.
+7. Antes del cierre se identifican, para esa Acta, los datos del **Representante de la empresa** que acompañó el recorrido: nombres y apellidos, DNI, cargo/función y email. Si coincide con el Acta anterior, la APK puede precargarlos, pero deben confirmarse nuevamente.
-8. La firma del Inspector y la manifestación/firma o negativa de la empresa completan el Acta, que pasa a **Firmada y cerrada**.
+8. Al terminar el contenido del Acta se elige **Urgente / No urgente** y luego se usa **Cerrar contenido y pasar a firma**. La urgencia pertenece al Acta completa, nunca a cada Hallazgo; desde ese momento el contenido queda inmutable y el estado visible es **Para firmar**.
-9. La Inspección sólo puede cerrarse cuando todas sus Actas no canceladas están firmadas y cerradas.
+9. En **Para firmar**, el acompañante de la empresa registra su manifestación: **conformidad**, **disconformidad con motivo obligatorio**, **negativa a firmar con motivo obligatorio** o **ausencia documentada**. La firma del Inspector no se dibuja en la tablet: se guarda una sola vez desde **Mi perfil** del Dashboard y el servidor copia esa firma de forma inmutable a cada Acta al usar **Aplicar mi firma y cerrar Acta**.
+10. La Inspección sólo puede cerrarse cuando todas sus Actas no canceladas están firmadas y cerradas.
 
 La nomenclatura técnica interna de API (`DRAFT`, `LOCKED`, `SEALED`, etc.) no se muestra al inspector: la interfaz usa textos operativos en castellano.
 
@@ -49,6 +72,10 @@ Además de lo anterior requiere elegir primero la **Instalación padre**. El bus
 
 La clasificación y los atributos se obtienen dinámicamente desde el mismo catálogo administrado por el Dashboard; la APK no mantiene listas técnicas paralelas.
 
+## Alta de Hallazgos
+
+El alta de Hallazgos usa un selector desplegable con búsqueda por nombre. La pantalla muestra sólo la información necesaria para decidir, mantiene **Otro / No está en la lista** como salida manual y evita exponer códigos o leyendas internas del catálogo. La fecha de corrección no se solicita al inspector al crear un Hallazgo; los plazos administrativos se gestionan fuera de este alta de campo. Los campos de carga son compactos y el teclado avanza con **Siguiente** entre ellos.
+
 ## Actas y firma
 
 La terminología visible se simplifica:
@@ -117,7 +144,7 @@ Esta candidata requiere conexión. No implementa trabajo offline ni cola persist
 - Se agregan siete pruebas para coordenadas y valores técnicos.
 
 
-## Revisión 0.19.2 · flujo conceptual corregido
+## Revisión 0.19.3 · flujo conceptual corregido
 
 - Se elimina **Inventario de campo** como acción independiente de la pantalla de Inspección.
 - El alta o selección de Inventario existe únicamente dentro de **Agregar Hallazgo**.

android-app/app/build.gradle.kts

@@ -2,6 +2,7 @@ plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
     id("org.jetbrains.kotlin.plugin.compose")
+    id("org.jetbrains.kotlin.kapt")
 }
 
 android {
@@ -12,8 +13,8 @@ android {
         applicationId = "com.korexlabs.dhinspeccion"
         minSdk = 26
         targetSdk = 36
-        versionCode = 30
+        versionCode = 38
-        versionName = "0.19.2"
+        versionName = "0.19.10"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -73,6 +74,10 @@ dependencies {
     implementation("com.squareup.okhttp3:okhttp:4.12.0")
     implementation("com.google.android.gms:play-services-location:21.3.0")
     implementation("androidx.exifinterface:exifinterface:1.4.1")
+    implementation("androidx.room:room-runtime:2.7.2")
+    implementation("androidx.room:room-ktx:2.7.2")
+    kapt("androidx.room:room-compiler:2.7.2")
+    implementation("androidx.work:work-runtime-ktx:2.10.3")
 
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.2.1")

android-app/app/src/main/java/com/korexlabs/dhinspeccion/MainViewModel.kt

@@ -6,7 +6,9 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
+import com.korexlabs.dhinspeccion.data.AssetSummary
 import com.korexlabs.dhinspeccion.data.FieldCoordinates
+import com.korexlabs.dhinspeccion.data.CaptureStatus
 import com.korexlabs.dhinspeccion.data.CreateFieldFindingRequest
 import com.korexlabs.dhinspeccion.data.CreateFieldInventoryRequest
 import com.korexlabs.dhinspeccion.data.DhRepository
@@ -18,10 +20,14 @@ import com.korexlabs.dhinspeccion.data.FieldFindingsRepository
 import com.korexlabs.dhinspeccion.data.FieldInventoryItem
 import com.korexlabs.dhinspeccion.data.FieldType
 import com.korexlabs.dhinspeccion.data.MobileActClosure
+import com.korexlabs.dhinspeccion.data.MobileActClosureHeader
 import com.korexlabs.dhinspeccion.data.MobileActDetail
 import com.korexlabs.dhinspeccion.data.MobileActSummary
 import com.korexlabs.dhinspeccion.data.MobileActsRepository
+import com.korexlabs.dhinspeccion.data.MobileVisitClosureHeader
+import com.korexlabs.dhinspeccion.data.MobileResponsible
 import com.korexlabs.dhinspeccion.data.MobileResponsibleRequest
+import com.korexlabs.dhinspeccion.data.offline.OfflineMutationQueue
 import com.korexlabs.dhinspeccion.data.StoredSession
 import com.korexlabs.dhinspeccion.data.VisitDetail
 import com.korexlabs.dhinspeccion.data.VisitSummary
@@ -36,6 +42,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     private val repository = DhRepository(application)
     private val findingsRepository = FieldFindingsRepository(application)
     private val actsRepository = MobileActsRepository(application)
+    private val offlineQueue = OfflineMutationQueue(application)
 
     var session: StoredSession? by mutableStateOf(repository.currentSession())
         private set
@@ -45,6 +52,14 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         private set
     var notice: String? by mutableStateOf(null)
         private set
+    var pendingSyncCount by mutableStateOf(0)
+        private set
+    var inspectorSignatureConfigured: Boolean? by mutableStateOf(null)
+        private set
+    var selectedActCompanySignaturePending by mutableStateOf(false)
+        private set
+    var selectedActSealPending by mutableStateOf(false)
+        private set
 
     var visits: List<VisitSummary> by mutableStateOf(emptyList())
         private set
@@ -75,6 +90,8 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         private set
 
     init {
+        OfflineMutationQueue.schedule(application)
+        viewModelScope.launch { refreshOfflineStateInternal() }
         if (session != null) loadVisits()
     }
 
@@ -143,24 +160,80 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
 
     fun startVisit() {
         val id = visit?.id ?: return
+        val previousVisit = visit
         launchBusy(mutation = true) {
-            visit = repository.startVisit(id)
+            offlineQueue.enqueueVisitStart(id)
+            val localStartedAt = Instant.now().toString()
+            visit = visit?.copy(status = "IN_PROGRESS", actualStartedAt = localStartedAt)
+            val result = offlineQueue.syncAll()
+            refreshOfflineStateInternal()
+            if (result.pending == 0) {
+                visit = repository.visit(id)
                 inventoryParentId = visit?.scopeAsset?.id ?: visit?.operationalArea?.id
                 notice = "Inspección iniciada."
                 loadActsInternal(id, selectDraft = true)
                 loadVisitsInternal()
+            } else if (result.retry) {
+                inventoryParentId = visit?.scopeAsset?.id ?: visit?.operationalArea?.id
+                notice = "Inspección iniciada en el dispositivo. Podés trabajar sin conexión; se sincronizará automáticamente."
+            } else {
+                visit = previousVisit
+                error = result.lastError ?: "No se pudo iniciar la Inspección."
+            }
         }
     }
 
     fun reloadActs() {
         val visitId = visit?.id ?: return
-        launchBusy { loadActsInternal(visitId, selectDraft = selectedAct == null) }
+        launchBusy {
+            loadActsInternal(visitId, selectDraft = selectedAct == null)
+            refreshInspectorSignatureStatusInternal()
+            refreshOfflineStateInternal()
+        }
+    }
+
+    fun syncPendingNow() {
+        launchBusy {
+            val result = offlineQueue.syncAll()
+            refreshOfflineStateInternal()
+            selectedAct?.id?.let { actId ->
+                runCatching { refreshSelectedActInternal(actId) }
+            }
+            if (result.pending == 0) {
+                notice = if (result.synced > 0) "Sincronización completa. ${result.synced} cambio${if (result.synced == 1) "" else "s"} enviado${if (result.synced == 1) "" else "s"}." else "No hay cambios pendientes de sincronización."
+            } else if (result.retry) {
+                notice = "Sin conexión. Los cambios siguen guardados en este dispositivo."
+            } else {
+                error = result.lastError ?: "Quedan cambios pendientes de sincronización."
+            }
+        }
+    }
+
+    fun refreshInspectorSignatureStatus() {
+        viewModelScope.launch {
+            refreshInspectorSignatureStatusInternal()
+            if (inspectorSignatureConfigured == true && pendingSyncCount > 0) {
+                val result = offlineQueue.syncAll()
+                refreshOfflineStateInternal()
+                val actId = selectedAct?.id
+                if (actId != null && !selectedActSealPending) {
+                    runCatching { refreshSelectedActInternal(actId) }
+                }
+                when {
+                    result.pending == 0 -> notice = "Firma verificada y cambios pendientes sincronizados."
+                    result.retry -> notice = "Firma verificada. Los cambios siguen guardados hasta recuperar conexión."
+                    else -> error = result.lastError ?: "Quedan cambios pendientes de sincronización."
+                }
+            }
+        }
     }
 
     fun selectAct(actId: String) {
         launchBusy {
             selectedAct = actsRepository.get(actId)
             actClosure = actsRepository.closure(actId)
+            refreshInspectorSignatureStatusInternal()
+            refreshOfflineStateInternal()
             clearFindingState()
         }
     }
@@ -176,11 +249,41 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
             return
         }
         launchBusy(mutation = true) {
-            val created = actsRepository.create(currentVisit.id, currentVisit.code)
+            val actId = DhRepository.newOperationId()
-            selectedAct = created
+            val occurredAt = Instant.now().toString()
-            actClosure = actsRepository.closure(created.id)
+            offlineQueue.enqueueActCreate(actId, currentVisit.id, currentVisit.code, occurredAt)
+            val localCode = "ACTA-PEND-${actId.take(6).uppercase()}"
+            val local = MobileActDetail(
+                id = actId,
+                visitId = currentVisit.id,
+                code = localCode,
+                status = "DRAFT",
+                occurredAt = occurredAt,
+                title = "Acta de inspección ${currentVisit.code}",
+                summary = "Acta de inspección en curso. Los Hallazgos y observaciones se incorporan de forma trazable durante la inspección.",
+            )
+            selectedAct = local
+            acts = acts + MobileActSummary(
+                id = actId, visitId = currentVisit.id, code = localCode, status = "DRAFT", occurredAt = occurredAt,
+                title = local.title, summary = local.summary,
+            )
+            actClosure = MobileActClosure(
+                act = MobileActClosureHeader(
+                    id = actId, code = localCode, status = "DRAFT", visitId = currentVisit.id, currentVersion = 0,
+                ),
+                visit = MobileVisitClosureHeader(
+                    id = currentVisit.id, code = currentVisit.code, status = currentVisit.status, actualClosedAt = currentVisit.actualClosedAt,
+                ),
+            )
+            val result = offlineQueue.syncAll()
+            refreshOfflineStateInternal()
+            if (result.pending == 0) {
                 loadActsInternal(currentVisit.id, selectDraft = false)
-            notice = "${created.code} creada. La urgencia se define recién al cerrar el Acta; los Hallazgos se agregan desde su propio flujo."
+                refreshSelectedActInternal(actId)
+                notice = "${selectedAct?.code ?: localCode} creada. La urgencia se define recién al cerrar el Acta; los Hallazgos se agregan desde su propio flujo."
+            } else {
+                notice = "Acta creada en el dispositivo. Podés continuar trabajando; recibirá su código oficial cuando vuelva internet."
+            }
         }
     }
 
@@ -209,16 +312,55 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         inventory = repository.fieldInventory(visitId, null, effectiveParentId).data
     }
 
+    private suspend fun ensureAssetInActOffline(
+        actId: String,
+        assetId: String,
+        code: String,
+        name: String,
+        typeName: String?,
+    ): OfflineMutationQueue.SyncResult {
+        if (selectedAct?.assets?.none { it.id == assetId } != false) {
+            offlineQueue.enqueueActAsset(actId, assetId)
+            selectedAct = selectedAct?.copy(
+                assets = selectedAct!!.assets + AssetSummary(assetId, code, name, typeName),
+                assetCount = selectedAct!!.assetCount + 1,
+            )
+            acts = acts.map { if (it.id == actId) it.copy(assetCount = selectedAct?.assetCount ?: it.assetCount) else it }
+        }
+        val result = offlineQueue.syncAll()
+        refreshOfflineStateInternal()
+        if (result.pending == 0) selectedAct = actsRepository.get(actId)
+        return result
+    }
+
     fun selectExisting(item: FieldInventoryItem) {
         val visitId = visit?.id ?: return
         launchBusy(mutation = true) {
+            offlineQueue.enqueueFieldAssetSelect(visitId, item.id)
+            selectedFieldAsset = FieldAssetDetail(
+                context = null,
+                asset = item.copy(selectedInInspection = true),
+                selectedInInspection = true,
+                capture = CaptureStatus(
+                    captureRequired = item.captureRequired,
+                    hasGeometry = item.hasGeometry,
+                    creationGpsCaptured = item.hasGeometry,
+                    fieldPhotoCount = item.fieldPhotoCount,
+                    readyForFinding = item.readyForFinding,
+                ),
+            )
+            val sync = offlineQueue.syncAll()
+            refreshOfflineStateInternal()
+            if (sync.pending == 0) {
                 selectedFieldAsset = repository.selectFieldAsset(visitId, item.id)
+                runCatching { reloadCurrentInventory(visitId) }
                 notice = "Inventario agregado a la Inspección."
-            reloadCurrentInventory(visitId)
+            } else {
+                notice = "Inventario seleccionado en el dispositivo. Se sincronizará automáticamente al volver internet."
+            }
             val draft = selectedDraftAct()
             if (selectedFieldAsset?.capture?.readyForFinding == true && draft != null) {
-                selectedAct = actsRepository.ensureAsset(draft.id, item.id)
+                ensureAssetInActOffline(draft.id, item.id, item.code, item.name, item.type?.name)
-                loadActsInternal(visitId, selectDraft = false)
                 loadFindingOptionsInternal(visitId, item.id, draft.id)
             } else if (selectedFieldAsset?.capture?.readyForFinding == true) {
                 notice = "Inventario listo. Creá o seleccioná un Acta antes de registrar Hallazgos."
@@ -244,11 +386,14 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
             return
         }
         if (type.familyRequired && familyId == null) {
-            error = "Elegí una clasificación técnica o la opción Otro / no catalogado."
+            error = "Elegí el Tipo de instalación o subinstalación correspondiente."
             return
         }
         launchBusy(mutation = true) {
+            val assetId = DhRepository.newOperationId()
+            val capturedAt = Instant.now().toString()
             val request = CreateFieldInventoryRequest(
+                clientGeneratedId = assetId,
                 typeId = type.id,
                 parentId = parentId,
                 familyId = familyId,
@@ -259,11 +404,44 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
                 deviceLatitude = FieldCoordinates.latitude(latitude),
                 deviceLongitude = FieldCoordinates.longitude(longitude),
                 deviceAccuracyM = accuracyM?.let(FieldCoordinates::accuracy),
-                deviceCapturedAt = Instant.now().toString(),
+                deviceCapturedAt = capturedAt,
             )
-            selectedFieldAsset = repository.createFieldAsset(visitId, request)
+            offlineQueue.enqueueFieldAssetCreate(assetId, visitId, request)
+            val localAsset = FieldInventoryItem(
+                id = assetId,
+                code = "PEND-${assetId.take(6).uppercase()}",
+                name = request.name,
+                commonName = request.commonName,
+                informationStatus = "DRAFT",
+                dataOrigin = "FIELD_SURVEY",
+                type = AssetSummary(type.id, type.code, type.name, type.name),
+                selectedInInspection = true,
+                captureRequired = true,
+                hasGeometry = true,
+                fieldPhotoCount = 0,
+                readyForFinding = false,
+            )
+            selectedFieldAsset = FieldAssetDetail(
+                asset = localAsset,
+                selectedInInspection = true,
+                capture = CaptureStatus(
+                    captureRequired = true,
+                    hasGeometry = true,
+                    creationGpsCaptured = true,
+                    fieldPhotoCount = 0,
+                    readyForFinding = false,
+                ),
+            )
+            inventory = inventory + localAsset
+            val result = offlineQueue.syncAll()
+            refreshOfflineStateInternal()
+            if (result.pending == 0) {
+                selectedFieldAsset = repository.selectFieldAsset(visitId, assetId)
+                runCatching { reloadCurrentInventory(visitId) }
                 notice = "Inventario creado con GPS. Falta la fotografía obligatoria. Si ya existía, podés fusionarlo antes de continuar."
-            reloadCurrentInventory(visitId)
+            } else {
+                notice = "Inventario creado y guardado en el dispositivo. Sacá la foto obligatoria; se sincronizará automáticamente al volver internet."
+            }
         }
     }
 
@@ -290,8 +468,9 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
             reloadCurrentInventory(visitId)
             val draft = selectedDraftAct()
             if (selectedFieldAsset?.capture?.readyForFinding == true && draft != null) {
-                selectedAct = actsRepository.ensureAsset(draft.id, result.canonical.id)
+                ensureAssetInActOffline(
-                loadActsInternal(visitId, selectDraft = false)
+                    draft.id, result.canonical.id, result.canonical.code, result.canonical.name, result.canonical.typeName,
+                )
                 loadFindingOptionsInternal(visitId, result.canonical.id, draft.id)
             }
         }
@@ -306,27 +485,41 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         val visitId = visit?.id ?: return
         val asset = selectedFieldAsset?.asset ?: return
         launchBusy(mutation = true) {
-            val response = repository.uploadFieldPhoto(
+            offlineQueue.enqueueFieldAssetPhoto(
-                visitId = visitId,
                 assetId = asset.id,
-                file = file,
+                visitId = visitId,
+                source = file,
                 latitude = latitude,
                 longitude = longitude,
                 accuracyM = accuracyM,
             )
-            selectedFieldAsset = selectedFieldAsset?.copy(capture = response.capture)
+            val localCapture = selectedFieldAsset?.capture?.copy(
-            notice = if (response.capture.readyForFinding) {
+                hasGeometry = true,
-                "Captura completa: GPS y fotografía registrados."
+                creationGpsCaptured = true,
+                fieldPhotoCount = (selectedFieldAsset?.capture?.fieldPhotoCount ?: 0) + 1,
+                readyForFinding = true,
+            ) ?: CaptureStatus(
+                captureRequired = true, hasGeometry = true, creationGpsCaptured = true, fieldPhotoCount = 1, readyForFinding = true,
+            )
+            selectedFieldAsset = selectedFieldAsset?.copy(
+                asset = asset.copy(hasGeometry = true, fieldPhotoCount = localCapture.fieldPhotoCount, readyForFinding = true),
+                capture = localCapture,
+            )
+            val result = offlineQueue.syncAll()
+            refreshOfflineStateInternal()
+            if (result.pending == 0) {
+                selectedFieldAsset = repository.selectFieldAsset(visitId, asset.id)
+                runCatching { reloadCurrentInventory(visitId) }
+                notice = "Inventario listo: ubicación y foto registradas."
             } else {
-                "Fotografía registrada."
+                notice = "Foto del Inventario guardada en el dispositivo. Ya podés continuar; se sincronizará al volver internet."
             }
-            reloadCurrentInventory(visitId)
             val draft = selectedDraftAct()
-            if (response.capture.readyForFinding && draft != null) {
+            if (selectedFieldAsset?.capture?.readyForFinding == true && draft != null) {
-                selectedAct = actsRepository.ensureAsset(draft.id, asset.id)
+                val current = selectedFieldAsset?.asset ?: asset
-                loadActsInternal(visitId, selectDraft = false)
+                ensureAssetInActOffline(draft.id, current.id, current.code, current.name, current.type?.name)
-                loadFindingOptionsInternal(visitId, asset.id, draft.id)
+                loadFindingOptionsInternal(visitId, current.id, draft.id)
-            } else if (response.capture.readyForFinding) {
+            } else if (selectedFieldAsset?.capture?.readyForFinding == true) {
                 notice = "Inventario listo. Creá o seleccioná un Acta antes de registrar Hallazgos."
             }
         }
@@ -341,8 +534,8 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
             return
         }
         launchBusy(mutation = true) {
-            selectedAct = actsRepository.ensureAsset(draft.id, assetId)
+            val asset = selectedFieldAsset?.asset ?: return@launchBusy
-            loadActsInternal(visitId, selectDraft = false)
+            ensureAssetInActOffline(draft.id, assetId, asset.code, asset.name, asset.type?.name)
             loadFindingOptionsInternal(visitId, assetId, draft.id)
         }
     }
@@ -353,7 +546,6 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         customLegalBasis: String?,
         description: String,
         severity: Int?,
-        correctionDueOn: String?,
     ) {
         val visitId = visit?.id ?: return
         val assetId = selectedFieldAsset?.asset?.id ?: return
@@ -375,24 +567,60 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
             return
         }
         launchBusy(mutation = true) {
-            selectedAct = actsRepository.ensureAsset(actId, assetId)
+            val clientFindingId = DhRepository.newOperationId()
-            val response = findingsRepository.create(
+            val request = CreateFieldFindingRequest(
-                visitId,
-                assetId,
-                CreateFieldFindingRequest(
                 actId = actId,
+                clientGeneratedId = clientFindingId,
                 catalogItemId = catalogItemId,
                 customTitle = customTitle?.trim()?.takeIf { it.isNotBlank() },
                 customLegalBasis = customLegalBasis?.trim()?.takeIf { it.isNotBlank() },
                 description = description.trim(),
                 severity = severity,
-                    correctionDueOn = correctionDueOn?.trim()?.takeIf { it.isNotBlank() },
-                ),
             )
-            lastCreatedFinding = response.finding
+            if (selectedAct?.assets?.none { it.id == assetId } != false) {
-            notice = "Hallazgo ${response.finding.code} registrado en ${response.act.code}. Podés agregar evidencia fotográfica."
+                offlineQueue.enqueueActAsset(actId, assetId)
+                selectedFieldAsset?.asset?.let { asset ->
+                    selectedAct = selectedAct?.copy(assets = selectedAct!!.assets + AssetSummary(
+                        id = asset.id,
+                        code = asset.code,
+                        name = asset.name,
+                        typeName = asset.type?.name,
+                    ))
+                }
+            }
+            offlineQueue.enqueueFindingCreate(clientFindingId, visitId, assetId, request)
+
+            val catalog = fieldFindingOptions?.catalog?.items?.firstOrNull { it.id == catalogItemId }
+            val localNumber = (fieldFindingOptions?.findings?.maxOfOrNull { it.findingNumber } ?: 0) + 1
+            val localFinding = FieldFindingItem(
+                id = clientFindingId,
+                actId = actId,
+                assetId = assetId,
+                catalogItemId = catalogItemId,
+                findingNumber = localNumber,
+                code = "PEND-H${localNumber.toString().padStart(3, '0')}",
+                status = "OPEN",
+                title = catalog?.title ?: customTitle?.trim().orEmpty().ifBlank { "Hallazgo pendiente" },
+                description = description.trim(),
+                severity = severity ?: catalog?.suggestedSeverity,
+                suggestedSeverity = catalog?.suggestedSeverity,
+            )
+            lastCreatedFinding = localFinding
+            fieldFindingOptions = fieldFindingOptions?.copy(
+                findings = fieldFindingOptions!!.findings + localFinding,
+                canAddAnother = true,
+            )
+
+            val result = offlineQueue.syncAll()
+            refreshOfflineStateInternal()
+            if (result.pending == 0) {
                 loadFindingOptionsInternal(visitId, assetId, actId, keepLastCreated = true)
+                lastCreatedFinding = fieldFindingOptions?.findings?.firstOrNull { it.id == clientFindingId } ?: localFinding
                 loadActsInternal(visitId, selectDraft = false)
+                notice = "Hallazgo ${lastCreatedFinding?.code ?: localFinding.code} registrado. Podés agregar evidencia fotográfica."
+            } else {
+                notice = "Hallazgo guardado en el dispositivo. Podés seguir sacando fotos; todo se sincronizará automáticamente al volver internet."
+            }
         }
     }
 
@@ -406,17 +634,23 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         description: String? = null,
     ) {
         launchBusy(mutation = true) {
-            findingsRepository.uploadObservationPhoto(
+            offlineQueue.enqueueFindingPhoto(
                 findingId = findingId,
-                file = file,
+                source = file,
                 latitude = latitude,
                 longitude = longitude,
                 accuracyM = accuracyM,
                 title = title,
                 description = description,
             )
+            val result = offlineQueue.syncAll()
+            refreshOfflineStateInternal()
+            if (result.pending == 0) {
                 loadEvidenceInternal(findingId)
                 notice = "Evidencia fotográfica registrada con GPS."
+            } else {
+                notice = "Foto guardada en el dispositivo. Se sincronizará automáticamente al volver la conexión."
+            }
         }
     }
 
@@ -433,24 +667,41 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         phone: String?,
     ) {
         val actId = selectedAct?.id ?: return
-        if (fullName.isBlank() || documentNumber.isBlank() || position.isBlank()) {
+        val normalizedEmail = email?.trim().orEmpty()
-            error = "Completá nombre, documento y cargo del responsable de la empresa."
+        val emailValid = Regex("""^[^\s@]+@[^\s@]+\.[^\s@]+$""").matches(normalizedEmail)
+        if (fullName.isBlank() || documentNumber.isBlank() || position.isBlank() || !emailValid) {
+            error = "Completá nombres y apellidos, DNI, cargo/función y un email válido del representante de la empresa."
             return
         }
         launchBusy(mutation = true) {
-            actClosure = actsRepository.setResponsible(
+            val request = MobileResponsibleRequest(
-                actId,
-                MobileResponsibleRequest(
                 attendanceStatus = "PRESENT",
                 fullName = fullName.trim(),
                 documentType = documentType,
                 documentNumber = documentNumber.trim(),
                 position = position.trim(),
-                    email = email?.trim()?.takeIf { it.isNotBlank() },
+                email = normalizedEmail.lowercase(),
                 phone = phone?.trim()?.takeIf { it.isNotBlank() },
-                ),
             )
-            notice = "Responsable de empresa registrado para el Acta."
+            offlineQueue.enqueueResponsible(actId, request)
+            actClosure = actClosure?.copy(responsible = MobileResponsible(
+                actId = actId,
+                attendanceStatus = request.attendanceStatus,
+                fullName = request.fullName,
+                documentType = request.documentType,
+                documentNumber = request.documentNumber,
+                position = request.position,
+                email = request.email,
+                phone = request.phone,
+            ))
+            val result = offlineQueue.syncAll()
+            refreshOfflineStateInternal()
+            if (result.pending == 0) {
+                actClosure = actsRepository.closure(actId)
+                notice = "Representante de la empresa registrado para esta Acta."
+            } else {
+                notice = "Representante guardado en el dispositivo. Se sincronizará automáticamente cuando vuelva internet."
+            }
         }
     }
 
@@ -461,14 +712,24 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
             return
         }
         launchBusy(mutation = true) {
-            actClosure = actsRepository.setResponsible(
+            val request = MobileResponsibleRequest(
-                actId,
-                MobileResponsibleRequest(
                 attendanceStatus = "ABSENT",
                 absenceReason = reason.trim(),
-                ),
             )
-            notice = "Ausencia del responsable registrada. La manifestación de empresa quedará pendiente y deberá resolverse antes de firmar y cerrar el Acta."
+            offlineQueue.enqueueResponsible(actId, request)
+            actClosure = actClosure?.copy(responsible = MobileResponsible(
+                actId = actId,
+                attendanceStatus = "ABSENT",
+                absenceReason = reason.trim(),
+            ))
+            val result = offlineQueue.syncAll()
+            refreshOfflineStateInternal()
+            if (result.pending == 0) actClosure = actsRepository.closure(actId)
+            notice = if (result.pending == 0) {
+                "Ausencia del representante registrada. La manifestación de la empresa deberá resolverse antes de firmar y cerrar el Acta."
+            } else {
+                "Ausencia guardada en el dispositivo. Se sincronizará automáticamente cuando vuelva internet."
+            }
         }
     }
 
@@ -479,10 +740,19 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
             return
         }
         launchBusy(mutation = true) {
-            actClosure = actsRepository.lock(actId, urgency)
+            offlineQueue.enqueueActLock(actId, urgency)
-            refreshSelectedActInternal(actId)
+            selectedAct = selectedAct?.copy(status = "LOCKED", urgency = urgency)
+            acts = acts.map { if (it.id == actId) it.copy(status = "LOCKED", urgency = urgency) else it }
+            actClosure = actClosure?.copy(act = actClosure!!.act.copy(status = "LOCKED", urgency = urgency))
+            val result = offlineQueue.syncAll()
+            refreshOfflineStateInternal()
             val urgencyLabel = if (urgency == "URGENT") "urgente" else "no urgente"
-            notice = "Acta cerrada como $urgencyLabel y pendiente de firma. Su contenido quedó inmutable."
+            if (result.pending == 0) {
+                refreshSelectedActInternal(actId)
+                notice = "Acta cerrada como $urgencyLabel. La urgencia quedó definida sobre el Acta y su contenido quedó inmutable, pendiente de firmas."
+            } else {
+                notice = "Cierre de contenido guardado en el dispositivo como $urgencyLabel. Podés continuar con la firma; se sincronizará al recuperar internet."
+            }
         }
     }
 
@@ -513,14 +783,28 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     ) {
         val actId = selectedAct?.id ?: return
         launchBusy(mutation = true) {
-            actClosure = actsRepository.signCompany(
+            offlineQueue.enqueueCompanySignature(
-                actId, png, latitude, longitude, accuracyM, manifestation, statement,
+                actId = actId,
+                source = png,
+                latitude = latitude,
+                longitude = longitude,
+                accuracyM = accuracyM,
+                manifestation = manifestation,
+                statement = statement,
             )
+            val result = offlineQueue.syncAll()
+            refreshOfflineStateInternal()
+            if (!selectedActCompanySignaturePending) {
+                actClosure = actsRepository.closure(actId)
                 notice = if (manifestation == "DISSENT") {
-                "Firma de empresa registrada con disidencia."
+                    "Firma del representante registrada en disconformidad."
                 } else {
-                "Firma de empresa registrada."
+                    "Firma del representante de la empresa registrada."
                 }
+            } else {
+                notice = "Firma guardada en el dispositivo. Quedó pendiente de sincronización y no se perderá si no hay internet."
+            }
+            result.lastError?.takeIf { result.pending > 0 && !result.retry }?.let { error = it }
         }
     }
 
@@ -535,8 +819,15 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
             return
         }
         launchBusy(mutation = true) {
-            actClosure = actsRepository.companyOutcome(actId, status, reason)
+            offlineQueue.enqueueCompanyOutcome(actId, status, reason.trim())
+            val result = offlineQueue.syncAll()
+            refreshOfflineStateInternal()
+            if (result.pending == 0) {
+                actClosure = actsRepository.closure(actId)
                 notice = "Negativa a firmar asentada."
+            } else {
+                notice = "Negativa a firmar guardada en el dispositivo. Se sincronizará automáticamente al recuperar internet."
+            }
         }
     }
 
@@ -544,20 +835,50 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         val currentVisit = visit ?: return
         val actId = selectedAct?.id ?: return
         launchBusy(mutation = true) {
-            actClosure = actsRepository.seal(actId)
+            offlineQueue.enqueueSeal(actId)
+            if (inspectorSignatureConfigured == false) {
+                refreshOfflineStateInternal()
+                notice = "Cierre guardado en el dispositivo. Falta configurar la firma del inspector en Mi perfil del Dashboard; después se sincronizará automáticamente."
+                return@launchBusy
+            }
+            val result = offlineQueue.syncAll()
+            refreshOfflineStateInternal()
+            if (!selectedActSealPending) {
                 refreshSelectedActInternal(actId)
                 loadActsInternal(currentVisit.id, selectDraft = false)
                 clearFindingState()
                 notice = "${selectedAct?.code ?: "Acta"} firmada y cerrada. Podés crear otra Acta o continuar hacia el cierre de la Inspección."
+            } else if (result.retry) {
+                val localClosedAt = Instant.now().toString()
+                selectedAct = selectedAct?.copy(status = "SEALED", sealedAt = localClosedAt, closedAt = localClosedAt)
+                acts = acts.map { if (it.id == actId) it.copy(status = "SEALED", sealedAt = localClosedAt, closedAt = localClosedAt) else it }
+                clearFindingState()
+                notice = "Acta cerrada en el dispositivo. Podés continuar con otra Acta; se sincronizará automáticamente al recuperar internet."
+            } else {
+                error = result.lastError ?: "El cierre quedó pendiente de sincronización."
+            }
         }
     }
 
     fun closeInspection() {
         val visitId = visit?.id ?: return
+        val previousVisit = visit
         launchBusy(mutation = true) {
-            visit = actsRepository.closeVisit(visitId)
+            val closedAt = Instant.now().toString()
+            offlineQueue.enqueueVisitClose(visitId, closedAt)
+            visit = visit?.copy(status = "CLOSED", actualClosedAt = closedAt)
+            val result = offlineQueue.syncAll()
+            refreshOfflineStateInternal()
+            if (result.pending == 0) {
+                visit = repository.visit(visitId)
                 loadVisitsInternal()
                 notice = "Inspección cerrada. Todas sus Actas quedaron firmadas y disponibles para el circuito de oficina."
+            } else if (result.retry) {
+                notice = "Cierre de Inspección guardado en el dispositivo. Quedará sincronizado automáticamente cuando vuelva internet."
+            } else {
+                visit = previousVisit
+                error = result.lastError ?: "No se pudo cerrar la Inspección."
+            }
         }
     }
 
@@ -595,6 +916,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
             selectedAct = null
             actClosure = null
         }
+        refreshOfflineStateInternal()
     }
 
     private suspend fun refreshSelectedActInternal(actId: String) {
@@ -625,6 +947,24 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         )
     }
 
+    private suspend fun refreshInspectorSignatureStatusInternal() {
+        runCatching { actsRepository.selfSignatureStatus() }
+            .onSuccess { inspectorSignatureConfigured = it.configured }
+    }
+
+    private suspend fun refreshOfflineStateInternal() {
+        pendingSyncCount = offlineQueue.pendingCount()
+        val actId = selectedAct?.id
+        if (actId == null) {
+            selectedActCompanySignaturePending = false
+            selectedActSealPending = false
+        } else {
+            selectedActCompanySignaturePending = offlineQueue.hasPending("COMPANY_SIGNATURE", actId)
+                || offlineQueue.hasPending("COMPANY_OUTCOME", actId)
+            selectedActSealPending = offlineQueue.hasPending("ACT_SEAL", actId)
+        }
+    }
+
     private fun clearActState() {
         acts = emptyList()
         selectedAct = null

android-app/app/src/main/java/com/korexlabs/dhinspeccion/data/DhMobile.kt

@@ -5,6 +5,8 @@ import android.security.keystore.KeyGenParameterSpec
 import android.security.keystore.KeyProperties
 import android.util.Base64
 import com.korexlabs.dhinspeccion.BuildConfig
+import com.korexlabs.dhinspeccion.data.offline.OfflineJsonCache
+import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import okhttp3.MediaType.Companion.toMediaType
@@ -25,6 +27,7 @@ import retrofit2.http.Part
 import retrofit2.http.Path
 import retrofit2.http.Query
 import java.io.File
+import java.io.IOException
 import java.security.KeyStore
 import java.time.Instant
 import java.util.UUID
@@ -254,6 +257,7 @@ data class FieldAssetDetail(
 )
 
 data class CreateFieldInventoryRequest(
+    val clientGeneratedId: String? = null,
     val typeId: String,
     val parentId: String? = null,
     val familyId: String? = null,
@@ -366,6 +370,7 @@ interface DhApi {
         @Part("deviceAccuracyM") accuracy: okhttp3.RequestBody?,
         @Part("deviceCapturedAt") capturedAt: okhttp3.RequestBody,
         @Part("deviceLabel") deviceLabel: okhttp3.RequestBody,
+        @Part("operationId") operationId: okhttp3.RequestBody?,
         @Part("exifLatitude") exifLatitude: okhttp3.RequestBody?,
         @Part("exifLongitude") exifLongitude: okhttp3.RequestBody?,
         @Part("exifCapturedAt") exifCapturedAt: okhttp3.RequestBody?,
@@ -448,8 +453,14 @@ class SecureSessionStore(context: Context) {
 }
 
 class DhRepository(context: Context) {
-    private val store = SecureSessionStore(context.applicationContext)
+    private val appContext = context.applicationContext
+    private val store = SecureSessionStore(appContext)
+    private val cache = OfflineJsonCache(appContext)
     private val moshi = Moshi.Builder().addLast(KotlinJsonAdapterFactory()).build()
+    private val visitListAdapter = moshi.adapter(VisitListResponse::class.java)
+    private val visitAdapter = moshi.adapter(VisitDetail::class.java)
+    private val inventoryAdapter = moshi.adapter(FieldInventoryListResponse::class.java)
+    private val fieldTypeAdapter = moshi.adapter(FieldTypeResponse::class.java)
     private val api: DhApi = Retrofit.Builder()
         .baseUrl(BuildConfig.API_BASE_URL)
         .client(OkHttpClient.Builder().build())
@@ -468,24 +479,46 @@ class DhRepository(context: Context) {
         store.clear()
     }
 
-    suspend fun visits(): VisitListResponse = authorized { session ->
+    suspend fun visits(): VisitListResponse {
-        api.visits("Bearer ${session.accessToken}", session.userId)
+        val session = store.load() ?: throw IllegalStateException("Sesión no iniciada")
+        return cached("visits:${session.userId}", visitListAdapter) {
+            authorized { active -> api.visits("Bearer ${active.accessToken}", active.userId) }
+        }
     }
 
-    suspend fun visit(id: String): VisitDetail = authorized { session ->
+    suspend fun visit(id: String): VisitDetail = cached("visit:$id", visitAdapter) {
-        api.visit("Bearer ${session.accessToken}", id)
+        authorized { session -> api.visit("Bearer ${session.accessToken}", id) }
     }
 
-    suspend fun startVisit(id: String): VisitDetail = authorized { session ->
+    suspend fun startVisit(id: String): VisitDetail {
-        api.startVisit("Bearer ${session.accessToken}", id)
+        val value = authorized { session -> api.startVisit("Bearer ${session.accessToken}", id) }
+        cache.put(userCacheKey("visit:$id"), visitAdapter.toJson(value))
+        return value
     }
 
-    suspend fun fieldInventory(visitId: String, search: String?, parentId: String? = null) = authorized { session ->
+    suspend fun fieldInventory(visitId: String, search: String?, parentId: String? = null): FieldInventoryListResponse {
-        api.fieldInventory("Bearer ${session.accessToken}", visitId, search?.takeIf { it.isNotBlank() }, parentId)
+        val normalizedSearch = search?.trim()?.takeIf { it.isNotBlank() }
+        val baseKey = "inventory:$visitId:${parentId ?: "root"}"
+        return try {
+            val value = authorized { session ->
+                api.fieldInventory("Bearer ${session.accessToken}", visitId, normalizedSearch, parentId)
+            }
+            if (normalizedSearch == null) cache.put(userCacheKey(baseKey), inventoryAdapter.toJson(value))
+            value
+        } catch (error: IOException) {
+            val cached = cache.get(userCacheKey(baseKey))?.let(inventoryAdapter::fromJson) ?: throw error
+            if (normalizedSearch == null) cached else cached.copy(
+                data = cached.data.filter { item ->
+                    item.code.contains(normalizedSearch, ignoreCase = true)
+                        || item.name.contains(normalizedSearch, ignoreCase = true)
+                },
+            )
+        }
     }
 
-    suspend fun fieldTypes(visitId: String, parentId: String?) = authorized { session ->
+    suspend fun fieldTypes(visitId: String, parentId: String?): FieldTypeResponse =
-        api.fieldTypes("Bearer ${session.accessToken}", visitId, parentId)
+        cached("field-types:$visitId:${parentId ?: "root"}", fieldTypeAdapter) {
+            authorized { session -> api.fieldTypes("Bearer ${session.accessToken}", visitId, parentId) }
         }
 
     suspend fun selectFieldAsset(visitId: String, assetId: String) = authorized { session ->
@@ -518,6 +551,7 @@ class DhRepository(context: Context) {
         longitude: Double,
         accuracyM: Double?,
         capturedAt: String = Instant.now().toString(),
+        operationId: String? = null,
     ): FieldPhotoResponse = authorized { session ->
         val text = "text/plain".toMediaType()
         val body = file.asRequestBody("image/jpeg".toMediaType())
@@ -532,12 +566,27 @@ class DhRepository(context: Context) {
             accuracy = accuracyM?.let(FieldCoordinates::accuracy)?.toString()?.toRequestBody(text),
             capturedAt = capturedAt.toRequestBody(text),
             deviceLabel = "DH Android".toRequestBody(text),
+            operationId = operationId?.toRequestBody(text),
             exifLatitude = FieldCoordinates.latitude(latitude).toString().toRequestBody(text),
             exifLongitude = FieldCoordinates.longitude(longitude).toString().toRequestBody(text),
             exifCapturedAt = capturedAt.toRequestBody(text),
         )
     }
 
+    private fun userCacheKey(key: String): String = "${store.load()?.userId ?: "anonymous"}:$key"
+
+    private suspend fun <T> cached(
+        key: String,
+        adapter: JsonAdapter<T>,
+        online: suspend () -> T,
+    ): T {
+        return try {
+            online().also { cache.put(userCacheKey(key), adapter.toJson(it)) }
+        } catch (error: IOException) {
+            cache.get(userCacheKey(key))?.let(adapter::fromJson) ?: throw error
+        }
+    }
+
     private suspend fun <T> authorized(block: suspend (StoredSession) -> T): T {
         var session = store.load() ?: throw IllegalStateException("Sesión no iniciada")
         try {
@@ -561,8 +610,10 @@ class DhRepository(context: Context) {
             if (error is HttpException) {
                 val body = runCatching { error.response()?.errorBody()?.string() }.getOrNull()
                 val message = runCatching { JSONObject(body.orEmpty()).optString("message") }.getOrNull()
+                if (message == "Error interno") return "No se pudo completar la operación. Intentá nuevamente."
                 if (!message.isNullOrBlank()) return message
-                return "Error HTTP ${error.code()}"
+                if (error.code() >= 500) return "No se pudo completar la operación. Intentá nuevamente."
+                return "No se pudo procesar la solicitud (${error.code()})."
             }
             return error.message ?: "Ocurrió un error inesperado"
         }

android-app/app/src/main/java/com/korexlabs/dhinspeccion/data/FieldAttributePayload.kt

@@ -0,0 +1,19 @@
+package com.korexlabs.dhinspeccion.data
+
+/** Builds the API payload using definition IDs while the form keeps stable field codes. */
+internal fun fieldAttributePayload(
+    definitions: List<FieldAttributeDefinition>,
+    valuesByCode: Map<String, String>,
+): Map<String, Any?> = definitions.mapNotNull { definition ->
+    val raw = valuesByCode[definition.code]?.trim().orEmpty()
+    if (raw.isBlank()) return@mapNotNull null
+    definition.id to coerceFieldAttribute(definition, raw)
+}.toMap()
+
+private fun coerceFieldAttribute(definition: FieldAttributeDefinition, raw: String): Any =
+    when (definition.dataType.uppercase()) {
+        "INTEGER", "INT" -> raw.toLongOrNull() ?: raw
+        "NUMBER", "DECIMAL", "FLOAT", "DOUBLE" -> raw.replace(',', '.').toDoubleOrNull() ?: raw
+        "BOOLEAN", "BOOL" -> raw.lowercase() in setOf("true", "1", "si", "sí", "yes")
+        else -> raw
+    }

android-app/app/src/main/java/com/korexlabs/dhinspeccion/data/FieldFindingsMobile.kt

@@ -2,6 +2,8 @@ package com.korexlabs.dhinspeccion.data
 
 import android.content.Context
 import com.korexlabs.dhinspeccion.BuildConfig
+import com.korexlabs.dhinspeccion.data.offline.OfflineJsonCache
+import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import okhttp3.MediaType.Companion.toMediaType
@@ -22,6 +24,7 @@ import retrofit2.http.Part
 import retrofit2.http.Path
 import retrofit2.http.Query
 import java.io.File
+import java.io.IOException
 import java.time.Instant
 
 data class FieldFindingAct(
@@ -108,12 +111,12 @@ data class FieldFindingOptionsResponse(
 
 data class CreateFieldFindingRequest(
     val actId: String,
+    val clientGeneratedId: String? = null,
     val catalogItemId: String? = null,
     val customTitle: String? = null,
     val customLegalBasis: String? = null,
     val description: String,
     val severity: Int? = null,
-    val correctionDueOn: String? = null,
 )
 
 data class FieldFindingCreateResponse(
@@ -162,6 +165,7 @@ private interface FieldFindingsApi {
         @Part("longitude") longitude: RequestBody,
         @Part("accuracyM") accuracyM: RequestBody?,
         @Part("deviceLabel") deviceLabel: RequestBody,
+        @Part("operationId") operationId: RequestBody?,
     ): FieldFindingEvidence
 
     @POST("auth/mobile/refresh")
@@ -173,8 +177,12 @@ private interface FieldFindingsApi {
  * F3.2 exige que la APK identifique explícitamente el Acta activa.
  */
 class FieldFindingsRepository(context: Context) {
-    private val store = SecureSessionStore(context.applicationContext)
+    private val appContext = context.applicationContext
+    private val store = SecureSessionStore(appContext)
+    private val cache = OfflineJsonCache(appContext)
     private val moshi = Moshi.Builder().addLast(KotlinJsonAdapterFactory()).build()
+    private val optionsAdapter = moshi.adapter(FieldFindingOptionsResponse::class.java)
+    private val evidenceAdapter = moshi.adapter(FieldFindingEvidenceListResponse::class.java)
     private val api: FieldFindingsApi = Retrofit.Builder()
         .baseUrl(BuildConfig.API_BASE_URL)
         .client(OkHttpClient.Builder().build())
@@ -182,10 +190,28 @@ class FieldFindingsRepository(context: Context) {
         .build()
         .create(FieldFindingsApi::class.java)
 
-    suspend fun options(visitId: String, assetId: String, actId: String): FieldFindingOptionsResponse =
+    suspend fun options(visitId: String, assetId: String, actId: String): FieldFindingOptionsResponse {
-        authorized { session ->
+        val exactKey = "finding-options:$visitId:$assetId:$actId"
+        val templateKey = "finding-options-template:$visitId:$assetId"
+        return try {
+            val value = authorized { session ->
                 api.options("Bearer ${session.accessToken}", visitId, assetId, actId)
             }
+            val json = optionsAdapter.toJson(value)
+            cache.put(userCacheKey(exactKey), json)
+            cache.put(userCacheKey(templateKey), json)
+            value
+        } catch (error: IOException) {
+            cache.get(userCacheKey(exactKey))?.let(optionsAdapter::fromJson)
+                ?: cache.get(userCacheKey(templateKey))?.let(optionsAdapter::fromJson)?.copy(
+                    act = FieldFindingAct(id = actId, code = "Acta local pendiente", status = "DRAFT"),
+                    findings = emptyList(),
+                    assetIncludedInAct = true,
+                    canAddAnother = true,
+                )
+                ?: throw error
+        }
+    }
 
     suspend fun create(
         visitId: String,
@@ -195,8 +221,9 @@ class FieldFindingsRepository(context: Context) {
         api.create("Bearer ${session.accessToken}", visitId, assetId, request)
     }
 
-    suspend fun evidence(findingId: String): FieldFindingEvidenceListResponse = authorized { session ->
+    suspend fun evidence(findingId: String): FieldFindingEvidenceListResponse =
-        api.evidence("Bearer ${session.accessToken}", findingId)
+        cached("finding-evidence:$findingId", evidenceAdapter) {
+            authorized { session -> api.evidence("Bearer ${session.accessToken}", findingId) }
         }
 
     suspend fun uploadObservationPhoto(
@@ -208,6 +235,7 @@ class FieldFindingsRepository(context: Context) {
         title: String? = null,
         description: String? = null,
         capturedAt: String = Instant.now().toString(),
+        operationId: String? = null,
     ): FieldFindingEvidence = authorized { session ->
         val text = "text/plain".toMediaType()
         val part = MultipartBody.Part.createFormData(
@@ -228,9 +256,24 @@ class FieldFindingsRepository(context: Context) {
             longitude = FieldCoordinates.longitude(longitude).toString().toRequestBody(text),
             accuracyM = accuracyM?.let(FieldCoordinates::accuracy)?.toString()?.toRequestBody(text),
             deviceLabel = "DH Android".toRequestBody(text),
+            operationId = operationId?.toRequestBody(text),
         )
     }
 
+    private fun userCacheKey(key: String): String = "${store.load()?.userId ?: "anonymous"}:$key"
+
+    private suspend fun <T> cached(
+        key: String,
+        adapter: JsonAdapter<T>,
+        online: suspend () -> T,
+    ): T {
+        return try {
+            online().also { cache.put(userCacheKey(key), adapter.toJson(it)) }
+        } catch (error: IOException) {
+            cache.get(userCacheKey(key))?.let(adapter::fromJson) ?: throw error
+        }
+    }
+
     private suspend fun <T> authorized(block: suspend (StoredSession) -> T): T {
         var session = store.load() ?: throw IllegalStateException("Sesión no iniciada")
         try {

android-app/app/src/main/java/com/korexlabs/dhinspeccion/data/MobileActs.kt

@@ -2,6 +2,8 @@ package com.korexlabs.dhinspeccion.data
 
 import android.content.Context
 import com.korexlabs.dhinspeccion.BuildConfig
+import com.korexlabs.dhinspeccion.data.offline.OfflineJsonCache
+import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import okhttp3.MediaType.Companion.toMediaType
@@ -24,6 +26,7 @@ import retrofit2.http.Part
 import retrofit2.http.Path
 import retrofit2.http.Query
 import java.io.File
+import java.io.IOException
 import java.time.Instant
 
 data class MobileActSummary(
@@ -90,6 +93,7 @@ data class MobileActListResponse(
 )
 
 data class CreateMobileActRequest(
+    val clientGeneratedId: String? = null,
     val occurredAt: String,
     val title: String,
     val summary: String,
@@ -188,11 +192,20 @@ data class MobileActClosure(
     val act: MobileActClosureHeader,
     val visit: MobileVisitClosureHeader,
     val responsible: MobileResponsible? = null,
+    val representativeSuggestion: MobileResponsible? = null,
     val closure: MobileClosureRecord? = null,
     val signatures: List<MobileSignature> = emptyList(),
     val consents: MobileClosureConsents = MobileClosureConsents(),
 )
 
+data class MobileProfileSignatureStatus(
+    val configured: Boolean = false,
+    val mimeType: String? = null,
+    val sizeBytes: Int? = null,
+    val imageSha256: String? = null,
+    val updatedAt: String? = null,
+)
+
 data class MobileCompanyOutcomeRequest(
     val status: String,
     val reason: String,
@@ -200,7 +213,7 @@ data class MobileCompanyOutcomeRequest(
 
 data class MobileSealActRequest(
     val clientClosedAt: String = Instant.now().toString(),
-    val uploadMode: String = "ONLINE",
+    val uploadMode: String = "IMMEDIATE",
 )
 
 data class MobileCloseVisitRequest(
@@ -235,6 +248,11 @@ private interface MobileActsApi {
         @Body request: UpdateMobileActRequest,
     ): MobileActDetail
 
+    @GET("users/self/signature")
+    suspend fun selfSignature(
+        @Header("Authorization") authorization: String,
+    ): MobileProfileSignatureStatus
+
     @GET("inspection-acts/{actId}/closure")
     suspend fun closure(
         @Header("Authorization") authorization: String,
@@ -311,8 +329,14 @@ private interface MobileActsApi {
 }
 
 class MobileActsRepository(context: Context) {
-    private val store = SecureSessionStore(context.applicationContext)
+    private val appContext = context.applicationContext
+    private val store = SecureSessionStore(appContext)
+    private val cache = OfflineJsonCache(appContext)
     private val moshi = Moshi.Builder().addLast(KotlinJsonAdapterFactory()).build()
+    private val actListAdapter = moshi.adapter(MobileActListResponse::class.java)
+    private val actAdapter = moshi.adapter(MobileActDetail::class.java)
+    private val closureAdapter = moshi.adapter(MobileActClosure::class.java)
+    private val signatureStatusAdapter = moshi.adapter(MobileProfileSignatureStatus::class.java)
     private val api: MobileActsApi = Retrofit.Builder()
         .baseUrl(BuildConfig.API_BASE_URL)
         .client(OkHttpClient.Builder().build())
@@ -320,29 +344,37 @@ class MobileActsRepository(context: Context) {
         .build()
         .create(MobileActsApi::class.java)
 
-    suspend fun list(visitId: String): MobileActListResponse = authorized { session ->
+    suspend fun list(visitId: String): MobileActListResponse =
-        api.listActs("Bearer ${session.accessToken}", visitId)
+        cached("acts:$visitId", actListAdapter) {
+            authorized { session -> api.listActs("Bearer ${session.accessToken}", visitId) }
         }
 
-    suspend fun get(actId: String): MobileActDetail = authorized { session ->
+    suspend fun get(actId: String): MobileActDetail = cached("act:$actId", actAdapter) {
-        api.act("Bearer ${session.accessToken}", actId)
+        authorized { session -> api.act("Bearer ${session.accessToken}", actId) }
     }
 
     suspend fun create(
         visitId: String,
         visitCode: String,
-    ): MobileActDetail = authorized { session ->
+        clientGeneratedId: String? = null,
+        occurredAt: String = Instant.now().toString(),
+    ): MobileActDetail {
+        val created = authorized { session ->
             api.createAct(
                 "Bearer ${session.accessToken}",
                 visitId,
                 CreateMobileActRequest(
-                occurredAt = Instant.now().toString(),
+                    clientGeneratedId = clientGeneratedId,
+                    occurredAt = occurredAt,
                     title = "Acta de inspección $visitCode",
                     summary = "Acta de inspección en curso. Los Hallazgos y observaciones se incorporan de forma trazable durante la inspección.",
                     assetIds = emptyList(),
                 ),
             )
         }
+        cache.put(userCacheKey("act:${created.id}"), actAdapter.toJson(created))
+        return created
+    }
 
     suspend fun ensureAsset(actId: String, assetId: String): MobileActDetail {
         val detail = get(actId)
@@ -353,16 +385,25 @@ class MobileActsRepository(context: Context) {
         }
     }
 
-    suspend fun closure(actId: String): MobileActClosure = authorized { session ->
+    suspend fun closure(actId: String): MobileActClosure = cached("act-closure:$actId", closureAdapter) {
-        api.closure("Bearer ${session.accessToken}", actId)
+        authorized { session -> api.closure("Bearer ${session.accessToken}", actId) }
     }
 
-    suspend fun setResponsible(actId: String, request: MobileResponsibleRequest): MobileActClosure = authorized { session ->
+    suspend fun selfSignatureStatus(): MobileProfileSignatureStatus =
-        api.responsible("Bearer ${session.accessToken}", actId, request)
+        cached("self-signature-status", signatureStatusAdapter) {
+            authorized { session -> api.selfSignature("Bearer ${session.accessToken}") }
         }
 
-    suspend fun lock(actId: String, urgency: String): MobileActClosure = authorized { session ->
+    suspend fun setResponsible(actId: String, request: MobileResponsibleRequest): MobileActClosure {
-        api.lock("Bearer ${session.accessToken}", actId, PrepareMobileActRequest(urgency))
+        val value = authorized { session -> api.responsible("Bearer ${session.accessToken}", actId, request) }
+        cache.put(userCacheKey("act-closure:$actId"), closureAdapter.toJson(value))
+        return value
+    }
+
+    suspend fun lock(actId: String, urgency: String): MobileActClosure {
+        val value = authorized { session -> api.lock("Bearer ${session.accessToken}", actId, PrepareMobileActRequest(urgency)) }
+        cache.put(userCacheKey("act-closure:$actId"), closureAdapter.toJson(value))
+        return value
     }
 
     suspend fun signInspector(
@@ -381,6 +422,7 @@ class MobileActsRepository(context: Context) {
         accuracyM: Double?,
         manifestation: String = "CONFORMITY",
         statement: String? = null,
+        clientSignedAt: String = Instant.now().toString(),
     ): MobileActClosure = signature(
         actId = actId,
         png = png,
@@ -390,22 +432,38 @@ class MobileActsRepository(context: Context) {
         company = true,
         manifestation = manifestation,
         statement = statement,
+        clientSignedAt = clientSignedAt,
     )
 
-    suspend fun companyOutcome(actId: String, status: String, reason: String): MobileActClosure = authorized { session ->
+    suspend fun companyOutcome(actId: String, status: String, reason: String): MobileActClosure {
+        val value = authorized { session ->
             api.companyOutcome(
                 "Bearer ${session.accessToken}",
                 actId,
                 MobileCompanyOutcomeRequest(status, reason.trim()),
             )
         }
-
+        cache.put(userCacheKey("act-closure:$actId"), closureAdapter.toJson(value))
-    suspend fun seal(actId: String): MobileActClosure = authorized { session ->
+        return value
-        api.sealAct("Bearer ${session.accessToken}", actId, MobileSealActRequest())
     }
 
-    suspend fun closeVisit(visitId: String): VisitDetail = authorized { session ->
+    suspend fun seal(
-        api.closeVisit("Bearer ${session.accessToken}", visitId, MobileCloseVisitRequest())
+        actId: String,
+        uploadMode: String = "IMMEDIATE",
+        clientClosedAt: String = Instant.now().toString(),
+    ): MobileActClosure {
+        val value = authorized { session ->
+            api.sealAct("Bearer ${session.accessToken}", actId, MobileSealActRequest(clientClosedAt, uploadMode))
+        }
+        cache.put(userCacheKey("act-closure:$actId"), closureAdapter.toJson(value))
+        return value
+    }
+
+    suspend fun closeVisit(
+        visitId: String,
+        clientClosedAt: String = Instant.now().toString(),
+    ): VisitDetail = authorized { session ->
+        api.closeVisit("Bearer ${session.accessToken}", visitId, MobileCloseVisitRequest(clientClosedAt))
     }
 
     private suspend fun signature(
@@ -417,6 +475,7 @@ class MobileActsRepository(context: Context) {
         company: Boolean,
         manifestation: String? = null,
         statement: String? = null,
+        clientSignedAt: String = Instant.now().toString(),
     ): MobileActClosure = authorized { session ->
         val text = "text/plain".toMediaType()
         val file = MultipartBody.Part.createFormData(
@@ -425,7 +484,7 @@ class MobileActsRepository(context: Context) {
             png.asRequestBody("image/png".toMediaType()),
         )
         val consent = "true".toRequestBody(text)
-        val signedAt = Instant.now().toString().toRequestBody(text)
+        val signedAt = clientSignedAt.toRequestBody(text)
         val device = "DH Android".toRequestBody(text)
         val lat = latitude?.let(FieldCoordinates::latitude)?.toString()?.toRequestBody(text)
         val lon = longitude?.let(FieldCoordinates::longitude)?.toString()?.toRequestBody(text)
@@ -445,6 +504,20 @@ class MobileActsRepository(context: Context) {
         }
     }
 
+    private fun userCacheKey(key: String): String = "${store.load()?.userId ?: "anonymous"}:$key"
+
+    private suspend fun <T> cached(
+        key: String,
+        adapter: JsonAdapter<T>,
+        online: suspend () -> T,
+    ): T {
+        return try {
+            online().also { cache.put(userCacheKey(key), adapter.toJson(it)) }
+        } catch (error: IOException) {
+            cache.get(userCacheKey(key))?.let(adapter::fromJson) ?: throw error
+        }
+    }
+
     private suspend fun <T> authorized(block: suspend (StoredSession) -> T): T {
         var session = store.load() ?: throw IllegalStateException("Sesión no iniciada")
         try {

android-app/app/src/main/java/com/korexlabs/dhinspeccion/data/offline/OfflineQueue.kt

@@ -0,0 +1,622 @@
+package com.korexlabs.dhinspeccion.data.offline
+
+import android.content.Context
+import androidx.room.Dao
+import androidx.room.Database
+import androidx.room.Entity
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.PrimaryKey
+import androidx.room.Query
+import androidx.room.Room
+import androidx.room.RoomDatabase
+import androidx.work.Constraints
+import androidx.work.CoroutineWorker
+import androidx.work.ExistingWorkPolicy
+import androidx.work.NetworkType
+import androidx.work.OneTimeWorkRequestBuilder
+import androidx.work.WorkManager
+import androidx.work.WorkerParameters
+import com.korexlabs.dhinspeccion.data.CreateFieldFindingRequest
+import com.korexlabs.dhinspeccion.data.CreateFieldInventoryRequest
+import com.korexlabs.dhinspeccion.data.DhRepository
+import com.korexlabs.dhinspeccion.data.FieldFindingsRepository
+import com.korexlabs.dhinspeccion.data.MobileActsRepository
+import com.korexlabs.dhinspeccion.data.MobileResponsibleRequest
+import com.korexlabs.dhinspeccion.data.SecureSessionStore
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+import org.json.JSONObject
+import retrofit2.HttpException
+import java.io.File
+import java.io.IOException
+import java.time.Instant
+import java.util.UUID
+import java.util.concurrent.atomic.AtomicLong
+
+@Entity(tableName = "pending_mobile_operations")
+data class PendingMobileOperation(
+    @PrimaryKey val id: String,
+    val ownerUserId: String,
+    val type: String,
+    val resourceId: String,
+    val payloadJson: String,
+    val filePath: String? = null,
+    val state: String = "PENDING",
+    val attempts: Int = 0,
+    val lastError: String? = null,
+    val createdAt: Long = System.currentTimeMillis(),
+    val updatedAt: Long = System.currentTimeMillis(),
+)
+
+@Dao
+interface PendingMobileOperationDao {
+    @Insert(onConflict = OnConflictStrategy.ABORT)
+    suspend fun insert(value: PendingMobileOperation)
+
+    @Query("SELECT * FROM pending_mobile_operations WHERE ownerUserId=:ownerUserId AND state IN ('PENDING','ERROR') ORDER BY createdAt ASC")
+    suspend fun pending(ownerUserId: String): List<PendingMobileOperation>
+
+    @Query("SELECT COUNT(*) FROM pending_mobile_operations WHERE ownerUserId=:ownerUserId AND state IN ('PENDING','ERROR','SYNCING')")
+    suspend fun pendingCount(ownerUserId: String): Int
+
+    @Query("SELECT COUNT(*) FROM pending_mobile_operations WHERE ownerUserId=:ownerUserId AND resourceId=:resourceId AND type=:type AND state IN ('PENDING','ERROR','SYNCING')")
+    suspend fun hasPending(ownerUserId: String, type: String, resourceId: String): Int
+
+    @Query("UPDATE pending_mobile_operations SET state=:state, attempts=:attempts, lastError=:lastError, updatedAt=:updatedAt WHERE id=:id")
+    suspend fun mark(id: String, state: String, attempts: Int, lastError: String?, updatedAt: Long = System.currentTimeMillis())
+
+    @Query("DELETE FROM pending_mobile_operations WHERE id=:id")
+    suspend fun delete(id: String)
+}
+
+
+@Entity(tableName = "mobile_offline_cache")
+data class OfflineCacheEntry(
+    @PrimaryKey val cacheKey: String,
+    val json: String,
+    val updatedAt: Long = System.currentTimeMillis(),
+)
+
+@Dao
+interface OfflineCacheDao {
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun put(value: OfflineCacheEntry)
+
+    @Query("SELECT * FROM mobile_offline_cache WHERE cacheKey=:key LIMIT 1")
+    suspend fun get(key: String): OfflineCacheEntry?
+
+    @Query("DELETE FROM mobile_offline_cache WHERE cacheKey=:key")
+    suspend fun delete(key: String)
+}
+
+@Database(entities = [PendingMobileOperation::class, OfflineCacheEntry::class], version = 1, exportSchema = false)
+abstract class OfflineQueueDatabase : RoomDatabase() {
+    abstract fun operations(): PendingMobileOperationDao
+    abstract fun cache(): OfflineCacheDao
+
+    companion object {
+        @Volatile private var instance: OfflineQueueDatabase? = null
+
+        fun get(context: Context): OfflineQueueDatabase = instance ?: synchronized(this) {
+            instance ?: Room.databaseBuilder(
+                context.applicationContext,
+                OfflineQueueDatabase::class.java,
+                "dh_mobile_offline_queue.db",
+            ).build().also { instance = it }
+        }
+    }
+}
+
+
+class OfflineJsonCache(context: Context) {
+    private val dao = OfflineQueueDatabase.get(context).cache()
+
+    suspend fun put(key: String, json: String) {
+        dao.put(OfflineCacheEntry(key, json))
+    }
+
+    suspend fun get(key: String): String? = dao.get(key)?.json
+
+    suspend fun delete(key: String) = dao.delete(key)
+}
+
+class OfflineMutationQueue(private val context: Context) {
+    private val dao = OfflineQueueDatabase.get(context).operations()
+    private val sessions = SecureSessionStore(context.applicationContext)
+    private val mediaRoot = File(context.filesDir, "offline-media").apply { mkdirs() }
+
+    suspend fun pendingCount(): Int = currentOwnerOrNull()?.let { dao.pendingCount(it) } ?: 0
+
+    suspend fun hasPending(type: String, resourceId: String): Boolean =
+        currentOwnerOrNull()?.let { dao.hasPending(it, type, resourceId) > 0 } ?: false
+
+    suspend fun enqueueFindingCreate(
+        findingId: String,
+        visitId: String,
+        assetId: String,
+        request: CreateFieldFindingRequest,
+    ): String = enqueueJson(
+        type = "FINDING_CREATE",
+        resourceId = findingId,
+        payload = JSONObject()
+            .put("visitId", visitId)
+            .put("assetId", assetId)
+            .put("actId", request.actId)
+            .put("clientGeneratedId", request.clientGeneratedId ?: findingId)
+            .put("catalogItemId", request.catalogItemId)
+            .put("customTitle", request.customTitle)
+            .put("customLegalBasis", request.customLegalBasis)
+            .put("description", request.description)
+            .put("severity", request.severity)
+            .toString(),
+    )
+
+    suspend fun enqueueFindingPhoto(
+        findingId: String,
+        source: File,
+        latitude: Double,
+        longitude: Double,
+        accuracyM: Double?,
+        title: String?,
+        description: String?,
+        capturedAt: String = Instant.now().toString(),
+    ): String = persistWithFile("FINDING_PHOTO", findingId, source, "jpg") { id ->
+        JSONObject()
+            .put("operationId", id)
+            .put("latitude", latitude)
+            .put("longitude", longitude)
+            .put("accuracyM", accuracyM)
+            .put("title", title)
+            .put("description", description)
+            .put("capturedAt", capturedAt)
+            .toString()
+    }
+
+    suspend fun enqueueVisitStart(visitId: String): String = enqueueJson(
+        type = "VISIT_START",
+        resourceId = visitId,
+        payload = JSONObject().toString(),
+    )
+
+    suspend fun enqueueVisitClose(
+        visitId: String,
+        clientClosedAt: String = Instant.now().toString(),
+    ): String = enqueueJson(
+        type = "VISIT_CLOSE",
+        resourceId = visitId,
+        payload = JSONObject().put("clientClosedAt", clientClosedAt).toString(),
+    )
+
+    suspend fun enqueueFieldAssetCreate(
+        assetId: String,
+        visitId: String,
+        request: CreateFieldInventoryRequest,
+    ): String = enqueueJson(
+        type = "FIELD_ASSET_CREATE",
+        resourceId = assetId,
+        payload = JSONObject()
+            .put("visitId", visitId)
+            .put("typeId", request.typeId)
+            .put("parentId", request.parentId)
+            .put("familyId", request.familyId)
+            .put("code", request.code)
+            .put("name", request.name)
+            .put("commonName", request.commonName)
+            .put("description", request.description)
+            .put("discoveryNotes", request.discoveryNotes)
+            .put("attributes", JSONObject(request.attributes))
+            .put("deviceLatitude", request.deviceLatitude)
+            .put("deviceLongitude", request.deviceLongitude)
+            .put("deviceAccuracyM", request.deviceAccuracyM)
+            .put("deviceCapturedAt", request.deviceCapturedAt)
+            .put("deviceLabel", request.deviceLabel)
+            .toString(),
+    )
+
+    suspend fun enqueueFieldAssetPhoto(
+        assetId: String,
+        visitId: String,
+        source: File,
+        latitude: Double,
+        longitude: Double,
+        accuracyM: Double?,
+        capturedAt: String = Instant.now().toString(),
+    ): String = persistWithFile("FIELD_ASSET_PHOTO", assetId, source, "jpg") { id ->
+        JSONObject()
+            .put("visitId", visitId)
+            .put("operationId", id)
+            .put("latitude", latitude)
+            .put("longitude", longitude)
+            .put("accuracyM", accuracyM)
+            .put("capturedAt", capturedAt)
+            .toString()
+    }
+
+    suspend fun enqueueFieldAssetSelect(visitId: String, assetId: String): String = enqueueJson(
+        type = "FIELD_ASSET_SELECT",
+        resourceId = assetId,
+        payload = JSONObject().put("visitId", visitId).toString(),
+    )
+
+    suspend fun enqueueActCreate(
+        actId: String,
+        visitId: String,
+        visitCode: String,
+        occurredAt: String,
+    ): String = enqueueJson(
+        type = "ACT_CREATE",
+        resourceId = actId,
+        payload = JSONObject()
+            .put("visitId", visitId)
+            .put("visitCode", visitCode)
+            .put("occurredAt", occurredAt)
+            .toString(),
+    )
+
+    suspend fun enqueueActAsset(actId: String, assetId: String): String = enqueueJson(
+        type = "ACT_ASSET_ENSURE",
+        resourceId = actId,
+        payload = JSONObject().put("assetId", assetId).toString(),
+    )
+
+    suspend fun enqueueResponsible(actId: String, request: MobileResponsibleRequest): String = enqueueJson(
+        type = "ACT_RESPONSIBLE",
+        resourceId = actId,
+        payload = JSONObject()
+            .put("attendanceStatus", request.attendanceStatus)
+            .put("fullName", request.fullName)
+            .put("documentType", request.documentType)
+            .put("documentNumber", request.documentNumber)
+            .put("position", request.position)
+            .put("email", request.email)
+            .put("phone", request.phone)
+            .put("absenceReason", request.absenceReason)
+            .toString(),
+    )
+
+    suspend fun enqueueActLock(actId: String, urgency: String): String = enqueueJson(
+        type = "ACT_LOCK",
+        resourceId = actId,
+        payload = JSONObject().put("urgency", urgency).toString(),
+    )
+
+    suspend fun enqueueCompanyOutcome(actId: String, status: String, reason: String): String = enqueueJson(
+        type = "COMPANY_OUTCOME",
+        resourceId = actId,
+        payload = JSONObject().put("status", status).put("reason", reason).toString(),
+    )
+
+    suspend fun enqueueCompanySignature(
+        actId: String,
+        source: File,
+        latitude: Double?,
+        longitude: Double?,
+        accuracyM: Double?,
+        manifestation: String,
+        statement: String?,
+        clientSignedAt: String = Instant.now().toString(),
+    ): String = persistWithFile("COMPANY_SIGNATURE", actId, source, "png") { _ ->
+        JSONObject()
+            .put("latitude", latitude)
+            .put("longitude", longitude)
+            .put("accuracyM", accuracyM)
+            .put("manifestation", manifestation)
+            .put("statement", statement)
+            .put("clientSignedAt", clientSignedAt)
+            .toString()
+    }
+
+    suspend fun enqueueSeal(
+        actId: String,
+        clientClosedAt: String = Instant.now().toString(),
+    ): String {
+        val id = UUID.randomUUID().toString()
+        dao.insert(
+            PendingMobileOperation(
+                id = id,
+                ownerUserId = currentOwner(),
+                type = "ACT_SEAL",
+                resourceId = actId,
+                payloadJson = JSONObject().put("clientClosedAt", clientClosedAt).toString(),
+                createdAt = nextCreatedAt(),
+            ),
+        )
+        schedule(context)
+        return id
+    }
+
+    private suspend fun enqueueJson(type: String, resourceId: String, payload: String): String {
+        val id = UUID.randomUUID().toString()
+        dao.insert(PendingMobileOperation(
+            id = id,
+            ownerUserId = currentOwner(),
+            type = type,
+            resourceId = resourceId,
+            payloadJson = payload,
+            createdAt = nextCreatedAt(),
+        ))
+        schedule(context)
+        return id
+    }
+
+    private suspend fun persistWithFile(
+        type: String,
+        resourceId: String,
+        source: File,
+        extension: String,
+        payload: (String) -> String,
+    ): String = withContext(Dispatchers.IO) {
+        val id = UUID.randomUUID().toString()
+        val target = File(mediaRoot, "$id.$extension")
+        source.copyTo(target, overwrite = false)
+        dao.insert(
+            PendingMobileOperation(
+                id = id,
+                ownerUserId = currentOwner(),
+                type = type,
+                resourceId = resourceId,
+                payloadJson = payload(id),
+                filePath = target.absolutePath,
+                createdAt = nextCreatedAt(),
+            ),
+        )
+        source.delete()
+        schedule(context)
+        id
+    }
+
+    suspend fun syncAll(): SyncResult = syncMutex.withLock {
+        val ownerUserId = currentOwnerOrNull() ?: return@withLock SyncResult(0, 0, retry = false)
+        var synced = 0
+        var lastError: String? = null
+        for (operation in dao.pending(ownerUserId)) {
+            val attempt = operation.attempts + 1
+            dao.mark(operation.id, "SYNCING", attempt, null)
+            try {
+                syncOne(operation)
+                operation.filePath?.let { File(it).delete() }
+                dao.delete(operation.id)
+                synced += 1
+            } catch (error: IOException) {
+                dao.mark(operation.id, "PENDING", attempt, error.message)
+                return@withLock SyncResult(synced, dao.pendingCount(ownerUserId), retry = true, lastError = error.message)
+            } catch (error: HttpException) {
+                if (isAlreadyApplied(operation, error)) {
+                    operation.filePath?.let { File(it).delete() }
+                    dao.delete(operation.id)
+                    synced += 1
+                } else {
+                    lastError = httpError(error)
+                    dao.mark(operation.id, "ERROR", attempt, lastError)
+                    return@withLock SyncResult(synced, dao.pendingCount(ownerUserId), retry = false, lastError = lastError)
+                }
+            } catch (error: Throwable) {
+                lastError = error.message ?: error::class.java.simpleName
+                dao.mark(operation.id, "ERROR", attempt, lastError)
+                return@withLock SyncResult(synced, dao.pendingCount(ownerUserId), retry = false, lastError = lastError)
+            }
+        }
+        SyncResult(synced, dao.pendingCount(ownerUserId), retry = false, lastError = lastError)
+    }
+
+    private suspend fun syncOne(operation: PendingMobileOperation) {
+        val payload = JSONObject(operation.payloadJson)
+        when (operation.type) {
+            "VISIT_START" -> DhRepository(context).startVisit(operation.resourceId)
+            "VISIT_CLOSE" -> MobileActsRepository(context).closeVisit(
+                operation.resourceId,
+                payload.getString("clientClosedAt"),
+            )
+            "FIELD_ASSET_CREATE" -> DhRepository(context).createFieldAsset(
+                payload.getString("visitId"),
+                CreateFieldInventoryRequest(
+                    clientGeneratedId = operation.resourceId,
+                    typeId = payload.getString("typeId"),
+                    parentId = payload.optNullableString("parentId"),
+                    familyId = payload.optNullableString("familyId"),
+                    code = payload.optNullableString("code"),
+                    name = payload.getString("name"),
+                    commonName = payload.optNullableString("commonName"),
+                    description = payload.optNullableString("description"),
+                    discoveryNotes = payload.optNullableString("discoveryNotes"),
+                    attributes = jsonObjectToMap(payload.getJSONObject("attributes")),
+                    deviceLatitude = payload.getDouble("deviceLatitude"),
+                    deviceLongitude = payload.getDouble("deviceLongitude"),
+                    deviceAccuracyM = payload.optDoubleOrNull("deviceAccuracyM"),
+                    deviceCapturedAt = payload.getString("deviceCapturedAt"),
+                    deviceLabel = payload.optString("deviceLabel", "DH Android"),
+                ),
+            )
+            "FIELD_ASSET_PHOTO" -> DhRepository(context).uploadFieldPhoto(
+                visitId = payload.getString("visitId"),
+                assetId = operation.resourceId,
+                file = requiredFile(operation),
+                latitude = payload.getDouble("latitude"),
+                longitude = payload.getDouble("longitude"),
+                accuracyM = payload.optDoubleOrNull("accuracyM"),
+                capturedAt = payload.getString("capturedAt"),
+                operationId = payload.getString("operationId"),
+            )
+            "FIELD_ASSET_SELECT" -> DhRepository(context).selectFieldAsset(
+                payload.getString("visitId"),
+                operation.resourceId,
+            )
+            "ACT_CREATE" -> MobileActsRepository(context).create(
+                visitId = payload.getString("visitId"),
+                visitCode = payload.getString("visitCode"),
+                clientGeneratedId = operation.resourceId,
+                occurredAt = payload.getString("occurredAt"),
+            )
+            "ACT_ASSET_ENSURE" -> MobileActsRepository(context).ensureAsset(
+                operation.resourceId,
+                payload.getString("assetId"),
+            )
+            "FINDING_CREATE" -> FieldFindingsRepository(context).create(
+                payload.getString("visitId"),
+                payload.getString("assetId"),
+                CreateFieldFindingRequest(
+                    actId = payload.getString("actId"),
+                    clientGeneratedId = payload.getString("clientGeneratedId"),
+                    catalogItemId = payload.optNullableString("catalogItemId"),
+                    customTitle = payload.optNullableString("customTitle"),
+                    customLegalBasis = payload.optNullableString("customLegalBasis"),
+                    description = payload.getString("description"),
+                    severity = if (!payload.has("severity") || payload.isNull("severity")) null else payload.getInt("severity"),
+                ),
+            )
+            "ACT_RESPONSIBLE" -> MobileActsRepository(context).setResponsible(
+                operation.resourceId,
+                MobileResponsibleRequest(
+                    attendanceStatus = payload.getString("attendanceStatus"),
+                    fullName = payload.optNullableString("fullName"),
+                    documentType = payload.optNullableString("documentType"),
+                    documentNumber = payload.optNullableString("documentNumber"),
+                    position = payload.optNullableString("position"),
+                    email = payload.optNullableString("email"),
+                    phone = payload.optNullableString("phone"),
+                    absenceReason = payload.optNullableString("absenceReason"),
+                ),
+            )
+            "ACT_LOCK" -> MobileActsRepository(context).lock(
+                operation.resourceId,
+                payload.getString("urgency"),
+            )
+            "COMPANY_OUTCOME" -> MobileActsRepository(context).companyOutcome(
+                operation.resourceId,
+                payload.getString("status"),
+                payload.getString("reason"),
+            )
+            "FINDING_PHOTO" -> {
+                val file = requiredFile(operation)
+                FieldFindingsRepository(context).uploadObservationPhoto(
+                    findingId = operation.resourceId,
+                    file = file,
+                    latitude = payload.getDouble("latitude"),
+                    longitude = payload.getDouble("longitude"),
+                    accuracyM = payload.optDoubleOrNull("accuracyM"),
+                    title = payload.optNullableString("title"),
+                    description = payload.optNullableString("description"),
+                    capturedAt = payload.getString("capturedAt"),
+                    operationId = payload.getString("operationId"),
+                )
+            }
+            "COMPANY_SIGNATURE" -> {
+                val file = requiredFile(operation)
+                MobileActsRepository(context).signCompany(
+                    actId = operation.resourceId,
+                    png = file,
+                    latitude = payload.optDoubleOrNull("latitude"),
+                    longitude = payload.optDoubleOrNull("longitude"),
+                    accuracyM = payload.optDoubleOrNull("accuracyM"),
+                    manifestation = payload.optString("manifestation", "CONFORMITY"),
+                    statement = payload.optNullableString("statement"),
+                    clientSignedAt = payload.getString("clientSignedAt"),
+                )
+            }
+            "ACT_SEAL" -> MobileActsRepository(context).seal(
+                actId = operation.resourceId,
+                uploadMode = "DEFERRED",
+                clientClosedAt = payload.getString("clientClosedAt"),
+            )
+            else -> error("Operación offline desconocida: ${operation.type}")
+        }
+    }
+
+    private suspend fun isAlreadyApplied(operation: PendingMobileOperation, error: HttpException): Boolean {
+        if (error.code() != 409) return false
+        return when (operation.type) {
+            "VISIT_START" -> runCatching {
+                DhRepository(context).visit(operation.resourceId).status in setOf("IN_PROGRESS", "CLOSED")
+            }.getOrDefault(false)
+            "VISIT_CLOSE" -> runCatching {
+                DhRepository(context).visit(operation.resourceId).status == "CLOSED"
+            }.getOrDefault(false)
+            "ACT_LOCK" -> runCatching {
+                MobileActsRepository(context).get(operation.resourceId).status != "DRAFT"
+            }.getOrDefault(false)
+            "COMPANY_OUTCOME", "COMPANY_SIGNATURE" -> runCatching {
+                MobileActsRepository(context).closure(operation.resourceId).signatures.any {
+                    it.signerType == "COMPANY_RESPONSIBLE" && (it.status == "SIGNED" || it.status == "REFUSED")
+                }
+            }.getOrDefault(false)
+            "ACT_SEAL" -> runCatching {
+                MobileActsRepository(context).get(operation.resourceId).status == "SEALED"
+            }.getOrDefault(false)
+            else -> false
+        }
+    }
+
+    private fun requiredFile(operation: PendingMobileOperation): File {
+        val path = operation.filePath ?: error("La operación ${operation.id} no tiene archivo local")
+        return File(path).also { require(it.isFile) { "Archivo local pendiente inexistente" } }
+    }
+
+    private fun currentOwnerOrNull(): String? = sessions.load()?.userId
+
+    private fun currentOwner(): String = currentOwnerOrNull()
+        ?: throw IllegalStateException("Sesión no iniciada")
+
+    data class SyncResult(val synced: Int, val pending: Int, val retry: Boolean, val lastError: String? = null)
+
+    companion object {
+        private const val UNIQUE_WORK = "dh-mobile-offline-sync"
+        private val syncMutex = Mutex()
+        private val queueClock = AtomicLong(System.currentTimeMillis())
+
+        private fun nextCreatedAt(): Long = queueClock.updateAndGet { previous ->
+            maxOf(System.currentTimeMillis(), previous + 1)
+        }
+
+        fun schedule(context: Context) {
+            val constraints = Constraints.Builder()
+                .setRequiredNetworkType(NetworkType.CONNECTED)
+                .build()
+            val request = OneTimeWorkRequestBuilder<OfflineSyncWorker>()
+                .setConstraints(constraints)
+                .build()
+            WorkManager.getInstance(context.applicationContext)
+                .enqueueUniqueWork(UNIQUE_WORK, ExistingWorkPolicy.KEEP, request)
+        }
+    }
+}
+
+class OfflineSyncWorker(
+    appContext: Context,
+    params: WorkerParameters,
+) : CoroutineWorker(appContext, params) {
+    override suspend fun doWork(): Result {
+        val result = OfflineMutationQueue(applicationContext).syncAll()
+        return if (result.retry) Result.retry() else Result.success()
+    }
+}
+
+private fun httpError(error: HttpException): String {
+    val body = runCatching { error.response()?.errorBody()?.string() }.getOrNull().orEmpty()
+    return runCatching { JSONObject(body).optString("message") }.getOrNull()
+        ?.takeIf { it.isNotBlank() }
+        ?: "No se pudo sincronizar (HTTP ${error.code()})"
+}
+
+private fun jsonObjectToMap(value: JSONObject): Map<String, Any?> = buildMap {
+    val keys = value.keys()
+    while (keys.hasNext()) {
+        val key = keys.next()
+        put(key, jsonValue(value.opt(key)))
+    }
+}
+
+private fun jsonValue(value: Any?): Any? = when (value) {
+    null, JSONObject.NULL -> null
+    is JSONObject -> jsonObjectToMap(value)
+    is org.json.JSONArray -> List(value.length()) { index -> jsonValue(value.opt(index)) }
+    else -> value
+}
+
+private fun JSONObject.optDoubleOrNull(name: String): Double? =
+    if (!has(name) || isNull(name)) null else getDouble(name)
+
+private fun JSONObject.optNullableString(name: String): String? =
+    if (!has(name) || isNull(name)) null else optString(name).takeIf { it.isNotBlank() }

android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/DhApp.kt

@@ -60,6 +60,7 @@ import com.korexlabs.dhinspeccion.MainViewModel
 import com.korexlabs.dhinspeccion.data.FieldAttributeDefinition
 import com.korexlabs.dhinspeccion.data.FieldInventoryItem
 import com.korexlabs.dhinspeccion.data.FieldType
+import com.korexlabs.dhinspeccion.data.fieldAttributePayload
 import com.korexlabs.dhinspeccion.data.VisitDetail
 import com.korexlabs.dhinspeccion.data.VisitSummary
 import kotlinx.coroutines.launch
@@ -521,18 +522,7 @@ private fun InventoryCard(item: FieldInventoryItem, canModify: Boolean, onSelect
 }
 
 private fun buildAttributes(type: FieldType, values: Map<String, String>): Map<String, Any?> =
-    type.attributes.mapNotNull { definition ->
+    fieldAttributePayload(type.attributes, values)
-        val raw = values[definition.code]?.trim().orEmpty()
-        if (raw.isBlank()) return@mapNotNull null
-        definition.code to coerceAttribute(definition, raw)
-    }.toMap()
-
-private fun coerceAttribute(definition: FieldAttributeDefinition, raw: String): Any = when (definition.dataType.uppercase()) {
-    "INTEGER", "INT" -> raw.toLongOrNull() ?: raw
-    "NUMBER", "DECIMAL", "FLOAT", "DOUBLE" -> raw.replace(',', '.').toDoubleOrNull() ?: raw
-    "BOOLEAN", "BOOL" -> raw.lowercase() in setOf("true", "1", "si", "sí", "yes")
-    else -> raw
-}
 
 private fun hasPermission(context: Context, permission: String): Boolean =
     ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED

android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/DynamicVisitRoot.kt

@@ -56,6 +56,7 @@ import com.korexlabs.dhinspeccion.MainViewModel
 import com.korexlabs.dhinspeccion.data.FieldAttributeDefinition
 import com.korexlabs.dhinspeccion.data.FieldInventoryItem
 import com.korexlabs.dhinspeccion.data.FieldType
+import com.korexlabs.dhinspeccion.data.fieldAttributePayload
 import com.korexlabs.dhinspeccion.data.VisitDetail
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
@@ -693,11 +694,11 @@ private fun DynamicFieldInventoryScreen(model: MainViewModel, onBack: () -> Unit
                     }
 
                     if (selectedType?.familyRequired == true) {
-                        Text("Clasificación técnica *", fontWeight = FontWeight.Bold)
+                        Text("Tipo de instalación *", fontWeight = FontWeight.Bold)
                         OutlinedTextField(
                             value = familySearch,
                             onValueChange = { familySearch = it },
-                            label = { Text("Buscar clasificación") },
+                            label = { Text("Buscar tipo de instalación") },
                             supportingText = { Text("${filteredFamilies.size} opciones compatibles") },
                             modifier = Modifier.fillMaxWidth(),
                             singleLine = true,
@@ -906,18 +907,7 @@ private fun dynamicStatusLabel(status: String): String = when (status) {
 }
 
 private fun buildDynamicAttributes(type: FieldType, values: Map<String, String>): Map<String, Any?> =
-    type.attributes.mapNotNull { definition ->
+    fieldAttributePayload(type.attributes, values)
-        val raw = values[definition.code]?.trim().orEmpty()
-        if (raw.isBlank()) return@mapNotNull null
-        definition.code to coerceDynamicAttribute(definition, raw)
-    }.toMap()
-
-private fun coerceDynamicAttribute(definition: FieldAttributeDefinition, raw: String): Any = when (definition.dataType.uppercase()) {
-    "INTEGER", "INT" -> raw.toLongOrNull() ?: raw
-    "NUMBER", "DECIMAL", "FLOAT", "DOUBLE" -> raw.replace(',', '.').toDoubleOrNull() ?: raw
-    "BOOLEAN", "BOOL" -> raw.lowercase() in setOf("true", "1", "si", "sí", "yes")
-    else -> raw
-}
 
 private fun dynamicHasPermission(context: Context, permission: String): Boolean =
     ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED

android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/F3VisitRoot.kt

@@ -57,6 +57,7 @@ import com.korexlabs.dhinspeccion.MainViewModel
 import com.korexlabs.dhinspeccion.data.FieldAttributeDefinition
 import com.korexlabs.dhinspeccion.data.FieldInventoryItem
 import com.korexlabs.dhinspeccion.data.FieldType
+import com.korexlabs.dhinspeccion.data.fieldAttributePayload
 import com.korexlabs.dhinspeccion.data.VisitDetail
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
@@ -720,18 +721,7 @@ private fun statusLabel(status: String): String = when (status) {
 }
 
 private fun buildF3Attributes(type: FieldType, values: Map<String, String>): Map<String, Any?> =
-    type.attributes.mapNotNull { definition ->
+    fieldAttributePayload(type.attributes, values)
-        val raw = values[definition.code]?.trim().orEmpty()
-        if (raw.isBlank()) return@mapNotNull null
-        definition.code to coerceF3Attribute(definition, raw)
-    }.toMap()
-
-private fun coerceF3Attribute(definition: FieldAttributeDefinition, raw: String): Any = when (definition.dataType.uppercase()) {
-    "INTEGER", "INT" -> raw.toLongOrNull() ?: raw
-    "NUMBER", "DECIMAL", "FLOAT", "DOUBLE" -> raw.replace(',', '.').toDoubleOrNull() ?: raw
-    "BOOLEAN", "BOOL" -> raw.lowercase() in setOf("true", "1", "si", "sí", "yes")
-    else -> raw
-}
 
 private fun f3HasPermission(context: Context, permission: String): Boolean =
     ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED

android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/FieldFindingScreen.kt

@@ -1,27 +1,35 @@
 package com.korexlabs.dhinspeccion.ui
 
 import android.Manifest
+import android.graphics.BitmapFactory
 import android.content.Context
 import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Environment
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.foundation.clickable
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Button
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ExposedDropdownMenuBox
+import androidx.compose.material3.ExposedDropdownMenuDefaults
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.MenuAnchorType
 import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
@@ -34,10 +42,17 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.focus.FocusDirection
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
 import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
 import androidx.exifinterface.media.ExifInterface
@@ -60,26 +75,32 @@ private data class FindingGeoSnapshot(
     val accuracyM: Double?,
 )
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun FieldFindingScreen(model: MainViewModel) {
     val options = model.fieldFindingOptions ?: return
     val asset = model.selectedFieldAsset?.asset ?: return
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
+    val focusManager = LocalFocusManager.current
+    val keyboard = LocalSoftwareKeyboardController.current
     var search by rememberSaveable(asset.id) { mutableStateOf("") }
+    var catalogExpanded by rememberSaveable(asset.id) { mutableStateOf(false) }
     var selectedCatalogId by rememberSaveable(asset.id) { mutableStateOf<String?>(null) }
     var other by rememberSaveable(asset.id) { mutableStateOf(false) }
     var customTitle by rememberSaveable(asset.id) { mutableStateOf("") }
     var customLegalBasis by rememberSaveable(asset.id) { mutableStateOf("") }
     var description by rememberSaveable(asset.id) { mutableStateOf("") }
     var severityText by rememberSaveable(asset.id) { mutableStateOf("") }
-    var correctionDueOn by rememberSaveable(asset.id) { mutableStateOf("") }
 
     var localError by rememberSaveable { mutableStateOf<String?>(null) }
     var requestedFindingId by remember { mutableStateOf<String?>(null) }
     var pendingPhotoFile by remember { mutableStateOf<File?>(null) }
     var pendingPhotoGeo by remember { mutableStateOf<FindingGeoSnapshot?>(null) }
     var pendingPhotoFindingId by remember { mutableStateOf<String?>(null) }
+    var reviewPhotoFile by remember { mutableStateOf<File?>(null) }
+    var reviewPhotoGeo by remember { mutableStateOf<FindingGeoSnapshot?>(null) }
+    var reviewPhotoFindingId by remember { mutableStateOf<String?>(null) }
 
     val takePicture = rememberLauncherForActivityResult(ActivityResultContracts.TakePicture()) { success ->
         val file = pendingPhotoFile
@@ -87,14 +108,11 @@ fun FieldFindingScreen(model: MainViewModel) {
         val findingId = pendingPhotoFindingId
         if (success && file != null && geo != null && findingId != null) {
             runCatching { writeFindingExif(file, geo) }
-            model.uploadFindingPhoto(
+            reviewPhotoFile = file
-                findingId = findingId,
+            reviewPhotoGeo = geo
-                file = file,
+            reviewPhotoFindingId = findingId
-                latitude = geo.latitude,
+        } else {
-                longitude = geo.longitude,
+            file?.delete()
-                accuracyM = geo.accuracyM,
-                title = "Evidencia fotográfica de campo",
-            )
         }
         pendingPhotoFile = null
         pendingPhotoGeo = null
@@ -164,8 +182,81 @@ fun FieldFindingScreen(model: MainViewModel) {
             customLegalBasis = ""
             description = ""
             severityText = ""
-            correctionDueOn = ""
             search = ""
+            catalogExpanded = false
+        }
+    }
+
+    val reviewFile = reviewPhotoFile
+    val reviewGeo = reviewPhotoGeo
+    val reviewFindingId = reviewPhotoFindingId
+    if (reviewFile != null && reviewGeo != null && reviewFindingId != null) {
+        val bitmap = remember(reviewFile.absolutePath, reviewFile.lastModified()) {
+            runCatching { BitmapFactory.decodeFile(reviewFile.absolutePath)?.asImageBitmap() }.getOrNull()
+        }
+        Dialog(onDismissRequest = {}) {
+            Card(Modifier.fillMaxWidth()) {
+                Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(12.dp)) {
+                    Text("Revisar fotografía", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
+                    Text(
+                        "Todavía no se subió. Verificá la imagen antes de incorporarla al Hallazgo.",
+                        style = MaterialTheme.typography.bodyMedium,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    )
+                    if (bitmap != null) {
+                        Image(
+                            bitmap = bitmap,
+                            contentDescription = "Vista previa de la fotografía del Hallazgo",
+                            modifier = Modifier.fillMaxWidth().heightIn(min = 220.dp, max = 460.dp),
+                            contentScale = ContentScale.Fit,
+                        )
+                    } else {
+                        Text("No se pudo generar la vista previa.", color = MaterialTheme.colorScheme.error)
+                    }
+                    Text(
+                        "GPS ${"%.6f".format(reviewGeo.latitude)}, ${"%.6f".format(reviewGeo.longitude)}${reviewGeo.accuracyM?.let { " · ±${"%.1f".format(it)} m" }.orEmpty()}",
+                        style = MaterialTheme.typography.bodySmall,
+                    )
+                    Button(
+                        onClick = {
+                            model.uploadFindingPhoto(
+                                findingId = reviewFindingId,
+                                file = reviewFile,
+                                latitude = reviewGeo.latitude,
+                                longitude = reviewGeo.longitude,
+                                accuracyM = reviewGeo.accuracyM,
+                                title = "Evidencia fotográfica de campo",
+                            )
+                            reviewPhotoFile = null
+                            reviewPhotoGeo = null
+                            reviewPhotoFindingId = null
+                        },
+                        enabled = !model.busy && bitmap != null,
+                        modifier = Modifier.fillMaxWidth(),
+                    ) { Text("Usar esta foto") }
+                    OutlinedButton(
+                        onClick = {
+                            reviewFile.delete()
+                            reviewPhotoFile = null
+                            reviewPhotoGeo = null
+                            reviewPhotoFindingId = null
+                            beginPhoto(reviewFindingId)
+                        },
+                        enabled = !model.busy,
+                        modifier = Modifier.fillMaxWidth(),
+                    ) { Text("Volver a tomar") }
+                    OutlinedButton(
+                        onClick = {
+                            reviewFile.delete()
+                            reviewPhotoFile = null
+                            reviewPhotoGeo = null
+                            reviewPhotoFindingId = null
+                        },
+                        enabled = !model.busy,
+                        modifier = Modifier.fillMaxWidth(),
+                    ) { Text("Eliminar foto") }
+                }
+            }
         }
     }
 
@@ -180,15 +271,15 @@ fun FieldFindingScreen(model: MainViewModel) {
             OutlinedButton(onClick = { model.clearFindingFlow() }, enabled = !model.busy) {
                 Text("Volver")
             }
-            Text("Hallazgo de campo", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
+            Text("Nuevo Hallazgo", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
         }
 
         Card(Modifier.fillMaxWidth()) {
             Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) {
                 Text(asset.name, fontWeight = FontWeight.Bold)
-                Text("${asset.code} · Acta ${options.act.code}", style = MaterialTheme.typography.bodySmall)
+                Text("${asset.code} · ${options.act.code}", style = MaterialTheme.typography.bodySmall)
                 Text(
-                    "GPS + foto del Inventario: ${if (options.capture.readyForFinding) "completo" else "pendiente"}",
+                    if (options.capture.readyForFinding) "Inventario listo para registrar Hallazgos" else "Completá GPS y foto antes de continuar",
                     color = if (options.capture.readyForFinding) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error,
                     style = MaterialTheme.typography.bodySmall,
                 )
@@ -225,87 +316,123 @@ fun FieldFindingScreen(model: MainViewModel) {
                                 style = MaterialTheme.typography.bodySmall,
                             )
                         }
+                        val photoCount = evidence.count { it.kind == "PHOTO" }
                         Button(
                             onClick = { requestPhoto(finding.id) },
                             enabled = !model.busy,
                             modifier = Modifier.fillMaxWidth(),
                         ) {
-                            Text("Tomar foto con GPS")
+                            Text(if (photoCount == 0) "Agregar foto con GPS" else "Agregar otra foto con GPS")
                         }
+                        Text(
+                            if (photoCount == 0) "Podés adjuntar una o varias fotos." else "$photoCount foto${if (photoCount == 1) "" else "s"} adjunta${if (photoCount == 1) "" else "s"}. Podés seguir agregando.",
+                            style = MaterialTheme.typography.bodySmall,
+                        )
                     }
                 }
             }
             HorizontalDivider()
         }
 
-        Text("1. Elegí el tipo de Hallazgo", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+        Text("1. Tipo de Hallazgo", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
         if (!options.catalog.typeConfigured) {
             Text(
-                options.catalog.configurationReason
+                "No hay tipos sugeridos para este Inventario. Elegí Otro para cargarlo manualmente.",
-                    ?: "Este tipo de Inventario todavía no tiene un catálogo contextual configurado. Podés usar OTROS.",
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
-                color = MaterialTheme.colorScheme.secondary,
-            )
-        }
-        OutlinedTextField(
-            value = search,
-            onValueChange = { search = it },
-            label = { Text("Buscar en catálogo") },
-            modifier = Modifier.fillMaxWidth(),
-            singleLine = true,
-        )
-
-        filtered.forEach { item ->
-            val chosen = !other && selectedCatalogId == item.id
-            Card(
-                modifier = Modifier.fillMaxWidth().clickable {
-                    selectedCatalogId = item.id
-                    other = false
-                    severityText = item.suggestedSeverity?.toString().orEmpty()
-                },
-                colors = if (chosen) {
-                    CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer)
-                } else {
-                    CardDefaults.cardColors()
-                },
-            ) {
-                Column(Modifier.padding(10.dp), verticalArrangement = Arrangement.spacedBy(3.dp)) {
-                    Text(if (chosen) "✓ ${item.title}" else item.title, fontWeight = FontWeight.SemiBold)
-                    Text(
-                        listOfNotNull(item.categoryName, item.code, item.suggestedSeverity?.let { "Gravedad sugerida $it" })
-                            .joinToString(" · "),
                 style = MaterialTheme.typography.bodySmall,
             )
         }
+        ExposedDropdownMenuBox(
+            expanded = catalogExpanded && !model.busy,
+            onExpandedChange = {
+                if (!model.busy) {
+                    catalogExpanded = it
+                    if (it) search = ""
+                }
+            },
+        ) {
+            OutlinedTextField(
+                value = if (catalogExpanded) search else when {
+                    other -> "Otro / No está en la lista"
+                    selected != null -> selected.title
+                    else -> ""
+                },
+                onValueChange = { search = it; catalogExpanded = true },
+                label = { Text("Tipo de Hallazgo *") },
+                placeholder = { Text("Buscar o seleccionar") },
+                trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = catalogExpanded) },
+                modifier = Modifier.fillMaxWidth().menuAnchor(MenuAnchorType.PrimaryEditable),
+                enabled = !model.busy,
+                singleLine = true,
+                keyboardOptions = KeyboardOptions(imeAction = ImeAction.Next),
+                keyboardActions = KeyboardActions(onNext = {
+                    catalogExpanded = false
+                    focusManager.moveFocus(FocusDirection.Down)
+                }),
+            )
+            ExposedDropdownMenu(
+                expanded = catalogExpanded && !model.busy,
+                onDismissRequest = { catalogExpanded = false; search = "" },
+                modifier = Modifier.heightIn(max = 320.dp),
+            ) {
+                filtered.forEach { item ->
+                    DropdownMenuItem(
+                        text = {
+                            Column {
+                                Text(item.title, fontWeight = FontWeight.SemiBold)
+                                item.suggestedSeverity?.let {
+                                    Text("Gravedad sugerida: $it/10", style = MaterialTheme.typography.bodySmall)
                                 }
                             }
-
+                        },
-        OutlinedButton(
+                        onClick = {
+                            selectedCatalogId = item.id
+                            other = false
+                            severityText = item.suggestedSeverity?.toString().orEmpty()
+                            catalogExpanded = false
+                            search = ""
+                            keyboard?.hide()
+                            focusManager.moveFocus(FocusDirection.Down)
+                        },
+                    )
+                }
+                DropdownMenuItem(
+                    text = { Text("Otro / No está en la lista", fontWeight = FontWeight.SemiBold) },
                     onClick = {
                         other = true
                         selectedCatalogId = null
                         severityText = ""
+                        catalogExpanded = false
+                        search = ""
+                        keyboard?.hide()
+                        focusManager.moveFocus(FocusDirection.Down)
                     },
-            modifier = Modifier.fillMaxWidth(),
+                )
-        ) {
+            }
-            Text(if (other) "✓ OTROS · Hallazgo no catalogado" else "OTROS · No está en el catálogo")
         }
         if (other) {
-            options.catalog.other.help?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
+            Text("Cargá un nombre claro para identificar el Hallazgo.", style = MaterialTheme.typography.bodySmall)
             OutlinedTextField(
                 value = customTitle,
                 onValueChange = { customTitle = it },
-                label = { Text("Título del nuevo Hallazgo *") },
+                label = { Text("Nombre del Hallazgo *") },
                 modifier = Modifier.fillMaxWidth(),
+                singleLine = true,
+                keyboardOptions = KeyboardOptions(imeAction = ImeAction.Next),
+                keyboardActions = KeyboardActions(onNext = { focusManager.moveFocus(FocusDirection.Down) }),
             )
             OutlinedTextField(
                 value = customLegalBasis,
                 onValueChange = { customLegalBasis = it },
-                label = { Text("Base legal / normativa (opcional)") },
+                label = { Text("Normativa (opcional)") },
                 modifier = Modifier.fillMaxWidth(),
+                singleLine = true,
+                keyboardOptions = KeyboardOptions(imeAction = ImeAction.Next),
+                keyboardActions = KeyboardActions(onNext = { focusManager.moveFocus(FocusDirection.Down) }),
             )
         }
 
-        Text("2. Describí lo observado", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+        Text("2. Qué observaste", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
         selected?.let {
             Card(Modifier.fillMaxWidth()) {
                 Column(Modifier.padding(10.dp), verticalArrangement = Arrangement.spacedBy(3.dp)) {
@@ -318,23 +445,21 @@ fun FieldFindingScreen(model: MainViewModel) {
         OutlinedTextField(
             value = description,
             onValueChange = { description = it },
-            label = { Text("Descripción del Hallazgo *") },
+            label = { Text("Qué observaste *") },
+            placeholder = { Text("Describí brevemente el problema") },
             modifier = Modifier.fillMaxWidth(),
             minLines = 3,
+            maxLines = 6,
+            keyboardOptions = KeyboardOptions(imeAction = ImeAction.Next),
+            keyboardActions = KeyboardActions(onNext = { focusManager.moveFocus(FocusDirection.Down) }),
         )
         OutlinedTextField(
             value = severityText,
             onValueChange = { value -> severityText = value.filter(Char::isDigit).take(2) },
-            label = { Text("Gravedad 1 a 10") },
+            label = { Text("Gravedad (1 a 10, opcional)") },
-            modifier = Modifier.fillMaxWidth(),
-            keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
-            singleLine = true,
-        )
-        OutlinedTextField(
-            value = correctionDueOn,
-            onValueChange = { correctionDueOn = it },
-            label = { Text("Fecha de corrección AAAA-MM-DD (opcional)") },
             modifier = Modifier.fillMaxWidth(),
+            keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number, imeAction = ImeAction.Done),
+            keyboardActions = KeyboardActions(onDone = { keyboard?.hide(); focusManager.clearFocus() }),
             singleLine = true,
         )
 
@@ -348,7 +473,6 @@ fun FieldFindingScreen(model: MainViewModel) {
                     customLegalBasis = if (other) customLegalBasis else null,
                     description = description,
                     severity = severity,
-                    correctionDueOn = correctionDueOn,
                 )
             },
             enabled = choiceReady && description.isNotBlank() && (severity == null || severity in 1..10) && !model.busy,
@@ -365,13 +489,19 @@ fun FieldFindingScreen(model: MainViewModel) {
                 Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
                     Text("Hallazgo registrado", fontWeight = FontWeight.Bold)
                     Text("${finding.code} · ${finding.title}")
+                    val createdEvidence = model.fieldFindingEvidence[finding.id].orEmpty()
+                    val createdPhotoCount = createdEvidence.count { it.kind == "PHOTO" }
                     Button(
                         onClick = { requestPhoto(finding.id) },
                         enabled = !model.busy,
                         modifier = Modifier.fillMaxWidth(),
                     ) {
-                        Text("Tomar foto con GPS")
+                        Text(if (createdPhotoCount == 0) "Agregar foto con GPS" else "Agregar otra foto con GPS")
                     }
+                    Text(
+                        if (createdPhotoCount == 0) "Podés adjuntar todas las fotos que necesites." else "Fotos adjuntas: $createdPhotoCount. Podés seguir agregando.",
+                        style = MaterialTheme.typography.bodySmall,
+                    )
                     Text("También podés registrar otro Hallazgo sobre el mismo Inventario.", style = MaterialTheme.typography.bodySmall)
                 }
             }

android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/MobileActsScreen.kt

@@ -57,30 +57,31 @@ fun MobileActsScreen(
     val visit = model.visit ?: return
     val selected = model.selectedAct
     val closure = model.actClosure
+    val representativeSeed = closure?.responsible ?: closure?.representativeSuggestion
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
 
     var closingUrgency by rememberSaveable(selected?.id) { mutableStateOf("") }
     var attendance by rememberSaveable(selected?.id) {
-        mutableStateOf(closure?.responsible?.attendanceStatus ?: "PRESENT")
+        mutableStateOf(representativeSeed?.attendanceStatus ?: "PRESENT")
     }
     var fullName by rememberSaveable(selected?.id) {
-        mutableStateOf(closure?.responsible?.fullName.orEmpty())
+        mutableStateOf(representativeSeed?.fullName.orEmpty())
     }
     var documentType by rememberSaveable(selected?.id) {
-        mutableStateOf(closure?.responsible?.documentType ?: "DNI")
+        mutableStateOf("DNI")
     }
     var documentNumber by rememberSaveable(selected?.id) {
-        mutableStateOf(closure?.responsible?.documentNumber.orEmpty())
+        mutableStateOf(representativeSeed?.documentNumber.orEmpty())
     }
     var position by rememberSaveable(selected?.id) {
-        mutableStateOf(closure?.responsible?.position.orEmpty())
+        mutableStateOf(representativeSeed?.position.orEmpty())
     }
     var email by rememberSaveable(selected?.id) {
-        mutableStateOf(closure?.responsible?.email.orEmpty())
+        mutableStateOf(representativeSeed?.email.orEmpty())
     }
     var phone by rememberSaveable(selected?.id) {
-        mutableStateOf(closure?.responsible?.phone.orEmpty())
+        mutableStateOf(representativeSeed?.phone.orEmpty())
     }
     var absenceReason by rememberSaveable(selected?.id) {
         mutableStateOf(closure?.responsible?.absenceReason.orEmpty())
@@ -91,10 +92,9 @@ fun MobileActsScreen(
 
     LaunchedEffect(visit.id) { model.reloadActs() }
 
-    fun signWithGeo(file: File, company: Boolean) {
+    fun signCompanyWithGeo(file: File) {
         scope.launch {
             val geo = runCatching { currentActSignatureGeo(context) }.getOrNull()
-            if (company) {
             model.signSelectedActAsCompany(
                 png = file,
                 latitude = geo?.latitude,
@@ -103,14 +103,6 @@ fun MobileActsScreen(
                 manifestation = manifestation,
                 statement = dissentStatement.takeIf { manifestation == "DISSENT" },
             )
-            } else {
-                model.signSelectedActAsInspector(
-                    png = file,
-                    latitude = geo?.latitude,
-                    longitude = geo?.longitude,
-                    accuracyM = geo?.accuracyM,
-                )
-            }
         }
     }
 
@@ -187,28 +179,6 @@ fun MobileActsScreen(
         }
 
         if (selected != null) {
-            HorizontalDivider()
-            Card(Modifier.fillMaxWidth()) {
-                Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
-                    Text(selected.code, style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-                    Text(actStatusLabel(selected.status))
-                    Text(
-                        when (selected.urgency) {
-                            "URGENT" -> "Urgencia: Urgente"
-                            "NON_URGENT" -> "Urgencia: No urgente"
-                            else -> "Urgencia: se define al cerrar el Acta"
-                        },
-                    )
-                    Text("${selected.findingCount} Hallazgo${if (selected.findingCount == 1) "" else "s"} · ${selected.assetCount} elemento${if (selected.assetCount == 1) "" else "s"} de Inventario")
-                    selected.deadlineAt?.let { Text("Vencimiento calculado: $it", style = MaterialTheme.typography.bodySmall) }
-                    if (selected.deadlineAt == null && selected.deadlineBasis == "GEDO_DATE") {
-                        Text("Vencimiento pendiente de fecha GEDO.", style = MaterialTheme.typography.bodySmall)
-                    }
-                    selected.lockedSha256?.let { Text("Hash bloqueado: $it", style = MaterialTheme.typography.bodySmall) }
-                    selected.closureSha256?.let { Text("Hash sellado: $it", style = MaterialTheme.typography.bodySmall) }
-                }
-            }
-
             when (selected.status) {
                 "DRAFT" -> {
                     Card(
@@ -225,29 +195,26 @@ fun MobileActsScreen(
                     }
 
                     HorizontalDivider()
-                    Text("Responsable de la empresa", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+                    Text("Representante de la empresa", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
                     Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
                         AssistChip(onClick = { attendance = "PRESENT" }, label = { Text(if (attendance == "PRESENT") "✓ Presente" else "Presente") })
                         AssistChip(onClick = { attendance = "ABSENT" }, label = { Text(if (attendance == "ABSENT") "✓ Ausente" else "Ausente") })
                     }
                     if (attendance == "PRESENT") {
-                        OutlinedTextField(fullName, { fullName = it }, label = { Text("Nombre y apellido *") }, modifier = Modifier.fillMaxWidth())
+                        OutlinedTextField(fullName, { fullName = it }, label = { Text("Nombres y apellidos *") }, modifier = Modifier.fillMaxWidth())
-                        Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(6.dp)) {
+                        OutlinedTextField(documentNumber, { documentNumber = it.filter(Char::isDigit) }, label = { Text("DNI *") }, modifier = Modifier.fillMaxWidth())
-                            listOf("DNI", "CUIL", "PASSPORT", "OTHER").forEach { kind ->
+                        OutlinedTextField(position, { position = it }, label = { Text("Cargo / función *") }, modifier = Modifier.fillMaxWidth())
-                                AssistChip(onClick = { documentType = kind }, label = { Text(if (documentType == kind) "✓ $kind" else kind) })
+                        OutlinedTextField(email, { email = it }, label = { Text("Email *") }, modifier = Modifier.fillMaxWidth())
+                        if (closure?.responsible == null && closure?.representativeSuggestion != null) {
+                            Text("Datos precargados del Acta anterior. Confirmalos para esta Acta.", style = MaterialTheme.typography.bodySmall)
                         }
-                        }
-                        OutlinedTextField(documentNumber, { documentNumber = it }, label = { Text("Documento *") }, modifier = Modifier.fillMaxWidth())
-                        OutlinedTextField(position, { position = it }, label = { Text("Cargo *") }, modifier = Modifier.fillMaxWidth())
-                        OutlinedTextField(email, { email = it }, label = { Text("Email") }, modifier = Modifier.fillMaxWidth())
-                        OutlinedTextField(phone, { phone = it }, label = { Text("Teléfono") }, modifier = Modifier.fillMaxWidth())
                         Button(
                             onClick = {
                                 model.setCompanyResponsiblePresent(fullName, documentType, documentNumber, position, email, phone)
                             },
-                            enabled = !model.busy && fullName.isNotBlank() && documentNumber.isNotBlank() && position.isNotBlank(),
+                            enabled = !model.busy && fullName.isNotBlank() && documentNumber.isNotBlank() && position.isNotBlank() && email.contains("@") && email.contains("."),
                             modifier = Modifier.fillMaxWidth(),
-                        ) { Text("Guardar responsable") }
+                        ) { Text("Guardar representante") }
                     } else {
                         OutlinedTextField(
                             absenceReason,
@@ -265,7 +232,7 @@ fun MobileActsScreen(
 
                     HorizontalDivider()
                     Text("Finalizar contenido", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-                    Text("Al cerrar el Acta, el contenido y los Hallazgos quedan inmutables. Definí ahora la urgencia según lo constatado.")
+                    Text("Al cerrar el contenido, el Acta queda inmutable y pasa a Para firmar. La firma del inspector se toma de Mi perfil del Dashboard; en la tablet firma el acompañante de la empresa.")
                     Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
                         AssistChip(
                             onClick = { closingUrgency = "NON_URGENT" },
@@ -280,69 +247,57 @@ fun MobileActsScreen(
                         onClick = { model.prepareSelectedAct(closingUrgency) },
                         enabled = !model.busy && closure?.responsible != null && closingUrgency.isNotBlank(),
                         modifier = Modifier.fillMaxWidth(),
-                    ) { Text("Finalizar y BLOQUEAR Acta") }
+                    ) { Text("Cerrar contenido y pasar a firma") }
                 }
 
                 "LOCKED" -> {
                     val signatures = closure?.signatures.orEmpty()
-                    val inspectorSigned = signatures.any { it.signerType == "INSPECTOR" && it.status == "SIGNED" }
                     val companyOutcome = signatures.firstOrNull { it.signerType == "COMPANY_RESPONSIBLE" }
-                    val companyResolved = companyOutcome?.status == "SIGNED" || companyOutcome?.status == "REFUSED"
+                    val companyResolved = companyOutcome?.status == "SIGNED" || companyOutcome?.status == "REFUSED" || companyOutcome?.status == "ABSENT"
 
-                    Text("Acta BLOQUEADA", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+                    Text("Para firmar", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-                    Text("El contenido ya es inmutable. Sólo resta resolver firmas y manifestaciones para poder SELLARLA.")
+                    Text("El contenido ya es inmutable. La firma del inspector está guardada en el Dashboard y se aplicará al cierre final.")
-                    closure?.closure?.preparedSha256?.let { Text("Hash bloqueado: $it", style = MaterialTheme.typography.bodySmall) }
 
                     HorizontalDivider()
-                    Text("Firma del inspector", fontWeight = FontWeight.Bold)
+                    Text("Acompañante / representante de la empresa", fontWeight = FontWeight.Bold)
-                    if (inspectorSigned) {
-                        Text("✓ Firma del inspector registrada", color = MaterialTheme.colorScheme.primary)
-                    } else {
-                        Text(closure?.consents?.inspector.orEmpty(), style = MaterialTheme.typography.bodySmall)
-                        SignaturePad(
-                            label = "Firmá como inspector/a",
-                            enabled = !model.busy,
-                            onCaptured = { file -> signWithGeo(file, company = false) },
-                        )
-                    }
-
-                    HorizontalDivider()
-                    Text("Manifestación de la empresa", fontWeight = FontWeight.Bold)
                     if (companyOutcome != null && companyResolved) {
                         val detail = when (companyOutcome.status) {
-                            "SIGNED" -> if (companyOutcome.companyManifestation == "DISSENT") "Firma en disidencia" else "Firma en conformidad"
+                            "SIGNED" -> if (companyOutcome.companyManifestation == "DISSENT") "Firmó en disconformidad" else "Firmó en conformidad"
-                            "REFUSED" -> "Negativa a firmar"
+                            "REFUSED" -> "Se negó a firmar"
+                            "ABSENT" -> "Ausencia documentada"
                             else -> companyOutcome.status
                         }
                         Text("✓ $detail", color = MaterialTheme.colorScheme.primary)
                         companyOutcome.reason?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
                         companyOutcome.companyStatement?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
                     } else if (closure?.responsible?.attendanceStatus == "ABSENT") {
-                        Text(
+                        val recordedAbsence = closure.responsible.absenceReason.orEmpty()
-                            "El responsable fue registrado como ausente. La ausencia NO resuelve la manifestación: deberá obtenerse firma o negativa posteriormente antes de SELLAR el Acta.",
+                        Text("El representante fue registrado como ausente. Confirmá esta ausencia para dejar la constancia documental.")
-                            style = MaterialTheme.typography.bodyMedium,
+                        Text(recordedAbsence, style = MaterialTheme.typography.bodySmall)
-                        )
+                        OutlinedButton(
+                            onClick = { model.recordCompanyOutcome("ABSENT", recordedAbsence) },
+                            enabled = !model.busy && recordedAbsence.trim().length >= 10,
+                            modifier = Modifier.fillMaxWidth(),
+                        ) { Text("Confirmar ausencia documentada") }
                     } else {
-                        Text(closure?.consents?.company.orEmpty(), style = MaterialTheme.typography.bodySmall)
                         Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
                             AssistChip(onClick = { manifestation = "CONFORMITY" }, label = { Text(if (manifestation == "CONFORMITY") "✓ Conforme" else "Conforme") })
-                            AssistChip(onClick = { manifestation = "DISSENT" }, label = { Text(if (manifestation == "DISSENT") "✓ En disidencia" else "En disidencia") })
+                            AssistChip(onClick = { manifestation = "DISSENT" }, label = { Text(if (manifestation == "DISSENT") "✓ En disconformidad" else "En disconformidad") })
                         }
                         if (manifestation == "DISSENT") {
                             OutlinedTextField(
                                 dissentStatement,
                                 { dissentStatement = it },
-                                label = { Text("Manifestación de disidencia *") },
+                                label = { Text("Motivo de disconformidad *") },
                                 minLines = 2,
                                 modifier = Modifier.fillMaxWidth(),
                             )
                         }
                         SignaturePad(
-                            label = "Firma del responsable de empresa",
+                            label = "Firma del representante de la empresa (acompañante)",
-                            enabled = !model.busy && inspectorSigned && (manifestation != "DISSENT" || dissentStatement.trim().length >= 10),
+                            enabled = !model.busy && (manifestation != "DISSENT" || dissentStatement.trim().length >= 10),
-                            onCaptured = { file -> signWithGeo(file, company = true) },
+                            onCaptured = { file -> signCompanyWithGeo(file) },
                         )
-                        Text("Si la persona presente se niega a firmar, asentá el motivo en lugar de dibujar una firma.", style = MaterialTheme.typography.bodySmall)
                         OutlinedTextField(
                             refusalReason,
                             { refusalReason = it },
@@ -352,23 +307,20 @@ fun MobileActsScreen(
                         )
                         OutlinedButton(
                             onClick = { model.recordCompanyOutcome("REFUSED", refusalReason) },
-                            enabled = !model.busy && inspectorSigned && refusalReason.trim().length >= 10,
+                            enabled = !model.busy && refusalReason.trim().length >= 10,
                             modifier = Modifier.fillMaxWidth(),
                         ) { Text("Registrar negativa a firmar") }
                     }
 
                     HorizontalDivider()
-                    if (inspectorSigned && companyResolved) {
+                    if (companyResolved) {
                         Button(
                             onClick = { model.closeSelectedAct() },
                             enabled = !model.busy,
                             modifier = Modifier.fillMaxWidth(),
-                        ) { Text("SELLAR Acta definitivamente") }
+                        ) { Text("Aplicar mi firma y cerrar Acta") }
                     } else {
-                        Text(
+                        Text("Completá la firma, disconformidad o negativa del acompañante para habilitar el cierre final.", style = MaterialTheme.typography.bodySmall)
-                            "Esta Acta bloquea el cierre de la Inspección hasta tener firma de inspector y firma o negativa válida de la empresa.",
-                            style = MaterialTheme.typography.bodySmall,
-                        )
                     }
                 }
 

android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/MobileHomeScreen.kt

@@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.items
@@ -86,21 +85,33 @@ fun MobileHomeScreen(model: MainViewModel) {
     }
 
     Column(Modifier.fillMaxSize().padding(top = 28.dp)) {
-        Row(
+        Column(
             Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 10.dp),
-            verticalAlignment = Alignment.CenterVertically,
+            verticalArrangement = Arrangement.spacedBy(8.dp),
-            horizontalArrangement = Arrangement.SpaceBetween,
         ) {
             Column {
                 Text("Mis inspecciones", style = MaterialTheme.typography.headlineSmall, fontWeight = FontWeight.Bold)
                 Text(session.displayName, style = MaterialTheme.typography.bodySmall)
             }
-            Row {
+            Row(
-                OutlinedButton(onClick = { model.loadVisits() }, enabled = !model.busy && !opening) {
+                Modifier.fillMaxWidth(),
-                    Text("Actualizar")
+                horizontalArrangement = Arrangement.spacedBy(8.dp),
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                OutlinedButton(
+                    onClick = { model.loadVisits() },
+                    enabled = !model.busy && !opening,
+                    modifier = Modifier.weight(1f),
+                ) {
+                    Text("Actualizar", maxLines = 1)
+                }
+                OutlinedButton(
+                    onClick = { model.logout() },
+                    enabled = !opening,
+                    modifier = Modifier.weight(1f),
+                ) {
+                    Text("Salir", maxLines = 1)
                 }
-                Spacer(Modifier.width(8.dp))
-                OutlinedButton(onClick = { model.logout() }, enabled = !opening) { Text("Salir") }
             }
         }
 

android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/ModernMobileActsScreen.kt

@@ -3,7 +3,6 @@ package com.korexlabs.dhinspeccion.ui
 import android.Manifest
 import android.content.Context
 import android.content.pm.PackageManager
-import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -72,28 +71,26 @@ fun ModernMobileActsScreen(
     val visit = model.visit ?: return
     val selected = model.selectedAct
     val closure = model.actClosure
+    val representativeSeed = closure?.responsible ?: closure?.representativeSuggestion
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
 
     var closingUrgency by rememberSaveable(selected?.id) { mutableStateOf("") }
-    var attendance by rememberSaveable(selected?.id) { mutableStateOf(closure?.responsible?.attendanceStatus ?: "PRESENT") }
+    var fullName by rememberSaveable(selected?.id) { mutableStateOf(representativeSeed?.fullName.orEmpty()) }
-    var fullName by rememberSaveable(selected?.id) { mutableStateOf(closure?.responsible?.fullName.orEmpty()) }
+    var documentType by rememberSaveable(selected?.id) { mutableStateOf("DNI") }
-    var documentType by rememberSaveable(selected?.id) { mutableStateOf(closure?.responsible?.documentType ?: "DNI") }
+    var documentNumber by rememberSaveable(selected?.id) { mutableStateOf(representativeSeed?.documentNumber.orEmpty()) }
-    var documentNumber by rememberSaveable(selected?.id) { mutableStateOf(closure?.responsible?.documentNumber.orEmpty()) }
+    var position by rememberSaveable(selected?.id) { mutableStateOf(representativeSeed?.position.orEmpty()) }
-    var position by rememberSaveable(selected?.id) { mutableStateOf(closure?.responsible?.position.orEmpty()) }
+    var email by rememberSaveable(selected?.id) { mutableStateOf(representativeSeed?.email.orEmpty()) }
-    var email by rememberSaveable(selected?.id) { mutableStateOf(closure?.responsible?.email.orEmpty()) }
+    var phone by rememberSaveable(selected?.id) { mutableStateOf(representativeSeed?.phone.orEmpty()) }
-    var phone by rememberSaveable(selected?.id) { mutableStateOf(closure?.responsible?.phone.orEmpty()) }
-    var absenceReason by rememberSaveable(selected?.id) { mutableStateOf(closure?.responsible?.absenceReason.orEmpty()) }
     var refusalReason by rememberSaveable(selected?.id) { mutableStateOf("") }
     var manifestation by rememberSaveable(selected?.id) { mutableStateOf("CONFORMITY") }
     var dissentStatement by rememberSaveable(selected?.id) { mutableStateOf("") }
 
     LaunchedEffect(visit.id) { model.reloadActs() }
 
-    fun signWithGeo(file: File, company: Boolean) {
+    fun signCompanyWithGeo(file: File) {
         scope.launch {
             val geo = runCatching { currentModernActSignatureGeo(context) }.getOrNull()
-            if (company) {
             model.signSelectedActAsCompany(
                 png = file,
                 latitude = geo?.latitude,
@@ -102,14 +99,6 @@ fun ModernMobileActsScreen(
                 manifestation = manifestation,
                 statement = dissentStatement.takeIf { manifestation == "DISSENT" },
             )
-            } else {
-                model.signSelectedActAsInspector(
-                    png = file,
-                    latitude = geo?.latitude,
-                    longitude = geo?.longitude,
-                    accuracyM = geo?.accuracyM,
-                )
-            }
         }
     }
 
@@ -147,6 +136,29 @@ fun ModernMobileActsScreen(
 
         ModernMessage(model)
 
+        if (model.pendingSyncCount > 0) {
+            Surface(
+                modifier = Modifier.fillMaxWidth(),
+                shape = MaterialTheme.shapes.medium,
+                color = MaterialTheme.colorScheme.secondaryContainer,
+            ) {
+                Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
+                    Text(
+                        "${model.pendingSyncCount} cambio${if (model.pendingSyncCount == 1) "" else "s"} guardado${if (model.pendingSyncCount == 1) "" else "s"} en este dispositivo",
+                        fontWeight = FontWeight.Bold,
+                    )
+                    Text(
+                        "Podés seguir trabajando sin internet. Los cambios se sincronizan automáticamente cuando vuelve la conexión.",
+                        style = MaterialTheme.typography.bodySmall,
+                        color = MaterialTheme.colorScheme.onSecondaryContainer,
+                    )
+                    OutlinedButton(onClick = { model.syncPendingNow() }, enabled = !model.busy) {
+                        Text("Sincronizar ahora")
+                    }
+                }
+            }
+        }
+
         if (model.acts.isEmpty()) {
             ElevatedCard(Modifier.fillMaxWidth()) {
                 Column(
@@ -171,12 +183,8 @@ fun ModernMobileActsScreen(
                     onClick = { model.selectAct(act.id) },
                     modifier = Modifier.fillMaxWidth(),
                     shape = MaterialTheme.shapes.large,
-                    color = if (active) MaterialTheme.colorScheme.primaryContainer else MaterialTheme.colorScheme.surface,
+                    color = if (active) MaterialTheme.colorScheme.primaryContainer else MaterialTheme.colorScheme.surfaceVariant,
-                    tonalElevation = if (active) 1.dp else 0.dp,
+                    tonalElevation = 0.dp,
-                    border = BorderStroke(
-                        if (active) 2.dp else 1.dp,
-                        if (active) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.outlineVariant,
-                    ),
                 ) {
                     Row(
                         Modifier.padding(15.dp),
@@ -244,33 +252,6 @@ fun ModernMobileActsScreen(
         }
 
         if (selected != null) {
-            HorizontalDivider()
-            Surface(
-                Modifier.fillMaxWidth(),
-                shape = MaterialTheme.shapes.large,
-                color = MaterialTheme.colorScheme.surfaceVariant,
-            ) {
-                Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
-                    Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) {
-                        Text(selected.code, style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-                        StatusPill(modernActStatusLabel(selected.status))
-                    }
-                    Text(
-                        when (selected.urgency) {
-                            "URGENT" -> "Urgencia · Urgente"
-                            "NON_URGENT" -> "Urgencia · No urgente"
-                            else -> "Urgencia · Se define al cerrar el Acta"
-                        },
-                        color = MaterialTheme.colorScheme.onSurfaceVariant,
-                    )
-                    Text("${selected.findingCount} Hallazgos · ${selected.assetCount} elementos de Inventario", style = MaterialTheme.typography.bodySmall)
-                    selected.deadlineAt?.let { Text("Vencimiento · $it", style = MaterialTheme.typography.bodySmall) }
-                    if (selected.deadlineAt == null && selected.deadlineBasis == "GEDO_DATE") {
-                        Text("Vencimiento pendiente de fecha GEDO", style = MaterialTheme.typography.bodySmall)
-                    }
-                }
-            }
-
             when (selected.status) {
                 "DRAFT" -> {
                     ElevatedCard(Modifier.fillMaxWidth()) {
@@ -293,42 +274,25 @@ fun ModernMobileActsScreen(
                             Row(verticalAlignment = Alignment.CenterVertically) {
                                 Icon(Icons.Filled.Person, null, tint = MaterialTheme.colorScheme.primary)
                                 Spacer(Modifier.width(8.dp))
-                                Text("Responsable de la empresa", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+                                Text("Representante de la empresa", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
                             }
-                            Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                            Text(
-                                FilterChip(selected = attendance == "PRESENT", onClick = { attendance = "PRESENT" }, label = { Text("Presente") })
+                                "Identificá a la persona que acompaña el recorrido. Al finalizar esta Acta podrá firmar conforme, firmar en disconformidad o negarse a firmar.",
-                                FilterChip(selected = attendance == "ABSENT", onClick = { attendance = "ABSENT" }, label = { Text("Ausente") })
+                                style = MaterialTheme.typography.bodySmall,
+                                color = MaterialTheme.colorScheme.onSurfaceVariant,
+                            )
+                            OutlinedTextField(fullName, { fullName = it }, label = { Text("Nombres y apellidos *") }, modifier = Modifier.fillMaxWidth(), singleLine = true)
+                            OutlinedTextField(documentNumber, { documentNumber = it.filter(Char::isDigit) }, label = { Text("DNI *") }, modifier = Modifier.fillMaxWidth(), singleLine = true)
+                            OutlinedTextField(position, { position = it }, label = { Text("Cargo / función *") }, modifier = Modifier.fillMaxWidth(), singleLine = true)
+                            OutlinedTextField(email, { email = it }, label = { Text("Email *") }, modifier = Modifier.fillMaxWidth(), singleLine = true)
+                            if (closure?.responsible == null && closure?.representativeSuggestion != null) {
+                                Text("Datos precargados del Acta anterior. Confirmalos antes de cerrar esta Acta.", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant)
                             }
-                            if (attendance == "PRESENT") {
-                                OutlinedTextField(fullName, { fullName = it }, label = { Text("Nombre y apellido *") }, modifier = Modifier.fillMaxWidth(), singleLine = true)
-                                Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(6.dp)) {
-                                    listOf("DNI", "CUIL", "PASSPORT", "OTHER").forEach { kind ->
-                                        FilterChip(selected = documentType == kind, onClick = { documentType = kind }, label = { Text(documentTypeLabelEs(kind)) })
-                                    }
-                                }
-                                OutlinedTextField(documentNumber, { documentNumber = it }, label = { Text("Documento *") }, modifier = Modifier.fillMaxWidth(), singleLine = true)
-                                OutlinedTextField(position, { position = it }, label = { Text("Cargo *") }, modifier = Modifier.fillMaxWidth(), singleLine = true)
-                                OutlinedTextField(email, { email = it }, label = { Text("Correo electrónico") }, modifier = Modifier.fillMaxWidth(), singleLine = true)
-                                OutlinedTextField(phone, { phone = it }, label = { Text("Teléfono") }, modifier = Modifier.fillMaxWidth(), singleLine = true)
                             Button(
                                 onClick = { model.setCompanyResponsiblePresent(fullName, documentType, documentNumber, position, email, phone) },
-                                    enabled = !model.busy && fullName.isNotBlank() && documentNumber.isNotBlank() && position.isNotBlank(),
+                                enabled = !model.busy && fullName.isNotBlank() && documentNumber.isNotBlank() && position.isNotBlank() && email.contains("@") && email.contains("."),
                                 modifier = Modifier.fillMaxWidth(),
-                                ) { Text("Guardar responsable") }
+                            ) { Text("Guardar representante") }
-                            } else {
-                                OutlinedTextField(
-                                    absenceReason,
-                                    { absenceReason = it },
-                                    label = { Text("Motivo de ausencia *") },
-                                    minLines = 2,
-                                    modifier = Modifier.fillMaxWidth(),
-                                )
-                                Button(
-                                    onClick = { model.setCompanyResponsibleAbsent(absenceReason) },
-                                    enabled = !model.busy && absenceReason.trim().length >= 10,
-                                    modifier = Modifier.fillMaxWidth(),
-                                ) { Text("Guardar ausencia") }
-                            }
                         }
                     }
 
@@ -340,7 +304,7 @@ fun ModernMobileActsScreen(
                                 Text("Cerrar Acta", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
                             }
                             Text(
-                                "Al cerrar el contenido, el Acta queda inmutable y pasa a Pendiente de firma. En este momento definí la urgencia según lo constatado en campo.",
+                                "Al cerrar el contenido, el Acta queda inmutable y pasa a Para firmar. La firma del inspector se toma de Mi perfil del Dashboard; en la tablet sólo firma el acompañante de la empresa. La urgencia pertenece al Acta completa. La urgencia no se asigna a cada Hallazgo.",
                                 color = MaterialTheme.colorScheme.onSurfaceVariant,
                             )
                             Text("Urgencia del Acta", fontWeight = FontWeight.SemiBold)
@@ -369,83 +333,119 @@ fun ModernMobileActsScreen(
                                 onClick = { model.prepareSelectedAct(closingUrgency) },
                                 enabled = !model.busy && closure?.responsible != null && closingUrgency.isNotBlank(),
                                 modifier = Modifier.fillMaxWidth(),
-                            ) { Text("Cerrar Acta y dejar pendiente de firma") }
+                            ) { Text("Cerrar contenido y pasar a firma") }
                         }
                     }
                 }
 
                 "LOCKED" -> {
                     val signatures = closure?.signatures.orEmpty()
-                    val inspectorSigned = signatures.any { it.signerType == "INSPECTOR" && it.status == "SIGNED" }
                     val companyOutcome = signatures.firstOrNull { it.signerType == "COMPANY_RESPONSIBLE" }
-                    val companyResolved = companyOutcome?.status == "SIGNED" || companyOutcome?.status == "REFUSED"
+                    val companyResolvedOnServer = companyOutcome?.status == "SIGNED" || companyOutcome?.status == "REFUSED" || companyOutcome?.status == "ABSENT"
+                    val companyResolved = companyResolvedOnServer || model.selectedActCompanySignaturePending
 
                     ElevatedCard(Modifier.fillMaxWidth()) {
                         Column(Modifier.padding(18.dp), verticalArrangement = Arrangement.spacedBy(12.dp)) {
                             Row(verticalAlignment = Alignment.CenterVertically) {
-                                Icon(Icons.Filled.Lock, null, tint = MaterialTheme.colorScheme.secondary)
+                                Icon(Icons.Filled.EditNote, null, tint = MaterialTheme.colorScheme.primary)
                                 Spacer(Modifier.width(8.dp))
-                                Text("Acta pendiente de firma", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+                                Text("Para firmar", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
                             }
-                            Text("El contenido ya está cerrado e inmutable. Completá la firma del inspector y la manifestación de la empresa cuando corresponda.")
-                            closure?.closure?.preparedSha256?.let { Text("Huella de integridad · $it", style = MaterialTheme.typography.bodySmall) }
-
-                            HorizontalDivider()
-                            Text("Firma del inspector", fontWeight = FontWeight.Bold)
-                            if (inspectorSigned) {
-                                SuccessLine("Firma del inspector registrada")
-                            } else {
-                                Text(closure?.consents?.inspector.orEmpty(), style = MaterialTheme.typography.bodySmall)
-                                SignaturePad(
-                                    label = "Firmá como inspector/a",
-                                    enabled = !model.busy,
-                                    onCaptured = { file -> signWithGeo(file, company = false) },
-                                )
-                            }
-
-                            HorizontalDivider()
-                            Text("Manifestación de la empresa", fontWeight = FontWeight.Bold)
-                            if (companyOutcome != null && companyResolved) {
-                                val detail = when (companyOutcome.status) {
-                                    "SIGNED" -> if (companyOutcome.companyManifestation == "DISSENT") "Firma en disidencia" else "Firma en conformidad"
-                                    "REFUSED" -> "Negativa a firmar"
-                                    else -> humanBackendLabelEs(companyOutcome.status)
-                                }
-                                SuccessLine(detail)
-                                companyOutcome.reason?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
-                                companyOutcome.companyStatement?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
-                            } else if (closure?.responsible?.attendanceStatus == "ABSENT") {
-                                Surface(Modifier.fillMaxWidth(), shape = MaterialTheme.shapes.medium, color = MaterialTheme.colorScheme.errorContainer) {
-                                    Row(Modifier.padding(12.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                                        Icon(Icons.Filled.ErrorOutline, null, tint = MaterialTheme.colorScheme.error)
                             Text(
-                                            "La ausencia no resuelve la manifestación. Debe registrarse firma o negativa antes de firmar y cerrar el Acta.",
+                                "El contenido ya está cerrado e inmutable. Ahora corresponde la manifestación y firma del acompañante de la empresa.",
+                                color = MaterialTheme.colorScheme.onSurfaceVariant,
+                            )
+                            when (model.inspectorSignatureConfigured) {
+                                true -> Surface(
+                                    modifier = Modifier.fillMaxWidth(),
+                                    shape = MaterialTheme.shapes.medium,
+                                    color = MaterialTheme.colorScheme.primaryContainer,
+                                ) {
+                                    Row(Modifier.padding(12.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                                        Icon(Icons.Filled.CheckCircle, null, tint = MaterialTheme.colorScheme.primary)
+                                        Text(
+                                            "Firma del inspector configurada en Mi perfil. Se aplicará automáticamente al cierre definitivo de esta Acta.",
                                             Modifier.weight(1f),
                                             style = MaterialTheme.typography.bodySmall,
                                         )
                                     }
                                 }
+                                false -> Surface(
+                                    modifier = Modifier.fillMaxWidth(),
+                                    shape = MaterialTheme.shapes.medium,
+                                    color = MaterialTheme.colorScheme.errorContainer,
+                                ) {
+                                    Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
+                                        Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                                            Icon(Icons.Filled.ErrorOutline, null, tint = MaterialTheme.colorScheme.error)
+                                            Text(
+                                                "Falta configurar la firma del inspector en Mi perfil del Dashboard. La firma de la empresa puede guardarse igual; el cierre quedará pendiente hasta completar este requisito.",
+                                                Modifier.weight(1f),
+                                                style = MaterialTheme.typography.bodySmall,
+                                            )
+                                        }
+                                        OutlinedButton(onClick = { model.refreshInspectorSignatureStatus() }, enabled = !model.busy) {
+                                            Text("Volver a verificar")
+                                        }
+                                    }
+                                }
+                                null -> Text(
+                                    "La firma del inspector se validará con el Dashboard al sincronizar.",
+                                    style = MaterialTheme.typography.bodySmall,
+                                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                                )
+                            }
+
+                            HorizontalDivider()
+                            Text("Acompañante / representante de la empresa", fontWeight = FontWeight.Bold)
+                            if (companyOutcome != null && companyResolvedOnServer) {
+                                val detail = when (companyOutcome.status) {
+                                    "SIGNED" -> if (companyOutcome.companyManifestation == "DISSENT") "Firmó en disconformidad" else "Firmó en conformidad"
+                                    "REFUSED" -> "Se negó a firmar"
+                                    "ABSENT" -> "Ausencia documentada"
+                                    else -> humanBackendLabelEs(companyOutcome.status)
+                                }
+                                SuccessLine(detail)
+                                companyOutcome.reason?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
+                                companyOutcome.companyStatement?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
+                            } else if (model.selectedActCompanySignaturePending) {
+                                Surface(Modifier.fillMaxWidth(), shape = MaterialTheme.shapes.medium, color = MaterialTheme.colorScheme.secondaryContainer) {
+                                    Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
+                                        SuccessLine("Firma guardada en el dispositivo")
+                                        Text(
+                                            "Todavía no llegó al servidor. Podés continuar; se enviará automáticamente cuando haya conexión.",
+                                            style = MaterialTheme.typography.bodySmall,
+                                        )
+                                    }
+                                }
+                            } else if (closure?.responsible?.attendanceStatus == "ABSENT") {
+                                Surface(Modifier.fillMaxWidth(), shape = MaterialTheme.shapes.medium, color = MaterialTheme.colorScheme.errorContainer) {
+                                    Text(
+                                        "Esta Acta conserva un registro histórico de ausencia. El flujo actual requiere identificar al acompañante antes de pasar el contenido a firma.",
+                                        Modifier.padding(12.dp),
+                                        style = MaterialTheme.typography.bodySmall,
+                                    )
+                                }
                             } else {
-                                Text(closure?.consents?.company.orEmpty(), style = MaterialTheme.typography.bodySmall)
                                 Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
                                     FilterChip(selected = manifestation == "CONFORMITY", onClick = { manifestation = "CONFORMITY" }, label = { Text("Conforme") })
-                                    FilterChip(selected = manifestation == "DISSENT", onClick = { manifestation = "DISSENT" }, label = { Text("En disidencia") })
+                                    FilterChip(selected = manifestation == "DISSENT", onClick = { manifestation = "DISSENT" }, label = { Text("En disconformidad") })
                                 }
                                 if (manifestation == "DISSENT") {
                                     OutlinedTextField(
                                         dissentStatement,
                                         { dissentStatement = it },
-                                        label = { Text("Manifestación de disidencia *") },
+                                        label = { Text("Motivo de disconformidad *") },
                                         minLines = 2,
                                         modifier = Modifier.fillMaxWidth(),
                                     )
                                 }
                                 SignaturePad(
-                                    label = "Firma del responsable de empresa",
+                                    label = "Firma del representante de la empresa (acompañante)",
-                                    enabled = !model.busy && inspectorSigned && (manifestation != "DISSENT" || dissentStatement.trim().length >= 10),
+                                    enabled = !model.busy && (manifestation != "DISSENT" || dissentStatement.trim().length >= 10),
-                                    onCaptured = { file -> signWithGeo(file, company = true) },
+                                    onCaptured = { file -> signCompanyWithGeo(file) },
                                 )
-                                Text("Si se niega a firmar, registrá el motivo.", style = MaterialTheme.typography.bodySmall)
+                                Text("Si se niega a firmar, asentá el motivo para dejar la constancia.", style = MaterialTheme.typography.bodySmall)
                                 OutlinedTextField(
                                     refusalReason,
                                     { refusalReason = it },
@@ -455,12 +455,21 @@ fun ModernMobileActsScreen(
                                 )
                                 OutlinedButton(
                                     onClick = { model.recordCompanyOutcome("REFUSED", refusalReason) },
-                                    enabled = !model.busy && inspectorSigned && refusalReason.trim().length >= 10,
+                                    enabled = !model.busy && refusalReason.trim().length >= 10,
                                     modifier = Modifier.fillMaxWidth(),
                                 ) { Text("Registrar negativa a firmar") }
                             }
 
-                            if (inspectorSigned && companyResolved) {
+                            if (companyResolved) {
+                                if (model.selectedActSealPending) {
+                                    Surface(Modifier.fillMaxWidth(), shape = MaterialTheme.shapes.medium, color = MaterialTheme.colorScheme.secondaryContainer) {
+                                        Text(
+                                            "Cierre guardado en este dispositivo · pendiente de sincronización",
+                                            Modifier.padding(12.dp),
+                                            fontWeight = FontWeight.SemiBold,
+                                        )
+                                    }
+                                } else {
                                     Button(
                                         onClick = { model.closeSelectedAct() },
                                         enabled = !model.busy,
@@ -468,11 +477,12 @@ fun ModernMobileActsScreen(
                                     ) {
                                         Icon(Icons.Filled.CheckCircle, null)
                                         Spacer(Modifier.width(6.dp))
-                                    Text("Firmar y cerrar Acta")
+                                        Text(if (model.inspectorSignatureConfigured == false) "Guardar cierre pendiente" else "Firmar y cerrar Acta")
+                                    }
                                 }
                             } else {
                                 Text(
-                                    "La Inspección no puede cerrarse hasta completar las manifestaciones de esta Acta.",
+                                    "Completá la firma, disconformidad o negativa del acompañante para habilitar el cierre final.",
                                     style = MaterialTheme.typography.bodySmall,
                                     color = MaterialTheme.colorScheme.onSurfaceVariant,
                                 )

android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/ModernVisitRoot.kt

@@ -16,6 +16,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
@@ -36,6 +37,11 @@ import androidx.compose.material.icons.filled.LocationOn
 import androidx.compose.material.icons.filled.Search
 import androidx.compose.material.icons.filled.WarningAmber
 import androidx.compose.material3.Button
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ExposedDropdownMenuBox
+import androidx.compose.material3.MenuAnchorType
+import androidx.compose.material3.ExposedDropdownMenuDefaults
 import androidx.compose.material3.ElevatedCard
 import androidx.compose.material3.FilledTonalButton
 import androidx.compose.material3.HorizontalDivider
@@ -57,6 +63,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.focus.FocusDirection
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalFocusManager
@@ -76,6 +83,7 @@ import com.korexlabs.dhinspeccion.MainViewModel
 import com.korexlabs.dhinspeccion.data.FieldAttributeDefinition
 import com.korexlabs.dhinspeccion.data.FieldInventoryItem
 import com.korexlabs.dhinspeccion.data.FieldType
+import com.korexlabs.dhinspeccion.data.fieldAttributePayload
 import com.korexlabs.dhinspeccion.data.VisitDetail
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -259,6 +267,7 @@ private fun ModernChecklistCard(visit: VisitDetail) {
     }
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun ModernFieldInventoryScreen(model: MainViewModel, onBack: () -> Unit) {
     val context = LocalContext.current
@@ -279,6 +288,7 @@ private fun ModernFieldInventoryScreen(model: MainViewModel, onBack: () -> Unit)
     var selectedTypeId by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
     var selectedFamilyId by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
     var familySearch by rememberSaveable(visit.id) { mutableStateOf("") }
+    var familyExpanded by remember { mutableStateOf(false) }
     val attributeValues = remember { mutableStateMapOf<String, String>() }
     var pendingAutoPhoto by rememberSaveable(visit.id) { mutableStateOf(false) }
     var localError by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
@@ -295,6 +305,7 @@ private fun ModernFieldInventoryScreen(model: MainViewModel, onBack: () -> Unit)
         selectedTypeId = null
         selectedFamilyId = null
         familySearch = ""
+        familyExpanded = false
         attributeValues.clear()
         localError = null
     }
@@ -379,6 +390,9 @@ private fun ModernFieldInventoryScreen(model: MainViewModel, onBack: () -> Unit)
     }
 
     val selectedType = model.fieldTypes.firstOrNull { it.id == selectedTypeId }
+    val editableAttributes = selectedType?.attributes.orEmpty().filterNot {
+        selectedType?.familyRequired == true && it.code == "tipo_instalacion"
+    }
     val selectedFamily = selectedType?.families?.firstOrNull { it.id == selectedFamilyId }
     val filteredFamilies = remember(selectedType, familySearch) {
         val needle = modernNormalize(familySearch)
@@ -746,37 +760,56 @@ private fun ModernFieldInventoryScreen(model: MainViewModel, onBack: () -> Unit)
                     }
 
                     if (selectedType?.familyRequired == true) {
-                        Text("Clasificación técnica", fontWeight = FontWeight.Bold)
+                        ExposedDropdownMenuBox(
-                        OutlinedTextField(
+                            expanded = familyExpanded && !model.busy,
-                            value = familySearch,
+                            onExpandedChange = {
-                            onValueChange = { familySearch = it },
+                                if (!model.busy) {
-                            label = { Text("Buscar clasificación") },
+                                    familyExpanded = it
-                            leadingIcon = { Icon(Icons.Filled.Search, null) },
+                                    familySearch = ""
-                            supportingText = { Text("${filteredFamilies.size} opciones compatibles") },
+                                }
-                            modifier = Modifier.fillMaxWidth(),
+                            },
-                            singleLine = true,
-                        )
-                        filteredFamilies.take(12).forEach { family ->
-                            Surface(
-                                onClick = { selectedFamilyId = family.id },
-                                modifier = Modifier.fillMaxWidth(),
-                                shape = MaterialTheme.shapes.medium,
-                                color = if (selectedFamilyId == family.id) MaterialTheme.colorScheme.primaryContainer else MaterialTheme.colorScheme.surface,
-                                border = BorderStroke(1.dp, if (selectedFamilyId == family.id) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.outlineVariant),
                         ) {
-                                Row(Modifier.padding(12.dp), verticalAlignment = Alignment.CenterVertically) {
+                            OutlinedTextField(
-                                    Text(
+                                value = if (familyExpanded) familySearch else selectedFamily?.name.orEmpty(),
-                                        (if (family.isOther) "Otro · " else "") + family.name,
+                                onValueChange = { familySearch = it; familyExpanded = true },
-                                        Modifier.weight(1f),
+                                label = { Text(if (isSubinstallation) "Tipo de subinstalación" else "Tipo de instalación") },
-                                        fontWeight = if (selectedFamilyId == family.id) FontWeight.Bold else FontWeight.Normal,
+                                placeholder = { Text("Buscar por nombre o código") },
+                                leadingIcon = { Icon(Icons.Filled.Search, null) },
+                                trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = familyExpanded) },
+                                enabled = !model.busy,
+                                modifier = Modifier.fillMaxWidth().menuAnchor(MenuAnchorType.PrimaryEditable),
+                                singleLine = true,
+                                keyboardOptions = KeyboardOptions(imeAction = ImeAction.Next),
+                                keyboardActions = KeyboardActions(onNext = {
+                                    familyExpanded = false
+                                    focusManager.moveFocus(FocusDirection.Down)
+                                }),
+                            )
+                            ExposedDropdownMenu(
+                                expanded = familyExpanded && !model.busy,
+                                onDismissRequest = { familyExpanded = false; familySearch = "" },
+                                modifier = Modifier.heightIn(max = 280.dp),
+                            ) {
+                                if (filteredFamilies.isEmpty()) {
+                                    DropdownMenuItem(text = { Text("Sin coincidencias") }, onClick = {}, enabled = false)
+                                }
+                                filteredFamilies.forEach { family ->
+                                    DropdownMenuItem(
+                                        text = { Text((if (family.isOther) "Otro · " else "") + family.name) },
+                                        trailingIcon = {
+                                            if (selectedFamilyId == family.id) Icon(Icons.Filled.CheckCircle, "Seleccionado")
+                                        },
+                                        onClick = {
+                                            selectedFamilyId = family.id
+                                            familyExpanded = false
+                                            familySearch = ""
+                                            keyboard?.hide()
+                                            focusManager.clearFocus()
+                                        },
                                     )
-                                    if (selectedFamilyId == family.id) Icon(Icons.Filled.CheckCircle, null, tint = MaterialTheme.colorScheme.primary)
                                 }
                             }
                         }
-                        if (filteredFamilies.size > 12) {
-                            Text("Seguí escribiendo para reducir la lista.", style = MaterialTheme.typography.bodySmall)
-                        }
                         selectedFamily?.let { family ->
                             if (family.isOther) {
                                 Text("Quedará marcado para revisión en oficina.", color = MaterialTheme.colorScheme.secondary)
@@ -791,9 +824,11 @@ private fun ModernFieldInventoryScreen(model: MainViewModel, onBack: () -> Unit)
                         value = name,
                         onValueChange = { name = it },
                         label = { Text("Nombre técnico *") },
-                        supportingText = { Text("Usá la denominación técnica del elemento. El código DH se genera automáticamente.") },
+                        placeholder = { Text("Denominación técnica") },
                         modifier = Modifier.fillMaxWidth(),
                         singleLine = true,
+                        keyboardOptions = KeyboardOptions(imeAction = ImeAction.Next),
+                        keyboardActions = KeyboardActions(onNext = { focusManager.moveFocus(FocusDirection.Down) }),
                     )
                     OutlinedTextField(
                         value = commonName,
@@ -801,17 +836,24 @@ private fun ModernFieldInventoryScreen(model: MainViewModel, onBack: () -> Unit)
                         label = { Text("Nombre habitual (opcional)") },
                         modifier = Modifier.fillMaxWidth(),
                         singleLine = true,
+                        keyboardOptions = KeyboardOptions(imeAction = ImeAction.Next),
+                        keyboardActions = KeyboardActions(onNext = { focusManager.moveFocus(FocusDirection.Down) }),
                     )
                     OutlinedTextField(
                         value = description,
                         onValueChange = { description = it },
                         label = { Text("Descripción (opcional)") },
-                        supportingText = { Text("Dato equivalente al alta desde el panel web.") },
                         modifier = Modifier.fillMaxWidth(),
-                        minLines = 2,
+                        singleLine = true,
+                        keyboardOptions = KeyboardOptions(imeAction = if (editableAttributes.isEmpty()) ImeAction.Done else ImeAction.Next),
+                        keyboardActions = KeyboardActions(
+                            onNext = { focusManager.moveFocus(FocusDirection.Down) },
+                            onDone = { keyboard?.hide(); focusManager.clearFocus() },
+                        ),
                     )
 
-                    selectedType?.attributes?.forEach { definition ->
+                    editableAttributes.forEachIndexed { index, definition ->
+                        val isLastAttribute = index == editableAttributes.lastIndex
                         OutlinedTextField(
                             value = attributeValues[definition.code].orEmpty(),
                             onValueChange = { attributeValues[definition.code] = it },
@@ -822,8 +864,14 @@ private fun ModernFieldInventoryScreen(model: MainViewModel, onBack: () -> Unit)
                             },
                             keyboardOptions = KeyboardOptions(
                                 keyboardType = if (definition.dataType.uppercase() in setOf("NUMBER", "DECIMAL", "INTEGER", "FLOAT")) KeyboardType.Decimal else KeyboardType.Text,
+                                imeAction = if (isLastAttribute) ImeAction.Done else ImeAction.Next,
+                            ),
+                            keyboardActions = KeyboardActions(
+                                onNext = { focusManager.moveFocus(FocusDirection.Down) },
+                                onDone = { keyboard?.hide(); focusManager.clearFocus() },
                             ),
                             modifier = Modifier.fillMaxWidth(),
+                            singleLine = true,
                         )
                     }
 
@@ -840,10 +888,9 @@ private fun ModernFieldInventoryScreen(model: MainViewModel, onBack: () -> Unit)
                         }
                     }
 
-                    val attributesReady = selectedType?.attributes
+                    val attributesReady = editableAttributes
-                        ?.filter { it.isRequired }
+                        .filter { it.isRequired }
-                        ?.all { attributeValues[it.code].orEmpty().isNotBlank() }
+                        .all { attributeValues[it.code].orEmpty().isNotBlank() }
-                        ?: false
                     val familyReady = selectedType?.familyRequired != true || selectedFamilyId != null
                     Button(
                         onClick = { requestCreate() },
@@ -1074,18 +1121,7 @@ private fun modernNormalize(value: String): String = value.trim().lowercase()
 private fun modernStatusLabel(status: String): String = visitStatusLabelEs(status)
 
 private fun buildModernAttributes(type: FieldType, values: Map<String, String>): Map<String, Any?> =
-    type.attributes.mapNotNull { definition ->
+    fieldAttributePayload(type.attributes, values)
-        val raw = values[definition.code]?.trim().orEmpty()
-        if (raw.isBlank()) return@mapNotNull null
-        definition.code to coerceModernAttribute(definition, raw)
-    }.toMap()
-
-private fun coerceModernAttribute(definition: FieldAttributeDefinition, raw: String): Any = when (definition.dataType.uppercase()) {
-    "INTEGER", "INT" -> raw.toLongOrNull() ?: raw
-    "NUMBER", "DECIMAL", "FLOAT", "DOUBLE" -> raw.replace(',', '.').toDoubleOrNull() ?: raw
-    "BOOLEAN", "BOOL" -> raw.lowercase() in setOf("true", "1", "si", "sí", "yes")
-    else -> raw
-}
 
 private fun modernHasPermission(context: Context, permission: String): Boolean =
     ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED

android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/UiSpanishLabels.kt

@@ -13,7 +13,7 @@ internal fun visitStatusLabelEs(status: String?): String = when (status?.upperca
 
 internal fun actStatusLabelEs(status: String?): String = when (status?.uppercase(Locale.ROOT)) {
     "DRAFT" -> "En elaboración"
-    "LOCKED" -> "Pendiente de firma"
+    "LOCKED" -> "Para firmar"
     "SEALED" -> "Firmada y cerrada"
     "CLOSED" -> "Cerrada"
     "RECTIFIED" -> "Rectificada"

android-app/app/src/test/java/com/korexlabs/dhinspeccion/DynamicFieldFlowContractTest.kt

@@ -10,7 +10,7 @@ class DynamicFieldFlowContractTest {
     @Test
     fun fastSubinstallationFlowKeepsParentClassificationAndCaptureSteps() {
         assertTrue(source.contains("Elegí la Instalación padre"))
-        assertTrue(source.contains("Clasificación técnica *"))
+        assertTrue(source.contains("Tipo de instalación *"))
         assertTrue(source.contains("Guardar y tomar foto"))
         assertTrue(source.contains("model.loadFieldTypes(item.id)"))
         assertTrue(source.contains("parentId = item.id"))

android-app/app/src/test/java/com/korexlabs/dhinspeccion/FieldAttributePayloadTest.kt

@@ -0,0 +1,29 @@
+package com.korexlabs.dhinspeccion
+
+import com.korexlabs.dhinspeccion.data.FieldAttributeDefinition
+import com.korexlabs.dhinspeccion.data.fieldAttributePayload
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class FieldAttributePayloadTest {
+    @Test
+    fun payloadUsesDefinitionIdsExpectedByApiAndKeepsTypedValues() {
+        val definitions = listOf(
+            FieldAttributeDefinition("id-marca", "campo_marca", "Marca", "TEXT"),
+            FieldAttributeDefinition("id-capacidad", "campo_capacidad", "Capacidad", "NUMBER"),
+            FieldAttributeDefinition("id-serie", "campo_numero_serie", "Número de serie", "TEXT"),
+        )
+
+        val payload = fieldAttributePayload(
+            definitions,
+            mapOf("campo_marca" to " algo ", "campo_capacidad" to "37,73", "campo_numero_serie" to "  "),
+        )
+
+        assertEquals("algo", payload["id-marca"])
+        assertEquals(37.73, payload["id-capacidad"])
+        assertFalse(payload.containsKey("id-serie"))
+        assertTrue(payload.keys.none { it.startsWith("campo_") })
+    }
+}

android-app/app/src/test/java/com/korexlabs/dhinspeccion/FinalFieldFlowContractTest.kt

@@ -20,8 +20,15 @@ class FinalFieldFlowContractTest {
         assertTrue(visit.contains("Instalación"))
         assertTrue(visit.contains("Subinstalación"))
         assertTrue(visit.contains("Guardar y tomar foto"))
-        assertTrue(acts.contains("Cerrar Acta y dejar pendiente de firma"))
+        assertTrue(acts.contains("Cerrar contenido y pasar a firma"))
-        assertTrue(labels.contains("\"LOCKED\" -> \"Pendiente de firma\""))
+        assertTrue(acts.contains("Nombres y apellidos *"))
+        assertTrue(acts.contains("Cargo / función *"))
+        assertTrue(acts.contains("Email *"))
+        assertTrue(acts.contains("En disconformidad"))
+        assertTrue(acts.contains("Motivo de disconformidad *"))
+        assertTrue(acts.contains("urgencia pertenece al Acta completa"))
+        assertTrue(acts.contains("urgencia no se asigna a cada Hallazgo"))
+        assertTrue(labels.contains("\"LOCKED\" -> \"Para firmar\""))
     }
 
     @Test
@@ -45,7 +52,9 @@ class FinalFieldFlowContractTest {
     fun currentFieldUiDoesNotExposeBackendEnglishStates() {
         assertTrue(home.contains("visitStatusLabelEs(visit.status)"))
         assertTrue(findings.contains("findingStatusLabelEs(finding.status)"))
-        assertTrue(acts.contains("documentTypeLabelEs(kind)"))
+        assertTrue(acts.contains("DNI *"))
+        assertFalse(acts.contains("PASSPORT"))
+        assertFalse(acts.contains("OTHER"))
         assertTrue(labels.contains("\"PASSPORT\" -> \"Pasaporte\""))
         assertTrue(labels.contains("\"OTHER\" -> \"Otro\""))
         assertFalse(acts.contains("Finalizar y BLOQUEAR Acta"))
@@ -54,4 +63,14 @@ class FinalFieldFlowContractTest {
         assertFalse(acts.contains("Acta SELLADA"))
         assertFalse(acts.contains("Text(\"Email\")"))
     }
+    @Test
+    fun findingCreationIsCompactSearchableAndHasNoCorrectionDate() {
+        assertTrue(findings.contains("ExposedDropdownMenuBox"))
+        assertTrue(findings.contains("Tipo de Hallazgo *"))
+        assertTrue(findings.contains("Buscar o seleccionar"))
+        assertTrue(findings.contains("Otro / No está en la lista"))
+        assertFalse(findings.contains("Fecha de corrección"))
+        assertFalse(findings.contains("Hallazgos del modelo autoritativo"))
+    }
+
 }

android-app/app/src/test/java/com/korexlabs/dhinspeccion/ReleaseMetadataTest.kt

@@ -8,8 +8,8 @@ class ReleaseMetadataTest {
     @Test
     fun debugBuildKeepsSeparateApplicationIdentity() {
         assertEquals("com.korexlabs.dhinspeccion.debug", BuildConfig.APPLICATION_ID)
-        assertEquals(30, BuildConfig.VERSION_CODE)
+        assertEquals(38, BuildConfig.VERSION_CODE)
-        assertEquals("0.19.2-debug", BuildConfig.VERSION_NAME)
+        assertEquals("0.19.10-debug", BuildConfig.VERSION_NAME)
     }
 
     @Test

android-app/build.gradle.kts

@@ -2,4 +2,5 @@ plugins {
     id("com.android.application") version "8.13.2" apply false
     id("org.jetbrains.kotlin.android") version "2.2.20" apply false
     id("org.jetbrains.kotlin.plugin.compose") version "2.2.20" apply false
+    id("org.jetbrains.kotlin.kapt") version "2.2.20" apply false
 }

api-v3/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "dhv2-api",
-  "version": "0.29.0-2",
+  "version": "0.29.0-8",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "dhv2-api",
-      "version": "0.29.0-2",
+      "version": "0.29.0-8",
       "license": "UNLICENSED",
       "dependencies": {
         "@nestjs/common": "^11.0.0",

api-v3/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dhv2-api",
-  "version": "0.29.0-2",
+  "version": "0.29.0-8",
   "private": true,
   "license": "UNLICENSED",
   "scripts": {

api-v3/src/administration/administration.module.ts

@@ -2,13 +2,14 @@ import { Module } from '@nestjs/common';
 import { AuditModule } from '../audit/audit.module';
 import { AuthModule } from '../auth/auth.module';
 import { PhaseADataModule } from '../core-data/phase-a-data.module';
+import { InspectionReportsModule } from '../inspection-reports/inspection-reports.module';
 import { RolesController } from './roles/roles.controller';
 import { RolesService } from './roles/roles.service';
 import { UsersController } from './users/users.controller';
 import { UsersService } from './users/users.service';
 
 @Module({
-  imports: [PhaseADataModule, AuditModule, AuthModule],
+  imports: [PhaseADataModule, AuditModule, AuthModule, InspectionReportsModule],
   controllers: [UsersController, RolesController],
   providers: [UsersService, RolesService],
 })

api-v3/src/administration/users/dto/create-user.dto.ts

@@ -28,10 +28,9 @@ export class CreateUserDto {
   @Transform(({ value }) =>
     typeof value === 'string' && value.trim() ? value.trim().toLowerCase() : null,
   )
-  @IsOptional()
   @IsEmail()
   @MaxLength(320)
-  email?: string | null;
+  email!: string;
 
   @Transform(({ value }) =>
     typeof value === 'string' && value.trim() ? value.replace(/\D/g, '') : null,

api-v3/src/administration/users/dto/update-self-profile.dto.ts

@@ -0,0 +1,30 @@
+import { Transform } from 'class-transformer';
+import {
+  IsEmail,
+  IsOptional,
+  IsString,
+  MaxLength,
+  MinLength,
+} from 'class-validator';
+
+const optionalText = ({ value }: { value: unknown }) =>
+  typeof value === 'string' && value.trim() ? value.trim() : null;
+
+export class UpdateSelfProfileDto {
+  @Transform(({ value }) => typeof value === 'string' ? value.trim().toLowerCase() : value)
+  @IsEmail()
+  @MaxLength(320)
+  email!: string;
+
+  @Transform(optionalText)
+  @IsOptional()
+  @IsString()
+  @MaxLength(40)
+  phone?: string | null;
+
+  @Transform(optionalText)
+  @IsOptional()
+  @IsString()
+  @MaxLength(160)
+  jobTitle?: string | null;
+}

api-v3/src/administration/users/dto/update-user-smtp-settings.dto.ts

@@ -0,0 +1,65 @@
+import { Transform } from 'class-transformer';
+import {
+  IsBoolean,
+  IsEnum,
+  IsInt,
+  IsOptional,
+  IsString,
+  Max,
+  MaxLength,
+  Min,
+  MinLength,
+  ValidateIf,
+} from 'class-validator';
+import { SmtpSecurityMode } from '../../../database/entities';
+
+export enum UserSmtpMode {
+  SYSTEM = 'SYSTEM',
+  CUSTOM = 'CUSTOM',
+}
+
+const trimmed = ({ value }: { value: unknown }) =>
+  typeof value === 'string' ? value.trim() : value;
+
+export class UpdateUserSmtpSettingsDto {
+  @IsEnum(UserSmtpMode)
+  mode!: UserSmtpMode;
+
+  @ValidateIf((dto: UpdateUserSmtpSettingsDto) => dto.mode === UserSmtpMode.CUSTOM)
+  @Transform(trimmed)
+  @IsString()
+  @MinLength(1)
+  @MaxLength(255)
+  host?: string;
+
+  @ValidateIf((dto: UpdateUserSmtpSettingsDto) => dto.mode === UserSmtpMode.CUSTOM)
+  @IsInt()
+  @Min(1)
+  @Max(65535)
+  port?: number;
+
+  @ValidateIf((dto: UpdateUserSmtpSettingsDto) => dto.mode === UserSmtpMode.CUSTOM)
+  @IsEnum(SmtpSecurityMode)
+  securityMode?: SmtpSecurityMode;
+
+  @IsOptional()
+  @Transform(trimmed)
+  @IsString()
+  @MaxLength(255)
+  username?: string | null;
+
+  @IsOptional()
+  @IsString()
+  @MaxLength(512)
+  password?: string | null;
+
+  @IsOptional()
+  @Transform(trimmed)
+  @IsString()
+  @MaxLength(200)
+  fromName?: string | null;
+
+  @IsOptional()
+  @IsBoolean()
+  enabled = true;
+}

api-v3/src/administration/users/users.controller.ts

@@ -1,6 +1,7 @@
 import {
   Body,
   Controller,
+  Delete,
   Get,
   Param,
   ParseUUIDPipe,
@@ -9,24 +10,43 @@ import {
   Put,
   Query,
   Req,
+  Res,
+  UploadedFile,
+  UseInterceptors,
 } from '@nestjs/common';
+import { FileInterceptor } from '@nestjs/platform-express';
+import type { Response } from 'express';
+import { AuditService } from '../../audit/audit.service';
 import { RequirePermissions } from '../../authorization/decorators/require-permissions.decorator';
 import { CurrentAuth } from '../../auth/decorators/current-auth.decorator';
 import type {
   AuthPrincipal,
   RequestWithContext,
 } from '../../common/http/request-context';
+import { AuditAction } from '../../database/entities';
+import { SmtpDeliveryService } from '../../inspection-reports/smtp-delivery.service';
+import {
+  MAX_INSPECTION_SIGNATURE_BYTES,
+  type UploadedInspectionSignatureFile,
+} from '../../inspection-closing/inspection-signature-file';
+import { administrationAuditContext } from '../common/administration-audit';
 import { ChangeUserStatusDto } from './dto/change-user-status.dto';
 import { CreateUserDto } from './dto/create-user.dto';
 import { ListUsersQueryDto } from './dto/list-users-query.dto';
 import { ReplaceUserRolesDto } from './dto/replace-user-roles.dto';
 import { ResetUserPasswordDto } from './dto/reset-user-password.dto';
+import { UpdateSelfProfileDto } from './dto/update-self-profile.dto';
+import { UpdateUserSmtpSettingsDto } from './dto/update-user-smtp-settings.dto';
 import { UpdateUserDto } from './dto/update-user.dto';
 import { UsersService } from './users.service';
 
 @Controller('users')
 export class UsersController {
-  constructor(private readonly users: UsersService) {}
+  constructor(
+    private readonly users: UsersService,
+    private readonly smtp: SmtpDeliveryService,
+    private readonly audit: AuditService,
+  ) {}
 
   @Get()
   @RequirePermissions('users.read')
@@ -34,6 +54,112 @@ export class UsersController {
     return this.users.list(query);
   }
 
+  @Get('self/profile')
+  selfProfile(@CurrentAuth() principal: AuthPrincipal) {
+    return this.users.getSelfProfile(principal.userId);
+  }
+
+  @Patch('self/profile')
+  updateSelfProfile(
+    @Body() dto: UpdateSelfProfileDto,
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ) {
+    return this.users.updateSelfProfile(dto, principal, request);
+  }
+
+  @Get('self/signature')
+  selfSignature(@CurrentAuth() principal: AuthPrincipal) {
+    return this.users.getSelfSignature(principal.userId);
+  }
+
+  @Get('self/signature/content')
+  async selfSignatureContent(
+    @CurrentAuth() principal: AuthPrincipal,
+    @Res() response: Response,
+  ): Promise<void> {
+    const signature = await this.users.getSelfSignatureContent(principal.userId);
+    response.setHeader('Content-Type', 'image/png');
+    response.setHeader('Content-Length', String(signature.buffer.length));
+    response.setHeader('Cache-Control', 'private, no-store');
+    response.setHeader('ETag', `"${signature.sha256}"`);
+    response.setHeader('X-Content-Type-Options', 'nosniff');
+    response.send(signature.buffer);
+  }
+
+  @Put('self/signature')
+  @UseInterceptors(FileInterceptor('file', {
+    limits: { fileSize: MAX_INSPECTION_SIGNATURE_BYTES, files: 1 },
+  }))
+  updateSelfSignature(
+    @UploadedFile() file: UploadedInspectionSignatureFile | undefined,
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ) {
+    return this.users.updateSelfSignature(file, principal, request);
+  }
+
+  @Delete('self/signature')
+  deleteSelfSignature(
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ) {
+    return this.users.deleteSelfSignature(principal, request);
+  }
+
+  @Get('self/smtp')
+  selfSmtp(@CurrentAuth() principal: AuthPrincipal) {
+    return this.smtp.publicUserSettings(principal.userId);
+  }
+
+  @Put('self/smtp')
+  async updateSelfSmtp(
+    @Body() dto: UpdateUserSmtpSettingsDto,
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ) {
+    const before = await this.smtp.publicUserSettings(principal.userId);
+    const after = await this.smtp.saveUserSettings(principal.userId, dto);
+    await this.audit.record({
+      ...administrationAuditContext(principal, request),
+      action: AuditAction.USER_SMTP_SETTINGS_UPDATED,
+      entityType: 'user_smtp_settings',
+      entityId: principal.userId,
+      beforeData: before as Record<string, unknown>,
+      afterData: after as Record<string, unknown>,
+      metadata: { passwordNeverReturned: true, scope: 'SELF' },
+    });
+    return after;
+  }
+
+  @Post('self/smtp/test')
+  async testSelfSmtp(
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ) {
+    const profile = await this.users.getSelfProfile(principal.userId);
+    if (!profile.email) throw new Error('El usuario no tiene email configurado');
+    const sent = await this.smtp.send({
+      to: profile.email,
+      subject: 'DH Inspección · Prueba de correo personal',
+      text: 'Este correo confirma que tu configuración de correo en DH Inspección funciona correctamente.',
+      attachment: {
+        filename: 'dh-inspeccion-prueba-correo.txt',
+        mimeType: 'text/plain',
+        content: Buffer.from('DH Inspección · Correo personal OK\n', 'utf8'),
+      },
+    }, principal.userId);
+    await this.audit.record({
+      ...administrationAuditContext(principal, request),
+      action: AuditAction.USER_SMTP_TEST_SENT,
+      entityType: 'user_smtp_settings',
+      entityId: principal.userId,
+      afterData: { recipient: profile.email, messageId: sent.messageId },
+      metadata: { scope: 'SELF' },
+    });
+    return { ok: true, recipient: profile.email, messageId: sent.messageId };
+  }
+
   @Post()
   @RequirePermissions('users.create')
   create(

api-v3/src/administration/users/users.service.ts

@@ -1,6 +1,8 @@
+import { createHash } from 'node:crypto';
 import {
   BadRequestException,
   ConflictException,
+  ForbiddenException,
   Injectable,
   NotFoundException,
 } from '@nestjs/common';
@@ -29,7 +31,12 @@ import type { CreateUserDto } from './dto/create-user.dto';
 import type { ListUsersQueryDto } from './dto/list-users-query.dto';
 import type { ReplaceUserRolesDto } from './dto/replace-user-roles.dto';
 import type { ResetUserPasswordDto } from './dto/reset-user-password.dto';
+import type { UpdateSelfProfileDto } from './dto/update-self-profile.dto';
 import type { UpdateUserDto } from './dto/update-user.dto';
+import {
+  inspectInspectionSignatureFile,
+  type UploadedInspectionSignatureFile,
+} from '../../inspection-closing/inspection-signature-file';
 
 export interface UserRoleView {
   id: string;
@@ -37,6 +44,14 @@ export interface UserRoleView {
   name: string;
 }
 
+export interface UserReusableSignatureView {
+  configured: boolean;
+  mimeType: 'image/png' | null;
+  sizeBytes: number | null;
+  imageSha256: string | null;
+  updatedAt: Date | null;
+}
+
 export interface AdministrativeUserView {
   id: string;
   username: string;
@@ -56,6 +71,7 @@ export interface AdministrativeUserView {
   createdAt: Date;
   updatedAt: Date;
   roles: UserRoleView[];
+  smtpMode: 'SYSTEM' | 'CUSTOM';
 }
 
 interface UserViewRow extends AdministrativeUserView {
@@ -76,10 +92,10 @@ function roleSelectionInvalid(): BadRequestException {
   });
 }
 
-function inspectorEmailRequired(): BadRequestException {
+function userEmailRequired(): BadRequestException {
   return new BadRequestException({
-    code: 'INSPECTOR_EMAIL_REQUIRED',
+    code: 'USER_EMAIL_REQUIRED',
-    message: 'Los usuarios con rol Inspector deben tener un email válido para recibir la documentación de sus inspecciones',
+    message: 'Cada usuario de Hidrocarburos debe tener un email válido',
   });
 }
 
@@ -144,6 +160,7 @@ export class UsersService {
           user_account.password_changed_at AS "passwordChangedAt",
           user_account.created_at AS "createdAt",
           user_account.updated_at AS "updatedAt",
+          COALESCE((SELECT mode FROM user_smtp_settings WHERE user_id=user_account.id),'SYSTEM') AS "smtpMode",
           COALESCE(
             JSONB_AGG(
               JSONB_BUILD_OBJECT(
@@ -185,6 +202,105 @@ export class UsersService {
     );
   }
 
+  async getSelfProfile(userId: string): Promise<AdministrativeUserView> {
+    return this.getById(userId);
+  }
+
+  async getSelfSignature(userId: string): Promise<UserReusableSignatureView> {
+    const [row] = (await this.dataSource.query(`
+      SELECT mime_type AS "mimeType", size_bytes AS "sizeBytes",
+             image_sha256 AS "imageSha256", updated_at AS "updatedAt"
+      FROM user_signature_profiles WHERE user_id=$1
+    `, [userId])) as Array<{
+      mimeType: 'image/png'; sizeBytes: number; imageSha256: string; updatedAt: Date;
+    }>;
+    return row ? { configured: true, ...row } : {
+      configured: false, mimeType: null, sizeBytes: null, imageSha256: null, updatedAt: null,
+    };
+  }
+
+  async getSelfSignatureContent(userId: string): Promise<{ buffer: Buffer; sha256: string }> {
+    const [row] = (await this.dataSource.query(`
+      SELECT image_data AS buffer, image_sha256 AS sha256
+      FROM user_signature_profiles WHERE user_id=$1
+    `, [userId])) as Array<{ buffer: Buffer; sha256: string }>;
+    if (!row) throw new NotFoundException({
+      code: 'USER_SIGNATURE_NOT_CONFIGURED',
+      message: 'Todavía no cargaste tu firma de inspector',
+    });
+    return row;
+  }
+
+  async updateSelfSignature(
+    file: UploadedInspectionSignatureFile | undefined,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ): Promise<UserReusableSignatureView> {
+    if (!principal.roles.includes('inspector')) throw new ForbiddenException({
+      code: 'INSPECTOR_SIGNATURE_ROLE_REQUIRED',
+      message: 'La firma reutilizable está disponible para usuarios con rol Inspector',
+    });
+    const inspected = inspectInspectionSignatureFile(file);
+    const imageSha256 = createHash('sha256').update(file!.buffer).digest('hex');
+    const before = await this.getSelfSignature(principal.userId);
+    await this.dataSource.transaction(async (manager) => {
+      await manager.query(`
+        INSERT INTO user_signature_profiles (
+          user_id,original_name,mime_type,size_bytes,image_sha256,image_data,updated_by
+        ) VALUES ($1,$2,$3,$4,$5,$6,$1)
+        ON CONFLICT (user_id) DO UPDATE SET
+          original_name=EXCLUDED.original_name, mime_type=EXCLUDED.mime_type,
+          size_bytes=EXCLUDED.size_bytes, image_sha256=EXCLUDED.image_sha256,
+          image_data=EXCLUDED.image_data, updated_by=EXCLUDED.updated_by,
+          updated_at=CURRENT_TIMESTAMP
+      `, [principal.userId, inspected.originalName, inspected.mimeType, file!.buffer.length, imageSha256, file!.buffer]);
+      await this.audit.record({
+        ...administrationAuditContext(principal, request),
+        action: AuditAction.USER_UPDATED,
+        entityType: 'user_signature_profile',
+        entityId: principal.userId,
+        beforeData: before as unknown as Record<string, unknown>,
+        afterData: { configured: true, imageSha256, sizeBytes: file!.buffer.length },
+        metadata: { scope: 'SELF_SIGNATURE', reusableForActs: true },
+      }, manager);
+    });
+    return this.getSelfSignature(principal.userId);
+  }
+
+  async deleteSelfSignature(
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ): Promise<UserReusableSignatureView> {
+    const before = await this.getSelfSignature(principal.userId);
+    await this.dataSource.transaction(async (manager) => {
+      await manager.query('DELETE FROM user_signature_profiles WHERE user_id=$1', [principal.userId]);
+      await this.audit.record({
+        ...administrationAuditContext(principal, request),
+        action: AuditAction.USER_UPDATED,
+        entityType: 'user_signature_profile',
+        entityId: principal.userId,
+        beforeData: before as unknown as Record<string, unknown>,
+        afterData: { configured: false },
+        metadata: { scope: 'SELF_SIGNATURE', reusableForActs: true },
+      }, manager);
+    });
+    return this.getSelfSignature(principal.userId);
+  }
+
+  async updateSelfProfile(
+    dto: UpdateSelfProfileDto,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ): Promise<AdministrativeUserView> {
+    if (!dto.email?.trim()) throw userEmailRequired();
+    return this.update(
+      principal.userId,
+      { email: dto.email, phone: dto.phone, jobTitle: dto.jobTitle },
+      principal,
+      request,
+    );
+  }
+
   async create(
     dto: CreateUserDto,
     principal: AuthPrincipal,
@@ -195,10 +311,10 @@ export class UsersService {
     try {
       return await this.dataSource.transaction(async (manager) => {
         const roles = await this.resolveRoles(manager, dto.roleIds);
-        this.assertInspectorHasEmail(roles, dto.email ?? null);
+        if (!dto.email?.trim()) throw userEmailRequired();
         const user = manager.getRepository(User).create({
           username: dto.username.trim().toLowerCase(),
-          email: dto.email?.trim().toLowerCase() || null,
+          email: dto.email.trim().toLowerCase(),
           dni: dto.dni ?? null,
           phone: dto.phone ?? null,
           jobTitle: dto.jobTitle ?? null,
@@ -268,15 +384,13 @@ export class UsersService {
       return await this.dataSource.transaction(async (manager) => {
         const user = await this.lockUser(manager, id);
         const before = await this.loadUserView(manager, id);
-        if (dto.email !== undefined && !dto.email && before.roles.some((role) => role.code === 'inspector')) {
+        if (dto.email !== undefined && !dto.email) throw userEmailRequired();
-          throw inspectorEmailRequired();
-        }
 
         if (dto.username !== undefined) {
           user.username = dto.username.trim().toLowerCase();
         }
         if (dto.email !== undefined) {
-          user.email = dto.email?.trim().toLowerCase() || null;
+          user.email = dto.email!.trim().toLowerCase();
         }
         if (dto.dni !== undefined) user.dni = dto.dni ?? null;
         if (dto.phone !== undefined) user.phone = dto.phone ?? null;
@@ -286,6 +400,13 @@ export class UsersService {
         if (dto.lastName !== undefined) user.lastName = dto.lastName.trim();
         user.updatedBy = principal.userId;
         await manager.getRepository(User).save(user);
+        if (dto.email !== undefined && user.email) {
+          await manager.query(`
+            UPDATE user_smtp_settings
+            SET from_email=$2,reply_to=$2,updated_by=$1,updated_at=CURRENT_TIMESTAMP
+            WHERE user_id=$1 AND mode='CUSTOM'
+          `, [id, user.email]);
+        }
 
         const updated = await this.loadUserView(manager, id);
         await this.audit.record(
@@ -414,7 +535,6 @@ export class UsersService {
       await this.lockUser(manager, id);
       const roles = await this.resolveRoles(manager, dto.roleIds);
       const before = await this.loadUserView(manager, id);
-      this.assertInspectorHasEmail(roles, before.email);
       const beforeIds = before.roles.map((role) => role.id).sort();
       const afterIds = roles.map((role) => role.id).sort();
       if (beforeIds.join(',') === afterIds.join(',')) return before;
@@ -453,12 +573,6 @@ export class UsersService {
     return roles;
   }
 
-  private assertInspectorHasEmail(roles: Role[], email: string | null | undefined): void {
-    if (roles.some((role) => role.code === 'inspector') && !email?.trim()) {
-      throw inspectorEmailRequired();
-    }
-  }
-
   private async insertUserRoles(
     manager: EntityManager,
     userId: string,
@@ -511,6 +625,7 @@ export class UsersService {
           user_account.password_changed_at AS "passwordChangedAt",
           user_account.created_at AS "createdAt",
           user_account.updated_at AS "updatedAt",
+          COALESCE((SELECT mode FROM user_smtp_settings WHERE user_id=user_account.id),'SYSTEM') AS "smtpMode",
           COALESCE(
             JSONB_AGG(
               JSONB_BUILD_OBJECT(

api-v3/src/asset-master/asset-master-bootstrap.ts

@@ -260,7 +260,7 @@ export const MASTER_BOOTSTRAP_TYPES: MasterBootstrapTypePreset[] = [
   {
     code: 'equipo',
     name: 'Equipo',
-    description: 'Equipo físico genérico. Se conserva como alternativa cuando el inventario no permita clasificarlo todavía en una familia técnica específica.',
+    description: 'Equipo físico genérico. Se conserva como alternativa cuando el inventario no permita clasificarlo todavía en un tipo de instalación/subinstalación específico.',
     canBeRoot: false,
     operationalRole: AssetTypeOperationalRole.GENERIC,
     allowedParentCodes: ['instalacion', 'planta', 'bateria', 'estacion', 'subestacion', 'pozo', 'zona_bombas', 'sistema_defensa_incendios', 'cargadero_descargadero'],

api-v3/src/asset-master/assets.service.ts

@@ -756,10 +756,12 @@ export class AssetsService {
         const definitions = await this.loadDefinitions(manager, type.id);
         const values = validateAssetAttributeValues(definitions, dto.attributes);
         const asset = manager.getRepository(Asset).create({
+          id: dto.clientGeneratedId,
           assetTypeId: type.id,
           parentId: dto.parentId,
           operationalAreaId: dto.operationalAreaId,
           operatorCompanyId: dto.operatorCompanyId,
+          inventoryFamilyId: dto.inventoryFamilyId ?? null,
           code: dto.code,
           name: dto.name,
           commonName: dto.commonName ?? null,

api-v3/src/asset-master/dto/create-field-discovery.dto.ts

@@ -2,6 +2,10 @@ import { Transform } from 'class-transformer';
 import { IsObject, IsOptional, IsString, IsUUID, Matches, MaxLength, MinLength } from 'class-validator';
 
 export class CreateFieldDiscoveryDto {
+  @IsOptional()
+  @IsUUID('4')
+  clientGeneratedId?: string;
+
   @IsUUID('4')
   visitId!: string;
 
@@ -36,6 +40,10 @@ export class CreateFieldDiscoveryDto {
   @IsUUID('4')
   operatorCompanyId!: string;
 
+  @IsOptional()
+  @IsUUID('4')
+  inventoryFamilyId?: string | null;
+
   @IsOptional()
   @Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim() : null)
   @IsString()

api-v3/src/asset-master/inventory-family-catalog.service.ts

@@ -98,7 +98,7 @@ export class InventoryFamilyCatalogService {
         ) VALUES ($1,$2,$3,NULL,$4::jsonb,'MANUAL:F6',true)
         RETURNING id
       `,[code,dto.name,dto.level,JSON.stringify(this.cleanLabels(dto.informationLabels ?? []))])) as Array<{id:string}>;
-      if (!inserted) throw new Error('No se pudo crear la clasificación de Inventario');
+      if (!inserted) throw new Error('No se pudo crear el tipo de Inventario');
       await this.replaceParents(manager, inserted.id, parentIds);
       const created = await this.family(inserted.id,false,manager);
       await this.audit.record({
@@ -186,7 +186,7 @@ export class InventoryFamilyCatalogService {
       } catch (error) {
         if (this.isUniqueViolation(error)) throw new ConflictException({
           code:'INVENTORY_FAMILY_ATTRIBUTE_CODE_EXISTS',
-          message:'Ya existe un campo técnico con ese código en la clasificación',
+          message:'Ya existe un campo técnico con ese código en el tipo',
         });
         throw error;
       }
@@ -328,7 +328,7 @@ export class InventoryFamilyCatalogService {
       ${lockClause}
     `),[familyId])) as FamilyRow[];
     if (!rows[0]) throw new NotFoundException({
-      code:'INVENTORY_FAMILY_NOT_FOUND',message:'La clasificación de Inventario no existe',
+      code:'INVENTORY_FAMILY_NOT_FOUND',message:'El tipo de Inventario no existe',
     });
     return rows[0];
   }
@@ -343,7 +343,7 @@ export class InventoryFamilyCatalogService {
     if (level==='INSTALLATION') {
       if (ids.length) throw new BadRequestException({
         code:'INVENTORY_FAMILY_PARENT_NOT_ALLOWED',
-        message:'Una clasificación de Instalación no lleva compatibilidades padre',
+        message:'Un tipo de Instalación no lleva compatibilidades padre',
       });
       return [];
     }
@@ -352,7 +352,7 @@ export class InventoryFamilyCatalogService {
       message:'Elegí al menos un tipo de Instalación compatible con esta Subinstalación',
     });
     if (ownId && ids.includes(ownId)) throw new BadRequestException({
-      code:'INVENTORY_FAMILY_PARENT_CYCLE',message:'Una clasificación no puede ser compatible consigo misma',
+      code:'INVENTORY_FAMILY_PARENT_CYCLE',message:'Un tipo no puede ser compatible consigo mismo',
     });
     const [count]=(await manager.query(`
       SELECT COUNT(*)::integer AS total FROM inventory_families
@@ -434,7 +434,7 @@ export class InventoryFamilyCatalogService {
       if (!unique.has(identity)) unique.set(identity,clean);
     }
     if (unique.size>100) throw new ConflictException({
-      code:'INVENTORY_FAMILY_TOO_MANY_FIELDS',message:'La clasificación admite hasta 100 campos de información',
+      code:'INVENTORY_FAMILY_TOO_MANY_FIELDS',message:'El tipo admite hasta 100 campos de información',
     });
     return [...unique.values()];
   }

api-v3/src/asset-master/inventory-structure.service.ts

@@ -253,7 +253,7 @@ export class InventoryStructureService {
           dto.kind === 'EMPRESA' ? 'Maestro manual de Empresas' : 'Estructura manual de Inventario',
           dto.kind === 'EMPRESA' ? 'inventory-master:empresa' : `inventory-structure:${dto.kind.toLowerCase()}`,
           family
-            ? `Clasificación técnica: ${family.code} · ${family.name}`
+            ? `Tipo: ${family.code} · ${family.name}`
             : yacimientoContext
               ? `Tipo de concesión: ${yacimientoContext.concessionName}`
               : null,
@@ -458,13 +458,13 @@ export class InventoryStructureService {
     if (!expectedLevel) {
       if (familyId) throw new BadRequestException({
         code: 'INVENTORY_STRUCTURE_FAMILY_NOT_ALLOWED',
-        message: 'Empresa, Departamento, Área y Yacimiento no llevan clasificación técnica',
+        message: 'Empresa, Departamento, Área y Yacimiento no llevan Tipo de instalación/subinstalación',
       });
       return null;
     }
     if (!familyId) throw new BadRequestException({
       code: 'INVENTORY_STRUCTURE_FAMILY_REQUIRED',
-      message: `Elegí la clasificación técnica de la ${kind.toLowerCase()}`,
+      message: `Elegí el tipo de la ${kind.toLowerCase()}`,
     });
     const rows = (await manager.query(`
       SELECT family.id,family.code,family.name,family.level,
@@ -479,15 +479,15 @@ export class InventoryStructureService {
       LIMIT 1
     `, [familyId])) as FamilyRow[];
     const family = rows[0];
-    if (!family) throw new NotFoundException({ code: 'INVENTORY_FAMILY_NOT_FOUND', message: 'La clasificación técnica no existe' });
+    if (!family) throw new NotFoundException({ code: 'INVENTORY_FAMILY_NOT_FOUND', message: 'El Tipo de instalación/subinstalación no existe' });
     if (family.level !== expectedLevel) throw new BadRequestException({
       code: 'INVENTORY_FAMILY_LEVEL_INVALID',
-      message: 'La clasificación técnica no corresponde al nivel seleccionado',
+      message: 'El Tipo de instalación/subinstalación no corresponde al nivel seleccionado',
     });
     if (kind === 'SUBINSTALACION') {
       if (!parent?.inventoryFamilyId) throw new BadRequestException({
         code:'INVENTORY_PARENT_FAMILY_REQUIRED',
-        message:'La Instalación padre debe tener una clasificación técnica válida',
+        message:'La Instalación padre debe tener un Tipo de instalación válido',
       });
       const [compatible]=(await manager.query(`
         SELECT 1 AS ok FROM inventory_family_parent_rules
@@ -496,7 +496,7 @@ export class InventoryStructureService {
       `,[family.id,parent.inventoryFamilyId])) as Array<{ok:number}>;
       if (!compatible) throw new BadRequestException({
         code: 'INVENTORY_SUBINSTALLATION_FAMILY_PARENT_INVALID',
-        message: 'Ese tipo de Subinstalación no es compatible con la clasificación de la Instalación seleccionada',
+        message: 'Ese tipo de Subinstalación no es compatible con el tipo de la Instalación seleccionada',
       });
     }
     return family;

api-v3/src/asset-master/inventory-technical-values.service.ts

@@ -29,7 +29,7 @@ export class InventoryTechnicalValuesService {
       for (const [definitionId,raw] of Object.entries(dto.values)) {
         const definition=definitionById.get(definitionId);
         if (!definition || !definition.isActive) throw new BadRequestException({
-          code:'INVENTORY_TECHNICAL_FIELD_INVALID',message:'Uno o más campos técnicos no pertenecen a la clasificación actual',
+          code:'INVENTORY_TECHNICAL_FIELD_INVALID',message:'Uno o más campos técnicos no pertenecen al tipo actual',
         });
         const value=this.normalize(definition,raw);
         if (value!==undefined) normalized[definitionId]=value;
@@ -67,7 +67,7 @@ export class InventoryTechnicalValuesService {
     const asset=rows[0];
     if (!asset) throw new NotFoundException({code:'ASSET_NOT_FOUND',message:'El registro de Inventario no existe'});
     if (!asset.inventoryFamilyId || !asset.familyCode || !asset.familyName || !asset.familyLevel) throw new BadRequestException({
-      code:'INVENTORY_TECHNICAL_FAMILY_REQUIRED',message:'Este nivel no tiene clasificación técnica y no admite campos técnicos por rubro',
+      code:'INVENTORY_TECHNICAL_FAMILY_REQUIRED',message:'Este nivel no tiene Tipo de instalación/subinstalación y no admite campos técnicos por rubro',
     });
     const definitions=(await manager.query(`
       SELECT id,code,name,data_type AS "dataType",is_required AS "isRequired",is_active AS "isActive",

api-v3/src/cli/bootstrap-admin.ts

@@ -118,10 +118,9 @@ async function main(): Promise<void> {
         );
       }
 
-      email = (await prompt.question('Email (optional): ')).trim().toLowerCase();
+      email = (await prompt.question('Email: ')).trim().toLowerCase();
       if (
-        email &&
+        !email || email.length > 320 || !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)
-        (email.length > 320 || !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email))
       ) {
         throw new Error('Email is invalid');
       }
@@ -189,7 +188,7 @@ async function main(): Promise<void> {
              OR ($2::text IS NOT NULL AND LOWER(email) = $2)
           LIMIT 1
         `,
-        [username, email || null],
+        [username, email],
       )) as unknown[];
       if (duplicate.length > 0) {
         throw new Error('Username or email already exists');
@@ -202,7 +201,7 @@ async function main(): Promise<void> {
 
       const user = manager.getRepository(User).create({
         username,
-        email: email || null,
+        email,
         passwordHash,
         firstName,
         lastName,

api-v3/src/database/entities/audit-event.entity.ts

@@ -103,6 +103,8 @@ export enum AuditAction {
   INSPECTION_BUSINESS_CALENDAR_UPDATED = 'INSPECTION_BUSINESS_CALENDAR_UPDATED',
   SMTP_SETTINGS_UPDATED = 'SMTP_SETTINGS_UPDATED',
   SMTP_TEST_SENT = 'SMTP_TEST_SENT',
+  USER_SMTP_SETTINGS_UPDATED = 'USER_SMTP_SETTINGS_UPDATED',
+  USER_SMTP_TEST_SENT = 'USER_SMTP_TEST_SENT',
   DOCUMENT_DELIVERY_SETTINGS_UPDATED = 'DOCUMENT_DELIVERY_SETTINGS_UPDATED',
   DOCUMENT_DELIVERY_RETRY_REQUESTED = 'DOCUMENT_DELIVERY_RETRY_REQUESTED',
   DOCUMENT_DELIVERY_SENT = 'DOCUMENT_DELIVERY_SENT',

api-v3/src/database/entities/user.entity.ts

@@ -16,8 +16,8 @@ export class User extends TimestampedEntity {
   @Column({ type: 'varchar', length: 80 })
   username!: string;
 
-  @Column({ type: 'varchar', length: 320, nullable: true })
+  @Column({ type: 'varchar', length: 320 })
-  email!: string | null;
+  email!: string;
 
   @Column({ type: 'varchar', length: 32, nullable: true })
   dni!: string | null;

api-v3/src/database/migrations/1790117400000-f6-2-user-smtp-and-act-representative.ts

@@ -0,0 +1,105 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+function quoteIdentifier(identifier: string): string {
+  return `"${identifier.replaceAll('"', '""')}"`;
+}
+
+export class F62UserSmtpAndActRepresentative1790117400000 implements MigrationInterface {
+  name = 'F62UserSmtpAndActRepresentative1790117400000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      DO $$
+      BEGIN
+        IF EXISTS (SELECT 1 FROM users WHERE email IS NULL OR btrim(email)='') THEN
+          RAISE EXCEPTION 'USER_EMAIL_REQUIRED_BEFORE_F62';
+        END IF;
+      END $$
+    `);
+    await queryRunner.query(`ALTER TABLE users ALTER COLUMN email SET NOT NULL`);
+
+    await queryRunner.query(`
+      CREATE TABLE user_smtp_settings (
+        user_id uuid PRIMARY KEY,
+        mode varchar(16) NOT NULL DEFAULT 'SYSTEM',
+        host varchar(255),
+        port integer,
+        security_mode varchar(24),
+        username varchar(255),
+        password_enc text,
+        from_name varchar(200),
+        from_email varchar(320),
+        reply_to varchar(320),
+        enabled boolean NOT NULL DEFAULT true,
+        updated_by uuid,
+        created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        CONSTRAINT chk_user_smtp_mode CHECK (mode IN ('SYSTEM','CUSTOM')),
+        CONSTRAINT chk_user_smtp_security CHECK (security_mode IS NULL OR security_mode IN ('NONE','STARTTLS','TLS')),
+        CONSTRAINT chk_user_smtp_port CHECK (port IS NULL OR (port > 0 AND port <= 65535)),
+        CONSTRAINT chk_user_smtp_custom_complete CHECK (
+          mode='SYSTEM' OR (
+            LENGTH(TRIM(COALESCE(host,''))) > 0
+            AND port IS NOT NULL
+            AND security_mode IS NOT NULL
+            AND LENGTH(TRIM(COALESCE(from_email,''))) > 0
+          )
+        ),
+        CONSTRAINT fk_user_smtp_user FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE,
+        CONSTRAINT fk_user_smtp_updated_by FOREIGN KEY (updated_by) REFERENCES users(id) ON DELETE SET NULL
+      )
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_act_responsibles
+      DROP CONSTRAINT chk_inspection_act_responsibles_details
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_act_responsibles
+      ADD CONSTRAINT chk_inspection_act_responsibles_details CHECK (
+        (
+          attendance_status = 'PRESENT'
+          AND LENGTH(TRIM(COALESCE(full_name, ''))) > 0
+          AND document_type IS NOT NULL
+          AND LENGTH(TRIM(COALESCE(document_number, ''))) > 0
+          AND LENGTH(TRIM(COALESCE(position, ''))) > 0
+          AND LENGTH(TRIM(COALESCE(email, ''))) > 0
+          AND absence_reason IS NULL
+        ) OR (
+          attendance_status = 'ABSENT'
+          AND LENGTH(TRIM(COALESCE(absence_reason, ''))) >= 10
+        )
+      )
+    `);
+
+    const appRole = process.env.DB_APP_USER;
+    if (!appRole) throw new Error('Missing required environment variable: DB_APP_USER');
+    const applicationRole = quoteIdentifier(appRole);
+    await queryRunner.query(`GRANT SELECT, INSERT, UPDATE ON TABLE user_smtp_settings TO ${applicationRole}`);
+    await queryRunner.query(`REVOKE DELETE ON TABLE user_smtp_settings FROM ${applicationRole}`);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE inspection_act_responsibles
+      DROP CONSTRAINT chk_inspection_act_responsibles_details
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_act_responsibles
+      ADD CONSTRAINT chk_inspection_act_responsibles_details CHECK (
+        (
+          attendance_status = 'PRESENT'
+          AND LENGTH(TRIM(COALESCE(full_name, ''))) > 0
+          AND document_type IS NOT NULL
+          AND LENGTH(TRIM(COALESCE(document_number, ''))) > 0
+          AND LENGTH(TRIM(COALESCE(position, ''))) > 0
+          AND absence_reason IS NULL
+        ) OR (
+          attendance_status = 'ABSENT'
+          AND LENGTH(TRIM(COALESCE(absence_reason, ''))) >= 10
+        )
+      )
+    `);
+    await queryRunner.query(`DROP TABLE IF EXISTS user_smtp_settings`);
+    await queryRunner.query(`ALTER TABLE users ALTER COLUMN email DROP NOT NULL`);
+  }
+}

api-v3/src/database/migrations/1790121000000-f6-5-field-finding-code-contract.ts

@@ -0,0 +1,45 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+/**
+ * F4 cambió el código visible del Acta a ACT-NNNNN-DD-MM-YY, pero el CHECK
+ * histórico de Hallazgos seguía aceptando sólo ACTA-YYYY-NNNNNN-HNNN.
+ * El servicio genera el Hallazgo a partir del código real del Acta, por lo que
+ * PostgreSQL rechazaba altas válidas de campo con un 500.
+ */
+export class F65FieldFindingCodeContract1790121000000 implements MigrationInterface {
+  name = 'F65FieldFindingCodeContract1790121000000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE inspection_findings
+      DROP CONSTRAINT IF EXISTS chk_inspection_findings_code
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_findings
+      ADD CONSTRAINT chk_inspection_findings_code CHECK (
+        code ~ '^(ACTA-[0-9]{4}-[0-9]{6}|ACT-[0-9]{5}-[0-9]{2}-[0-9]{2}-[0-9]{2})-H[0-9]{3}$'
+      )
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      UPDATE inspection_findings finding
+      SET code = 'ACTA-' || act.act_year::text || '-' || LPAD(act.act_number::text, 6, '0')
+        || '-H' || LPAD(finding.finding_number::text, 3, '0')
+      FROM inspection_acts act
+      WHERE finding.act_id = act.id
+        AND finding.code ~ '^ACT-[0-9]{5}-[0-9]{2}-[0-9]{2}-[0-9]{2}-H[0-9]{3}$'
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_findings
+      DROP CONSTRAINT IF EXISTS chk_inspection_findings_code
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_findings
+      ADD CONSTRAINT chk_inspection_findings_code CHECK (
+        code ~ '^ACTA-[0-9]{4}-[0-9]{6}-H[0-9]{3}$'
+      )
+    `);
+  }
+}

api-v3/src/database/migrations/1790124600000-f6-7-user-reusable-signature.ts

@@ -0,0 +1,49 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+function quoteIdentifier(identifier: string): string {
+  return `"${identifier.replaceAll('"', '""')}"`;
+}
+
+export class F67UserReusableSignature1790124600000 implements MigrationInterface {
+  name = 'F67UserReusableSignature1790124600000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      CREATE TABLE user_signature_profiles (
+        user_id uuid PRIMARY KEY,
+        original_name varchar(255) NOT NULL,
+        mime_type varchar(100) NOT NULL,
+        size_bytes integer NOT NULL,
+        image_sha256 char(64) NOT NULL,
+        image_data bytea NOT NULL,
+        updated_by uuid,
+        created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        CONSTRAINT chk_user_signature_profiles_png CHECK (mime_type='image/png'),
+        CONSTRAINT chk_user_signature_profiles_size CHECK (
+          size_bytes BETWEEN 1 AND 1048576
+          AND OCTET_LENGTH(image_data)=size_bytes
+        ),
+        CONSTRAINT chk_user_signature_profiles_sha CHECK (
+          image_sha256 ~ '^[0-9a-f]{64}$'
+        ),
+        CONSTRAINT fk_user_signature_profiles_user FOREIGN KEY (user_id)
+          REFERENCES users(id) ON DELETE CASCADE,
+        CONSTRAINT fk_user_signature_profiles_updated_by FOREIGN KEY (updated_by)
+          REFERENCES users(id) ON DELETE SET NULL
+      )
+    `);
+    const appRole = process.env.DB_APP_USER;
+    if (!appRole) throw new Error('Missing required environment variable: DB_APP_USER');
+    const applicationRole = quoteIdentifier(appRole);
+    await queryRunner.query(`
+      GRANT SELECT, INSERT, UPDATE, DELETE
+      ON TABLE user_signature_profiles
+      TO ${applicationRole}
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('DROP TABLE user_signature_profiles');
+  }
+}

api-v3/src/database/migrations/1790128200000-f6-8-offline-evidence-idempotency.ts

@@ -0,0 +1,33 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class F68OfflineEvidenceIdempotency1790128200000 implements MigrationInterface {
+  name = 'F68OfflineEvidenceIdempotency1790128200000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE inspection_finding_evidence
+      ADD COLUMN client_operation_id uuid
+    `);
+    await queryRunner.query(`
+      CREATE UNIQUE INDEX uq_inspection_finding_evidence_client_operation
+      ON inspection_finding_evidence (client_operation_id)
+      WHERE client_operation_id IS NOT NULL
+    `);
+    await queryRunner.query(`
+      ALTER TABLE asset_field_capture_events
+      ADD COLUMN client_operation_id uuid
+    `);
+    await queryRunner.query(`
+      CREATE UNIQUE INDEX uq_asset_field_capture_events_client_operation
+      ON asset_field_capture_events (client_operation_id)
+      WHERE client_operation_id IS NOT NULL
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('DROP INDEX uq_asset_field_capture_events_client_operation');
+    await queryRunner.query('ALTER TABLE asset_field_capture_events DROP COLUMN client_operation_id');
+    await queryRunner.query('DROP INDEX uq_inspection_finding_evidence_client_operation');
+    await queryRunner.query('ALTER TABLE inspection_finding_evidence DROP COLUMN client_operation_id');
+  }
+}

api-v3/src/inspection-acts/dto/create-inspection-act.dto.ts

@@ -12,6 +12,10 @@ import {
 } from 'class-validator';
 
 export class CreateInspectionActDto {
+  @IsOptional()
+  @IsUUID('4')
+  clientGeneratedId?: string;
+
   @IsISO8601({ strict: true })
   occurredAt!: string;
 

api-v3/src/inspection-acts/inspection-acts.controller.ts

@@ -53,6 +53,12 @@ export class InspectionActsController {
     return this.acts.listGlobal(query);
   }
 
+  @Get(':id/field-media')
+  @RequirePermissions('inspection_acts.read', 'assets.read_media')
+  fieldMedia(@Param('id', new ParseUUIDPipe({ version: '4' })) id: string) {
+    return this.acts.listFieldMedia(id);
+  }
+
   @Get(':id')
   @RequirePermissions('inspection_acts.read')
   get(@Param('id', new ParseUUIDPipe({ version: '4' })) id: string) {

api-v3/src/inspection-acts/inspection-acts.service.ts

@@ -278,6 +278,48 @@ export class InspectionActsService {
     return this.dataSource.transaction((manager) => this.loadView(manager, id));
   }
 
+  async listFieldMedia(id: string) {
+    const [act] = await this.dataSource.query(
+      'SELECT id FROM inspection_acts WHERE id=$1::uuid',
+      [id],
+    ) as Array<{ id: string }>;
+    if (!act) throw actNotFound();
+    const data = await this.dataSource.query(`
+      SELECT
+        media.id,
+        media.asset_id AS "assetId",
+        asset.code AS "assetCode",
+        asset.name AS "assetName",
+        media.kind,
+        media.original_name AS "originalName",
+        media.mime_type AS "mimeType",
+        media.size_bytes::double precision AS "sizeBytes",
+        media.sha256,
+        media.title,
+        media.description,
+        media.captured_at AS "capturedAt",
+        media.latitude::double precision AS latitude,
+        media.longitude::double precision AS longitude,
+        media.accuracy_m::double precision AS "accuracyM",
+        media.source,
+        capture.device_captured_at AS "fieldCapturedAt",
+        capture.created_at AS "createdAt"
+      FROM inspection_acts act
+      INNER JOIN inspection_act_assets link
+        ON link.act_id=act.id AND link.included=true
+      INNER JOIN asset_field_capture_events capture
+        ON capture.visit_id=act.visit_id
+       AND capture.asset_id=link.asset_id
+       AND capture.event_type='PHOTO'
+      INNER JOIN asset_media media
+        ON media.id=capture.media_id AND media.deleted_at IS NULL
+      INNER JOIN assets asset ON asset.id=media.asset_id
+      WHERE act.id=$1::uuid
+      ORDER BY capture.device_captured_at DESC,capture.created_at DESC,media.id
+    `, [id]);
+    return { data };
+  }
+
   async create(
     visitId: string,
     dto: CreateInspectionActDto,
@@ -289,6 +331,22 @@ export class InspectionActsService {
       const visit = await this.lockVisit(manager, visitId);
       this.assertVisitOpen(visit);
       await this.assertActorAssigned(manager, visitId, principal);
+      if (dto.clientGeneratedId) {
+        const [existing] = await manager.query(`
+          SELECT id, visit_id AS "visitId"
+          FROM inspection_acts
+          WHERE id=$1
+        `, [dto.clientGeneratedId]) as Array<{ id: string; visitId: string }>;
+        if (existing) {
+          if (existing.visitId !== visitId) {
+            throw new ConflictException({
+              code: 'INSPECTION_ACT_CLIENT_ID_REUSED',
+              message: 'El identificador offline del Acta ya fue utilizado en otra inspección',
+            });
+          }
+          return this.loadView(manager, existing.id);
+        }
+      }
       await this.assertVisitHasNoDraftAct(manager, visitId);
       await this.assertVisitAssets(manager, visitId, dto.assetIds);
       const occurredAt = new Date(dto.occurredAt);
@@ -305,6 +363,7 @@ export class InspectionActsService {
       `, [occurredAt])) as Array<{ date_part: string }>;
       const code = `ACT-${String(actNumber).padStart(5, '0')}-${dateRow.date_part}`;
       const act = manager.getRepository(InspectionAct).create({
+        id: dto.clientGeneratedId,
         visitId,
         actYear,
         actNumber,
@@ -728,10 +787,13 @@ export class InspectionActsService {
     principal: AuthPrincipal,
   ): Promise<number> {
     const [row] = (await manager.query(`
+      WITH updated AS (
         UPDATE inspection_acts
         SET current_version = current_version + 1
         WHERE id = $1
-      RETURNING current_version AS "versionNumber"
+        RETURNING current_version
+      )
+      SELECT current_version AS "versionNumber" FROM updated
     `, [act.id])) as Array<{ versionNumber: number }>;
     const versionNumber = Number(row.versionNumber);
     act.currentVersion = versionNumber;

api-v3/src/inspection-closing/company-signature-invite.service.ts

@@ -213,14 +213,14 @@ export class CompanySignatureInviteService {
 
     if (!publicUrl) {
       deliveryError = 'COMPANY_SIGNATURE_PUBLIC_BASE_URL no configurada';
-    } else if (!(await this.smtp.configured())) {
+    } else if (!(await this.smtp.configured(principal.userId))) {
       deliveryError = 'SMTP no configurado';
     } else {
       const body = [
         `Se solicita revisar y manifestarse sobre el Acta ${created.actCode}.`,
         `Inspección: ${created.inspectionCode}.`,
         '',
-        'El enlace permite firmar en conformidad, firmar en disidencia o registrar una negativa a firmar.',
+        'El enlace permite firmar en conformidad, firmar en disconformidad o registrar una negativa a firmar.',
         'El contenido del Acta está bloqueado y no puede modificarse desde este enlace.',
         '',
         `Enlace seguro: ${publicUrl}`,
@@ -236,7 +236,7 @@ export class CompanySignatureInviteService {
             mimeType: 'text/plain',
             content: Buffer.from(body, 'utf8'),
           },
-        });
+        }, principal.userId);
         emailSent = true;
         await this.dataSource.query(`
           UPDATE inspection_act_company_signature_invites

api-v3/src/inspection-closing/dto/upsert-inspection-responsible.dto.ts

@@ -54,7 +54,9 @@ export class UpsertInspectionResponsibleDto {
   @MaxLength(200)
   position?: string;
 
-  @IsOptional()
+  @ValidateIf((dto: UpsertInspectionResponsibleDto) => (
+    dto.attendanceStatus === InspectionResponsibleAttendanceStatus.PRESENT
+  ))
   @Transform(trimOrUndefined)
   @IsEmail()
   @MaxLength(320)

api-v3/src/inspection-closing/inspection-closing.service.ts

@@ -103,6 +103,14 @@ interface StoredSignature extends SignatureView {
   storedName: string | null;
 }
 
+interface ReusableInspectorSignature {
+  originalName: string;
+  mimeType: 'image/png';
+  sizeBytes: number;
+  imageSha256: string;
+  imageData: Buffer;
+}
+
 interface ClosureRecord {
   actId: string;
   schemaVersion: string;
@@ -152,6 +160,7 @@ export interface InspectionClosureView {
     actualClosedAt: Date | null;
   };
   responsible: ResponsibleView | null;
+  representativeSuggestion: ResponsibleView | null;
   closure: null | {
     schemaVersion: string;
     preparedSha256: string;
@@ -305,6 +314,7 @@ export class InspectionClosingService {
       const lockedAt = new Date();
 
       const [updated] = (await manager.query(`
+        WITH updated AS (
           UPDATE inspection_acts
           SET status='LOCKED',
               urgency=$2,
@@ -319,7 +329,9 @@ export class InspectionClosingService {
               updated_by=$9,
               updated_at=$8
           WHERE id=$1
-        RETURNING current_version AS "versionNumber"
+          RETURNING current_version
+        )
+        SELECT current_version AS "versionNumber" FROM updated
       `, [
         actId,
         dto.urgency,
@@ -376,7 +388,7 @@ export class InspectionClosingService {
         afterData: {
           status: InspectionActStatus.LOCKED,
           lockedSha256: preparedSha256,
-          urgency: act.urgency,
+          urgency: dto.urgency,
           deadlineDays,
           deadlineDayType,
           deadlineBasis,
@@ -460,6 +472,13 @@ export class InspectionClosingService {
           message: 'La negativa a firmar requiere identificar al responsable que se negó',
         });
       }
+      if (dto.status === InspectionActSignatureStatus.ABSENT
+        && responsible.attendanceStatus !== InspectionResponsibleAttendanceStatus.ABSENT) {
+        throw new BadRequestException({
+          code: 'INSPECTION_COMPANY_ABSENCE_REQUIRES_ABSENT_RESPONSIBLE',
+          message: 'La ausencia sólo puede confirmarse cuando el representante fue registrado como ausente',
+        });
+      }
       if (await this.hasCompanyOutcome(manager, actId)) {
         throw new ConflictException({
           code: 'INSPECTION_ACT_COMPANY_OUTCOME_ALREADY_RECORDED',
@@ -531,22 +550,15 @@ export class InspectionClosingService {
     request: RequestWithContext,
   ): Promise<InspectionClosureView> {
     assertMobileInspector(principal);
-    const sealed = await this.dataSource.transaction(async (manager) => {
+    let generatedInspectorSignaturePath: string | null = null;
+    let sealed: InspectionClosureView;
+    try {
+      sealed = await this.dataSource.transaction(async (manager) => {
       const { act, visit } = await this.lockContext(manager, actId);
       this.assertLockedForManifestation(act);
       await this.assertActorAssigned(manager, visit.id, principal, true);
       const closure = await this.requireClosure(manager, actId);
-      const signatures = await this.loadSignatures(manager, actId);
+      let signatures = await this.loadSignatures(manager, actId);
-      const inspectorSigned = signatures.some((item) =>
-        item.signerType === InspectionActSignerType.INSPECTOR
-        && item.status === InspectionActSignatureStatus.SIGNED,
-      );
-      if (!inspectorSigned) {
-        throw new ConflictException({
-          code: 'INSPECTION_ACT_INSPECTOR_SIGNATURE_REQUIRED',
-          message: 'Se requiere la firma del inspector para sellar el acta',
-        });
-      }
       const companyOutcomes = signatures.filter((item) =>
         item.signerType === InspectionActSignerType.COMPANY_RESPONSIBLE,
       );
@@ -556,6 +568,17 @@ export class InspectionClosingService {
           message: 'Debe existir exactamente una firma, disidencia, negativa o ausencia documentada del responsable de la empresa',
         });
       }
+      const inspectorSigned = signatures.some((item) =>
+        item.signerType === InspectionActSignerType.INSPECTOR
+        && item.status === InspectionActSignatureStatus.SIGNED,
+      );
+      if (!inspectorSigned) {
+        const created = await this.createInspectorSignatureFromProfile(
+          manager, actId, closure.preparedSha256, principal, request,
+        );
+        generatedInspectorSignaturePath = created.filePath;
+        signatures = await this.loadSignatures(manager, actId);
+      }
 
       const serverSealedAt = new Date();
       const deviceSealedAt = new Date(dto.clientClosedAt);
@@ -618,6 +641,7 @@ export class InspectionClosingService {
         WHERE act_id=$1
       `, [actId, finalSnapshot, finalSha256, deviceSealedAt, serverSealedAt, dto.uploadMode, principal.userId]);
       const [updated] = (await manager.query(`
+        WITH updated AS (
           UPDATE inspection_acts
           SET status='SEALED',
               sealed_at=$2,
@@ -629,7 +653,9 @@ export class InspectionClosingService {
               updated_by=$3,
               updated_at=$2
           WHERE id=$1
-        RETURNING current_version AS "versionNumber"
+          RETURNING current_version
+        )
+        SELECT current_version AS "versionNumber" FROM updated
       `, [actId, serverSealedAt, principal.userId, finalSha256])) as Array<{ versionNumber: number }>;
       await manager.query(`
         INSERT INTO inspection_act_versions (
@@ -664,6 +690,10 @@ export class InspectionClosingService {
       await this.reports.ensureFrozenReport(manager, actId, principal, request);
       return this.loadView(manager, actId);
       });
+    } catch (error) {
+      if (generatedInspectorSignaturePath) await unlink(generatedInspectorSignaturePath).catch(() => undefined);
+      throw error;
+    }
     await this.reports.ensureWordForAct(actId);
     return sealed;
   }
@@ -1022,6 +1052,7 @@ export class InspectionClosingService {
     }>;
     if (!context) throw actNotFound();
     const responsible = await this.loadResponsible(manager, actId);
+    const representativeSuggestion = responsible ? null : await this.loadResponsibleSuggestion(manager, actId);
     const closure = await this.loadClosure(manager, actId);
     const signatures = await this.loadSignatures(manager, actId);
     return {
@@ -1051,6 +1082,7 @@ export class InspectionClosingService {
         actualClosedAt: context.visitActualClosedAt,
       },
       responsible,
+      representativeSuggestion,
       closure: closure ? {
         schemaVersion: closure.schemaVersion,
         preparedSha256: closure.preparedSha256,
@@ -1083,12 +1115,30 @@ export class InspectionClosingService {
     return row ?? null;
   }
 
+  private async loadResponsibleSuggestion(manager: EntityManager, actId: string): Promise<ResponsibleView | null> {
+    const [row] = await manager.query(`
+      SELECT responsible.act_id AS "actId",responsible.attendance_status AS "attendanceStatus",
+        responsible.full_name AS "fullName",responsible.document_type AS "documentType",
+        responsible.document_number AS "documentNumber",responsible.position,responsible.email,responsible.phone,
+        responsible.absence_reason AS "absenceReason",responsible.updated_by AS "updatedBy",
+        responsible.created_at AS "createdAt",responsible.updated_at AS "updatedAt"
+      FROM inspection_acts current_act
+      JOIN inspection_acts previous_act
+        ON previous_act.visit_id=current_act.visit_id AND previous_act.id<>current_act.id
+      JOIN inspection_act_responsibles responsible ON responsible.act_id=previous_act.id
+      WHERE current_act.id=$1 AND responsible.attendance_status='PRESENT'
+      ORDER BY responsible.updated_at DESC,previous_act.created_at DESC
+      LIMIT 1
+    `, [actId]) as ResponsibleView[];
+    return row ?? null;
+  }
+
   private async requireResponsible(manager: EntityManager, actId: string): Promise<ResponsibleView> {
     const responsible = await this.loadResponsible(manager, actId);
     if (!responsible) {
       throw new ConflictException({
         code: 'INSPECTION_ACT_RESPONSIBLE_REQUIRED',
-        message: 'Debe identificarse al responsable o documentar su ausencia antes de finalizar el acta',
+        message: 'Debe identificarse al representante de la empresa o documentar su ausencia antes de cerrar el Acta',
       });
     }
     return responsible;
@@ -1150,6 +1200,82 @@ export class InspectionClosingService {
     return rows.map(({ storedName: _storedName, originalName: _originalName, ...row }) => row);
   }
 
+  private async requireReusableInspectorSignature(
+    manager: EntityManager,
+    userId: string,
+  ): Promise<ReusableInspectorSignature> {
+    const [row] = await manager.query(`
+      SELECT original_name AS "originalName", mime_type AS "mimeType",
+             size_bytes AS "sizeBytes", image_sha256 AS "imageSha256",
+             image_data AS "imageData"
+      FROM user_signature_profiles
+      WHERE user_id=$1
+    `, [userId]) as ReusableInspectorSignature[];
+    if (!row) {
+      throw new ConflictException({
+        code: 'INSPECTION_INSPECTOR_PROFILE_SIGNATURE_REQUIRED',
+        message: 'Para cerrar definitivamente el Acta, cargá tu firma de inspector desde Mi perfil en el Dashboard',
+      });
+    }
+    return row;
+  }
+
+  private async createInspectorSignatureFromProfile(
+    manager: EntityManager,
+    actId: string,
+    preparedSha256: string,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ): Promise<{ filePath: string }> {
+    const profile = await this.requireReusableInspectorSignature(manager, principal.userId);
+    const id = randomUUID();
+    const storedName = `${id}.png`;
+    const filePath = resolve(this.signatureRoot, storedName);
+    await mkdir(this.signatureRoot, { recursive: true, mode: 0o700 });
+    await writeFile(filePath, profile.imageData, { flag: 'wx', mode: 0o600 });
+    const signedAt = new Date();
+    const source = this.signatureSource(principal);
+    const signerName = `${principal.firstName} ${principal.lastName}`.trim();
+    const payload = {
+      actId, lockedSha256: preparedSha256, signerType: InspectionActSignerType.INSPECTOR,
+      signerUserId: principal.userId, signerName, position: 'Inspector/a',
+      status: InspectionActSignatureStatus.SIGNED, imageSha256: profile.imageSha256,
+      consentText: INSPECTOR_CONSENT, consentVersion: CONSENT_VERSION,
+      consentAcceptedAt: signedAt.toISOString(), signedAt: signedAt.toISOString(),
+      source, signatureMode: 'PROFILE_REUSABLE', uploadedBy: principal.userId,
+    };
+    const signaturePayloadSha256 = sha256CanonicalJson(payload);
+    try {
+      await manager.query(`
+        INSERT INTO inspection_act_signatures (
+          id,act_id,signer_type,signer_user_id,signer_name,document_type,document_number,position,status,
+          original_name,stored_name,mime_type,size_bytes,image_sha256,consent_text,consent_version,
+          consent_accepted_at,client_signed_at,signed_at,latitude,longitude,accuracy_m,device_label,source,
+          prepared_sha256,signature_payload_sha256,uploaded_by,created_at
+        ) VALUES (
+          $1,$2,'INSPECTOR',$3,$4,NULL,NULL,'Inspector/a','SIGNED',
+          $5,$6,$7,$8,$9,$10,$11,$12,NULL,$12,NULL,NULL,NULL,$13,$14,$15,$16,$3,$12
+        )
+      `, [
+        id, actId, principal.userId, signerName, profile.originalName, storedName, profile.mimeType,
+        profile.sizeBytes, profile.imageSha256, INSPECTOR_CONSENT, CONSENT_VERSION, signedAt,
+        'Firma guardada en Mi perfil', source, preparedSha256, signaturePayloadSha256,
+      ]);
+      await this.audit.record({
+        ...administrationAuditContext(principal, request),
+        action: AuditAction.INSPECTION_ACT_SIGNATURE_RECORDED,
+        entityType: 'inspection_act_signature',
+        entityId: id,
+        afterData: payload,
+        metadata: { actId, immutable: true, signatureMode: 'PROFILE_REUSABLE' },
+      }, manager);
+      return { filePath };
+    } catch (error) {
+      await unlink(filePath).catch(() => undefined);
+      throw error;
+    }
+  }
+
   private async loadStoredSignature(manager: EntityManager, id: string): Promise<StoredSignature> {
     const [row] = await manager.query(`${this.signatureSelect()} WHERE signature.id=$1`, [id]) as StoredSignature[];
     if (!row) throw signatureNotFound();

api-v3/src/inspection-findings/dto/create-inspection-evidence.dto.ts

@@ -16,6 +16,10 @@ import {
 } from '../../database/entities';
 
 export class CreateInspectionEvidenceDto {
+  @IsOptional()
+  @IsUUID('4')
+  operationId?: string;
+
   @IsEnum(InspectionEvidenceKind)
   kind!: InspectionEvidenceKind;
 

api-v3/src/inspection-findings/dto/create-inspection-finding.dto.ts

@@ -16,6 +16,10 @@ const optionalText = ({ value }: { value: unknown }) =>
   typeof value === 'string' && value.trim() ? value.trim() : null;
 
 export class CreateInspectionFindingDto {
+  @IsOptional()
+  @IsUUID('4')
+  clientGeneratedId?: string;
+
   @IsUUID('4')
   assetId!: string;
 

api-v3/src/inspection-findings/f3-finding-catalog-resolver.service.ts

@@ -61,7 +61,7 @@ export class F3FindingCatalogResolverService {
         inventoryFamily: null,
         catalogSource: 'INVENTORY_FAMILY' as const,
         typeConfigured: false,
-        configurationReason: 'El elemento todavía no tiene una clasificación técnica activa.',
+        configurationReason: 'El elemento todavía no tiene tipo de instalación/subinstalación activo.',
         categories: [],
         items: [],
         other,
@@ -120,7 +120,7 @@ export class F3FindingCatalogResolverService {
       },
       catalogSource: 'INVENTORY_FAMILY' as const,
       typeConfigured: true,
-      configurationReason: `Hallazgos asociados a la clasificación técnica ${asset.familyName ?? asset.familyCode ?? ''}`.trim(),
+      configurationReason: `Hallazgos asociados al tipo ${asset.familyName ?? asset.familyCode ?? ''}`.trim(),
       categories,
       items,
       other,

api-v3/src/inspection-findings/inspection-evidence.service.ts

@@ -153,6 +153,22 @@ export class InspectionEvidenceService {
       assertMobileInspector(principal);
     }
     this.validateCoordinates(dto.latitude, dto.longitude, dto.accuracyM);
+    if (dto.operationId) {
+      const [existing] = await this.dataSource.query(
+        `${this.evidenceSelect()} WHERE evidence.client_operation_id = $1`,
+        [dto.operationId],
+      ) as StoredInspectionEvidence[];
+      if (existing) {
+        if (existing.findingId !== findingId) {
+          throw new ConflictException({
+            code: 'INSPECTION_EVIDENCE_OPERATION_REUSED',
+            message: 'La operación offline ya fue utilizada para otra evidencia',
+          });
+        }
+        const { storedName: _storedName, ...view } = existing;
+        return view;
+      }
+    }
     const inspected = inspectInspectionEvidenceFile(file, dto.kind);
     this.validatePurpose(dto, inspected.mimeType);
 
@@ -210,12 +226,12 @@ export class InspectionEvidenceService {
             id, finding_id, communication_id, verification_visit_id, kind, purpose,
             original_name, stored_name, mime_type, size_bytes, sha256,
             title, description, captured_at, latitude, longitude, accuracy_m,
-            device_label, source, uploaded_by
+            device_label, source, uploaded_by, client_operation_id
           ) VALUES (
             $1, $2, $3, $4, $5, $6,
             $7, $8, $9, $10, $11,
             $12, $13, $14, $15, $16, $17,
-            $18, $19, $20
+            $18, $19, $20, $21
           )
         `, [
           id,
@@ -238,6 +254,7 @@ export class InspectionEvidenceService {
           dto.deviceLabel?.trim() || null,
           source,
           principal.userId,
+          dto.operationId ?? null,
         ]);
         const created = await this.loadEvidence(manager, id);
         await this.audit.record({

api-v3/src/inspection-findings/inspection-findings.service.ts

@@ -398,6 +398,22 @@ export class InspectionFindingsService {
       const visit = await this.lockVisit(manager, act.visitId);
       this.assertActEditable(act, visit);
       await this.assertActorAssigned(manager, visit.id, principal);
+      if (dto.clientGeneratedId) {
+        const [existing] = await manager.query(`
+          SELECT id, act_id AS "actId", asset_id AS "assetId"
+          FROM inspection_findings
+          WHERE id=$1
+        `, [dto.clientGeneratedId]) as Array<{ id: string; actId: string; assetId: string }>;
+        if (existing) {
+          if (existing.actId !== actId || existing.assetId !== dto.assetId) {
+            throw new ConflictException({
+              code: 'INSPECTION_FINDING_CLIENT_ID_REUSED',
+              message: 'El identificador offline del Hallazgo ya fue utilizado en otro contexto',
+            });
+          }
+          return this.loadView(manager, existing.id);
+        }
+      }
       await this.assertActAsset(manager, actId, dto.assetId);
 
       const catalog = dto.catalogItemId
@@ -418,6 +434,7 @@ export class InspectionFindingsService {
         });
       }
       const finding = manager.getRepository(InspectionFinding).create({
+        id: dto.clientGeneratedId,
         actId,
         assetId: dto.assetId,
         catalogItemId: catalog?.id ?? null,
@@ -1166,10 +1183,13 @@ export class InspectionFindingsService {
     principal: AuthPrincipal,
   ): Promise<number> {
     const [row] = await manager.query(`
+      WITH updated AS (
         UPDATE inspection_findings
         SET current_version = current_version + 1
         WHERE id = $1
-      RETURNING current_version AS "versionNumber"
+        RETURNING current_version
+      )
+      SELECT current_version AS "versionNumber" FROM updated
     `, [finding.id]) as Array<{ versionNumber: number }>;
     const versionNumber = Number(row.versionNumber);
     finding.currentVersion = versionNumber;

api-v3/src/inspection-reports/inspection-act-pdf-builder.ts

@@ -99,8 +99,10 @@ function lines(snapshot: Record<string, unknown>): string[] {
     `Fecha: ${date(act.occurredAt)}`,
     `Urgencia: ${urgencyLabel(act.urgency)}`,
     `Plazo: ${deadlineText}`,
-    `Responsable empresa: ${text(responsible.fullName)}`,
+    `Representante de la empresa: ${text(responsible.fullName)}`,
-    `Cargo: ${text(responsible.position)}`,
+    `DNI: ${text(responsible.documentNumber)}`,
+    `Cargo / funcion: ${text(responsible.position)}`,
+    `Email: ${text(responsible.email)}`,
     '',
     'RESUMEN',
     ...wrap(text(act.summary)),
@@ -136,7 +138,7 @@ function lines(snapshot: Record<string, unknown>): string[] {
     out.push('Manifestacion de empresa: pendiente.');
   } else if (text(companySignature.status, '') === 'SIGNED') {
     const manifestation = text(companySignature.companyManifestation, 'CONFORMITY');
-    out.push(manifestation === 'DISSENT' ? 'Empresa: firma en disidencia' : 'Empresa: firma en conformidad');
+    out.push(manifestation === 'DISSENT' ? 'Empresa: firma en disconformidad' : 'Empresa: firma en conformidad');
     if (manifestation === 'DISSENT') out.push(...wrap(text(companySignature.companyStatement)));
   } else {
     out.push(...wrap(`Empresa: ${text(companySignature.status)} - ${text(companySignature.reason)}`));

api-v3/src/inspection-reports/inspection-document-delivery.service.ts

@@ -281,7 +281,7 @@ export class InspectionDocumentDeliveryService {
       email = company?.email ?? null;
     } else if (row.recipientKind === 'INSPECTOR' && row.recipientUserId) {
       const [inspector] = await this.dataSource.query(`
-        SELECT email FROM users WHERE id=$1 AND is_active=true
+        SELECT email FROM users WHERE id=$1 AND status='ACTIVE'
       `, [row.recipientUserId]) as Array<{ email: string | null }>;
       email = inspector?.email ?? null;
     } else {
@@ -305,7 +305,14 @@ export class InspectionDocumentDeliveryService {
       await this.setStatus(row.id,'WAITING_RECIPIENT','Destinatario no configurado');
       return;
     }
-    if (!await this.smtp.configured()) {
+    const [sender] = await this.dataSource.query(`
+      SELECT visit.lead_inspector_user_id AS "userId"
+      FROM inspection_acts act
+      JOIN inspection_visits visit ON visit.id=act.visit_id
+      WHERE act.id=$1
+    `, [row.actId]) as Array<{ userId: string | null }>;
+    const senderUserId = sender?.userId ?? undefined;
+    if (!await this.smtp.configured(senderUserId)) {
       await this.setStatus(row.id,'WAITING_TRANSPORT','SMTP no configurado');
       return;
     }
@@ -348,7 +355,7 @@ export class InspectionDocumentDeliveryService {
           : `Se adjunta el acta sellada e inmutable ${row.actCode}.`;
       const sent = await this.smtp.send({
         to:row.recipientEmail,subject:`DH Inspección · ${label}`,text,attachment,
-      });
+      }, senderUserId);
       await this.dataSource.query(`
         UPDATE inspection_document_deliveries
         SET status='SENT',sent_at=CURRENT_TIMESTAMP,provider_message_id=$2,

api-v3/src/inspection-reports/inspection-report-word-builder.ts

@@ -147,8 +147,10 @@ function documentXml(input: ReportWordInput): string {
     paragraph('El bloque siguiente reproduce información proveniente del Acta sellada. Debe conservarse sin alterar su sentido ni sustituir los Hallazgos originales.'),
     labelValue('Resumen del Acta', text(snapshot.act.summary)),
     labelValue('Observaciones del Acta', text(snapshot.act.observations)),
-    labelValue('Responsable de empresa', text(snapshot.responsible.fullName)),
+    labelValue('Representante de la empresa', text(snapshot.responsible.fullName)),
-    labelValue('Cargo', text(snapshot.responsible.position)),
+    labelValue('DNI', text(snapshot.responsible.documentNumber)),
+    labelValue('Cargo / función', text(snapshot.responsible.position)),
+    labelValue('Email', text(snapshot.responsible.email)),
     paragraph('Inventario inspeccionado', 'Heading1'),
     inventoryRows.length
       ? table(['Código', 'Nombre', 'Tipo'], inventoryRows)

api-v3/src/inspection-reports/inspection-reports.controller.ts

@@ -28,6 +28,7 @@ import {
 } from './inspection-report-workflow.service';
 import { InspectionReportsService } from './inspection-reports.service';
 import { InspectionReportWordService } from './inspection-report-word.service';
+import { InspectionActPdfService } from './inspection-act-pdf.service';
 
 @Controller('inspection-reports')
 export class InspectionReportsController {
@@ -148,3 +149,24 @@ export class InspectionActReportController {
     return this.reports.generate(actId, principal, request);
   }
 }
+
+@Controller('inspection-acts/:actId/pdf')
+export class InspectionActPdfController {
+  constructor(private readonly pdf: InspectionActPdfService) {}
+
+  @Get()
+  @RequirePermissions('inspection_acts.read')
+  async content(
+    @Param('actId', new ParseUUIDPipe({ version: '4' })) actId: string,
+    @Res() response: Response,
+  ) {
+    await this.pdf.ensure(actId);
+    const content = await this.pdf.content(actId);
+    response.setHeader('Content-Type', content.mimeType);
+    response.setHeader('Content-Length', String(content.buffer.length));
+    response.setHeader('Content-Disposition', `inline; filename="${content.originalName.replaceAll('"', '')}"`);
+    response.setHeader('Cache-Control', 'private, no-store');
+    response.setHeader('X-Content-Type-Options', 'nosniff');
+    return response.send(content.buffer);
+  }
+}

api-v3/src/inspection-reports/inspection-reports.module.ts

@@ -7,7 +7,7 @@ import { InspectionDeadlineAdminService } from './inspection-deadline-admin.serv
 import { InspectionDocumentDeliveryService } from './inspection-document-delivery.service';
 import { InspectionReportWorkflowService } from './inspection-report-workflow.service';
 import { InspectionReportWordService } from './inspection-report-word.service';
-import { InspectionActReportController, InspectionReportsController } from './inspection-reports.controller';
+import { InspectionActPdfController, InspectionActReportController, InspectionReportsController } from './inspection-reports.controller';
 import { InspectionReportsService } from './inspection-reports.service';
 import { SmtpDeliveryService } from './smtp-delivery.service';
 
@@ -16,6 +16,7 @@ import { SmtpDeliveryService } from './smtp-delivery.service';
   controllers: [
     InspectionReportsController,
     InspectionActReportController,
+    InspectionActPdfController,
     InspectionDeadlineAdminController,
     DocumentDeliveryController,
   ],

api-v3/src/inspection-reports/smtp-delivery.service.ts

@@ -11,7 +11,7 @@ interface MailInput { to:string; subject:string; text:string; attachment:MailAtt
 interface Reply { code:number; text:string; }
 
 export interface EffectiveSmtpSettings {
-  source: 'DATABASE' | 'ENVIRONMENT';
+  source: 'USER' | 'DATABASE' | 'ENVIRONMENT';
   host: string;
   port: number;
   securityMode: SmtpSecurityMode;
@@ -47,10 +47,10 @@ export class SmtpDeliveryService {
     private readonly config:ConfigService,
   ){}
 
-  async configured():Promise<boolean>{return Boolean(await this.resolveSettings());}
+  async configured(userId?:string):Promise<boolean>{return Boolean(await this.resolveSettings(userId));}
 
-  async fromAddress():Promise<string|null>{
+  async fromAddress(userId?:string):Promise<string|null>{
-    const settings=await this.resolveSettings();
+    const settings=await this.resolveSettings(userId);
     if(!settings)return null;
     return settings.fromName?`${settings.fromName} <${settings.fromEmail}>`:settings.fromEmail;
   }
@@ -73,6 +73,56 @@ export class SmtpDeliveryService {
     }:{source:'NONE',enabled:false};
   }
 
+  async publicUserSettings(userId:string){
+    const [user]=await this.dataSource.query(`
+      SELECT email,first_name AS "firstName",last_name AS "lastName" FROM users WHERE id=$1
+    `,[userId]) as Array<{email:string;firstName:string;lastName:string}>;
+    if(!user)throw new Error('Usuario no encontrado');
+    const [row]=await this.dataSource.query(`
+      SELECT mode,host,port,security_mode AS "securityMode",username,
+        (password_enc IS NOT NULL) AS "hasPassword",from_name AS "fromName",
+        from_email AS "fromEmail",enabled,updated_at AS "updatedAt"
+      FROM user_smtp_settings WHERE user_id=$1
+    `,[userId]) as Array<Record<string,unknown>>;
+    return {
+      mode:row?.mode??'SYSTEM',email:user.email,generalConfigured:Boolean(await this.resolveSystemSettings()),
+      custom:row?{
+        host:row.host??'',port:row.port??587,securityMode:row.securityMode??'STARTTLS',
+        username:row.username??'',hasPassword:Boolean(row.hasPassword),
+        fromName:row.fromName??`${user.firstName} ${user.lastName}`,fromEmail:row.fromEmail??user.email,
+        enabled:row.enabled!==false,updatedAt:row.updatedAt??null,
+      }:null,
+    };
+  }
+
+  async saveUserSettings(userId:string,input:{
+    mode:'SYSTEM'|'CUSTOM';host?:string;port?:number;securityMode?:SmtpSecurityMode;
+    username?:string|null;password?:string|null;fromName?:string|null;enabled?:boolean;
+  }){
+    const [user]=await this.dataSource.query(`SELECT email,first_name AS "firstName",last_name AS "lastName" FROM users WHERE id=$1`,[userId]) as Array<{email:string;firstName:string;lastName:string}>;
+    if(!user?.email)throw new Error('El usuario debe tener un email configurado');
+    const [existing]=await this.dataSource.query(`SELECT password_enc AS "passwordEnc" FROM user_smtp_settings WHERE user_id=$1`,[userId]) as Array<{passwordEnc:string|null}>;
+    if(input.mode==='SYSTEM'){
+      await this.dataSource.query(`
+        INSERT INTO user_smtp_settings(user_id,mode,updated_by) VALUES($1,'SYSTEM',$1)
+        ON CONFLICT(user_id) DO UPDATE SET mode='SYSTEM',updated_by=$1,updated_at=CURRENT_TIMESTAMP
+      `,[userId]);
+      return this.publicUserSettings(userId);
+    }
+    if(!input.host||!input.port||!input.securityMode)throw new Error('La configuración SMTP propia está incompleta');
+    const passwordEnc=input.password===undefined?existing?.passwordEnc??null:input.password?this.encryptSecret(input.password):null;
+    const fromName=input.fromName?.trim()||`${user.firstName} ${user.lastName}`.trim();
+    await this.dataSource.query(`
+      INSERT INTO user_smtp_settings(user_id,mode,host,port,security_mode,username,password_enc,from_name,from_email,reply_to,enabled,updated_by)
+      VALUES($1,'CUSTOM',$2,$3,$4,$5,$6,$7,$8,$8,$9,$1)
+      ON CONFLICT(user_id) DO UPDATE SET mode='CUSTOM',host=EXCLUDED.host,port=EXCLUDED.port,
+        security_mode=EXCLUDED.security_mode,username=EXCLUDED.username,password_enc=EXCLUDED.password_enc,
+        from_name=EXCLUDED.from_name,from_email=EXCLUDED.from_email,reply_to=EXCLUDED.reply_to,
+        enabled=EXCLUDED.enabled,updated_by=$1,updated_at=CURRENT_TIMESTAMP
+    `,[userId,input.host,input.port,input.securityMode,input.username?.trim()||null,passwordEnc,fromName,user.email,input.enabled!==false]);
+    return this.publicUserSettings(userId);
+  }
+
   async saveSettings(input:{
     host:string;port:number;securityMode:SmtpSecurityMode;username?:string|null;
     password?:string|null;fromName:string;fromEmail:string;replyTo?:string|null;enabled:boolean;
@@ -96,8 +146,8 @@ export class SmtpDeliveryService {
     return this.publicSettings();
   }
 
-  async send(input:MailInput):Promise<{messageId:string}>{
+  async send(input:MailInput,userId?:string):Promise<{messageId:string}>{
-    const settings=await this.resolveSettings();
+    const settings=await this.resolveSettings(userId);
     if(!settings)throw new Error('SMTP no configurado');
     const {host,port,securityMode,userName,password}= {
       host:settings.host,port:settings.port,securityMode:settings.securityMode,
@@ -137,7 +187,33 @@ export class SmtpDeliveryService {
     return {messageId:match?.[1]??randomUUID()};
   }
 
-  private async resolveSettings():Promise<EffectiveSmtpSettings|null>{
+  private async resolveSettings(userId?:string):Promise<EffectiveSmtpSettings|null>{
+    if(userId){
+      const [row]=await this.dataSource.query(`
+        SELECT settings.mode,settings.host,settings.port,settings.security_mode AS "securityMode",
+          settings.username,settings.password_enc AS "passwordEnc",settings.from_name AS "fromName",
+          settings.enabled,user_account.email AS "userEmail"
+        FROM users user_account
+        LEFT JOIN user_smtp_settings settings ON settings.user_id=user_account.id
+        WHERE user_account.id=$1
+      `,[userId]) as Array<{
+        mode:'SYSTEM'|'CUSTOM'|null;host:string|null;port:number|null;securityMode:SmtpSecurityMode|null;
+        username:string|null;passwordEnc:string|null;fromName:string|null;enabled:boolean|null;userEmail:string;
+      }>;
+      if(row?.mode==='CUSTOM'&&row.enabled!==false&&row.host&&row.port&&row.securityMode&&row.userEmail){
+        return {
+          source:'USER',host:row.host,port:Number(row.port),securityMode:row.securityMode,
+          username:row.username,password:row.passwordEnc?this.decryptSecret(row.passwordEnc):'',
+          fromName:row.fromName,fromEmail:row.userEmail,replyTo:row.userEmail,
+        };
+      }
+      const general=await this.resolveSystemSettings();
+      return general&&row?.userEmail?{...general,replyTo:row.userEmail}:general;
+    }
+    return this.resolveSystemSettings();
+  }
+
+  private async resolveSystemSettings():Promise<EffectiveSmtpSettings|null>{
     const [row]=await this.dataSource.query(`
       SELECT host,port,security_mode AS "securityMode",username,password_enc AS "passwordEnc",
         from_name AS "fromName",from_email AS "fromEmail",reply_to AS "replyTo",enabled

api-v3/src/inspection-visits/dto/create-field-finding.dto.ts

@@ -4,7 +4,6 @@ import {
   IsOptional,
   IsString,
   IsUUID,
-  Matches,
   Max,
   MaxLength,
   Min,
@@ -24,6 +23,10 @@ export class CreateFieldFindingDto {
   @IsUUID('4')
   actId!: string;
 
+  @IsOptional()
+  @IsUUID('4')
+  clientGeneratedId?: string;
+
   @IsOptional()
   @Transform(optionalText)
   @IsUUID('4')
@@ -56,8 +59,4 @@ export class CreateFieldFindingDto {
   @Max(10)
   severity?: number;
 
-  @IsOptional()
-  @Transform(optionalText)
-  @Matches(/^\d{4}-\d{2}-\d{2}$/)
-  correctionDueOn?: string | null;
 }

api-v3/src/inspection-visits/dto/create-field-inventory.dto.ts

@@ -14,6 +14,10 @@ import {
 } from 'class-validator';
 
 export class CreateFieldInventoryDto {
+  @IsOptional()
+  @IsUUID('4')
+  clientGeneratedId?: string;
+
   @IsUUID('4')
   typeId!: string;
 

api-v3/src/inspection-visits/dto/upload-field-inventory-photo.dto.ts

@@ -4,12 +4,17 @@ import {
   IsNumber,
   IsOptional,
   IsString,
+  IsUUID,
   Max,
   MaxLength,
   Min,
 } from 'class-validator';
 
 export class UploadFieldInventoryPhotoDto {
+  @IsOptional()
+  @IsUUID('4')
+  operationId?: string;
+
   @IsOptional()
   @Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim() : null)
   @IsString()

api-v3/src/inspection-visits/f3-field-inventory-structure.service.ts

@@ -101,13 +101,13 @@ export class F3FieldInventoryStructureService {
     if (familyRequired && !dto.familyId) {
       throw new BadRequestException({
         code: 'FIELD_INVENTORY_FAMILY_REQUIRED',
-        message: 'Elegí la familia técnica o la opción Otro / no catalogado',
+        message: 'Elegí el Tipo de instalación/subinstalación o la opción Otro / no catalogado',
       });
     }
     if (!familyRequired && dto.familyId) {
       throw new BadRequestException({
         code: 'FIELD_INVENTORY_FAMILY_NOT_ALLOWED',
-        message: 'Este nivel estructural no utiliza familia técnica',
+        message: 'Este nivel estructural no utiliza Tipo de instalación/subinstalación',
       });
     }
     const family = dto.familyId
@@ -116,7 +116,7 @@ export class F3FieldInventoryStructureService {
     if (dto.familyId && !family) {
       throw new BadRequestException({
         code: 'FIELD_INVENTORY_FAMILY_INVALID',
-        message: 'La familia técnica no es válida para el padre seleccionado',
+        message: 'El Tipo de instalación/subinstalación no es válido para el padre seleccionado',
       });
     }
 
@@ -214,7 +214,7 @@ export class F3FieldInventoryStructureService {
       if (!parent.inventoryFamilyId) {
         throw new ConflictException({
           code: 'FIELD_INVENTORY_PARENT_FAMILY_REQUIRED',
-          message: 'La Instalación debe tener una familia técnica antes de agregar Subinstalaciones',
+          message: 'La Instalación debe tener un Tipo de instalación antes de agregar Subinstalaciones',
         });
       }
       return this.dataSource.query(`

api-v3/src/inspection-visits/field-findings.service.ts

@@ -99,13 +99,14 @@ export class FieldFindingsService {
       });
     }
     const payload: CreateInspectionFindingDto = {
+      clientGeneratedId: dto.clientGeneratedId,
       assetId,
       catalogItemId: dto.catalogItemId ?? null,
       customTitle: dto.customTitle ?? null,
       customLegalBasis: dto.customLegalBasis ?? null,
       description: dto.description,
       severity: dto.severity,
-      correctionDueOn: dto.correctionDueOn ?? null,
+      correctionDueOn: null,
     };
     const finding = await this.findings.create(act.id, payload, principal, request);
     return {
@@ -278,7 +279,7 @@ export class FieldFindingsService {
     if (assetTypeCode !== 'yacimiento' && !row.inventoryFamilyId) {
       throw new ConflictException({
         code: 'FIELD_FINDING_FAMILY_REQUIRED',
-        message: 'La Instalación/Subinstalación debe tener una clasificación técnica antes de registrar Hallazgos',
+        message: 'La Instalación/Subinstalación debe tener su tipo definido antes de registrar Hallazgos',
       });
     }
     if (!row.insideScope) {

api-v3/src/inspection-visits/field-inventory.service.ts

@@ -273,6 +273,23 @@ export class FieldInventoryService {
     request: RequestWithContext,
   ) {
     const context = await this.requireVisitContext(visitId, principal, true);
+    if (dto.clientGeneratedId) {
+      const [existing] = await this.dataSource.query(`
+        SELECT discovery.asset_id AS "assetId", discovery.visit_id AS "visitId"
+        FROM asset_field_discoveries discovery
+        WHERE discovery.asset_id=$1::uuid
+        LIMIT 1
+      `, [dto.clientGeneratedId]) as Array<{ assetId: string; visitId: string }>;
+      if (existing) {
+        if (existing.visitId !== visitId) {
+          throw new ConflictException({
+            code: 'FIELD_INVENTORY_CLIENT_ID_REUSED',
+            message: 'El identificador offline del Inventario ya fue utilizado en otra inspección',
+          });
+        }
+        return this.detail(visitId, existing.assetId, principal);
+      }
+    }
     const parentId = dto.parentId ?? context.scopeAssetId;
     await this.requireParentInContext(parentId, context);
 
@@ -286,6 +303,7 @@ export class FieldInventoryService {
 
     const code = dto.code?.trim().toUpperCase() || await this.nextFieldCode(capturedAt);
     const discoveryDto: CreateFieldDiscoveryDto = {
+      clientGeneratedId: dto.clientGeneratedId,
       visitId,
       code,
       name: dto.name,
@@ -295,6 +313,7 @@ export class FieldInventoryService {
       operationalAreaId: context.areaId,
       // Compatibility-only creation snapshot. Membership never depends on it.
       operatorCompanyId: context.companyId,
+      inventoryFamilyId: dto.familyId ?? null,
       description: dto.description ?? null,
       discoveryNotes: dto.discoveryNotes ?? null,
       attributes: dto.attributes,
@@ -350,6 +369,28 @@ export class FieldInventoryService {
   ): Promise<{ media: AssetMediaView; capture: FieldInventoryCaptureStatus }> {
     const context = await this.requireVisitContext(visitId, principal, true);
     await this.requireAssetInContext(assetId, context);
+    if (dto.operationId) {
+      const [existing] = await this.dataSource.query(`
+        SELECT media_id AS "mediaId", asset_id AS "assetId"
+        FROM asset_field_capture_events
+        WHERE client_operation_id=$1::uuid
+        LIMIT 1
+      `, [dto.operationId]) as Array<{ mediaId: string | null; assetId: string }>;
+      if (existing) {
+        if (existing.assetId !== assetId || !existing.mediaId) {
+          throw new ConflictException({
+            code: 'FIELD_PHOTO_OPERATION_REUSED',
+            message: 'La operación offline de fotografía ya fue utilizada en otro Inventario',
+          });
+        }
+        const media = (await this.media.list(assetId)).data.find((item) => item.id === existing.mediaId);
+        if (!media) throw new ConflictException({
+          code: 'FIELD_PHOTO_OPERATION_MEDIA_MISSING',
+          message: 'La fotografía sincronizada no está disponible',
+        });
+        return { media, capture: await this.captureStatus(visitId, assetId) };
+      }
+    }
     if (!await this.isSelected(visitId, assetId)) {
       throw new ConflictException({
         code: 'FIELD_INVENTORY_NOT_SELECTED',
@@ -382,8 +423,8 @@ export class FieldInventoryService {
         device_latitude, device_longitude, device_accuracy_m,
         device_captured_at, device_label,
         exif_latitude, exif_longitude, exif_captured_at,
-        created_by
+        created_by, client_operation_id
-      ) VALUES ($1,$2,$3,'PHOTO',$4,$5,$6,$7,$8,$9,$10,$11,$12)
+      ) VALUES ($1,$2,$3,'PHOTO',$4,$5,$6,$7,$8,$9,$10,$11,$12,$13)
     `, [
       visitId,
       assetId,
@@ -397,6 +438,7 @@ export class FieldInventoryService {
       dto.exifLongitude ?? null,
       dto.exifCapturedAt ? new Date(dto.exifCapturedAt) : null,
       principal.userId,
+      dto.operationId ?? null,
     ]);
 
     return { media: uploaded, capture: await this.captureStatus(visitId, assetId) };

api-v3/src/version.ts

@@ -1,2 +1,2 @@
-export const API_VERSION = '0.29.0-1';
+export const API_VERSION = '0.29.0-8';
-export const API_PHASE = 'F6.1';
+export const API_PHASE = 'F6.8';

api-v3/test/unit/f3-1-profile-dossier-other.test.ts

@@ -25,11 +25,11 @@ test('F3.1 amplía el perfil personal y protege email del Inspector también en
   assert.match(userMigration, /trg_users_inspector_email/);
 });
 
-test('F3.1 exige email al crear o asignar el rol Inspector', () => {
+test('F3.1 email del Inspector sigue protegido y F6.2 endurece email para todo usuario', () => {
-  assert.match(usersService, /assertInspectorHasEmail\(roles, dto\.email/);
+  assert.match(usersService, /USER_EMAIL_REQUIRED/);
-  assert.match(usersService, /assertInspectorHasEmail\(roles, before\.email\)/);
+  assert.match(usersService, /Cada usuario de Hidrocarburos debe tener un email válido/);
-  assert.match(usersService, /Los usuarios con rol Inspector deben tener un email válido/);
+  assert.match(usersService, /if \(!dto\.email\?\.trim\(\)\) throw userEmailRequired\(\)/);
-  assert.match(usersService, /dto\.email !== undefined && !dto\.email && before\.roles\.some/);
+  assert.match(usersService, /dto\.email !== undefined && !dto\.email/);
 });
 
 test('F3.1 dossier canónico agrega alias sin borrar identidad histórica', () => {

api-v3/test/unit/f3-2-mobile-multi-acta.test.ts

@@ -28,7 +28,8 @@ test('F3.2/F4 exige seleccionar el Acta explícitamente al crear Hallazgos desde
 test('F4 conserva el cierre documental inmutable de cada Acta como LOCKED y luego SEALED', () => {
   const closing = read('src/inspection-closing/inspection-closing.service.ts');
   assert.match(closing, /status='LOCKED'/);
-  assert.match(closing, /INSPECTION_ACT_INSPECTOR_SIGNATURE_REQUIRED/);
+  assert.match(closing, /INSPECTION_INSPECTOR_PROFILE_SIGNATURE_REQUIRED/);
+  assert.match(closing, /createInspectorSignatureFromProfile/);
   assert.match(closing, /INSPECTION_ACT_COMPANY_OUTCOME_REQUIRED/);
   assert.match(closing, /finalSha256 = sha256CanonicalJson\(finalSnapshot\)/);
   assert.match(closing, /status='SEALED'/);

api-v3/test/unit/f4-android-act-contract.test.ts

@@ -34,9 +34,9 @@ test('F4 Android uses only lock and seal endpoints for the active Act lifecycle'
   assert.doesNotMatch(mobileActs, /suspend fun closeAct\(/);
 });
 
-test('F4 Android ViewModel calls lock and seal directly', () => {
+test('F6.8 Android ViewModel persists lock and seal through the offline queue', () => {
-  assert.match(viewModel, /actsRepository\.lock\(actId, urgency\)/);
+  assert.match(viewModel, /offlineQueue\.enqueueActLock\(actId, urgency\)/);
-  assert.match(viewModel, /actsRepository\.seal\(actId\)/);
+  assert.match(viewModel, /offlineQueue\.enqueueSeal\(actId\)/);
   assert.doesNotMatch(viewModel, /actsRepository\.prepare\(/);
   assert.doesNotMatch(viewModel, /actsRepository\.reopen\(/);
   assert.doesNotMatch(viewModel, /actsRepository\.closeAct\(/);

api-v3/test/unit/f4-health-metadata.test.ts

@@ -1,8 +1,12 @@
 import assert from 'node:assert/strict';
 import test from 'node:test';
+import { readFileSync } from 'node:fs';
+import { resolve } from 'node:path';
 import { API_PHASE, API_VERSION } from '../../src/version';
 
-test('health metadata reports the current F6.1 release', () => {
+test('health metadata reports the current F6.8 release', () => {
-  assert.equal(API_PHASE, 'F6.1');
+  assert.equal(API_PHASE, 'F6.8');
-  assert.equal(API_VERSION, '0.29.0-1');
+  const pkg = JSON.parse(readFileSync(resolve(process.cwd(), 'package.json'), 'utf8')) as { version: string };
+  assert.equal(API_VERSION, pkg.version);
+  assert.equal(API_VERSION, '0.29.0-8');
 });

api-v3/test/unit/f4-multi-act-lifecycle.test.ts

@@ -80,9 +80,10 @@ test('F4 field finding flow only targets a draft act of the same in-progress ins
   assert.match(draftGuard, /WHERE visit_id = \$1::uuid[\s\S]*AND status = 'DRAFT'/);
 });
 
-test('F4 sealing requires inspector signature and exactly one terminal company outcome', () => {
+test('F6.7 sealing copies the stored inspector signature and requires exactly one terminal company outcome', () => {
   const closeBody = closing.slice(closing.indexOf('  async close('), closing.indexOf('  async signatureContent('));
-  assert.match(closeBody, /INSPECTION_ACT_INSPECTOR_SIGNATURE_REQUIRED/);
+  assert.match(closeBody, /createInspectorSignatureFromProfile/);
+  assert.match(closing, /INSPECTION_INSPECTOR_PROFILE_SIGNATURE_REQUIRED/);
   assert.match(closeBody, /companyOutcomes\.length !== 1/);
   assert.match(closeBody, /INSPECTION_ACT_COMPANY_OUTCOME_REQUIRED/);
   assert.match(closeBody, /ausencia documentada/);

api-v3/test/unit/f5-1-clean-manual-inventory-contract.test.ts

@@ -63,7 +63,7 @@ test('F5.1 Finding Catalog defaults to associated findings and exposes all items
   assert.match(panel, /available\.filter\(\(item\) => savedIds\.has\(item\.id\)\)/);
   assert.match(panel, /Buscar dentro de \{viewMode === 'ASSOCIATED' \? 'los asociados' : 'todo el Catálogo'\}/);
   assert.match(panel, /Todos para vincular/);
-  assert.match(panel, /Esta clasificación todavía no tiene Hallazgos asociados/);
+  assert.match(panel, /Este tipo todavía no tiene Hallazgos asociados/);
 });
 
 test('F7 Inventory Configuration exposes only simple types, containment and fields', () => {
@@ -116,7 +116,7 @@ test('F7 canonical detail uses one short everyday profile and keeps advanced adm
   assert.match(detail, />Fotos</);
   assert.match(detail, />Cambios</);
   assert.match(detail, /Empresa operadora/);
-  assert.match(detail, /Tipo técnico/);
+  assert.match(detail, /Tipo de instalación \/ subinstalación/);
   assert.match(detail, /AssetTechnicalDataPanel/);
   assert.match(detail, /AssetDossierPanel/);
   assert.match(detail, /Administración avanzada/);

api-v3/test/unit/f5-android-test-cut.test.ts

@@ -10,8 +10,8 @@ function mountedRepoFile(path: string): string {
 test('F6.3 Android test cut targets production API and has a distinct installable debug version', () => {
   const gradle = mountedRepoFile('android-app/app/build.gradle.kts');
 
-  assert.match(gradle, /versionCode = 30/);
+  assert.match(gradle, /versionCode = 38/);
-  assert.match(gradle, /versionName = "0\.19\.2"/);
+  assert.match(gradle, /versionName = "0\.19\.10"/);
   assert.match(gradle, /https:\/\/dhv2\.korexlabs\.com\/api\/v3\//);
   assert.match(gradle, /applicationIdSuffix = "\.debug"/);
 });
@@ -26,3 +26,18 @@ test('F5/F6.3 field inventory exposes Other families as reviewable choices to An
   assert.match(service, /AS "isOther"/);
   assert.match(service, /isOtherFamily: family\.isOther/);
 });
+
+
+test('field inventory persists the validated Tipo de instalación in the initial asset insert', () => {
+  const fieldService = readFileSync(
+    resolve(process.cwd(), 'src/inspection-visits/field-inventory.service.ts'),
+    'utf8',
+  );
+  const assetsService = readFileSync(
+    resolve(process.cwd(), 'src/asset-master/assets.service.ts'),
+    'utf8',
+  );
+
+  assert.match(fieldService, /inventoryFamilyId: dto\.familyId \?\? null/);
+  assert.match(assetsService, /inventoryFamilyId: dto\.inventoryFamilyId \?\? null/);
+});

api-v3/test/unit/f6-1-findings-mobile-open.test.ts

@@ -31,7 +31,8 @@ test('F6.1 uses contextual type catalog for Yacimiento and keeps OTROS/add-anoth
   assert.match(catalog, /finding_catalog_asset_overrides override/);
   assert.match(resolver, /code: 'OTHER'/);
   assert.match(resolver, /label: 'OTROS'/);
-  assert.match(androidFinding, /OTROS · No está en el catálogo/);
+  assert.match(androidFinding, /ExposedDropdownMenuBox/);
+  assert.match(androidFinding, /Otro \/ No está en la lista/);
   assert.match(androidFinding, /También podés registrar otro Hallazgo sobre el mismo Inventario/);
 });
 

api-v3/test/unit/f6-1-presentation-ready-contract.test.ts

@@ -13,7 +13,7 @@ test('F6.1 presentation metadata keeps the visible WEB version aligned with pack
   const visibleVersion = version.match(/APP_VERSION\s*=\s*'([^']+)'/)?.[1];
 
   assert.equal(visibleVersion, pkg.version);
-  assert.match(version, /APP_PHASE\s*=\s*'F6\.1 · Contexto operativo Área–Operadora consolidado'/);
+  assert.match(version, /APP_PHASE\s*=\s*'F6\.8/);
 });
 
 test('F6.1 presentation keeps Relevamientos retired from WEB navigation and routes', () => {
@@ -33,7 +33,7 @@ test('F6.1 presentation keeps the complete Inspector profile and documentary-cop
   for (const field of ['dni', 'phone', 'jobTitle', 'employeeNumber']) {
     assert.match(user, new RegExp(`name="${field}"`));
   }
-  assert.match(user, /email es obligatorio para un Inspector/i);
+  assert.match(user, /email es obligatorio para todos los usuarios de Hidrocarburos/i);
   assert.match(user, /la documentación se enviará también/i);
   assert.match(delivery, /recipientKind:'INSPECTOR'/);
   assert.match(delivery, /documentKind:'ACT_PDF'/);
@@ -49,7 +49,7 @@ test('F6.1 presentation keeps Android start, Otro and chronological merge flows
   assert.match(mobileApi, /field-inventory\/\{assetId\}\/merge/);
   assert.match(overview, /"Iniciar inspección"/);
   assert.match(overview, /Otro \/ no catalogado/);
-  assert.match(viewModel, /repository\.startVisit\(id\)/);
+  assert.match(viewModel, /enqueueVisitStart\(id\)|repository\.startVisit\(id\)/);
   assert.match(viewModel, /selectedFieldAsset = repository\.selectFieldAsset\(visitId, result\.canonical\.id\)/);
   assert.match(viewModel, /la historia de \$\{result\.source\.code\} permanece trazable/);
 });

api-v3/test/unit/f6-2-act-representative-user-smtp.test.ts

@@ -0,0 +1,72 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { readFileSync } from 'node:fs';
+import { resolve } from 'node:path';
+
+const read = (path: string) => readFileSync(resolve(process.cwd(), path), 'utf8');
+const migration = read('src/database/migrations/1790117400000-f6-2-user-smtp-and-act-representative.ts');
+const closing = read('src/inspection-closing/inspection-closing.service.ts');
+const responsibleDto = read('src/inspection-closing/dto/upsert-inspection-responsible.dto.ts');
+const prepareDto = read('src/inspection-closing/dto/prepare-inspection-act.dto.ts');
+const findingEntity = read('src/database/entities/inspection-finding.entity.ts');
+const smtp = read('src/inspection-reports/smtp-delivery.service.ts');
+const users = read('src/administration/users/users.controller.ts');
+const delivery = read('src/inspection-reports/inspection-document-delivery.service.ts');
+
+const android = read('../android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/ModernMobileActsScreen.kt');
+const androidModel = read('../android-app/app/src/main/java/com/korexlabs/dhinspeccion/data/MobileActs.kt');
+const profilePage = read('../web-v2/src/pages/MyProfilePage.tsx');
+
+test('F6.2 keeps urgency exclusively at Act close, never on individual findings', () => {
+  assert.match(prepareDto, /InspectionActUrgency/);
+  assert.match(prepareDto, /urgency!/);
+  assert.doesNotMatch(findingEntity, /\burgency\b/i);
+  assert.match(android, /Urgencia del Acta/);
+  assert.match(android, /urgencia no se asigna a cada Hallazgo/i);
+});
+
+test('F6.2 requires the company representative identity and email on every Act', () => {
+  assert.match(responsibleDto, /attendanceStatus === InspectionResponsibleAttendanceStatus\.PRESENT/);
+  assert.match(responsibleDto, /@IsEmail\(\)/);
+  assert.match(migration, /LENGTH\(TRIM\(COALESCE\(email, ''\)\)\) > 0/);
+  assert.match(closing, /representativeSuggestion/);
+  assert.match(closing, /previous_act\.visit_id=current_act\.visit_id/);
+  assert.match(androidModel, /representativeSuggestion/);
+  assert.match(android, /Nombres y apellidos \*/);
+  assert.match(android, /DNI \*/);
+  assert.match(android, /Cargo \/ función \*/);
+  assert.match(android, /Email \*/);
+  assert.match(android, /Firma del representante de la empresa/);
+  assert.match(android, /En disconformidad/);
+  assert.match(android, /Motivo de disconformidad \*/);
+});
+
+test('F6.2 gives every authenticated user a general SMTP default and encrypted custom override', () => {
+  assert.match(migration, /CREATE TABLE user_smtp_settings/);
+  assert.match(migration, /ALTER COLUMN email SET NOT NULL/);
+  assert.match(migration, /mode IN \('SYSTEM','CUSTOM'\)/);
+  assert.match(smtp, /publicUserSettings/);
+  assert.match(smtp, /saveUserSettings/);
+  assert.match(smtp, /source:\s*["']USER["']/);
+  assert.match(smtp, /encryptSecret/);
+  assert.match(smtp, /password_enc/);
+});
+
+test('F6.2 exposes personal mail settings in Mi perfil without granting administration permissions', () => {
+  assert.match(users, /@Get\('self\/profile'\)/);
+  assert.match(users, /@Patch\('self\/profile'\)/);
+  assert.match(users, /@Get\('self\/smtp'\)/);
+  assert.match(users, /@Put\('self\/smtp'\)/);
+  assert.match(users, /@Post\('self\/smtp\/test'\)/);
+  assert.match(profilePage, /MI PERFIL/);
+  assert.match(profilePage, /Usar SMTP general/);
+  assert.match(profilePage, /Usar SMTP propio/);
+  assert.match(profilePage, /Enviar correo de prueba/);
+  assert.doesNotMatch(profilePage, /document_delivery\.manage/);
+});
+
+test('F6.2 sends Act-related mail through the lead inspector transport selection', () => {
+  assert.match(delivery, /lead_inspector_user_id AS "userId"/);
+  assert.match(delivery, /configured\(senderUserId\)/);
+  assert.match(delivery, /}, senderUserId\);/);
+});

api-v3/test/unit/f6-3-mobile-act-finding-flow.test.ts

@@ -63,3 +63,12 @@ test('F6.1 Acta urgency is null while drafting and is persisted atomically at lo
   assert.match(migration, /ALTER COLUMN urgency DROP NOT NULL/);
   assert.match(migration, /SET urgency=NULL WHERE status='DRAFT'/);
 });
+
+test('F6.3 Acta version capture uses a SELECT-shaped CTE so TypeORM never turns the version into NaN', () => {
+  const service = source('src/inspection-acts/inspection-acts.service.ts');
+
+  assert.match(service, /WITH updated AS \(/);
+  assert.match(service, /RETURNING current_version/);
+  assert.match(service, /SELECT current_version AS "versionNumber" FROM updated/);
+  assert.match(service, /const versionNumber = Number\(row\.versionNumber\)/);
+});

api-v3/test/unit/f6-5-field-finding-mobile-contract.test.ts

@@ -0,0 +1,31 @@
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import { resolve } from 'node:path';
+import test from 'node:test';
+
+function source(path: string): string {
+  return readFileSync(resolve(process.cwd(), path), 'utf8');
+}
+
+test('F6.5 finding code CHECK accepts the current visible Acta code', () => {
+  const migration = source('src/database/migrations/1790121000000-f6-5-field-finding-code-contract.ts');
+  const service = source('src/inspection-findings/inspection-findings.service.ts');
+
+  assert.match(migration, /ACT-\[0-9\]\{5\}-\[0-9\]\{2\}-\[0-9\]\{2\}-\[0-9\]\{2\}/);
+  assert.match(migration, /-H\[0-9\]\{3\}/);
+  assert.match(service, /code: `\$\{act\.code\}-H\$\{String\(findingNumber\)\.padStart\(3, '0'\)\}`/);
+});
+
+test('F6.5 mobile finding creation never asks the inspector for a correction date', () => {
+  const dto = source('src/inspection-visits/dto/create-field-finding.dto.ts');
+  const adapter = source('src/inspection-visits/field-findings.service.ts');
+  const androidRequest = source('../android-app/app/src/main/java/com/korexlabs/dhinspeccion/data/FieldFindingsMobile.kt');
+  const androidScreen = source('../android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/FieldFindingScreen.kt');
+
+  assert.doesNotMatch(dto, /correctionDueOn/);
+  assert.match(adapter, /correctionDueOn: null/);
+  assert.doesNotMatch(androidRequest.match(/data class CreateFieldFindingRequest\([\s\S]*?\n\)/)?.[0] ?? '', /correctionDueOn/);
+  assert.doesNotMatch(androidScreen, /Fecha de corrección/);
+  assert.match(androidScreen, /ExposedDropdownMenuBox/);
+  assert.match(androidScreen, /Tipo de Hallazgo \*/);
+});

api-v3/test/unit/f6-6-mobile-finding-resilience.test.ts

@@ -0,0 +1,37 @@
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import { resolve } from 'node:path';
+import test from 'node:test';
+
+function source(path: string): string {
+  return readFileSync(resolve(process.cwd(), path), 'utf8');
+}
+
+test('F6.6 Hallazgo version capture uses a SELECT-shaped CTE so TypeORM never turns the version into NaN', () => {
+  const service = source('src/inspection-findings/inspection-findings.service.ts');
+
+  assert.match(service, /WITH updated AS \(/);
+  assert.match(service, /UPDATE inspection_findings/);
+  assert.match(service, /RETURNING current_version/);
+  assert.match(service, /SELECT current_version AS "versionNumber" FROM updated/);
+  assert.match(service, /const versionNumber = Number\(row\.versionNumber\)/);
+});
+
+test('F6.6 mobile home keeps Salir readable on narrow screens', () => {
+  const home = source('../android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/MobileHomeScreen.kt');
+
+  assert.match(home, /Text\("Actualizar", maxLines = 1\)/);
+  assert.match(home, /Text\("Salir", maxLines = 1\)/);
+  assert.match(home, /modifier = Modifier\.weight\(1f\)/);
+});
+
+test('F6.6 Hallazgos can receive as many field photos as needed', () => {
+  const screen = source('../android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/FieldFindingScreen.kt');
+  const model = source('../android-app/app/src/main/java/com/korexlabs/dhinspeccion/MainViewModel.kt');
+
+  assert.match(screen, /Agregar foto con GPS/);
+  assert.match(screen, /Agregar otra foto con GPS/);
+  assert.match(screen, /Podés adjuntar todas las fotos que necesites/);
+  assert.match(model, /loadEvidenceInternal\(findingId\)/);
+  assert.doesNotMatch(screen, /máximo de 1 foto|solo una foto/i);
+});

api-v3/test/unit/f6-7-act-signing-ui.test.ts

@@ -0,0 +1,50 @@
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import { resolve } from 'node:path';
+import test from 'node:test';
+
+function source(path: string): string {
+  return readFileSync(resolve(process.cwd(), path), 'utf8');
+}
+
+const closing = source('src/inspection-closing/inspection-closing.service.ts');
+const users = source('src/administration/users/users.controller.ts');
+const userService = source('src/administration/users/users.service.ts');
+const migration = source('src/database/migrations/1790124600000-f6-7-user-reusable-signature.ts');
+const android = source('../android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/ModernMobileActsScreen.kt');
+const labels = source('../android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/UiSpanishLabels.kt');
+const profile = source('../web-v2/src/pages/MyProfilePage.tsx');
+
+test('F6.7 Acta lock and seal use SELECT-shaped version CTEs', () => {
+  assert.doesNotMatch(closing, /RETURNING current_version AS "versionNumber"/);
+  assert.equal((closing.match(/WITH updated AS \(/g) ?? []).length >= 2, true);
+  assert.equal((closing.match(/SELECT current_version AS "versionNumber" FROM updated/g) ?? []).length >= 2, true);
+});
+test('F6.7 inspector signature is stored once in profile and copied into each sealed Acta', () => {
+  assert.match(migration, /CREATE TABLE user_signature_profiles/);
+  assert.match(migration, /image_data bytea NOT NULL/);
+  assert.match(migration, /image_sha256 char\(64\) NOT NULL/);
+  assert.match(users, /@Put\('self\/signature'\)/);
+  assert.match(users, /@Get\('self\/signature\/content'\)/);
+  assert.match(userService, /inspectInspectionSignatureFile/);
+  assert.match(closing, /requireReusableInspectorSignature/);
+  assert.match(closing, /createInspectorSignatureFromProfile/);
+  assert.match(closing, /signatureMode: 'PROFILE_REUSABLE'/);
+});
+
+test('F6.7 Android goes Draft to Para firmar to company manifestation without inspector drawing', () => {
+  assert.match(labels, /"LOCKED" -> "Para firmar"/);
+  assert.match(android, /Cerrar contenido y pasar a firma/);
+  assert.match(android, /Firma del representante de la empresa \(acompañante\)/);
+  assert.match(android, /cerrar Acta/);
+  assert.doesNotMatch(android, /Firmá como inspector\/a/);
+  assert.doesNotMatch(android, /inspectorSigned/);
+  assert.doesNotMatch(android, /Text\(selected\.code/);
+  assert.match(android, /attendanceStatus == "ABSENT"/);
+});
+test('F6.7 Dashboard exposes the reusable inspector signature clearly', () => {
+  assert.match(profile, /FIRMA DEL INSPECTOR/);
+  assert.match(profile, /Firma guardada para Actas/);
+  assert.match(profile, /saveSelfSignature/);
+  assert.match(profile, /Cada Acta conserva una copia propia de la firma/);
+});

api-v3/test/unit/f6-8-offline-document-contract.test.ts

@@ -0,0 +1,83 @@
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import { resolve } from 'node:path';
+import test from 'node:test';
+
+const api = (path: string) => readFileSync(resolve(process.cwd(), path), 'utf8');
+const android = (path: string) => readFileSync(resolve(process.cwd(), '..', 'android-app', path), 'utf8');
+const web = (path: string) => readFileSync(resolve(process.cwd(), '..', 'web-v2', path), 'utf8');
+
+test('F6.8 persists field mutations locally and retries only when network is available', () => {
+  const queue = android('app/src/main/java/com/korexlabs/dhinspeccion/data/offline/OfflineQueue.kt');
+  assert.match(queue, /@Database\(entities = \[PendingMobileOperation::class, OfflineCacheEntry::class\]/);
+  assert.match(queue, /NetworkType\.CONNECTED/);
+  assert.match(queue, /OneTimeWorkRequestBuilder<OfflineSyncWorker>/);
+  for (const operation of [
+    'VISIT_START', 'VISIT_CLOSE', 'FIELD_ASSET_CREATE', 'FIELD_ASSET_PHOTO',
+    'ACT_CREATE', 'ACT_ASSET_ENSURE', 'FINDING_CREATE', 'FINDING_PHOTO',
+    'ACT_RESPONSIBLE', 'ACT_LOCK', 'COMPANY_OUTCOME', 'COMPANY_SIGNATURE', 'ACT_SEAL',
+  ]) assert.match(queue, new RegExp(`"${operation}"`));
+});
+
+test('F6.8 isolates offline work and cached inspection data by authenticated user', () => {
+  const queue = android('app/src/main/java/com/korexlabs/dhinspeccion/data/offline/OfflineQueue.kt');
+  const mobile = android('app/src/main/java/com/korexlabs/dhinspeccion/data/DhMobile.kt');
+  const acts = android('app/src/main/java/com/korexlabs/dhinspeccion/data/MobileActs.kt');
+  const findings = android('app/src/main/java/com/korexlabs/dhinspeccion/data/FieldFindingsMobile.kt');
+  assert.match(queue, /val ownerUserId: String/);
+  assert.match(queue, /ownerUserId=:ownerUserId/);
+  assert.match(queue, /SecureSessionStore/);
+  assert.match(mobile, /userCacheKey/);
+  assert.match(acts, /userCacheKey/);
+  assert.match(findings, /userCacheKey/);
+});
+
+test('F6.8 gives offline-created objects idempotent client identities', () => {
+  const actDto = api('src/inspection-acts/dto/create-inspection-act.dto.ts');
+  const findingDto = api('src/inspection-findings/dto/create-inspection-finding.dto.ts');
+  const inventoryDto = api('src/inspection-visits/dto/create-field-inventory.dto.ts');
+  const migration = api('src/database/migrations/1790128200000-f6-8-offline-evidence-idempotency.ts');
+  assert.match(actDto, /clientGeneratedId/);
+  assert.match(findingDto, /clientGeneratedId/);
+  assert.match(inventoryDto, /clientGeneratedId/);
+  assert.match(migration, /inspection_finding_evidence/);
+  assert.match(migration, /asset_field_capture_events/);
+  assert.equal((migration.match(/client_operation_id/g) ?? []).length >= 6, true);
+});
+
+test('F6.8 reviews photos before queueing and never sends the retired ONLINE upload mode', () => {
+  const photo = android('app/src/main/java/com/korexlabs/dhinspeccion/ui/FieldFindingScreen.kt');
+  const acts = android('app/src/main/java/com/korexlabs/dhinspeccion/data/MobileActs.kt');
+  assert.match(photo, /Revisar fotografía/);
+  assert.match(photo, /Usar esta foto/);
+  assert.match(photo, /Volver a tomar/);
+  assert.match(photo, /Eliminar foto/);
+  assert.doesNotMatch(acts, /uploadMode: String = "ONLINE"/);
+  assert.match(acts, /uploadMode: String = "IMMEDIATE"/);
+});
+
+test('F6.8 makes the real Acta PDF and photographic record first-class in Dashboard', () => {
+  const controller = api('src/inspection-reports/inspection-reports.controller.ts');
+  const page = web('src/pages/InspectionActEditorPage.tsx');
+  const media = web('src/features/inspections/InspectionActMediaPanel.tsx');
+  assert.match(controller, /inspection-acts\/:actId\/pdf/);
+  assert.match(api('src/inspection-acts/inspection-acts.controller.ts'), /:id\/field-media/);
+  assert.match(api('src/inspection-acts/inspection-acts.service.ts'), /capture\.visit_id=act\.visit_id/);
+  assert.match(page, /Abrir PDF del Acta/);
+  assert.match(page, /Descargar PDF/);
+  assert.match(media, /Fotos y Hallazgos/);
+  assert.match(media, /Evidencia fotográfica/);
+  assert.match(media, /Fotos tomadas durante esta inspección/);
+});
+
+test('F6.8 presents technical families to users as installation and subinstallation types', () => {
+  const config = web('src/pages/AssetTypesPage.tsx');
+  const detail = web('src/pages/SimpleInventoryDetailPage.tsx');
+  const field = api('src/inspection-visits/f3-field-inventory-structure.service.ts');
+  assert.match(config, /Tipos de Instalación/);
+  assert.match(config, /Tipos de Subinstalación/);
+  assert.match(detail, /Tipo de instalación \/ subinstalación/);
+  assert.match(field, /Tipo de instalación\/subinstalación/);
+  assert.doesNotMatch(config, /clasificación técnica/i);
+  assert.doesNotMatch(detail, /clasificación técnica/i);
+});

docs/AUDITORIA_INTEGRAL_F6_8_2026-09-15.md

@@ -0,0 +1,80 @@
+# Auditoría integral DH V2 · F6.8 · 15/09/2026
+
+## Alcance
+Revisión del árbol activo API V3, WEB V2 y Android de campo contra el modelo funcional vigente. La auditoría distingue superficie activa, compatibilidad histórica y código fuente retirado/no enrutable para no confundir legado con funcionalidad productiva.
+
+## 1. Acceso, usuarios, roles y perfil
+- El acceso autenticado, permisos y cambio de contraseña siguen aislados por permisos.
+- La firma reutilizable del inspector se administra en Mi perfil y se consulta desde Android antes del cierre del Acta.
+- Corrección F6.8: Android ya no presume que existe la firma. Si se configura después de haber guardado un cierre pendiente, “Volver a verificar” reintenta automáticamente la sincronización.
+- Corrección F6.8: cola y caché offline están separadas por `userId`; un segundo usuario del mismo dispositivo no puede sincronizar ni reutilizar datos locales del anterior.
+
+## 2. Planificación e Inspecciones
+- Flujo activo: oficina planifica; la APK inicia y cierra la ejecución física.
+- Contexto vigente: Departamento → Área → Yacimiento; Operadora temporal del Área; el Yacimiento fija el alcance físico.
+- La planificación activa no usa fecha de fin prevista. Las referencias `plannedEndAt` encontradas pertenecen al subsistema Survey retirado y no están en rutas activas.
+- Corrección F6.8: inicio y cierre de Inspección quedan persistidos localmente si se pierde conectividad y se sincronizan en orden al recuperarla. Un rechazo funcional del servidor revierte el estado optimista local.
+
+## 3. Actas
+- Una Inspección puede contener múltiples Actas, manteniendo como máximo una en borrador simultáneamente.
+- La urgencia se define al bloquear/cerrar el contenido del Acta completa; no pertenece individualmente a cada Hallazgo.
+- El Acta bloqueada es inmutable y pasa a firma. La firma del inspector proviene del perfil; la persona acompañante firma por cada Acta.
+- Flujo activo de acompañante: conforme, disconformidad con motivo o negativa a firmar con motivo. La opción de crear nuevas ausencias fue retirada de la interfaz; `ABSENT` se conserva únicamente para leer registros históricos.
+- Corrección crítica F6.8: Android enviaba `uploadMode=ONLINE`, valor inválido para la API. Se reemplazó por `IMMEDIATE` y la cola offline usa `DEFERRED`.
+- Corrección F6.8: alta, bloqueo, responsable, manifestación, firma y sellado pueden quedar en cola local sin perderse.
+
+## 4. Hallazgos y evidencia
+- Los Hallazgos pertenecen a un Acta explícita y a un elemento de Inventario incluido en ella.
+- El catálogo se resuelve por Tipo de instalación/subinstalación y mantiene OTROS como salida no restrictiva.
+- Corrección F6.8: alta de Hallazgo y carga de evidencia usan UUID de cliente para que un reintento offline no duplique registros.
+- Corrección F6.8: cada fotografía se revisa antes de incorporarse: usar, volver a tomar o eliminar; conserva GPS y fecha de captura.
+- Se mantienen múltiples fotografías por Hallazgo.
+
+## 5. Inventarios
+- Jerarquía activa: Departamento → Área → Yacimiento → Instalación → Subinstalación.
+- Corrección de nomenclatura: la antigua expresión visible “clasificación técnica/familia técnica” se presenta como “Tipo de instalación” o “Tipo de subinstalación”. Los nombres físicos internos de tablas/variables se conservan para evitar migraciones destructivas.
+- Altas en campo conservan GPS y foto obligatoria antes de habilitar Hallazgos.
+- Corrección F6.8: creación, selección, foto y asociación al Acta pueden persistirse offline con identidad estable e idempotencia de servidor.
+- Historial, dossier y consulta temporal siguen separados del estado actual para no reescribir historia.
+
+## 6. Acta documental, fotos y Dashboard
+- Desvío corregido: la ficha de Acta mezclaba demasiada información administrativa y el PDF/fotos no eran contenido principal.
+- F6.8 agrega “Documento del Acta” con apertura y descarga del PDF real sellado.
+- Las fotos de Hallazgos se muestran como miniaturas dentro del Acta.
+- Las fotos de Inventario se limitan a eventos de campo de la misma Inspección y a elementos incluidos en esa Acta; no se mezclan fotos históricas de otras visitas.
+- La proyección documental anterior queda sólo como referencia colapsada, no como sustituto del PDF oficial.
+
+## 7. Seguimiento, verificaciones y vencimientos
+- El seguimiento administrativo permanece separado de la captura de campo.
+- Respuesta de empresa, documentación, fechas informadas y verificación física conservan trazabilidad sin reabrir el Acta.
+- La planificación de verificaciones continúa basada en Hallazgos abiertos y no reemplaza el plazo administrativo del Acta.
+- No se detectaron rutas activas que vuelvan a asignar la urgencia al Hallazgo.
+
+## 8. Informes, GEDO y entrega documental
+- Flujo activo confirmado: Acta → INF → oficialización GEDO/IF.
+- Un INF corresponde a una sola Acta; una Inspección con varias Actas puede producir varios INF.
+- El circuito legacy de aprobación/firma final por Director fue retirado de la superficie activa; sus menciones permanecen sólo en migraciones reversibles/historia.
+- La entrega documental y SMTP continúan bajo permisos administrativos y trazabilidad.
+
+## 9. Importaciones y compatibilidad histórica
+- El módulo API de importaciones se conserva, pero la antigua pantalla de importación fue retirada deliberadamente de las rutas WEB en F5; no se reactivó durante F6.8 para no mezclar el contrato anterior con el modelo autoritativo actual.
+- Las páginas Survey y campos como `plannedEndAt` existen como fuente histórica sin ruta activa; los módulos Survey tampoco están registrados en `AppModule`.
+- Se mantienen redirects `/activos` → `/inventarios` y valores históricos de estados de Acta únicamente para compatibilidad de enlaces/datos existentes.
+
+## 10. Offline, consistencia y seguridad de sincronización
+- Room persiste operaciones y contexto descargado; WorkManager reintenta sólo con red disponible.
+- Las operaciones dependientes se procesan en orden estable y la cola se detiene ante un error funcional permanente para no ejecutar hijos sobre un padre rechazado.
+- Las operaciones críticas usan identificadores de cliente y columnas de idempotencia para evitar duplicados tras cortes/reintentos.
+- Los archivos pendientes se almacenan dentro del espacio privado de la aplicación hasta quedar sincronizados.
+
+## Barreras de aceptación F6.8
+- API: build + suite integral de contratos/unidad.
+- WEB: typecheck/build de producción.
+- Android: compilación Debug/Release, tests unitarios, APK Debug instalable y lint por variante dentro de los límites del VPS.
+- Deploy productivo: backup previo, migraciones, recreación API/WEB, health/versiones y ausencia de migraciones pendientes.
+
+## Compatibilidad intencional que NO debe eliminarse a ciegas
+- Estados/eventos históricos de Acta (`READY`, `CLOSED`, `RECTIFIED`, `ABSENT`) para lectura de expedientes existentes.
+- Rutas antiguas `/activos` como redirección de compatibilidad.
+- Migraciones históricas y textos de rollback: no se reescriben.
+- Fuentes Survey/legacy no enrutadas: no forman parte del producto activo, pero sirven a contratos históricos y rollback.

web-v2/Dockerfile

@@ -3,6 +3,7 @@ WORKDIR /app
 COPY package*.json ./
 RUN npm ci
 COPY tsconfig*.json vite.config.ts index.html ./
+COPY public ./public
 COPY src ./src
 RUN npm run build
 

web-v2/index.html

@@ -4,6 +4,7 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="referrer" content="strict-origin-when-cross-origin" />
+    <link rel="icon" type="image/webp" href="/favicon.webp" />
     <title>DH Inspección V2</title>
   </head>
   <body>

web-v2/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "dhv2-web",
-  "version": "0.23.0-2",
+  "version": "0.23.0-5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "dhv2-web",
-      "version": "0.23.0-2",
+      "version": "0.23.0-5",
       "dependencies": {
         "maplibre-gl": "6.4.1",
         "react": "^19.0.0",

web-v2/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dhv2-web",
-  "version": "0.23.0-2",
+  "version": "0.23.0-5",
   "private": true,
   "type": "module",
   "engines": {

web-v2/src/app/App.tsx

@@ -9,6 +9,7 @@ import { CompanySignaturePage } from '../pages/CompanySignaturePage';
 import { DashboardPage } from '../pages/DashboardPage';
 import { LoginPage } from '../pages/LoginPage';
 import { NewUserPage } from '../pages/NewUserPage';
+import { MyProfilePage } from '../pages/MyProfilePage';
 import { RolesPage } from '../pages/RolesPage';
 import { AccessDeniedPage, NotFoundPage } from '../pages/SystemPages';
 import { UserDetailPage } from '../pages/UserDetailPage';
@@ -45,6 +46,7 @@ export function App() {
     <Route element={<ProtectedRoute />}>
       <Route path="/change-password" element={<ChangePasswordPage />} />
       <Route element={<OperationalContextProvider><AppLayout /></OperationalContextProvider>}>
+        <Route path="/mi-perfil" element={<MyProfilePage />} />
         <Route element={<PermissionRoute permission="dashboard.read" />}><Route index element={<DashboardPage />} /></Route>
         <Route element={<PermissionRoute permission="assets.read" />}><Route path="/mapa" element={<MapPage />} /></Route>
         <Route element={<PermissionRoute permission="assets.read" />}>

web-v2/src/components/Icon.tsx

@@ -1,7 +1,7 @@
 export type IconName =
   | 'home' | 'map' | 'layers' | 'calendar' | 'clipboard' | 'alert'
   | 'history' | 'users' | 'shield' | 'audit' | 'logout' | 'menu'
-  | 'plus' | 'search' | 'edit' | 'chevron' | 'check' | 'key' | 'upload' | 'mail' | 'lock';
+  | 'plus' | 'search' | 'edit' | 'chevron' | 'check' | 'key' | 'upload' | 'mail' | 'lock' | 'camera';
 
 export function Icon({ name, size = 18 }: { name: IconName; size?: number }) {
   const paths: Record<IconName, React.ReactNode> = {
@@ -26,6 +26,7 @@ export function Icon({ name, size = 18 }: { name: IconName; size?: number }) {
     upload: <><path d="M12 16V4"/><path d="m7 9 5-5 5 5"/><path d="M5 20h14"/></>,
     mail: <><rect x="3" y="5" width="18" height="14" rx="2"/><path d="m3 7 9 6 9-6"/></>,
     lock: <><rect x="5" y="10" width="14" height="10" rx="2"/><path d="M8 10V7a4 4 0 0 1 8 0v3"/></>,
+    camera: <><path d="M4 7h3l2-3h6l2 3h3a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V9a2 2 0 0 1 2-2Z"/><circle cx="12" cy="13" r="4"/></>,
   };
   return (
     <svg className="icon" width={size} height={size} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.8" strokeLinecap="round" strokeLinejoin="round" aria-hidden="true">

web-v2/src/config/version.ts

@@ -1,2 +1,2 @@
-export const APP_VERSION = '0.23.0-1';
+export const APP_VERSION = '0.23.0-5';
-export const APP_PHASE = 'F6.1 · Contexto operativo Área–Operadora consolidado';
+export const APP_PHASE = 'F6.8 · Offline seguro y Acta documental';

web-v2/src/features/assets/AssetFindingCatalogPanel.tsx

@@ -38,7 +38,7 @@ export function AssetFindingCatalogPanel({ assetId, canManage }: { assetId: stri
       .catch((requestError) => {
         if (!active) return;
         const message = errorMessage(requestError);
-        if (message.includes('no tiene clasificación técnica')) setUnsupported(true);
+        if (message.includes('no tiene tipo')) setUnsupported(true);
         else setError(message);
       })
       .finally(() => active && setLoading(false));
@@ -52,10 +52,10 @@ export function AssetFindingCatalogPanel({ assetId, canManage }: { assetId: stri
       .some((value) => value.toLocaleLowerCase().includes(needle)));
   }, [items, search]);
 
-  if (loading) return <div className="panel"><LoadingBlock label="Cargando clasificación y Hallazgos aplicables…" /></div>;
+  if (loading) return <div className="panel"><LoadingBlock label="Cargando tipo y Hallazgos aplicables…" /></div>;
   if (error) return <Alert>{error}</Alert>;
   if (unsupported || !technical) return <section className="panel asset-finding-catalog-panel">
-    <div className="panel-heading"><div><span className="eyebrow">HALLAZGOS APLICABLES</span><h2>Sin clasificación técnica</h2><p className="section-copy">Departamento, Área y Yacimiento son niveles estructurales. Los Hallazgos se registran sobre Instalaciones y Subinstalaciones clasificadas.</p></div></div>
+    <div className="panel-heading"><div><span className="eyebrow">HALLAZGOS APLICABLES</span><h2>Sin tipo asignado</h2><p className="section-copy">Departamento, Área y Yacimiento son niveles estructurales. Los Hallazgos se registran sobre Instalaciones y Subinstalaciones con su tipo definido.</p></div></div>
   </section>;
 
   return <div className="asset-tab-stack">
@@ -65,14 +65,14 @@ export function AssetFindingCatalogPanel({ assetId, canManage }: { assetId: stri
         <div>
           <span className="eyebrow">HALLAZGOS APLICABLES</span>
           <h2>{technical.family.name}</h2>
-          <p className="section-copy">Se muestran únicamente los Hallazgos asociados a esta clasificación técnica. Éste es el mismo catálogo que consume la APK para este objeto.</p>
+          <p className="section-copy">Se muestran únicamente los Hallazgos asociados a este tipo. Éste es el mismo catálogo que consume la APK para este objeto.</p>
         </div>
         <span className="count-pill">{items.length} asociados</span>
       </div>
 
       {canManage && <div className="temporal-notice">
         <Icon name="layers" />
-        <p><strong>¿Falta un Hallazgo?</strong> Administrá la clasificación en Configuración de Inventarios y el cambio se aplicará a todos los objetos de este mismo tipo técnico.</p>
+        <p><strong>¿Falta un Hallazgo?</strong> Administrá el tipo en Configuración de Inventarios y el cambio se aplicará a todos los objetos de este mismo tipo.</p>
         <Link className="button secondary" to="/admin/asset-types">Configurar Inventarios</Link>
       </div>}
 
@@ -82,7 +82,7 @@ export function AssetFindingCatalogPanel({ assetId, canManage }: { assetId: stri
       </label>}
 
       {items.length === 0
-        ? <div className="inline-empty">Esta clasificación todavía no tiene Hallazgos asociados. Desde Configuración de Inventarios podés vincular los que correspondan.</div>
+        ? <div className="inline-empty">Este tipo todavía no tiene Hallazgos asociados. Desde Configuración de Inventarios podés vincular los que correspondan.</div>
         : visible.length === 0
           ? <div className="inline-empty">No hay Hallazgos asociados que coincidan con la búsqueda.</div>
           : <div className="finding-selection-list">{visible.map((item) => <div className="finding-selection-row" key={item.id}>

web-v2/src/features/assets/AssetHierarchyView.tsx

@@ -46,13 +46,13 @@ const structuredInventorySections = [
   {
     code: 'instalacion',
     label: 'Instalaciones',
-    description: 'Elementos técnicos ubicados dentro de un Yacimiento y clasificados por su familia de Inventario.',
+    description: 'Elementos técnicos ubicados dentro de un Yacimiento y definidos por su tipo de instalación.',
     icon: 'layers' as const,
   },
   {
     code: 'subinstalacion',
     label: 'Subinstalaciones',
-    description: 'Último nivel estructural. Dependen de una Instalación y conservan su clasificación técnica.',
+    description: 'Último nivel estructural. Dependen de una Instalación y conservan su tipo de subinstalación.',
     icon: 'layers' as const,
   },
 ] as const;
@@ -198,8 +198,8 @@ export function AssetHierarchyView({ filters, types }: { filters: InventoryQuery
         <div><span>1</span><strong>Departamento</strong><small>raíz territorial</small></div><i>›</i>
         <div><span>2</span><strong>Área</strong><small>operadoras vinculadas</small></div><i>›</i>
         <div><span>3</span><strong>Yacimiento</strong><small>dentro del Área</small></div><i>›</i>
-        <div><span>4</span><strong>Instalación</strong><small>clasificación técnica</small></div><i>›</i>
+        <div><span>4</span><strong>Instalación</strong><small>tipo de instalación</small></div><i>›</i>
-        <div><span>5</span><strong>Subinstalación</strong><small>clasificación técnica</small></div>
+        <div><span>5</span><strong>Subinstalación</strong><small>tipo de subinstalación</small></div>
       </div>
 
       <section className="asset-browser-group" style={{ marginTop: 20 }}>
@@ -238,7 +238,7 @@ export function AssetHierarchyView({ filters, types }: { filters: InventoryQuery
     <section className="asset-browser-group">
       <div className="asset-browser-group-heading"><div><h3>{nextLevelLabel(current?.type.code)}</h3><p>Jerarquía: Departamento → Área → Yacimiento → Instalación → Subinstalación.</p></div><span>{children.length}</span></div>
       {children.length === 0
-        ? <EmptyState title={current?.type.code.toLowerCase() === 'subinstalacion' ? 'Fin de la jerarquía' : 'No hay registros en este nivel'} text={current?.type.code.toLowerCase() === 'subinstalacion' ? 'Abrí la ficha para ver su clasificación y Hallazgos asociados.' : 'Agregá el primer registro de este nivel o revisá la búsqueda actual.'} />
+        ? <EmptyState title={current?.type.code.toLowerCase() === 'subinstalacion' ? 'Fin de la jerarquía' : 'No hay registros en este nivel'} text={current?.type.code.toLowerCase() === 'subinstalacion' ? 'Abrí la ficha para ver su tipo y Hallazgos asociados.' : 'Agregá el primer registro de este nivel o revisá la búsqueda actual.'} />
         : <div className="asset-browser-list">{children.map((item) => <InventoryCard key={item.id} item={item} href={navigationHref(searchParams,item.id)} />)}</div>}
     </section>
   </div>;

web-v2/src/features/assets/AssetTechnicalDataPanel.tsx

@@ -26,7 +26,7 @@ export function AssetTechnicalDataPanel({assetId,canEdit}:{assetId:string;canEdi
     let active=true; setLoading(true); setUnsupported(false); setError('');
     getInventoryTechnicalValues(assetId).then((loaded)=>{if(!active)return;setData(loaded);setValues(Object.fromEntries(loaded.definitions.map((definition)=>{
       const raw=loaded.values[definition.id]; return [definition.id,definition.dataType==='DATETIME'?localDateTime(raw):raw??''];
-    })))}).catch((requestError)=>{if(!active)return;const message=errorMessage(requestError);if(message.includes('no tiene clasificación técnica'))setUnsupported(true);else setError(message);}).finally(()=>active&&setLoading(false));
+    })))}).catch((requestError)=>{if(!active)return;const message=errorMessage(requestError);if(message.includes('no tiene tipo'))setUnsupported(true);else setError(message);}).finally(()=>active&&setLoading(false));
     return()=>{active=false};
   },[assetId]);
   if(loading)return <div className="form-section"><LoadingBlock label="Cargando datos técnicos…" /></div>;
@@ -48,9 +48,9 @@ export function AssetTechnicalDataPanel({assetId,canEdit}:{assetId:string;canEdi
     }catch(requestError){setError(errorMessage(requestError));}finally{setSaving(false)}
   };
   return <div className="form-section">
-    <div><h2>Información técnica · {data.family.name}</h2><p className="section-copy">Estos campos pertenecen a la clasificación concreta del elemento, no al nivel genérico.</p></div>
+    <div><h2>Información técnica · {data.family.name}</h2><p className="section-copy">Estos campos pertenecen al tipo concreto del elemento, no al nivel genérico.</p></div>
     {error&&<Alert>{error}</Alert>}{success&&<Alert type="success">{success}</Alert>}
-    {activeDefinitions.length===0?<div className="inline-empty">Esta clasificación todavía no tiene campos técnicos configurados.</div>:canEdit?<div className="dynamic-attributes">{activeDefinitions.map((definition)=>{
+    {activeDefinitions.length===0?<div className="inline-empty">Este tipo todavía no tiene campos técnicos configurados.</div>:canEdit?<div className="dynamic-attributes">{activeDefinitions.map((definition)=>{
       const value=values[definition.id];const label=<span>{definition.name}{definition.unit?` (${definition.unit})`:''}{definition.isRequired?<em>obligatorio</em>:<em>opcional</em>}</span>;
       if(definition.dataType==='BOOLEAN')return <label className="check-row attribute-check" key={definition.id}><input type="checkbox" checked={Boolean(value)} onChange={(event)=>setValues((current)=>({...current,[definition.id]:event.target.checked}))}/><span><strong>{definition.name}</strong><small>{definition.code}</small></span></label>;
       if(definition.dataType==='SELECT')return <label className="field" key={definition.id}>{label}<SearchableSelect value={String(value??'')} onChange={(event)=>setValues((current)=>({...current,[definition.id]:event.target.value}))} required={definition.isRequired}><option value="">Seleccionar…</option>{definition.options?.map((option)=><option key={option} value={option}>{option}</option>)}</SearchableSelect></label>;

web-v2/src/features/inspections/FindingCatalogTypeApplicabilityPanel.tsx

@@ -27,7 +27,7 @@ export function FindingCatalogTypeApplicabilityPanel() {
   const [catalog, setCatalog] = useState<FindingAdminCatalog>(EMPTY_CATALOG);
   const [familyId, setFamilyId] = useState('');
   const [enabled, setEnabled] = useState<Set<string>>(new Set());
-  const [reason, setReason] = useState('Actualización de Hallazgos asociados a la clasificación de Inventario');
+  const [reason, setReason] = useState('Actualización de Hallazgos asociados al tipo de Inventario');
   const [search, setSearch] = useState('');
   const [viewMode, setViewMode] = useState<ViewMode>('ASSOCIATED');
   const [loading, setLoading] = useState(true);
@@ -77,15 +77,15 @@ export function FindingCatalogTypeApplicabilityPanel() {
   };
 
   if (loading) return <div className="panel"><LoadingBlock label="Cargando aplicabilidad…" /></div>;
-  if (families.length === 0) return <Alert>No hay clasificaciones de Instalación/Subinstalación disponibles. Crealas primero en Configuración de Inventarios.</Alert>;
+  if (families.length === 0) return <Alert>No hay tipos de Instalación/Subinstalación disponibles. Crealos primero en Configuración de Inventarios.</Alert>;
 
   return <section className="panel finding-applicability-panel">
-    <div className="panel-heading"><div><span className="eyebrow">APLICABILIDAD POR CLASIFICACIÓN</span><h2>Qué Hallazgos verá el inspector</h2><p className="section-copy">Al elegir una clasificación se muestran sólo sus Hallazgos asociados. “Todos para vincular” se usa exclusivamente para modificar la relación.</p></div><span className="count-pill">{savedIds.size} vinculados</span></div>
+    <div className="panel-heading"><div><span className="eyebrow">APLICABILIDAD POR TIPO</span><h2>Qué Hallazgos verá el inspector</h2><p className="section-copy">Al elegir un tipo se muestran sólo sus Hallazgos asociados. “Todos para vincular” se usa exclusivamente para modificar la relación.</p></div><span className="count-pill">{savedIds.size} vinculados</span></div>
     {error && <Alert>{error}</Alert>}{success && <Alert type="success">{success}</Alert>}
-    <div className="form-grid finding-applicability-toolbar"><label className="field"><span>Clasificación de Inventario</span><SearchableSelect value={familyId} onChange={(event) => setFamilyId(event.target.value)}>{families.map((family) => <option value={family.id} key={family.id}>{familyContext(family)}</option>)}</SearchableSelect></label><label className="field"><span>Buscar dentro de {viewMode === 'ASSOCIATED' ? 'los asociados' : 'todo el Catálogo'}</span><input value={search} onChange={(event) => setSearch(event.target.value)} placeholder="Título, código o categoría…" /></label></div>
+    <div className="form-grid finding-applicability-toolbar"><label className="field"><span>Tipo de instalación / subinstalación</span><SearchableSelect value={familyId} onChange={(event) => setFamilyId(event.target.value)}>{families.map((family) => <option value={family.id} key={family.id}>{familyContext(family)}</option>)}</SearchableSelect></label><label className="field"><span>Buscar dentro de {viewMode === 'ASSOCIATED' ? 'los asociados' : 'todo el Catálogo'}</span><input value={search} onChange={(event) => setSearch(event.target.value)} placeholder="Título, código o categoría…" /></label></div>
     {selectedFamily && <div className="temporal-notice"><Icon name="layers" /><p><strong>{selectedFamily.name}:</strong> {selectedFamily.level === 'SUBINSTALLATION' && selectedFamily.parentFamilies.length ? `compatible con ${selectedFamily.parentFamilies.map((parent) => parent.name).join(', ')}. ` : ''}Tiene {savedIds.size} Hallazgo{savedIds.size === 1 ? '' : 's'} asociado{savedIds.size === 1 ? '' : 's'}.</p></div>}
     <div className="quick-view-row" style={{ marginBottom: 12 }}><button type="button" className={viewMode === 'ASSOCIATED' ? 'active' : ''} onClick={() => { setViewMode('ASSOCIATED'); setSearch(''); }}>Asociados ({savedIds.size})</button><button type="button" className={viewMode === 'ALL' ? 'active' : ''} onClick={() => { setViewMode('ALL'); setSearch(''); }}>Todos para vincular ({catalog.items.filter((item) => item.isActive && activeCategoryIds.has(item.categoryId)).length})</button></div>
-    {viewMode === 'ASSOCIATED' && visible.length === 0 ? <div className="inline-empty"><strong>{search.trim() ? 'Ningún Hallazgo asociado coincide con la búsqueda.' : 'Esta clasificación todavía no tiene Hallazgos asociados.'}</strong><br />{!search.trim() && 'Abrí “Todos para vincular” para elegirlos.'}</div> : <>{viewMode === 'ALL' && <div className="catalog-selection-actions"><button type="button" className="button secondary" onClick={selectVisible}>Seleccionar visibles</button><button type="button" className="button secondary" onClick={() => setEnabled(new Set())}>Quitar todos</button></div>}<div className="finding-selection-list">{visible.map((item) => viewMode === 'ALL' ? <label className="finding-selection-row" key={item.id}><input type="checkbox" checked={enabled.has(item.id)} onChange={() => toggle(item.id)} /><span><strong>{item.title}</strong><small>{categoryName.get(item.categoryId) ?? 'Catálogo'} · {item.code}{item.suggestedSeverity ? ` · gravedad sugerida ${item.suggestedSeverity}/10` : ''}</small></span></label> : <div className="finding-selection-row" key={item.id}><span className="asset-symbol"><Icon name="check" size={14} /></span><span><strong>{item.title}</strong><small>{categoryName.get(item.categoryId) ?? 'Catálogo'} · {item.code}{item.suggestedSeverity ? ` · gravedad sugerida ${item.suggestedSeverity}/10` : ''}</small></span></div>)}</div></>}
+    {viewMode === 'ASSOCIATED' && visible.length === 0 ? <div className="inline-empty"><strong>{search.trim() ? 'Ningún Hallazgo asociado coincide con la búsqueda.' : 'Este tipo todavía no tiene Hallazgos asociados.'}</strong><br />{!search.trim() && 'Abrí “Todos para vincular” para elegirlos.'}</div> : <>{viewMode === 'ALL' && <div className="catalog-selection-actions"><button type="button" className="button secondary" onClick={selectVisible}>Seleccionar visibles</button><button type="button" className="button secondary" onClick={() => setEnabled(new Set())}>Quitar todos</button></div>}<div className="finding-selection-list">{visible.map((item) => viewMode === 'ALL' ? <label className="finding-selection-row" key={item.id}><input type="checkbox" checked={enabled.has(item.id)} onChange={() => toggle(item.id)} /><span><strong>{item.title}</strong><small>{categoryName.get(item.categoryId) ?? 'Catálogo'} · {item.code}{item.suggestedSeverity ? ` · gravedad sugerida ${item.suggestedSeverity}/10` : ''}</small></span></label> : <div className="finding-selection-row" key={item.id}><span className="asset-symbol"><Icon name="check" size={14} /></span><span><strong>{item.title}</strong><small>{categoryName.get(item.categoryId) ?? 'Catálogo'} · {item.code}{item.suggestedSeverity ? ` · gravedad sugerida ${item.suggestedSeverity}/10` : ''}</small></span></div>)}</div></>}
     {viewMode === 'ALL' && <><label className="field"><span>Motivo del cambio</span><textarea rows={2} value={reason} onChange={(event) => setReason(event.target.value)} maxLength={2000} /></label><div className="form-actions"><button type="button" className="button primary" disabled={saving || reason.trim().length < 5 || !selectedFamily} onClick={save}><Icon name="check" />{saving ? 'Guardando…' : `Guardar ${enabled.size} asociados`}</button></div></>}
   </section>;
 }

web-v2/src/features/inspections/InspectionActMediaPanel.tsx

@@ -0,0 +1,149 @@
+import { useEffect, useState } from 'react';
+import { Alert, EmptyState, LoadingBlock, errorMessage } from '../../components/Feedback';
+import { Icon } from '../../components/Icon';
+import {
+  getAssetMediaBlob,
+  getInspectionFindingEvidenceBlob,
+  listInspectionActFieldMedia,
+  listInspectionFindingEvidence,
+  listInspectionFindings,
+} from '../../lib/api';
+import type { InspectionActFieldMedia, InspectionFindingEvidence } from '../../lib/api';
+import { formatDate } from '../../lib/format';
+
+type ActPhoto = {
+  findingId: string;
+  findingCode: string;
+  findingTitle: string;
+  evidence: InspectionFindingEvidence;
+};
+
+type AssetPhoto = InspectionActFieldMedia;
+
+function PhotoThumb({ photo }: { photo: ActPhoto }) {
+  const [url, setUrl] = useState('');
+
+  useEffect(() => {
+    let active = true;
+    let objectUrl = '';
+    getInspectionFindingEvidenceBlob(photo.evidence.id)
+      .then((blob) => {
+        if (!active) return;
+        objectUrl = URL.createObjectURL(blob);
+        setUrl(objectUrl);
+      })
+      .catch(() => undefined);
+    return () => {
+      active = false;
+      if (objectUrl) URL.revokeObjectURL(objectUrl);
+    };
+  }, [photo.evidence.id]);
+
+  return <article className="act-photo-card">
+    <button
+      type="button"
+      className="act-photo-preview"
+      onClick={() => url && window.open(url, '_blank', 'noopener,noreferrer')}
+      aria-label={`Ver foto ${photo.findingCode}`}
+    >
+      {url
+        ? <img src={url} alt={photo.evidence.title || `${photo.findingCode} · ${photo.findingTitle}`} />
+        : <span className="media-preview-loading"><span className="spinner" /></span>}
+    </button>
+    <div className="act-photo-copy">
+      <span className="eyebrow">{photo.findingCode}</span>
+      <strong>{photo.findingTitle}</strong>
+      <small>{formatDate(photo.evidence.capturedAt || photo.evidence.createdAt)}</small>
+      {photo.evidence.latitude != null && photo.evidence.longitude != null && <small>
+        GPS {photo.evidence.latitude.toFixed(6)}, {photo.evidence.longitude.toFixed(6)}
+      </small>}
+    </div>
+  </article>;
+}
+
+function AssetPhotoThumb({ photo }: { photo: AssetPhoto }) {
+  const [url, setUrl] = useState('');
+
+  useEffect(() => {
+    let active = true;
+    let objectUrl = '';
+    getAssetMediaBlob(photo.id)
+      .then((blob) => {
+        if (!active) return;
+        objectUrl = URL.createObjectURL(blob);
+        setUrl(objectUrl);
+      })
+      .catch(() => undefined);
+    return () => {
+      active = false;
+      if (objectUrl) URL.revokeObjectURL(objectUrl);
+    };
+  }, [photo.id]);
+
+  return <article className="act-photo-card">
+    <button type="button" className="act-photo-preview" onClick={() => url && window.open(url, '_blank', 'noopener,noreferrer')} aria-label={`Ver foto ${photo.assetCode}`}>
+      {url ? <img src={url} alt={photo.title || photo.assetName} /> : <span className="media-preview-loading"><span className="spinner" /></span>}
+    </button>
+    <div className="act-photo-copy">
+      <span className="eyebrow">INVENTARIO · {photo.assetCode}</span>
+      <strong>{photo.assetName}</strong>
+      <small>{formatDate(photo.fieldCapturedAt || photo.capturedAt || photo.createdAt)}</small>
+      {photo.latitude != null && photo.longitude != null && <small>GPS {photo.latitude.toFixed(6)}, {photo.longitude.toFixed(6)}</small>}
+    </div>
+  </article>;
+}
+
+export function InspectionActMediaPanel({ actId }: { actId: string }) {
+  const [photos, setPhotos] = useState<ActPhoto[]>([]);
+  const [assetPhotos, setAssetPhotos] = useState<AssetPhoto[]>([]);
+  const [findingCount, setFindingCount] = useState(0);
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState('');
+
+  useEffect(() => {
+    let active = true;
+    setLoading(true);
+    setError('');
+    Promise.all([
+      listInspectionFindings(actId),
+      listInspectionActFieldMedia(actId).catch(() => []),
+    ])
+      .then(async ([findings, fieldMedia]) => {
+        const evidenceByFinding = await Promise.all(
+          findings.map(async (finding) => ({
+            finding,
+            evidence: await listInspectionFindingEvidence(finding.id),
+          })),
+        );
+        if (!active) return;
+        setFindingCount(findings.length);
+        setPhotos(evidenceByFinding.flatMap(({ finding, evidence }) =>
+          evidence.filter((item) => item.kind === 'PHOTO').map((item) => ({
+            findingId: finding.id, findingCode: finding.code, findingTitle: finding.title, evidence: item,
+          })),
+        ));
+        setAssetPhotos(fieldMedia.filter((item) => item.kind === 'PHOTO'));
+      })
+      .catch((requestError) => active && setError(errorMessage(requestError)))
+      .finally(() => active && setLoading(false));
+    return () => { active = false; };
+  }, [actId]);
+
+  return <section className="panel act-media-panel">
+    <div className="panel-heading">
+      <div>
+        <span className="eyebrow">REGISTRO DE CAMPO</span>
+        <h2>Fotos y Hallazgos</h2>
+        <p className="section-copy">Las fotografías del Acta se muestran directamente, vinculadas al Hallazgo que documentan.</p>
+      </div>
+      <span className="count-pill">{photos.length + assetPhotos.length} foto{photos.length + assetPhotos.length === 1 ? '' : 's'} · {findingCount} hallazgo{findingCount === 1 ? '' : 's'}</span>
+    </div>
+    {error && <Alert>{error}</Alert>}
+    {loading ? <LoadingBlock label="Cargando registro fotográfico…" /> : <>
+      {photos.length === 0 && assetPhotos.length === 0 && <EmptyState title="Sin fotografías" text="Esta Acta todavía no tiene fotografías sincronizadas." />}
+      {photos.length > 0 && <div className="act-media-group"><div className="subsection-heading"><div><span className="eyebrow">HALLAZGOS</span><h4>Evidencia fotográfica</h4></div><span>{photos.length}</span></div><div className="act-photo-grid">{photos.map((photo) => <PhotoThumb key={photo.evidence.id} photo={photo} />)}</div></div>}
+      {assetPhotos.length > 0 && <div className="act-media-group"><div className="subsection-heading"><div><span className="eyebrow">INVENTARIO DE LA INSPECCIÓN</span><h4>Fotos tomadas durante esta inspección</h4></div><span>{assetPhotos.length}</span></div><div className="act-photo-grid">{assetPhotos.map((photo) => <AssetPhotoThumb key={photo.id} photo={photo} />)}</div></div>}
+    </>}
+    {(photos.length > 0 || assetPhotos.length > 0) && <div className="act-media-footnote"><Icon name="camera" /><span>Seleccioná una foto para verla a tamaño completo.</span></div>}
+  </section>;
+}

web-v2/src/layout/AppLayout.tsx

@@ -100,11 +100,13 @@ export function AppLayout() {
         </nav>
 
         <div className="sidebar-user">
+          <NavLink to="/mi-perfil" onClick={close} className="sidebar-user-profile" title="Abrir Mi perfil">
             <div className="user-avatar">{user?.firstName?.[0]}{user?.lastName?.[0]}</div>
             <div className="user-copy">
               <strong>{user?.firstName} {user?.lastName}</strong>
-            <small>{user?.roles.join(' · ') || user?.username}</small>
+              <small>Mi perfil · {user?.roles.join(' · ') || user?.username}</small>
             </div>
+          </NavLink>
           <button className="icon-button dark" onClick={handleLogout} title="Cerrar sesión" aria-label="Cerrar sesión">
             <Icon name="logout" />
           </button>