Compare commits
8
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
079728aa6d | ||
|
|
47cd985931 | ||
|
|
da7c1ddb55 | ||
|
|
a2ec846721 | ||
|
|
9eef156197 | ||
|
|
08f164a209 | ||
|
|
23450bb6d0 | ||
|
|
20ccba5292 |
@@ -1,5 +1,5 @@
|
||||
name: Android CI / RC
|
||||
# F6.2 field closing barrier: lint + real tests + debug artifact + release compile.
|
||||
# F6.8 offline/document barrier: lint + real tests + debug artifact + release compile.
|
||||
|
||||
on:
|
||||
push:
|
||||
@@ -111,7 +111,7 @@ jobs:
|
||||
cp android-app/app/build/outputs/apk/debug/app-debug.apk "$apk"
|
||||
sha256sum "$apk" > "${apk}.sha256"
|
||||
{
|
||||
echo "phase=F6.2"
|
||||
echo "phase=F6.8"
|
||||
echo "version=$version"
|
||||
echo "versionCode=$code"
|
||||
echo "commit=$GITHUB_SHA"
|
||||
|
||||
+32
-7
@@ -1,20 +1,41 @@
|
||||
# DH Inspección Android · release final de campo 0.19.3
|
||||
# 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.3**.
|
||||
- `versionCode`: **31**.
|
||||
- `versionName`: **0.19.10**.
|
||||
- `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-4 / WEB 0.23.0-3**.
|
||||
- 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.3 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.
|
||||
@@ -23,8 +44,8 @@ La APK 0.19.3 fija como recorrido principal de campo:
|
||||
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. 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. Al terminar el contenido del Acta se elige **Urgente / No urgente** y luego se usa **Cerrar Acta y dejar pendiente de firma**. La urgencia pertenece al Acta completa, nunca a cada Hallazgo; desde ese momento el contenido queda inmutable y el estado visible es **Pendiente de firma**.
|
||||
9. La firma del Inspector y la manifestación del representante completan el Acta: **conformidad**, **disconformidad con motivo obligatorio** o **negativa a firmar con motivo obligatorio**. La firma se registra Acta por Acta aunque sea la misma persona.
|
||||
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. 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.
|
||||
@@ -51,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:
|
||||
|
||||
@@ -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 = 33
|
||||
versionName = "0.19.5"
|
||||
versionCode = 38
|
||||
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")
|
||||
|
||||
@@ -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)
|
||||
inventoryParentId = visit?.scopeAsset?.id ?: visit?.operationalArea?.id
|
||||
notice = "Inspección iniciada."
|
||||
loadActsInternal(id, selectDraft = true)
|
||||
loadVisitsInternal()
|
||||
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)
|
||||
selectedAct = created
|
||||
actClosure = actsRepository.closure(created.id)
|
||||
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."
|
||||
val actId = DhRepository.newOperationId()
|
||||
val occurredAt = Instant.now().toString()
|
||||
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)
|
||||
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) {
|
||||
selectedFieldAsset = repository.selectFieldAsset(visitId, item.id)
|
||||
notice = "Inventario agregado a la Inspección."
|
||||
reloadCurrentInventory(visitId)
|
||||
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."
|
||||
} 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)
|
||||
loadActsInternal(visitId, selectDraft = false)
|
||||
ensureAssetInActOffline(draft.id, item.id, item.code, item.name, item.type?.name)
|
||||
loadFindingOptionsInternal(visitId, item.id, draft.id)
|
||||
} else if (selectedFieldAsset?.capture?.readyForFinding == true) {
|
||||
notice = "Inventario listo. Creá o seleccioná un Acta antes de registrar Hallazgos."
|
||||
@@ -248,7 +390,10 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
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)
|
||||
notice = "Inventario creado con GPS. Falta la fotografía obligatoria. Si ya existía, podés fusionarlo antes de continuar."
|
||||
reloadCurrentInventory(visitId)
|
||||
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."
|
||||
} 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)
|
||||
loadActsInternal(visitId, selectDraft = false)
|
||||
ensureAssetInActOffline(
|
||||
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(
|
||||
visitId = visitId,
|
||||
offlineQueue.enqueueFieldAssetPhoto(
|
||||
assetId = asset.id,
|
||||
file = file,
|
||||
visitId = visitId,
|
||||
source = file,
|
||||
latitude = latitude,
|
||||
longitude = longitude,
|
||||
accuracyM = accuracyM,
|
||||
)
|
||||
selectedFieldAsset = selectedFieldAsset?.copy(capture = response.capture)
|
||||
notice = if (response.capture.readyForFinding) {
|
||||
"Captura completa: GPS y fotografía registrados."
|
||||
val localCapture = selectedFieldAsset?.capture?.copy(
|
||||
hasGeometry = true,
|
||||
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) {
|
||||
selectedAct = actsRepository.ensureAsset(draft.id, asset.id)
|
||||
loadActsInternal(visitId, selectDraft = false)
|
||||
loadFindingOptionsInternal(visitId, asset.id, draft.id)
|
||||
} else if (response.capture.readyForFinding) {
|
||||
if (selectedFieldAsset?.capture?.readyForFinding == true && draft != null) {
|
||||
val current = selectedFieldAsset?.asset ?: asset
|
||||
ensureAssetInActOffline(draft.id, current.id, current.code, current.name, current.type?.name)
|
||||
loadFindingOptionsInternal(visitId, current.id, draft.id)
|
||||
} 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)
|
||||
loadActsInternal(visitId, selectDraft = false)
|
||||
val asset = selectedFieldAsset?.asset ?: return@launchBusy
|
||||
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 response = findingsRepository.create(
|
||||
visitId,
|
||||
assetId,
|
||||
CreateFieldFindingRequest(
|
||||
actId = actId,
|
||||
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() },
|
||||
),
|
||||
val clientFindingId = DhRepository.newOperationId()
|
||||
val request = CreateFieldFindingRequest(
|
||||
actId = actId,
|
||||
clientGeneratedId = clientFindingId,
|
||||
catalogItemId = catalogItemId,
|
||||
customTitle = customTitle?.trim()?.takeIf { it.isNotBlank() },
|
||||
customLegalBasis = customLegalBasis?.trim()?.takeIf { it.isNotBlank() },
|
||||
description = description.trim(),
|
||||
severity = severity,
|
||||
)
|
||||
lastCreatedFinding = response.finding
|
||||
notice = "Hallazgo ${response.finding.code} registrado en ${response.act.code}. Podés agregar evidencia fotográfica."
|
||||
loadFindingOptionsInternal(visitId, assetId, actId, keepLastCreated = true)
|
||||
loadActsInternal(visitId, selectDraft = false)
|
||||
if (selectedAct?.assets?.none { it.id == assetId } != false) {
|
||||
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,
|
||||
)
|
||||
loadEvidenceInternal(findingId)
|
||||
notice = "Evidencia fotográfica registrada con GPS."
|
||||
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."
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -440,19 +674,34 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
return
|
||||
}
|
||||
launchBusy(mutation = true) {
|
||||
actClosure = actsRepository.setResponsible(
|
||||
actId,
|
||||
MobileResponsibleRequest(
|
||||
attendanceStatus = "PRESENT",
|
||||
fullName = fullName.trim(),
|
||||
documentType = documentType,
|
||||
documentNumber = documentNumber.trim(),
|
||||
position = position.trim(),
|
||||
email = normalizedEmail.lowercase(),
|
||||
phone = phone?.trim()?.takeIf { it.isNotBlank() },
|
||||
),
|
||||
val request = MobileResponsibleRequest(
|
||||
attendanceStatus = "PRESENT",
|
||||
fullName = fullName.trim(),
|
||||
documentType = documentType,
|
||||
documentNumber = documentNumber.trim(),
|
||||
position = position.trim(),
|
||||
email = normalizedEmail.lowercase(),
|
||||
phone = phone?.trim()?.takeIf { it.isNotBlank() },
|
||||
)
|
||||
notice = "Representante de la empresa registrado para esta 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."
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -463,14 +712,24 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
return
|
||||
}
|
||||
launchBusy(mutation = true) {
|
||||
actClosure = actsRepository.setResponsible(
|
||||
actId,
|
||||
MobileResponsibleRequest(
|
||||
attendanceStatus = "ABSENT",
|
||||
absenceReason = reason.trim(),
|
||||
),
|
||||
val request = MobileResponsibleRequest(
|
||||
attendanceStatus = "ABSENT",
|
||||
absenceReason = reason.trim(),
|
||||
)
|
||||
notice = "Ausencia del representante registrada. La manifestación de la empresa 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."
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -481,10 +740,19 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
return
|
||||
}
|
||||
launchBusy(mutation = true) {
|
||||
actClosure = actsRepository.lock(actId, urgency)
|
||||
refreshSelectedActInternal(actId)
|
||||
offlineQueue.enqueueActLock(actId, urgency)
|
||||
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. La urgencia quedó definida sobre el Acta y su contenido quedó inmutable, pendiente de firmas."
|
||||
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."
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -515,14 +783,28 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
) {
|
||||
val actId = selectedAct?.id ?: return
|
||||
launchBusy(mutation = true) {
|
||||
actClosure = actsRepository.signCompany(
|
||||
actId, png, latitude, longitude, accuracyM, manifestation, statement,
|
||||
offlineQueue.enqueueCompanySignature(
|
||||
actId = actId,
|
||||
source = png,
|
||||
latitude = latitude,
|
||||
longitude = longitude,
|
||||
accuracyM = accuracyM,
|
||||
manifestation = manifestation,
|
||||
statement = statement,
|
||||
)
|
||||
notice = if (manifestation == "DISSENT") {
|
||||
"Firma del representante registrada en disconformidad."
|
||||
val result = offlineQueue.syncAll()
|
||||
refreshOfflineStateInternal()
|
||||
if (!selectedActCompanySignaturePending) {
|
||||
actClosure = actsRepository.closure(actId)
|
||||
notice = if (manifestation == "DISSENT") {
|
||||
"Firma del representante registrada en disconformidad."
|
||||
} else {
|
||||
"Firma del representante de la empresa registrada."
|
||||
}
|
||||
} else {
|
||||
"Firma del representante de la empresa registrada."
|
||||
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 }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -537,8 +819,15 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
return
|
||||
}
|
||||
launchBusy(mutation = true) {
|
||||
actClosure = actsRepository.companyOutcome(actId, status, reason)
|
||||
notice = "Negativa a firmar asentada."
|
||||
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."
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -546,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)
|
||||
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."
|
||||
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)
|
||||
loadVisitsInternal()
|
||||
notice = "Inspección cerrada. Todas sus Actas quedaron firmadas y disponibles para el circuito de oficina."
|
||||
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."
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -597,6 +916,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
selectedAct = null
|
||||
actClosure = null
|
||||
}
|
||||
refreshOfflineStateInternal()
|
||||
}
|
||||
|
||||
private suspend fun refreshSelectedActInternal(actId: String) {
|
||||
@@ -627,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
|
||||
|
||||
@@ -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,25 +479,47 @@ class DhRepository(context: Context) {
|
||||
store.clear()
|
||||
}
|
||||
|
||||
suspend fun visits(): VisitListResponse = authorized { session ->
|
||||
api.visits("Bearer ${session.accessToken}", session.userId)
|
||||
suspend fun visits(): VisitListResponse {
|
||||
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 ->
|
||||
api.visit("Bearer ${session.accessToken}", id)
|
||||
suspend fun visit(id: String): VisitDetail = cached("visit:$id", visitAdapter) {
|
||||
authorized { session -> api.visit("Bearer ${session.accessToken}", id) }
|
||||
}
|
||||
|
||||
suspend fun startVisit(id: String): VisitDetail = authorized { session ->
|
||||
api.startVisit("Bearer ${session.accessToken}", id)
|
||||
suspend fun startVisit(id: String): VisitDetail {
|
||||
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 ->
|
||||
api.fieldInventory("Bearer ${session.accessToken}", visitId, search?.takeIf { it.isNotBlank() }, parentId)
|
||||
suspend fun fieldInventory(visitId: String, search: String?, parentId: String? = null): FieldInventoryListResponse {
|
||||
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 ->
|
||||
api.fieldTypes("Bearer ${session.accessToken}", visitId, parentId)
|
||||
}
|
||||
suspend fun fieldTypes(visitId: String, parentId: String?): FieldTypeResponse =
|
||||
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 ->
|
||||
api.selectFieldAsset("Bearer ${session.accessToken}", visitId, assetId)
|
||||
@@ -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"
|
||||
}
|
||||
|
||||
+51
-8
@@ -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 =
|
||||
authorized { session ->
|
||||
api.options("Bearer ${session.accessToken}", visitId, assetId, actId)
|
||||
suspend fun options(visitId: String, assetId: String, actId: String): FieldFindingOptionsResponse {
|
||||
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,9 +221,10 @@ class FieldFindingsRepository(context: Context) {
|
||||
api.create("Bearer ${session.accessToken}", visitId, assetId, request)
|
||||
}
|
||||
|
||||
suspend fun evidence(findingId: String): FieldFindingEvidenceListResponse = authorized { session ->
|
||||
api.evidence("Bearer ${session.accessToken}", findingId)
|
||||
}
|
||||
suspend fun evidence(findingId: String): FieldFindingEvidenceListResponse =
|
||||
cached("finding-evidence:$findingId", evidenceAdapter) {
|
||||
authorized { session -> api.evidence("Bearer ${session.accessToken}", findingId) }
|
||||
}
|
||||
|
||||
suspend fun uploadObservationPhoto(
|
||||
findingId: String,
|
||||
@@ -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 {
|
||||
|
||||
@@ -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,
|
||||
@@ -194,6 +198,14 @@ data class MobileActClosure(
|
||||
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,
|
||||
@@ -201,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(
|
||||
@@ -236,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,
|
||||
@@ -312,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())
|
||||
@@ -321,28 +344,36 @@ class MobileActsRepository(context: Context) {
|
||||
.build()
|
||||
.create(MobileActsApi::class.java)
|
||||
|
||||
suspend fun list(visitId: String): MobileActListResponse = authorized { session ->
|
||||
api.listActs("Bearer ${session.accessToken}", visitId)
|
||||
}
|
||||
suspend fun list(visitId: String): MobileActListResponse =
|
||||
cached("acts:$visitId", actListAdapter) {
|
||||
authorized { session -> api.listActs("Bearer ${session.accessToken}", visitId) }
|
||||
}
|
||||
|
||||
suspend fun get(actId: String): MobileActDetail = authorized { session ->
|
||||
api.act("Bearer ${session.accessToken}", actId)
|
||||
suspend fun get(actId: String): MobileActDetail = cached("act:$actId", actAdapter) {
|
||||
authorized { session -> api.act("Bearer ${session.accessToken}", actId) }
|
||||
}
|
||||
|
||||
suspend fun create(
|
||||
visitId: String,
|
||||
visitCode: String,
|
||||
): MobileActDetail = authorized { session ->
|
||||
api.createAct(
|
||||
"Bearer ${session.accessToken}",
|
||||
visitId,
|
||||
CreateMobileActRequest(
|
||||
occurredAt = Instant.now().toString(),
|
||||
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(),
|
||||
),
|
||||
)
|
||||
clientGeneratedId: String? = null,
|
||||
occurredAt: String = Instant.now().toString(),
|
||||
): MobileActDetail {
|
||||
val created = authorized { session ->
|
||||
api.createAct(
|
||||
"Bearer ${session.accessToken}",
|
||||
visitId,
|
||||
CreateMobileActRequest(
|
||||
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 {
|
||||
@@ -354,16 +385,25 @@ class MobileActsRepository(context: Context) {
|
||||
}
|
||||
}
|
||||
|
||||
suspend fun closure(actId: String): MobileActClosure = authorized { session ->
|
||||
api.closure("Bearer ${session.accessToken}", actId)
|
||||
suspend fun closure(actId: String): MobileActClosure = cached("act-closure:$actId", closureAdapter) {
|
||||
authorized { session -> api.closure("Bearer ${session.accessToken}", actId) }
|
||||
}
|
||||
|
||||
suspend fun setResponsible(actId: String, request: MobileResponsibleRequest): MobileActClosure = authorized { session ->
|
||||
api.responsible("Bearer ${session.accessToken}", actId, request)
|
||||
suspend fun selfSignatureStatus(): MobileProfileSignatureStatus =
|
||||
cached("self-signature-status", signatureStatusAdapter) {
|
||||
authorized { session -> api.selfSignature("Bearer ${session.accessToken}") }
|
||||
}
|
||||
|
||||
suspend fun setResponsible(actId: String, request: MobileResponsibleRequest): MobileActClosure {
|
||||
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 = authorized { session ->
|
||||
api.lock("Bearer ${session.accessToken}", actId, PrepareMobileActRequest(urgency))
|
||||
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(
|
||||
@@ -382,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,
|
||||
@@ -391,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 ->
|
||||
api.companyOutcome(
|
||||
"Bearer ${session.accessToken}",
|
||||
actId,
|
||||
MobileCompanyOutcomeRequest(status, reason.trim()),
|
||||
)
|
||||
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))
|
||||
return value
|
||||
}
|
||||
|
||||
suspend fun seal(actId: String): MobileActClosure = authorized { session ->
|
||||
api.sealAct("Bearer ${session.accessToken}", actId, MobileSealActRequest())
|
||||
suspend fun seal(
|
||||
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): VisitDetail = authorized { session ->
|
||||
api.closeVisit("Bearer ${session.accessToken}", visitId, MobileCloseVisitRequest())
|
||||
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(
|
||||
@@ -418,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(
|
||||
@@ -426,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)
|
||||
@@ -446,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 {
|
||||
|
||||
+622
@@ -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() }
|
||||
+202
-72
@@ -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(
|
||||
findingId = findingId,
|
||||
file = file,
|
||||
latitude = geo.latitude,
|
||||
longitude = geo.longitude,
|
||||
accuracyM = geo.accuracyM,
|
||||
title = "Evidencia fotográfica de campo",
|
||||
)
|
||||
reviewPhotoFile = file
|
||||
reviewPhotoGeo = geo
|
||||
reviewPhotoFindingId = findingId
|
||||
} else {
|
||||
file?.delete()
|
||||
}
|
||||
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
|
||||
?: "Este tipo de Inventario todavía no tiene un catálogo contextual configurado. Podés usar OTROS.",
|
||||
color = MaterialTheme.colorScheme.secondary,
|
||||
"No hay tipos sugeridos para este Inventario. Elegí Otro para cargarlo manualmente.",
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
)
|
||||
}
|
||||
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()
|
||||
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),
|
||||
) {
|
||||
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,
|
||||
filtered.forEach { item ->
|
||||
DropdownMenuItem(
|
||||
text = {
|
||||
Column {
|
||||
Text(item.title, fontWeight = FontWeight.SemiBold)
|
||||
item.suggestedSeverity?.let {
|
||||
Text("Gravedad sugerida: $it/10", style = MaterialTheme.typography.bodySmall)
|
||||
}
|
||||
}
|
||||
},
|
||||
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)
|
||||
},
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
OutlinedButton(
|
||||
onClick = {
|
||||
other = true
|
||||
selectedCatalogId = null
|
||||
severityText = ""
|
||||
},
|
||||
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") },
|
||||
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)") },
|
||||
label = { Text("Gravedad (1 a 10, 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)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -92,26 +92,17 @@ 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,
|
||||
longitude = geo?.longitude,
|
||||
accuracyM = geo?.accuracyM,
|
||||
manifestation = manifestation,
|
||||
statement = dissentStatement.takeIf { manifestation == "DISSENT" },
|
||||
)
|
||||
} else {
|
||||
model.signSelectedActAsInspector(
|
||||
png = file,
|
||||
latitude = geo?.latitude,
|
||||
longitude = geo?.longitude,
|
||||
accuracyM = geo?.accuracyM,
|
||||
)
|
||||
}
|
||||
model.signSelectedActAsCompany(
|
||||
png = file,
|
||||
latitude = geo?.latitude,
|
||||
longitude = geo?.longitude,
|
||||
accuracyM = geo?.accuracyM,
|
||||
manifestation = manifestation,
|
||||
statement = dissentStatement.takeIf { manifestation == "DISSENT" },
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -188,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(
|
||||
@@ -263,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 una única urgencia para el Acta completa; no para cada Hallazgo.")
|
||||
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" },
|
||||
@@ -278,50 +247,39 @@ 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("El contenido ya es inmutable. Sólo resta resolver firmas y manifestaciones para poder SELLARLA.")
|
||||
closure?.closure?.preparedSha256?.let { Text("Hash bloqueado: $it", style = MaterialTheme.typography.bodySmall) }
|
||||
Text("Para firmar", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
|
||||
Text("El contenido ya es inmutable. La firma del inspector está guardada en el Dashboard y se aplicará al cierre final.")
|
||||
|
||||
HorizontalDivider()
|
||||
Text("Firma del inspector", 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)
|
||||
Text("Acompañante / representante de la empresa", fontWeight = FontWeight.Bold)
|
||||
if (companyOutcome != null && companyResolved) {
|
||||
val detail = when (companyOutcome.status) {
|
||||
"SIGNED" -> if (companyOutcome.companyManifestation == "DISSENT") "Firma en disconformidad" else "Firma en conformidad"
|
||||
"REFUSED" -> "Negativa a firmar"
|
||||
"SIGNED" -> if (companyOutcome.companyManifestation == "DISSENT") "Firmó en disconformidad" else "Firmó en conformidad"
|
||||
"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(
|
||||
"El representante fue registrado como ausente. La ausencia NO resuelve la manifestación: deberá obtenerse firma o negativa posteriormente antes de SELLAR el Acta.",
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
)
|
||||
val recordedAbsence = closure.responsible.absenceReason.orEmpty()
|
||||
Text("El representante fue registrado como ausente. Confirmá esta ausencia para dejar la constancia documental.")
|
||||
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 disconformidad" else "En disconformidad") })
|
||||
@@ -336,11 +294,10 @@ fun MobileActsScreen(
|
||||
)
|
||||
}
|
||||
SignaturePad(
|
||||
label = "Firma del representante de la empresa",
|
||||
enabled = !model.busy && inspectorSigned && (manifestation != "DISSENT" || dissentStatement.trim().length >= 10),
|
||||
onCaptured = { file -> signWithGeo(file, company = true) },
|
||||
label = "Firma del representante de la empresa (acompañante)",
|
||||
enabled = !model.busy && (manifestation != "DISSENT" || dissentStatement.trim().length >= 10),
|
||||
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 },
|
||||
@@ -350,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(
|
||||
"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,
|
||||
)
|
||||
Text("Completá la firma, disconformidad o negativa del acompañante para habilitar el cierre final.", style = MaterialTheme.typography.bodySmall)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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,
|
||||
horizontalArrangement = Arrangement.SpaceBetween,
|
||||
verticalArrangement = Arrangement.spacedBy(8.dp),
|
||||
) {
|
||||
Column {
|
||||
Text("Mis inspecciones", style = MaterialTheme.typography.headlineSmall, fontWeight = FontWeight.Bold)
|
||||
Text(session.displayName, style = MaterialTheme.typography.bodySmall)
|
||||
}
|
||||
Row {
|
||||
OutlinedButton(onClick = { model.loadVisits() }, enabled = !model.busy && !opening) {
|
||||
Text("Actualizar")
|
||||
Row(
|
||||
Modifier.fillMaxWidth(),
|
||||
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") }
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+149
-137
@@ -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
|
||||
@@ -77,40 +76,29 @@ fun ModernMobileActsScreen(
|
||||
val scope = rememberCoroutineScope()
|
||||
|
||||
var closingUrgency by rememberSaveable(selected?.id) { mutableStateOf("") }
|
||||
var attendance by rememberSaveable(selected?.id) { mutableStateOf(representativeSeed?.attendanceStatus ?: "PRESENT") }
|
||||
var fullName by rememberSaveable(selected?.id) { mutableStateOf(representativeSeed?.fullName.orEmpty()) }
|
||||
var documentType by rememberSaveable(selected?.id) { mutableStateOf("DNI") }
|
||||
var documentNumber by rememberSaveable(selected?.id) { mutableStateOf(representativeSeed?.documentNumber.orEmpty()) }
|
||||
var position by rememberSaveable(selected?.id) { mutableStateOf(representativeSeed?.position.orEmpty()) }
|
||||
var email by rememberSaveable(selected?.id) { mutableStateOf(representativeSeed?.email.orEmpty()) }
|
||||
var phone by rememberSaveable(selected?.id) { mutableStateOf(representativeSeed?.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,
|
||||
longitude = geo?.longitude,
|
||||
accuracyM = geo?.accuracyM,
|
||||
manifestation = manifestation,
|
||||
statement = dissentStatement.takeIf { manifestation == "DISSENT" },
|
||||
)
|
||||
} else {
|
||||
model.signSelectedActAsInspector(
|
||||
png = file,
|
||||
latitude = geo?.latitude,
|
||||
longitude = geo?.longitude,
|
||||
accuracyM = geo?.accuracyM,
|
||||
)
|
||||
}
|
||||
model.signSelectedActAsCompany(
|
||||
png = file,
|
||||
latitude = geo?.latitude,
|
||||
longitude = geo?.longitude,
|
||||
accuracyM = geo?.accuracyM,
|
||||
manifestation = manifestation,
|
||||
statement = dissentStatement.takeIf { manifestation == "DISSENT" },
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -148,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(
|
||||
@@ -172,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,
|
||||
tonalElevation = if (active) 1.dp else 0.dp,
|
||||
border = BorderStroke(
|
||||
if (active) 2.dp else 1.dp,
|
||||
if (active) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.outlineVariant,
|
||||
),
|
||||
color = if (active) MaterialTheme.colorScheme.primaryContainer else MaterialTheme.colorScheme.surfaceVariant,
|
||||
tonalElevation = 0.dp,
|
||||
) {
|
||||
Row(
|
||||
Modifier.padding(15.dp),
|
||||
@@ -245,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()) {
|
||||
@@ -296,37 +276,23 @@ fun ModernMobileActsScreen(
|
||||
Spacer(Modifier.width(8.dp))
|
||||
Text("Representante de la empresa", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
|
||||
}
|
||||
Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
FilterChip(selected = attendance == "PRESENT", onClick = { attendance = "PRESENT" }, label = { Text("Presente") })
|
||||
FilterChip(selected = attendance == "ABSENT", onClick = { attendance = "ABSENT" }, label = { Text("Ausente") })
|
||||
}
|
||||
if (attendance == "PRESENT") {
|
||||
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)
|
||||
}
|
||||
Button(
|
||||
onClick = { model.setCompanyResponsiblePresent(fullName, documentType, documentNumber, position, email, phone) },
|
||||
enabled = !model.busy && fullName.isNotBlank() && documentNumber.isNotBlank() && position.isNotBlank() && email.contains("@") && email.contains("."),
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
) { 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") }
|
||||
Text(
|
||||
"Identificá a la persona que acompaña el recorrido. Al finalizar esta Acta podrá firmar conforme, firmar en disconformidad o negarse a firmar.",
|
||||
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)
|
||||
}
|
||||
Button(
|
||||
onClick = { model.setCompanyResponsiblePresent(fullName, documentType, documentNumber, position, email, phone) },
|
||||
enabled = !model.busy && fullName.isNotBlank() && documentNumber.isNotBlank() && position.isNotBlank() && email.contains("@") && email.contains("."),
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
) { Text("Guardar representante") }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -338,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 del Acta completa. La urgencia no se asigna a cada Hallazgo.",
|
||||
"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)
|
||||
@@ -367,64 +333,100 @@ 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 disconformidad" 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) {
|
||||
Text(
|
||||
"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.ErrorOutline, null, tint = MaterialTheme.colorScheme.error)
|
||||
Icon(Icons.Filled.CheckCircle, null, tint = MaterialTheme.colorScheme.primary)
|
||||
Text(
|
||||
"La ausencia no resuelve la manifestación. Debe registrarse firma o negativa antes de firmar y cerrar el Acta.",
|
||||
"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 disconformidad") })
|
||||
@@ -439,11 +441,11 @@ fun ModernMobileActsScreen(
|
||||
)
|
||||
}
|
||||
SignaturePad(
|
||||
label = "Firma del representante de la empresa",
|
||||
enabled = !model.busy && inspectorSigned && (manifestation != "DISSENT" || dissentStatement.trim().length >= 10),
|
||||
onCaptured = { file -> signWithGeo(file, company = true) },
|
||||
label = "Firma del representante de la empresa (acompañante)",
|
||||
enabled = !model.busy && (manifestation != "DISSENT" || dissentStatement.trim().length >= 10),
|
||||
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 },
|
||||
@@ -453,24 +455,34 @@ 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) {
|
||||
Button(
|
||||
onClick = { model.closeSelectedAct() },
|
||||
enabled = !model.busy,
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
) {
|
||||
Icon(Icons.Filled.CheckCircle, null)
|
||||
Spacer(Modifier.width(6.dp))
|
||||
Text("Firmar y cerrar Acta")
|
||||
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,
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
) {
|
||||
Icon(Icons.Filled.CheckCircle, null)
|
||||
Spacer(Modifier.width(6.dp))
|
||||
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,
|
||||
)
|
||||
|
||||
@@ -63,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
|
||||
@@ -778,6 +779,11 @@ private fun ModernFieldInventoryScreen(model: MainViewModel, onBack: () -> Unit)
|
||||
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,
|
||||
@@ -818,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,
|
||||
@@ -828,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() },
|
||||
),
|
||||
)
|
||||
|
||||
editableAttributes.forEach { definition ->
|
||||
editableAttributes.forEachIndexed { index, definition ->
|
||||
val isLastAttribute = index == editableAttributes.lastIndex
|
||||
OutlinedTextField(
|
||||
value = attributeValues[definition.code].orEmpty(),
|
||||
onValueChange = { attributeValues[definition.code] = it },
|
||||
@@ -849,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,
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 6.5 KiB After Width: | Height: | Size: 8.2 KiB |
+13
-3
@@ -20,15 +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(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 del Acta completa"))
|
||||
assertTrue(acts.contains("urgencia pertenece al Acta completa"))
|
||||
assertTrue(acts.contains("urgencia no se asigna a cada Hallazgo"))
|
||||
assertTrue(labels.contains("\"LOCKED\" -> \"Pendiente de firma\""))
|
||||
assertTrue(labels.contains("\"LOCKED\" -> \"Para firmar\""))
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -63,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"))
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -8,8 +8,8 @@ class ReleaseMetadataTest {
|
||||
@Test
|
||||
fun debugBuildKeepsSeparateApplicationIdentity() {
|
||||
assertEquals("com.korexlabs.dhinspeccion.debug", BuildConfig.APPLICATION_ID)
|
||||
assertEquals(33, BuildConfig.VERSION_CODE)
|
||||
assertEquals("0.19.5-debug", BuildConfig.VERSION_NAME)
|
||||
assertEquals(38, BuildConfig.VERSION_CODE)
|
||||
assertEquals("0.19.10-debug", BuildConfig.VERSION_NAME)
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "dhv2-api",
|
||||
"version": "0.29.0-4",
|
||||
"version": "0.29.0-8",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "dhv2-api",
|
||||
"version": "0.29.0-4",
|
||||
"version": "0.29.0-8",
|
||||
"license": "UNLICENSED",
|
||||
"dependencies": {
|
||||
"@nestjs/common": "^11.0.0",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "dhv2-api",
|
||||
"version": "0.29.0-4",
|
||||
"version": "0.29.0-8",
|
||||
"private": true,
|
||||
"license": "UNLICENSED",
|
||||
"scripts": {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import {
|
||||
Body,
|
||||
Controller,
|
||||
Delete,
|
||||
Get,
|
||||
Param,
|
||||
ParseUUIDPipe,
|
||||
@@ -9,7 +10,12 @@ 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';
|
||||
@@ -19,6 +25,10 @@ import type {
|
||||
} 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';
|
||||
@@ -58,6 +68,45 @@ export class UsersController {
|
||||
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);
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
import { createHash } from 'node:crypto';
|
||||
import {
|
||||
BadRequestException,
|
||||
ConflictException,
|
||||
ForbiddenException,
|
||||
Injectable,
|
||||
NotFoundException,
|
||||
} from '@nestjs/common';
|
||||
@@ -31,6 +33,10 @@ 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;
|
||||
@@ -38,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;
|
||||
@@ -192,6 +206,87 @@ export class UsersService {
|
||||
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,
|
||||
|
||||
@@ -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'],
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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()];
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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}$'
|
||||
)
|
||||
`);
|
||||
}
|
||||
}
|
||||
@@ -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');
|
||||
}
|
||||
}
|
||||
@@ -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');
|
||||
}
|
||||
}
|
||||
@@ -12,6 +12,10 @@ import {
|
||||
} from 'class-validator';
|
||||
|
||||
export class CreateInspectionActDto {
|
||||
@IsOptional()
|
||||
@IsUUID('4')
|
||||
clientGeneratedId?: string;
|
||||
|
||||
@IsISO8601({ strict: true })
|
||||
occurredAt!: string;
|
||||
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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;
|
||||
@@ -306,21 +314,24 @@ export class InspectionClosingService {
|
||||
const lockedAt = new Date();
|
||||
|
||||
const [updated] = (await manager.query(`
|
||||
UPDATE inspection_acts
|
||||
SET status='LOCKED',
|
||||
urgency=$2,
|
||||
deadline_days=$3,
|
||||
deadline_day_type=$4,
|
||||
deadline_basis=$5,
|
||||
deadline_base_at=$6,
|
||||
deadline_at=$7,
|
||||
locked_at=$8,
|
||||
locked_by=$9,
|
||||
current_version=current_version+1,
|
||||
updated_by=$9,
|
||||
updated_at=$8
|
||||
WHERE id=$1
|
||||
RETURNING current_version AS "versionNumber"
|
||||
WITH updated AS (
|
||||
UPDATE inspection_acts
|
||||
SET status='LOCKED',
|
||||
urgency=$2,
|
||||
deadline_days=$3,
|
||||
deadline_day_type=$4,
|
||||
deadline_basis=$5,
|
||||
deadline_base_at=$6,
|
||||
deadline_at=$7,
|
||||
locked_at=$8,
|
||||
locked_by=$9,
|
||||
current_version=current_version+1,
|
||||
updated_by=$9,
|
||||
updated_at=$8
|
||||
WHERE id=$1
|
||||
RETURNING current_version
|
||||
)
|
||||
SELECT current_version AS "versionNumber" FROM updated
|
||||
`, [
|
||||
actId,
|
||||
dto.urgency,
|
||||
@@ -377,7 +388,7 @@ export class InspectionClosingService {
|
||||
afterData: {
|
||||
status: InspectionActStatus.LOCKED,
|
||||
lockedSha256: preparedSha256,
|
||||
urgency: act.urgency,
|
||||
urgency: dto.urgency,
|
||||
deadlineDays,
|
||||
deadlineDayType,
|
||||
deadlineBasis,
|
||||
@@ -461,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',
|
||||
@@ -532,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);
|
||||
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',
|
||||
});
|
||||
}
|
||||
let signatures = await this.loadSignatures(manager, actId);
|
||||
const companyOutcomes = signatures.filter((item) =>
|
||||
item.signerType === InspectionActSignerType.COMPANY_RESPONSIBLE,
|
||||
);
|
||||
@@ -557,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);
|
||||
@@ -619,18 +641,21 @@ export class InspectionClosingService {
|
||||
WHERE act_id=$1
|
||||
`, [actId, finalSnapshot, finalSha256, deviceSealedAt, serverSealedAt, dto.uploadMode, principal.userId]);
|
||||
const [updated] = (await manager.query(`
|
||||
UPDATE inspection_acts
|
||||
SET status='SEALED',
|
||||
sealed_at=$2,
|
||||
sealed_by=$3,
|
||||
closed_at=$2,
|
||||
closed_by=$3,
|
||||
closure_sha256=$4,
|
||||
current_version=current_version+1,
|
||||
updated_by=$3,
|
||||
updated_at=$2
|
||||
WHERE id=$1
|
||||
RETURNING current_version AS "versionNumber"
|
||||
WITH updated AS (
|
||||
UPDATE inspection_acts
|
||||
SET status='SEALED',
|
||||
sealed_at=$2,
|
||||
sealed_by=$3,
|
||||
closed_at=$2,
|
||||
closed_by=$3,
|
||||
closure_sha256=$4,
|
||||
current_version=current_version+1,
|
||||
updated_by=$3,
|
||||
updated_at=$2
|
||||
WHERE id=$1
|
||||
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,7 +689,11 @@ export class InspectionClosingService {
|
||||
}, manager);
|
||||
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;
|
||||
}
|
||||
@@ -1171,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();
|
||||
|
||||
@@ -16,6 +16,10 @@ import {
|
||||
} from '../../database/entities';
|
||||
|
||||
export class CreateInspectionEvidenceDto {
|
||||
@IsOptional()
|
||||
@IsUUID('4')
|
||||
operationId?: string;
|
||||
|
||||
@IsEnum(InspectionEvidenceKind)
|
||||
kind!: InspectionEvidenceKind;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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({
|
||||
|
||||
@@ -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(`
|
||||
UPDATE inspection_findings
|
||||
SET current_version = current_version + 1
|
||||
WHERE id = $1
|
||||
RETURNING current_version AS "versionNumber"
|
||||
WITH updated AS (
|
||||
UPDATE inspection_findings
|
||||
SET current_version = current_version + 1
|
||||
WHERE id = $1
|
||||
RETURNING current_version
|
||||
)
|
||||
SELECT current_version AS "versionNumber" FROM updated
|
||||
`, [finding.id]) as Array<{ versionNumber: number }>;
|
||||
const versionNumber = Number(row.versionNumber);
|
||||
finding.currentVersion = versionNumber;
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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,
|
||||
],
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -14,6 +14,10 @@ import {
|
||||
} from 'class-validator';
|
||||
|
||||
export class CreateFieldInventoryDto {
|
||||
@IsOptional()
|
||||
@IsUUID('4')
|
||||
clientGeneratedId?: string;
|
||||
|
||||
@IsUUID('4')
|
||||
typeId!: string;
|
||||
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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(`
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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
|
||||
) VALUES ($1,$2,$3,'PHOTO',$4,$5,$6,$7,$8,$9,$10,$11,$12)
|
||||
created_by, client_operation_id
|
||||
) 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) };
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
export const API_VERSION = '0.29.0-4';
|
||||
export const API_PHASE = 'F6.2';
|
||||
export const API_VERSION = '0.29.0-8';
|
||||
export const API_PHASE = 'F6.8';
|
||||
|
||||
@@ -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'/);
|
||||
|
||||
@@ -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', () => {
|
||||
assert.match(viewModel, /actsRepository\.lock\(actId, urgency\)/);
|
||||
assert.match(viewModel, /actsRepository\.seal\(actId\)/);
|
||||
test('F6.8 Android ViewModel persists lock and seal through the offline queue', () => {
|
||||
assert.match(viewModel, /offlineQueue\.enqueueActLock\(actId, urgency\)/);
|
||||
assert.match(viewModel, /offlineQueue\.enqueueSeal\(actId\)/);
|
||||
assert.doesNotMatch(viewModel, /actsRepository\.prepare\(/);
|
||||
assert.doesNotMatch(viewModel, /actsRepository\.reopen\(/);
|
||||
assert.doesNotMatch(viewModel, /actsRepository\.closeAct\(/);
|
||||
|
||||
@@ -4,9 +4,9 @@ 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', () => {
|
||||
assert.equal(API_PHASE, 'F6.2');
|
||||
test('health metadata reports the current F6.8 release', () => {
|
||||
assert.equal(API_PHASE, 'F6.8');
|
||||
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-4');
|
||||
assert.equal(API_VERSION, '0.29.0-8');
|
||||
});
|
||||
@@ -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/);
|
||||
|
||||
@@ -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/);
|
||||
|
||||
@@ -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 = 33/);
|
||||
assert.match(gradle, /versionName = "0\.19\.5"/);
|
||||
assert.match(gradle, /versionCode = 38/);
|
||||
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/);
|
||||
});
|
||||
|
||||
@@ -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/);
|
||||
});
|
||||
|
||||
|
||||
@@ -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\.2 · Firma por Acta y correo de usuario'/);
|
||||
assert.match(version, /APP_PHASE\s*=\s*'F6\.8/);
|
||||
});
|
||||
|
||||
test('F6.1 presentation keeps Relevamientos retired from WEB navigation and routes', () => {
|
||||
@@ -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/);
|
||||
});
|
||||
|
||||
@@ -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 \*/);
|
||||
});
|
||||
@@ -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);
|
||||
});
|
||||
@@ -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/);
|
||||
});
|
||||
@@ -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);
|
||||
});
|
||||
@@ -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.
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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>
|
||||
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "dhv2-web",
|
||||
"version": "0.23.0-3",
|
||||
"version": "0.23.0-5",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "dhv2-web",
|
||||
"version": "0.23.0-3",
|
||||
"version": "0.23.0-5",
|
||||
"dependencies": {
|
||||
"maplibre-gl": "6.4.1",
|
||||
"react": "^19.0.0",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "dhv2-web",
|
||||
"version": "0.23.0-3",
|
||||
"version": "0.23.0-5",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"engines": {
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 8.2 KiB |
@@ -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">
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
export const APP_VERSION = '0.23.0-3';
|
||||
export const APP_PHASE = 'F6.2 · Firma por Acta y correo de usuario';
|
||||
export const APP_VERSION = '0.23.0-5';
|
||||
export const APP_PHASE = 'F6.8 · Offline seguro y Acta documental';
|
||||
|
||||
@@ -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}>
|
||||
|
||||
@@ -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>5</span><strong>Subinstalación</strong><small>clasificación técnica</small></div>
|
||||
<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>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>;
|
||||
|
||||
@@ -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>;
|
||||
|
||||
@@ -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>;
|
||||
}
|
||||
|
||||
@@ -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>;
|
||||
}
|
||||
+33
-2
@@ -933,10 +933,12 @@ export interface InspectionVisit extends InspectionVisitListItem {
|
||||
}
|
||||
|
||||
export type InspectionActStatus =
|
||||
| 'DRAFT' | 'READY' | 'CLOSED' | 'CANCELLED' | 'RECTIFIED';
|
||||
| 'DRAFT' | 'LOCKED' | 'SEALED' | 'CANCELLED'
|
||||
| 'READY' | 'CLOSED' | 'RECTIFIED';
|
||||
|
||||
export type InspectionActVersionEvent =
|
||||
| 'CREATED' | 'UPDATED' | 'READY' | 'REOPENED' | 'CLOSED' | 'CANCELLED';
|
||||
| 'CREATED' | 'UPDATED' | 'LOCKED' | 'SEALED' | 'CANCELLED'
|
||||
| 'READY' | 'REOPENED' | 'CLOSED';
|
||||
|
||||
export interface InspectionActListItem {
|
||||
id: string;
|
||||
@@ -992,6 +994,27 @@ export interface InspectionAct extends InspectionActListItem {
|
||||
versions: InspectionActVersion[];
|
||||
}
|
||||
|
||||
export interface InspectionActFieldMedia {
|
||||
id: string;
|
||||
assetId: string;
|
||||
assetCode: string;
|
||||
assetName: string;
|
||||
kind: AssetMediaKind;
|
||||
originalName: string;
|
||||
mimeType: string;
|
||||
sizeBytes: number;
|
||||
sha256: string;
|
||||
title: string | null;
|
||||
description: string | null;
|
||||
capturedAt: string | null;
|
||||
latitude: number | null;
|
||||
longitude: number | null;
|
||||
accuracyM: number | null;
|
||||
source: 'WEB' | 'ANDROID' | 'IMPORT';
|
||||
fieldCapturedAt: string;
|
||||
createdAt: string;
|
||||
}
|
||||
|
||||
export type InspectionReportStatus = 'FROZEN' | 'CANCELLED';
|
||||
export type InspectionReportPdfStatus = 'PENDING' | 'READY' | 'FAILED';
|
||||
export type InspectionReportWordStatus = 'PENDING' | 'READY' | 'FAILED';
|
||||
@@ -2684,6 +2707,14 @@ export function getInspectionAct(id: string) {
|
||||
return apiRequest<InspectionAct>(`/inspection-acts/${id}`);
|
||||
}
|
||||
|
||||
export function getInspectionActPdfBlob(actId: string) {
|
||||
return apiBlobRequest(`/inspection-acts/${actId}/pdf`);
|
||||
}
|
||||
|
||||
export async function listInspectionActFieldMedia(actId: string) {
|
||||
return (await apiRequest<{ data: InspectionActFieldMedia[] }>(`/inspection-acts/${actId}/field-media`)).data;
|
||||
}
|
||||
|
||||
export function getInspectionClosure(actId: string) {
|
||||
return apiRequest<InspectionClosure>(`/inspection-acts/${actId}/closure`);
|
||||
}
|
||||
|
||||
@@ -23,6 +23,15 @@ export interface UserSmtpSettings {
|
||||
custom: UserSmtpCustomSettings | null;
|
||||
}
|
||||
|
||||
|
||||
export interface UserReusableSignature {
|
||||
configured: boolean;
|
||||
mimeType: 'image/png' | null;
|
||||
sizeBytes: number | null;
|
||||
imageSha256: string | null;
|
||||
updatedAt: string | null;
|
||||
}
|
||||
|
||||
export interface UserSmtpSettingsInput {
|
||||
mode: UserSmtpMode;
|
||||
host?: string;
|
||||
@@ -65,3 +74,26 @@ export function testSelfSmtpSettings() {
|
||||
method: 'POST',
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
export function getSelfSignature() {
|
||||
return apiRequest<UserReusableSignature>('/users/self/signature');
|
||||
}
|
||||
|
||||
export function saveSelfSignature(file: File) {
|
||||
const body = new FormData();
|
||||
body.append('file', file);
|
||||
return apiRequest<UserReusableSignature>('/users/self/signature', {
|
||||
method: 'PUT',
|
||||
body,
|
||||
});
|
||||
}
|
||||
|
||||
export function deleteSelfSignature() {
|
||||
return apiRequest<UserReusableSignature>('/users/self/signature', { method: 'DELETE' });
|
||||
}
|
||||
|
||||
export function selfSignatureContentUrl(signature: UserReusableSignature) {
|
||||
const version = signature.imageSha256 ? `?v=${encodeURIComponent(signature.imageSha256)}` : '';
|
||||
return `/api/v3/users/self/signature/content${version}`;
|
||||
}
|
||||
|
||||
@@ -52,8 +52,8 @@ const LEVELS: Array<{ kind: CanonicalKind; label: string; description: string }>
|
||||
{ kind: 'DEPARTAMENTO', label: 'Departamento', description: 'Raíz territorial de la estructura física.' },
|
||||
{ kind: 'AREA', label: 'Área', description: 'Pertenece obligatoriamente a un Departamento.' },
|
||||
{ kind: 'YACIMIENTO', label: 'Yacimiento', description: 'Pertenece a un Área; su nombre puede repetirse en otra Área.' },
|
||||
{ kind: 'INSTALACION', label: 'Instalación', description: 'Instancia dentro de un Yacimiento y con clasificación técnica.' },
|
||||
{ kind: 'SUBINSTALACION', label: 'Subinstalación', description: 'Instancia dentro de una Instalación y con clasificación técnica.' },
|
||||
{ kind: 'INSTALACION', label: 'Instalación', description: 'Instancia dentro de un Yacimiento y con tipo de instalación.' },
|
||||
{ kind: 'SUBINSTALACION', label: 'Subinstalación', description: 'Instancia dentro de una Instalación y con tipo de subinstalación.' },
|
||||
];
|
||||
|
||||
function canonicalType(types: AssetType[], kind: CanonicalKind): AssetType | null {
|
||||
@@ -190,7 +190,7 @@ export function AssetTypesPage() {
|
||||
if (canManageFindings) await replaceInventoryFamilyFindings(familyEditor.id, {
|
||||
itemIds: [...familyFindingIds], reason: 'Actualización desde Configuración de Inventarios F6',
|
||||
});
|
||||
setSuccess('Clasificación actualizada.'); await load(); setFamilyEditor(null);
|
||||
setSuccess('Tipo actualizado.'); await load(); setFamilyEditor(null);
|
||||
}
|
||||
} catch (requestError) { setError(errorMessage(requestError)); }
|
||||
finally { setSaving(false); }
|
||||
@@ -258,35 +258,35 @@ export function AssetTypesPage() {
|
||||
|
||||
if (loading) return <LoadingBlock label="Cargando configuración de Inventarios…" />;
|
||||
return <section className="inventory-config-page">
|
||||
<div className="page-heading"><div><span className="eyebrow">ADMINISTRACIÓN</span><h1>Configuración de Inventarios</h1><p>Administrá clasificaciones, compatibilidades, Hallazgos y campos técnicos desde un único lugar.</p></div>{canManage && <Link className="button primary" to="/inventarios/nuevo"><Icon name="plus" />Agregar registro</Link>}</div>
|
||||
<div className="page-heading"><div><span className="eyebrow">ADMINISTRACIÓN</span><h1>Configuración de Inventarios</h1><p>Administrá tipos de instalación y subinstalación, compatibilidades, Hallazgos y campos técnicos desde un único lugar.</p></div>{canManage && <Link className="button primary" to="/inventarios/nuevo"><Icon name="plus" />Agregar registro</Link>}</div>
|
||||
{error && <Alert>{error}</Alert>}{success && <Alert type="success">{success}</Alert>}
|
||||
|
||||
<div className="panel" style={{ marginBottom: 18 }}><div className="panel-heading"><div><span className="eyebrow">MODELO F6</span><h2>Estructura física fija</h2><p className="section-copy">La clasificación describe qué es cada Instalación/Subinstalación, pero nunca altera su nivel jerárquico.</p></div></div><div className="asset-browser-levels" aria-label="Estructura de Inventarios"><div><span>1</span><strong>Departamento</strong><small>raíz territorial</small></div><i>›</i><div><span>2</span><strong>Área</strong><small>dentro del Departamento</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>5</span><strong>Subinstalación</strong><small>clasificación técnica</small></div></div><div className="temporal-notice" style={{ marginTop: 14 }}><Icon name="users" /><p><strong>Empresa:</strong> maestro independiente; su relación con Área no reescribe el árbol físico.</p></div></div>
|
||||
<div className="panel" style={{ marginBottom: 18 }}><div className="panel-heading"><div><span className="eyebrow">MODELO F6</span><h2>Estructura física fija</h2><p className="section-copy">El tipo describe qué es cada Instalación/Subinstalación, pero nunca altera su nivel jerárquico.</p></div></div><div className="asset-browser-levels" aria-label="Estructura de Inventarios"><div><span>1</span><strong>Departamento</strong><small>raíz territorial</small></div><i>›</i><div><span>2</span><strong>Área</strong><small>dentro del Departamento</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>tipo de instalación</small></div><i>›</i><div><span>5</span><strong>Subinstalación</strong><small>tipo de subinstalación</small></div></div><div className="temporal-notice" style={{ marginTop: 14 }}><Icon name="users" /><p><strong>Empresa:</strong> maestro independiente; su relación con Área no reescribe el árbol físico.</p></div></div>
|
||||
|
||||
<div className="dashboard-grid" style={{ alignItems: 'start' }}>
|
||||
<article className="panel"><div className="panel-heading"><div><span className="eyebrow">CLASIFICACIONES</span><h2>Tipos de Instalación</h2><p className="section-copy">Tocá uno para editar Hallazgos, campos técnicos y ver sus Subinstalaciones compatibles.</p></div>{canManage && <button className="button primary" onClick={() => openNewFamily('INSTALLATION')}><Icon name="plus" />Nuevo tipo</button>}</div><div className="attribute-list">{installationFamilies.filter((family) => family.isActive !== false).map((family) => <button type="button" className={`attribute-card ${selectedInstallationFamilyId === family.id ? 'active' : ''}`} key={family.id} onClick={() => void openFamily(family)}><span className="asset-symbol"><Icon name="layers" size={16} /></span><span><strong>{family.name}</strong><small>{family.findingCount ?? 0} Hallazgos · {family.technicalAttributeCount ?? 0} campos técnicos</small></span><span className="tag">{family.assetCount ?? 0} registros</span><Icon name="chevron" /></button>)}</div></article>
|
||||
<article className="panel"><div className="panel-heading"><div><span className="eyebrow">COMPATIBILIDAD</span><h2>Tipos de Subinstalación</h2><p className="section-copy">Una misma clasificación puede ser válida para varias Instalaciones.</p></div>{canManage && <button className="button primary" onClick={() => openNewFamily('SUBINSTALLATION')}><Icon name="plus" />Nuevo tipo</button>}</div><label className="field" style={{ marginBottom: 14 }}><span>Filtrar por tipo de Instalación</span><SearchableSelect value={selectedInstallationFamilyId} onChange={(event) => setSelectedInstallationFamilyId(event.target.value)}><option value="">Todas las Instalaciones</option>{installationFamilies.filter((family) => family.isActive !== false).map((family) => <option key={family.id} value={family.id}>{family.name}</option>)}</SearchableSelect></label>{visibleSubinstallationFamilies.length === 0 ? <div className="inline-empty">{selectedInstallationFamilyId ? 'No hay tipos compatibles con esta Instalación.' : 'No hay tipos de Subinstalación configurados.'}</div> : <div className="attribute-list" style={{ maxHeight: 560, overflow: 'auto' }}>{visibleSubinstallationFamilies.map((family) => <button type="button" className="attribute-card" key={family.id} onClick={() => void openFamily(family)}><span className="asset-symbol"><Icon name="layers" size={16} /></span><span><strong>{family.name}</strong><small>{family.parentFamilies.map((parent) => parent.name).join(' · ') || 'Sin compatibilidades'} · {family.findingCount ?? 0} Hallazgos</small></span><span className="tag">{family.assetCount ?? 0} registros</span><Icon name="chevron" /></button>)}</div>}</article>
|
||||
<article className="panel"><div className="panel-heading"><div><span className="eyebrow">TIPOS DE INSTALACIÓN</span><h2>Tipos de Instalación</h2><p className="section-copy">Tocá uno para editar Hallazgos, campos técnicos y ver sus Subinstalaciones compatibles.</p></div>{canManage && <button className="button primary" onClick={() => openNewFamily('INSTALLATION')}><Icon name="plus" />Nuevo tipo</button>}</div><div className="attribute-list">{installationFamilies.filter((family) => family.isActive !== false).map((family) => <button type="button" className={`attribute-card ${selectedInstallationFamilyId === family.id ? 'active' : ''}`} key={family.id} onClick={() => void openFamily(family)}><span className="asset-symbol"><Icon name="layers" size={16} /></span><span><strong>{family.name}</strong><small>{family.findingCount ?? 0} Hallazgos · {family.technicalAttributeCount ?? 0} campos técnicos</small></span><span className="tag">{family.assetCount ?? 0} registros</span><Icon name="chevron" /></button>)}</div></article>
|
||||
<article className="panel"><div className="panel-heading"><div><span className="eyebrow">COMPATIBILIDAD</span><h2>Tipos de Subinstalación</h2><p className="section-copy">Un mismo tipo de subinstalación puede ser válido para varias Instalaciones.</p></div>{canManage && <button className="button primary" onClick={() => openNewFamily('SUBINSTALLATION')}><Icon name="plus" />Nuevo tipo</button>}</div><label className="field" style={{ marginBottom: 14 }}><span>Filtrar por tipo de Instalación</span><SearchableSelect value={selectedInstallationFamilyId} onChange={(event) => setSelectedInstallationFamilyId(event.target.value)}><option value="">Todas las Instalaciones</option>{installationFamilies.filter((family) => family.isActive !== false).map((family) => <option key={family.id} value={family.id}>{family.name}</option>)}</SearchableSelect></label>{visibleSubinstallationFamilies.length === 0 ? <div className="inline-empty">{selectedInstallationFamilyId ? 'No hay tipos compatibles con esta Instalación.' : 'No hay tipos de Subinstalación configurados.'}</div> : <div className="attribute-list" style={{ maxHeight: 560, overflow: 'auto' }}>{visibleSubinstallationFamilies.map((family) => <button type="button" className="attribute-card" key={family.id} onClick={() => void openFamily(family)}><span className="asset-symbol"><Icon name="layers" size={16} /></span><span><strong>{family.name}</strong><small>{family.parentFamilies.map((parent) => parent.name).join(' · ') || 'Sin compatibilidades'} · {family.findingCount ?? 0} Hallazgos</small></span><span className="tag">{family.assetCount ?? 0} registros</span><Icon name="chevron" /></button>)}</div>}</article>
|
||||
</div>
|
||||
|
||||
<article className="panel" style={{ marginTop: 18 }}><div className="panel-heading"><div><span className="eyebrow">CAMPOS GENERALES DEL NIVEL</span><h2>Información estructural</h2><p className="section-copy">Usá estos campos sólo cuando correspondan a todo el nivel. Marca, potencia, capacidad u otros datos técnicos deben configurarse dentro de cada clasificación.</p></div>{canManage && selectedType && <button className="button primary" onClick={() => openAttribute('new')}><Icon name="plus" />Nuevo campo general</button>}</div><div className="quick-view-row" style={{ marginBottom: 16 }}>{LEVELS.map((level) => <button type="button" key={level.kind} className={selectedKind === level.kind ? 'active' : ''} onClick={() => { setSelectedKind(level.kind); setAttributeEditor(null); }}>{level.label}</button>)}</div><p className="section-copy">{LEVELS.find((item) => item.kind === selectedKind)?.description}</p>{!selectedType ? <Alert>Este nivel todavía no tiene un tipo maestro activo.</Alert> : selectedType.attributes.length === 0 ? <div className="inline-empty">No hay campos generales para este nivel.</div> : <div className="attribute-list">{selectedType.attributes.map((attribute) => <button type="button" className={`attribute-card ${attribute.isActive ? '' : 'disabled'}`} key={attribute.id} onClick={() => openAttribute(attribute)}><span className="attribute-order">{attribute.sortOrder}</span><span><strong>{attribute.name}</strong><small>{attribute.code} · {attributeTypeLabel(attribute.dataType)}{attribute.unit ? ` · ${attribute.unit}` : ''}</small></span><span className="attribute-flags">{attribute.isRequired && <span className="tag">Obligatorio</span>}{!attribute.isActive && <span className="tag">Inactivo</span>}</span><Icon name="chevron" /></button>)}</div>}</article>
|
||||
<article className="panel" style={{ marginTop: 18 }}><div className="panel-heading"><div><span className="eyebrow">CAMPOS GENERALES DEL NIVEL</span><h2>Información estructural</h2><p className="section-copy">Usá estos campos sólo cuando correspondan a todo el nivel. Marca, potencia, capacidad u otros datos técnicos deben configurarse dentro de cada tipo.</p></div>{canManage && selectedType && <button className="button primary" onClick={() => openAttribute('new')}><Icon name="plus" />Nuevo campo general</button>}</div><div className="quick-view-row" style={{ marginBottom: 16 }}>{LEVELS.map((level) => <button type="button" key={level.kind} className={selectedKind === level.kind ? 'active' : ''} onClick={() => { setSelectedKind(level.kind); setAttributeEditor(null); }}>{level.label}</button>)}</div><p className="section-copy">{LEVELS.find((item) => item.kind === selectedKind)?.description}</p>{!selectedType ? <Alert>Este nivel todavía no tiene un tipo maestro activo.</Alert> : selectedType.attributes.length === 0 ? <div className="inline-empty">No hay campos generales para este nivel.</div> : <div className="attribute-list">{selectedType.attributes.map((attribute) => <button type="button" className={`attribute-card ${attribute.isActive ? '' : 'disabled'}`} key={attribute.id} onClick={() => openAttribute(attribute)}><span className="attribute-order">{attribute.sortOrder}</span><span><strong>{attribute.name}</strong><small>{attribute.code} · {attributeTypeLabel(attribute.dataType)}{attribute.unit ? ` · ${attribute.unit}` : ''}</small></span><span className="attribute-flags">{attribute.isRequired && <span className="tag">Obligatorio</span>}{!attribute.isActive && <span className="tag">Inactivo</span>}</span><Icon name="chevron" /></button>)}</div>}</article>
|
||||
|
||||
{familyEditor && <div className="modal-backdrop"><form className="detail-drawer catalog-drawer" onSubmit={saveFamily}><div className="drawer-heading"><div><span className="eyebrow">CLASIFICACIÓN TÉCNICA</span><h2>{familyEditor === 'new' ? 'Nueva clasificación' : familyName}</h2></div><button type="button" className="icon-button" onClick={() => setFamilyEditor(null)}>×</button></div><div className="catalog-editor-fields">
|
||||
{familyEditor && <div className="modal-backdrop"><form className="detail-drawer catalog-drawer" onSubmit={saveFamily}><div className="drawer-heading"><div><span className="eyebrow">TIPO DE INSTALACIÓN / SUBINSTALACIÓN</span><h2>{familyEditor === 'new' ? 'Nuevo tipo' : familyName}</h2></div><button type="button" className="icon-button" onClick={() => setFamilyEditor(null)}>×</button></div><div className="catalog-editor-fields">
|
||||
{familyEditor === 'new' && <label className="field"><span>Nivel</span><SearchableSelect value={familyLevel} onChange={(event) => { setFamilyLevel(event.target.value as 'INSTALLATION' | 'SUBINSTALLATION'); setFamilyParentIds(new Set()); }}><option value="INSTALLATION">Instalación</option><option value="SUBINSTALLATION">Subinstalación</option></SearchableSelect></label>}
|
||||
<label className="field"><span>Nombre</span><input value={familyName} onChange={(event) => setFamilyName(event.target.value)} maxLength={240} required /></label>
|
||||
{familyLevel === 'SUBINSTALLATION' && <div className="field"><span>Tipos de Instalación compatibles <em>{familyParentIds.size} seleccionados</em></span><div className="finding-selection-list" style={{ maxHeight: 220, overflow: 'auto' }}>{installationFamilies.filter((family) => family.isActive !== false).map((family) => <label className="finding-selection-row" key={family.id}><input type="checkbox" checked={familyParentIds.has(family.id)} onChange={() => toggleParentCompatibility(family.id)} /><span><strong>{family.name}</strong><small>{family.code}</small></span></label>)}</div></div>}
|
||||
{familyEditor !== 'new' && <>
|
||||
<div className="temporal-notice"><Icon name="alert" /><p><strong>{familyFindingIds.size} Hallazgos asociados.</strong> La APK sólo verá estos Hallazgos para esta clasificación, además de OTROS.</p></div>
|
||||
<div className="temporal-notice"><Icon name="alert" /><p><strong>{familyFindingIds.size} Hallazgos asociados.</strong> La APK sólo verá estos Hallazgos para este tipo, además de OTROS.</p></div>
|
||||
<div className="quick-view-row"><button type="button" className={familyFindingMode === 'ASSOCIATED' ? 'active' : ''} onClick={() => setFamilyFindingMode('ASSOCIATED')}>Asociados ({familyFindingIds.size})</button>{canManageFindings && <button type="button" className={familyFindingMode === 'ALL' ? 'active' : ''} onClick={() => setFamilyFindingMode('ALL')}>Agregar o quitar</button>}</div>
|
||||
<label className="field"><span>Buscar Hallazgo</span><input value={familyFindingSearch} onChange={(event) => setFamilyFindingSearch(event.target.value)} placeholder="Título, código o categoría…" /></label>
|
||||
{visibleFamilyFindings.length === 0 ? <div className="inline-empty">{familyFindingMode === 'ASSOCIATED' ? 'No hay Hallazgos asociados.' : 'No hay coincidencias.'}</div> : <div className="finding-selection-list" style={{ maxHeight: 280, overflow: 'auto' }}>{visibleFamilyFindings.map((item) => familyFindingMode === 'ALL' ? <label className="finding-selection-row" key={item.id}><input type="checkbox" checked={familyFindingIds.has(item.id)} onChange={() => toggleFamilyFinding(item.id)} /><span><strong>{item.title}</strong><small>{findingCategoryNames.get(item.categoryId) ?? 'Catálogo'} · {item.code}</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>{findingCategoryNames.get(item.categoryId) ?? 'Catálogo'} · {item.code}</small></span></div>)}</div>}
|
||||
|
||||
<div className="panel-heading" style={{ marginTop: 10 }}><div><span className="eyebrow">DATOS DEL RUBRO</span><h3>Campos técnicos</h3><p className="section-copy">Sólo aparecen cuando un elemento usa esta clasificación.</p></div>{canManage && !technicalEditor && <button type="button" className="button secondary" onClick={() => openTechnicalAttribute('new')}><Icon name="plus" />Nuevo campo</button>}</div>
|
||||
<div className="panel-heading" style={{ marginTop: 10 }}><div><span className="eyebrow">DATOS DEL RUBRO</span><h3>Campos técnicos</h3><p className="section-copy">Sólo aparecen cuando un elemento usa este tipo.</p></div>{canManage && !technicalEditor && <button type="button" className="button secondary" onClick={() => openTechnicalAttribute('new')}><Icon name="plus" />Nuevo campo</button>}</div>
|
||||
{technicalLoading ? <LoadingBlock label="Cargando campos técnicos…" /> : technicalAttributes.length === 0 && !technicalEditor ? <div className="inline-empty">No hay campos técnicos definidos.</div> : !technicalEditor && <div className="attribute-list">{technicalAttributes.map((attribute) => <button type="button" className={`attribute-card ${attribute.isActive ? '' : 'disabled'}`} key={attribute.id} onClick={() => openTechnicalAttribute(attribute)}><span className="attribute-order">{attribute.sortOrder}</span><span><strong>{attribute.name}</strong><small>{attribute.code} · {attributeTypeLabel(attribute.dataType)}{attribute.unit ? ` · ${attribute.unit}` : ''}</small></span>{attribute.isRequired && <span className="tag">Obligatorio</span>}<Icon name="chevron" /></button>)}</div>}
|
||||
{technicalEditor && <div className="panel" style={{ padding: 14 }}><div className="panel-heading"><div><strong>{technicalEditor === 'new' ? 'Nuevo campo técnico' : 'Editar campo técnico'}</strong></div><button type="button" className="icon-button" onClick={() => setTechnicalEditor(null)}>×</button></div><label className="field"><span>Nombre</span><input value={technicalName} onChange={(event) => { setTechnicalName(event.target.value); if (technicalEditor === 'new') setTechnicalCode(attributeCodeFromName(event.target.value)); }} required /></label><label className="field"><span>Código interno</span><input value={technicalCode} onChange={(event) => setTechnicalCode(event.target.value.toLowerCase())} disabled={technicalEditor !== 'new'} pattern="[a-z][a-z0-9_]*" required /></label><label className="field"><span>Tipo de dato</span><SearchableSelect value={technicalType} onChange={(event) => setTechnicalType(event.target.value as InventoryFamilyAttributeDataType)}>{ATTRIBUTE_TYPES.map((item) => <option key={item.value} value={item.value}>{item.label}</option>)}</SearchableSelect></label>{technicalType === 'SELECT' && <label className="field"><span>Opciones</span><textarea rows={4} value={technicalOptions} onChange={(event) => setTechnicalOptions(event.target.value)} placeholder="Una por línea" required /></label>}<label className="field"><span>Unidad <em>opcional</em></span><input value={technicalUnit} onChange={(event) => setTechnicalUnit(event.target.value)} /></label><label className="field"><span>Orden</span><input type="number" min={0} max={10000} value={technicalOrder} onChange={(event) => setTechnicalOrder(Number(event.target.value))} /></label><label className="check-row"><input type="checkbox" checked={technicalRequired} onChange={(event) => setTechnicalRequired(event.target.checked)} /><span><strong>Obligatorio</strong><small>Debe completarse para esta clasificación.</small></span></label>{technicalEditor !== 'new' && <label className="check-row"><input type="checkbox" checked={technicalActive} onChange={(event) => setTechnicalActive(event.target.checked)} /><span><strong>Campo activo</strong><small>Desactivarlo conserva datos existentes.</small></span></label>}<div className="form-actions"><button type="button" className="button secondary" onClick={() => setTechnicalEditor(null)}>Cancelar</button><button type="button" className="button primary" disabled={saving || !technicalName.trim() || !technicalCode || (technicalType === 'SELECT' && !technicalOptions.trim())} onClick={(event) => void saveTechnicalAttribute(event as unknown as FormEvent)}>{saving ? 'Guardando…' : 'Guardar campo'}</button></div></div>}
|
||||
{technicalEditor && <div className="panel" style={{ padding: 14 }}><div className="panel-heading"><div><strong>{technicalEditor === 'new' ? 'Nuevo campo técnico' : 'Editar campo técnico'}</strong></div><button type="button" className="icon-button" onClick={() => setTechnicalEditor(null)}>×</button></div><label className="field"><span>Nombre</span><input value={technicalName} onChange={(event) => { setTechnicalName(event.target.value); if (technicalEditor === 'new') setTechnicalCode(attributeCodeFromName(event.target.value)); }} required /></label><label className="field"><span>Código interno</span><input value={technicalCode} onChange={(event) => setTechnicalCode(event.target.value.toLowerCase())} disabled={technicalEditor !== 'new'} pattern="[a-z][a-z0-9_]*" required /></label><label className="field"><span>Tipo de dato</span><SearchableSelect value={technicalType} onChange={(event) => setTechnicalType(event.target.value as InventoryFamilyAttributeDataType)}>{ATTRIBUTE_TYPES.map((item) => <option key={item.value} value={item.value}>{item.label}</option>)}</SearchableSelect></label>{technicalType === 'SELECT' && <label className="field"><span>Opciones</span><textarea rows={4} value={technicalOptions} onChange={(event) => setTechnicalOptions(event.target.value)} placeholder="Una por línea" required /></label>}<label className="field"><span>Unidad <em>opcional</em></span><input value={technicalUnit} onChange={(event) => setTechnicalUnit(event.target.value)} /></label><label className="field"><span>Orden</span><input type="number" min={0} max={10000} value={technicalOrder} onChange={(event) => setTechnicalOrder(Number(event.target.value))} /></label><label className="check-row"><input type="checkbox" checked={technicalRequired} onChange={(event) => setTechnicalRequired(event.target.checked)} /><span><strong>Obligatorio</strong><small>Debe completarse para este tipo.</small></span></label>{technicalEditor !== 'new' && <label className="check-row"><input type="checkbox" checked={technicalActive} onChange={(event) => setTechnicalActive(event.target.checked)} /><span><strong>Campo activo</strong><small>Desactivarlo conserva datos existentes.</small></span></label>}<div className="form-actions"><button type="button" className="button secondary" onClick={() => setTechnicalEditor(null)}>Cancelar</button><button type="button" className="button primary" disabled={saving || !technicalName.trim() || !technicalCode || (technicalType === 'SELECT' && !technicalOptions.trim())} onClick={(event) => void saveTechnicalAttribute(event as unknown as FormEvent)}>{saving ? 'Guardando…' : 'Guardar campo'}</button></div></div>}
|
||||
<Link className="button secondary" to={`/admin/finding-catalog?familyId=${familyEditor.id}`}>Abrir Catálogo completo <Icon name="chevron" /></Link>
|
||||
<label className="check-row"><input type="checkbox" checked={familyActive} onChange={(event) => setFamilyActive(event.target.checked)} /><span><strong>Clasificación disponible</strong><small>Al desactivarla deja de ofrecerse en nuevas altas.</small></span></label>
|
||||
<label className="check-row"><input type="checkbox" checked={familyActive} onChange={(event) => setFamilyActive(event.target.checked)} /><span><strong>Tipo disponible</strong><small>Al desactivarla deja de ofrecerse en nuevas altas.</small></span></label>
|
||||
</>}
|
||||
</div><div className="form-actions"><button type="button" className="button secondary" onClick={() => setFamilyEditor(null)}>Cancelar</button><button className="button primary" disabled={saving || !familyName.trim() || (familyLevel === 'SUBINSTALLATION' && familyParentIds.size === 0)}>{saving ? 'Guardando…' : familyEditor === 'new' ? 'Crear clasificación' : 'Guardar clasificación'}</button></div></form></div>}
|
||||
</div><div className="form-actions"><button type="button" className="button secondary" onClick={() => setFamilyEditor(null)}>Cancelar</button><button className="button primary" disabled={saving || !familyName.trim() || (familyLevel === 'SUBINSTALLATION' && familyParentIds.size === 0)}>{saving ? 'Guardando…' : familyEditor === 'new' ? 'Crear tipo' : 'Guardar tipo'}</button></div></form></div>}
|
||||
|
||||
{attributeEditor && selectedType && <div className="modal-backdrop"><form className="detail-drawer catalog-drawer" onSubmit={saveAttribute}><div className="drawer-heading"><div><span className="eyebrow">CAMPO GENERAL DE {LEVELS.find((item) => item.kind === selectedKind)?.label.toUpperCase()}</span><h2>{attributeEditor === 'new' ? 'Nuevo campo' : 'Editar campo'}</h2></div><button type="button" className="icon-button" onClick={() => setAttributeEditor(null)}>×</button></div><div className="catalog-editor-fields"><label className="field"><span>Nombre visible</span><input value={attributeName} onChange={(event) => { setAttributeName(event.target.value); if (attributeEditor === 'new') setAttributeCode(attributeCodeFromName(event.target.value)); }} maxLength={160} required /></label><label className="field"><span>Código interno</span><input value={attributeCode} onChange={(event) => setAttributeCode(event.target.value.toLowerCase())} disabled={attributeEditor !== 'new'} maxLength={80} required pattern="[a-z][a-z0-9_]*" /></label><label className="field"><span>Tipo de dato</span><SearchableSelect value={attributeType} onChange={(event) => setAttributeType(event.target.value as AssetAttributeDataType)}>{ATTRIBUTE_TYPES.map((item) => <option value={item.value} key={item.value}>{item.label}</option>)}</SearchableSelect></label>{attributeType === 'SELECT' && <label className="field"><span>Opciones</span><textarea rows={5} value={attributeOptions} onChange={(event) => setAttributeOptions(event.target.value)} placeholder="Una opción por línea" /></label>}<label className="field"><span>Unidad <em>opcional</em></span><input value={attributeUnit} onChange={(event) => setAttributeUnit(event.target.value)} maxLength={40} /></label><label className="field"><span>Orden</span><input type="number" value={attributeOrder} onChange={(event) => setAttributeOrder(Number(event.target.value))} min={0} max={10000} /></label><label className="check-row"><input type="checkbox" checked={attributeRequired} onChange={(event) => setAttributeRequired(event.target.checked)} /><span><strong>Campo obligatorio</strong><small>Debe completarse cuando se registra este nivel.</small></span></label>{attributeEditor !== 'new' && <label className="check-row"><input type="checkbox" checked={attributeActive} onChange={(event) => setAttributeActive(event.target.checked)} /><span><strong>Campo activo</strong><small>Desactivarlo conserva los datos actuales.</small></span></label>}</div><div className="form-actions"><button type="button" className="button secondary" onClick={() => setAttributeEditor(null)}>Cancelar</button><button className="button primary" disabled={saving || !attributeName.trim() || !attributeCode}>{saving ? 'Guardando…' : 'Guardar campo'}</button></div></form></div>}
|
||||
</section>;
|
||||
|
||||
@@ -48,7 +48,7 @@ const structuredTypeCopy: Record<string, { title: string; description: string }>
|
||||
},
|
||||
instalacion: {
|
||||
title: 'Instalaciones',
|
||||
description: 'Instalaciones dentro de un Yacimiento, con clasificación técnica y contexto operativo.',
|
||||
description: 'Instalaciones dentro de un Yacimiento, con tipo de instalación y contexto operativo.',
|
||||
},
|
||||
subinstalacion: {
|
||||
title: 'Subinstalaciones',
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { Link, useParams } from 'react-router';
|
||||
import { DocumentPdfProjection } from '../components/DocumentPdfProjection';
|
||||
import { Alert, LoadingBlock, errorMessage } from '../components/Feedback';
|
||||
import { Icon } from '../components/Icon';
|
||||
import {
|
||||
@@ -10,7 +9,9 @@ import {
|
||||
} from '../features/inspections/inspectionActPresentation';
|
||||
import { InspectionClosurePanel } from '../features/inspections/InspectionClosurePanel';
|
||||
import { InspectionFindingsPanel } from '../features/inspections/InspectionFindingsPanel';
|
||||
import { getInspectionVisit } from '../lib/api';
|
||||
import { InspectionActMediaPanel } from '../features/inspections/InspectionActMediaPanel';
|
||||
import { DocumentPdfProjection } from '../components/DocumentPdfProjection';
|
||||
import { getInspectionActPdfBlob, getInspectionVisit } from '../lib/api';
|
||||
import type { InspectionVisit } from '../lib/api';
|
||||
import { getInspectionActF4, type InspectionActF4 } from '../lib/inspectionActF4Api';
|
||||
import { formatDate } from '../lib/format';
|
||||
@@ -21,6 +22,7 @@ export function InspectionActEditorPage() {
|
||||
const [act, setAct] = useState<InspectionActF4 | null>(null);
|
||||
const [loading, setLoading] = useState(Boolean(actId));
|
||||
const [error, setError] = useState('');
|
||||
const [pdfBusy, setPdfBusy] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
if (!actId) return;
|
||||
@@ -48,21 +50,47 @@ export function InspectionActEditorPage() {
|
||||
|
||||
const isSealed = act?.status === 'SEALED' || act?.status === 'CLOSED';
|
||||
|
||||
const openActPdf = async (download: boolean) => {
|
||||
if (!act) return;
|
||||
setPdfBusy(true); setError('');
|
||||
try {
|
||||
const blob = await getInspectionActPdfBlob(act.id);
|
||||
const url = URL.createObjectURL(blob);
|
||||
if (download) {
|
||||
const link = document.createElement('a');
|
||||
link.href = url;
|
||||
link.download = `${act.code}.pdf`;
|
||||
link.click();
|
||||
setTimeout(() => URL.revokeObjectURL(url), 1_000);
|
||||
} else {
|
||||
window.open(url, '_blank', 'noopener,noreferrer');
|
||||
setTimeout(() => URL.revokeObjectURL(url), 60_000);
|
||||
}
|
||||
} catch (requestError) {
|
||||
setError(errorMessage(requestError));
|
||||
} finally {
|
||||
setPdfBusy(false);
|
||||
}
|
||||
};
|
||||
|
||||
return <section className="survey-editor inspection-act-editor">
|
||||
<div className="breadcrumb"><Link to="/inspecciones">Inspecciones</Link><span>/</span>{visit && <><Link to={`/inspecciones/${visit.id}`}>{visit.code}</Link><span>/</span></>}<span>{act?.code ?? 'Acta'}</span></div>
|
||||
<div className="page-heading survey-editor-heading"><div><span className="eyebrow">ACTA DE INSPECCIÓN · SÓLO LECTURA</span><h1>{act?.title ?? 'Acta'}</h1><p>{act ? `${act.code} · versión ${act.currentVersion}` : 'Consulta del documento sincronizado desde la APK.'}</p></div>{act && <span className={`status-badge large ${inspectionActStatusClass(act.status)}`}>{inspectionActStatusLabel(act.status)}</span>}</div>
|
||||
<div className="page-heading survey-editor-heading"><div><span className="eyebrow">ACTA DE INSPECCIÓN</span><h1>{act?.code ?? 'Acta'}</h1><p>{visit ? `${visit.code} · ${visit.scopeAsset?.name ?? visit.operationalArea?.name ?? 'Inspección'} · versión ${act?.currentVersion ?? ''}` : 'Consulta del documento sincronizado desde la APK.'}</p></div>{act && <span className={`status-badge large ${inspectionActStatusClass(act.status)}`}>{inspectionActStatusLabel(act.status)}</span>}</div>
|
||||
|
||||
{error && <Alert>{error}</Alert>}
|
||||
{visit && <div className="temporal-notice"><Icon name="clipboard" /><p><strong>{visit.code}</strong> El contenido constatado y los Hallazgos se registran desde la APK. Una vez bloqueada, el Acta ya no vuelve a borrador; la manifestación de empresa puede completarse posteriormente por enlace seguro.</p></div>}
|
||||
{act?.report && <div className="temporal-notice"><Icon name="clipboard" /><p><strong>Informe relacionado: <Link to={`/informes/${act.report.id}`}>{act.report.code}</Link>.</strong> {act.report.pdfStatus === 'READY' ? 'El documento PDF está disponible.' : 'El contenido está congelado y el PDF continúa pendiente de composición.'}</p></div>}
|
||||
{isSealed && act && !act.report && <div className="temporal-notice"><Icon name="clipboard" /><p><strong>Informe pendiente de emisión.</strong> El Acta ya está sellada y habilita el circuito documental del INF.</p></div>}
|
||||
{act && <section className="panel act-document-primary">
|
||||
<div className="act-document-primary-copy"><span className="asset-symbol"><Icon name="clipboard" /></span><div><span className="eyebrow">DOCUMENTO DEL ACTA</span><h2>{isSealed ? 'PDF del Acta disponible' : 'PDF pendiente de cierre'}</h2><p>{isSealed ? 'Abrí o descargá el Acta completa firmada y sellada.' : 'El PDF definitivo se genera cuando el Acta queda firmada y cerrada.'}</p></div></div>
|
||||
<div className="act-primary-actions">{isSealed ? <><button className="button primary" type="button" disabled={pdfBusy} onClick={() => void openActPdf(false)}>{pdfBusy ? 'Preparando…' : 'Abrir PDF del Acta'}</button><button className="button secondary" type="button" disabled={pdfBusy} onClick={() => void openActPdf(true)}>Descargar PDF</button></> : <span className="status-badge pending">{inspectionActStatusLabel(act.status)}</span>}</div>
|
||||
</section>}
|
||||
{act?.report && <div className="temporal-notice"><Icon name="clipboard" /><p><strong>Informe relacionado: <Link to={`/informes/${act.report.id}`}>{act.report.code}</Link>.</strong> {act.report.pdfStatus === 'READY' ? ' El informe está disponible.' : ' El INF continúa en preparación.'}</p></div>}
|
||||
{isSealed && act && !act.report && <div className="temporal-notice"><Icon name="clipboard" /><p><strong>INF pendiente de emisión.</strong> El Acta ya está sellada y disponible como documento fuente.</p></div>}
|
||||
{act?.status === 'CANCELLED' && <Alert>Cancelada: {act.cancellationReason}</Alert>}
|
||||
|
||||
{act && <section className="panel inspection-act-form">
|
||||
<div className="panel-heading"><div><span className="eyebrow">CONTENIDO SINCRONIZADO</span><h2>{act.code}</h2></div><small className="muted">Actualizado {formatDate(act.updatedAt)}</small></div>
|
||||
<div className="responsible-summary">
|
||||
<div><small>Fecha y hora</small><strong>{formatDate(act.occurredAt)}</strong></div>
|
||||
<div><small>Título</small><strong>{act.title}</strong></div>
|
||||
<div><small>Estado documental</small><strong>{inspectionActStatusLabel(act.status)}</strong></div>
|
||||
<div><small>Urgencia</small><strong>{act.urgency === 'URGENT' ? 'Urgente' : act.urgency === 'NON_URGENT' ? 'No urgente' : 'Pendiente de cierre'}</strong></div>
|
||||
<div><small>Hallazgos</small><strong>{act.findingCount}</strong></div>
|
||||
</div>
|
||||
@@ -71,7 +99,8 @@ export function InspectionActEditorPage() {
|
||||
<div className="inspection-act-asset-grid">{act.assets.map((asset) => <div className="inspection-member selected" key={asset.id}><span><strong>{asset.name}</strong><small>{asset.code} · {asset.typeName}</small></span></div>)}</div>
|
||||
</section>}
|
||||
|
||||
{act && <DocumentPdfProjection kind="act" />}
|
||||
{act && <InspectionActMediaPanel actId={act.id} />}
|
||||
{act && <details className="legacy-projection-details"><summary>Ver estructura documental de referencia</summary><DocumentPdfProjection kind="act" /></details>}
|
||||
{act && <InspectionFindingsPanel act={act} />}
|
||||
{act && <InspectionClosurePanel act={act} />}
|
||||
|
||||
|
||||
@@ -250,7 +250,7 @@ export function InventoryCreatePage() {
|
||||
{requiresFamily && <div className="form-section">
|
||||
<div>
|
||||
<h2>{kind === 'INSTALACION' ? 'Tipo de instalación' : 'Tipo / función'}</h2>
|
||||
<p className="section-copy">{kind === 'SUBINSTALACION' ? 'Sólo aparecen tipos permitidos dentro de la Instalación seleccionada.' : 'Elegí la clasificación simple que corresponda.'}</p>
|
||||
<p className="section-copy">{kind === 'SUBINSTALACION' ? 'Sólo aparecen tipos permitidos dentro de la Instalación seleccionada.' : 'Elegí el tipo que corresponda.'}</p>
|
||||
</div>
|
||||
{kind === 'SUBINSTALACION' && !selectedParent?.inventoryFamily ? <Alert>La Instalación elegida todavía no tiene un tipo configurado.</Alert> : <label className="field">
|
||||
<span>{kind === 'INSTALACION' ? 'Tipo' : 'Tipo / función'} <em>obligatorio</em></span>
|
||||
|
||||
@@ -4,13 +4,18 @@ import { Alert, LoadingBlock, errorMessage } from '../components/Feedback';
|
||||
import { useAuth } from '../auth/AuthContext';
|
||||
import { initials } from '../lib/format';
|
||||
import {
|
||||
deleteSelfSignature,
|
||||
getSelfProfile,
|
||||
getSelfSignature,
|
||||
getSelfSmtpSettings,
|
||||
saveSelfSignature,
|
||||
saveSelfSmtpSettings,
|
||||
selfSignatureContentUrl,
|
||||
testSelfSmtpSettings,
|
||||
updateSelfProfile,
|
||||
} from '../lib/myProfileApi';
|
||||
import type {
|
||||
UserReusableSignature,
|
||||
UserSmtpMode,
|
||||
UserSmtpSecurityMode,
|
||||
UserSmtpSettings,
|
||||
@@ -21,6 +26,8 @@ export function MyProfilePage() {
|
||||
const { user } = useAuth();
|
||||
const [profile, setProfile] = useState<AdministrativeUserProfile | null>(null);
|
||||
const [smtp, setSmtp] = useState<UserSmtpSettings | null>(null);
|
||||
const [signature, setSignature] = useState<UserReusableSignature | null>(null);
|
||||
const [signatureFile, setSignatureFile] = useState<File | null>(null);
|
||||
const [mode, setMode] = useState<UserSmtpMode>('SYSTEM');
|
||||
const [host, setHost] = useState('');
|
||||
const [port, setPort] = useState(587);
|
||||
@@ -47,12 +54,14 @@ export function MyProfilePage() {
|
||||
const load = async () => {
|
||||
setLoading(true);
|
||||
try {
|
||||
const [loadedProfile, loadedSmtp] = await Promise.all([
|
||||
const [loadedProfile, loadedSmtp, loadedSignature] = await Promise.all([
|
||||
getSelfProfile(),
|
||||
getSelfSmtpSettings(),
|
||||
getSelfSignature(),
|
||||
]);
|
||||
setProfile(loadedProfile);
|
||||
applySmtp(loadedSmtp);
|
||||
setSignature(loadedSignature);
|
||||
} catch (requestError) {
|
||||
setError(errorMessage(requestError));
|
||||
} finally {
|
||||
@@ -82,6 +91,35 @@ export function MyProfilePage() {
|
||||
}
|
||||
};
|
||||
|
||||
const saveSignature = async () => {
|
||||
if (!signatureFile) return;
|
||||
setError(''); setSuccess(''); setSaving('signature');
|
||||
try {
|
||||
const updated = await saveSelfSignature(signatureFile);
|
||||
setSignature(updated);
|
||||
setSignatureFile(null);
|
||||
setSuccess('Firma del inspector guardada. Se aplicará automáticamente al cerrar cada Acta.');
|
||||
} catch (requestError) {
|
||||
setError(errorMessage(requestError));
|
||||
} finally {
|
||||
setSaving('');
|
||||
}
|
||||
};
|
||||
|
||||
const clearSignature = async () => {
|
||||
setError(''); setSuccess(''); setSaving('signature-delete');
|
||||
try {
|
||||
const updated = await deleteSelfSignature();
|
||||
setSignature(updated);
|
||||
setSignatureFile(null);
|
||||
setSuccess('Firma guardada eliminada.');
|
||||
} catch (requestError) {
|
||||
setError(errorMessage(requestError));
|
||||
} finally {
|
||||
setSaving('');
|
||||
}
|
||||
};
|
||||
|
||||
const saveSmtp = async () => {
|
||||
setError(''); setSuccess(''); setSaving('smtp');
|
||||
try {
|
||||
@@ -116,7 +154,9 @@ export function MyProfilePage() {
|
||||
};
|
||||
|
||||
if (loading) return <LoadingBlock label="Cargando tu perfil…" />;
|
||||
if (!profile || !smtp) return <Alert>{error || 'No se pudo cargar el perfil.'}</Alert>;
|
||||
if (!profile || !smtp || !signature) return <Alert>{error || 'No se pudo cargar el perfil.'}</Alert>;
|
||||
|
||||
const isInspector = profile.roles.some((role) => role.code === 'inspector');
|
||||
|
||||
return <section>
|
||||
<div className="page-heading user-heading">
|
||||
@@ -184,6 +224,24 @@ export function MyProfilePage() {
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{isInspector && <div className="panel form-panel" style={{ marginTop: 16 }}>
|
||||
<div className="panel-heading">
|
||||
<div><span className="eyebrow">FIRMA DEL INSPECTOR</span><h2>Firma guardada para Actas</h2></div>
|
||||
</div>
|
||||
<p className="muted-copy">Cargala una sola vez. Cuando cierres un Acta desde la APK, el contenido quedará en estado <strong>Para firmar</strong>; después firma el acompañante y, al finalizar, el sistema incorpora automáticamente esta firma del inspector al ejemplar inmutable.</p>
|
||||
{signature.configured && <div className="signature-profile-preview">
|
||||
<img src={selfSignatureContentUrl(signature)} alt="Firma guardada del inspector" />
|
||||
<div><strong>Firma configurada</strong><small>PNG · {Math.max(1, Math.round((signature.sizeBytes ?? 0) / 1024))} KB</small></div>
|
||||
</div>}
|
||||
<div className="form-grid" style={{ marginTop: 14 }}>
|
||||
<label className="field"><span>{signature.configured ? 'Reemplazar firma PNG' : 'Firma PNG *'}</span><input type="file" accept="image/png" onChange={(event) => setSignatureFile(event.target.files?.[0] ?? null)} /></label>
|
||||
</div>
|
||||
<p className="muted-copy">La imagen debe ser PNG y pesar como máximo 1 MB. Cada Acta conserva una copia propia de la firma y su SHA-256; cambiar la firma del perfil no altera Actas ya cerradas.</p>
|
||||
<div className="form-actions wrap-actions">
|
||||
<button className="button primary" type="button" onClick={saveSignature} disabled={!signatureFile || saving === 'signature'}>{saving === 'signature' ? 'Guardando…' : signature.configured ? 'Reemplazar firma' : 'Guardar firma'}</button>
|
||||
{signature.configured && <button className="button secondary" type="button" onClick={clearSignature} disabled={saving === 'signature-delete'}>{saving === 'signature-delete' ? 'Eliminando…' : 'Eliminar firma guardada'}</button>}
|
||||
</div>
|
||||
</div>}
|
||||
<div className="panel" style={{ marginTop: 16 }}>
|
||||
<div className="panel-heading"><div><span className="eyebrow">SEGURIDAD</span><h2>Cuenta</h2></div></div>
|
||||
<p>Tu email es obligatorio para operar en DH Inspección. La contraseña SMTP nunca se muestra ni se incluye en auditorías.</p>
|
||||
|
||||
@@ -312,7 +312,7 @@ export function SimpleInventoryDetailPage({ initialAsset }: { initialAsset: Asse
|
||||
{parentLabel && <div className="simple-inventory-context-card"><small>{parentLabel}</small>{asset.parent ? <Link to={`/inventarios/${asset.parent.id}`}><strong>{asset.parent.name}</strong><span>{asset.parent.code}</span></Link> : <strong>Sin asignar</strong>}</div>}
|
||||
{kind === 'YACIMIENTO' && <div className="simple-inventory-context-card"><small>Empresa operadora</small>{asset.operatorCompany ? <Link to={`/inventarios/${asset.operatorCompany.id}`}><strong>{asset.operatorCompany.name}</strong><span>{asset.operatorCompany.code}</span></Link> : <strong>Sin asignar</strong>}</div>}
|
||||
{(kind === 'INSTALACION' || kind === 'SUBINSTALACION') && <div className="simple-inventory-context-card"><small>Empresa del Yacimiento</small>{asset.operatorCompany ? <Link to={`/inventarios/${asset.operatorCompany.id}`}><strong>{asset.operatorCompany.name}</strong><span>{asset.operatorCompany.code}</span></Link> : <strong>Sin asignar</strong>}</div>}
|
||||
{technicalLevel && <div className="simple-inventory-context-card"><small>Tipo técnico</small><strong>{technical?.family.name ?? 'Sin clasificación técnica'}</strong>{technical?.family.code && <span>{technical.family.code}</span>}</div>}
|
||||
{technicalLevel && <div className="simple-inventory-context-card"><small>Tipo de instalación / subinstalación</small><strong>{technical?.family.name ?? 'Sin tipo asignado'}</strong>{technical?.family.code && <span>{technical.family.code}</span>}</div>}
|
||||
</div>
|
||||
</article>
|
||||
|
||||
|
||||
@@ -1350,3 +1350,69 @@ code { color: #5e6677; font-family: ui-monospace, monospace; font-size: 9px; }
|
||||
cursor: default;
|
||||
opacity: .65;
|
||||
}
|
||||
|
||||
/* F6.7 · firma reutilizable del inspector */
|
||||
.signature-profile-preview {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 16px;
|
||||
max-width: 620px;
|
||||
padding: 14px 16px;
|
||||
border: 1px solid var(--line);
|
||||
border-radius: 14px;
|
||||
background: #f7faf9;
|
||||
}
|
||||
.signature-profile-preview img {
|
||||
width: min(240px, 46%);
|
||||
height: 88px;
|
||||
object-fit: contain;
|
||||
border-radius: 10px;
|
||||
background: #fff;
|
||||
border: 1px solid #e3e7e5;
|
||||
}
|
||||
.signature-profile-preview strong,
|
||||
.signature-profile-preview small { display: block; }
|
||||
.signature-profile-preview small { margin-top: 4px; color: var(--muted); }
|
||||
@media (max-width: 640px) {
|
||||
.signature-profile-preview { align-items: flex-start; flex-direction: column; }
|
||||
.signature-profile-preview img { width: 100%; }
|
||||
}
|
||||
|
||||
/* F6.8 · Acta: documento y registro fotográfico visibles como contenido principal. */
|
||||
.act-document-primary { display: flex; align-items: center; justify-content: space-between; gap: 18px; border-color: #b8d4ce; background: #f5fbf9; }
|
||||
.act-document-primary-copy { min-width: 0; display: flex; align-items: flex-start; gap: 13px; }
|
||||
.act-document-primary-copy .asset-symbol { flex: 0 0 auto; color: #176e67; background: #d9f0ed; }
|
||||
.act-document-primary-copy h2 { margin: 4px 0; font-size: 16px; }
|
||||
.act-document-primary-copy p { margin: 0; color: var(--muted); font-size: 10px; }
|
||||
.act-primary-actions { display: flex; align-items: center; justify-content: flex-end; gap: 8px; flex-wrap: wrap; }
|
||||
.act-media-panel { display: grid; gap: 14px; }
|
||||
.act-media-panel > .panel-heading { margin-bottom: 0; }
|
||||
.act-photo-grid { display: grid; grid-template-columns: repeat(3,minmax(0,1fr)); gap: 12px; }
|
||||
.act-photo-card { min-width: 0; overflow: hidden; border: 1px solid var(--line); border-radius: 12px; background: white; }
|
||||
.act-photo-preview { width: 100%; height: 190px; display: block; padding: 0; overflow: hidden; border: 0; cursor: zoom-in; background: #e9eef3; }
|
||||
.act-photo-preview img { width: 100%; height: 100%; display: block; object-fit: cover; transition: transform .16s ease; }
|
||||
.act-photo-preview:hover img { transform: scale(1.02); }
|
||||
.act-photo-preview .media-preview-loading { width: 100%; height: 100%; display: grid; place-items: center; }
|
||||
.act-photo-copy { min-width: 0; display: grid; gap: 4px; padding: 11px 12px 13px; }
|
||||
.act-photo-copy strong { overflow: hidden; font-size: 10px; text-overflow: ellipsis; white-space: nowrap; }
|
||||
.act-photo-copy small { color: var(--muted); font-size: 8px; }
|
||||
.act-media-footnote { display: flex; align-items: center; gap: 7px; color: var(--muted); font-size: 9px; }
|
||||
|
||||
@media (max-width: 900px) {
|
||||
.act-photo-grid { grid-template-columns: repeat(2,minmax(0,1fr)); }
|
||||
.act-document-primary { align-items: flex-start; flex-direction: column; }
|
||||
.act-primary-actions { width: 100%; justify-content: flex-start; }
|
||||
}
|
||||
|
||||
@media (max-width: 620px) {
|
||||
.act-photo-grid { grid-template-columns: 1fr; }
|
||||
.act-photo-preview { height: 230px; }
|
||||
.act-primary-actions .button { flex: 1 1 auto; }
|
||||
}
|
||||
.act-media-group { display: grid; gap: 10px; padding-top: 2px; }
|
||||
.act-media-group + .act-media-group { margin-top: 5px; padding-top: 16px; border-top: 1px solid var(--line); }
|
||||
.legacy-projection-details { overflow: hidden; border: 1px solid var(--line); border-radius: 12px; background: var(--surface); }
|
||||
.legacy-projection-details > summary { cursor: pointer; list-style: none; padding: 12px 14px; color: var(--muted); font-size: 9px; font-weight: 700; letter-spacing: .04em; }
|
||||
.legacy-projection-details > summary::-webkit-details-marker { display: none; }
|
||||
.legacy-projection-details[open] > summary { border-bottom: 1px solid var(--line); }
|
||||
.legacy-projection-details > .document-pdf-projection { margin: 12px; }
|
||||
|
||||
Reference in New Issue
Block a user