Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 admin
|
d44ae049f3 | ||
|
admin
|
78e92970ff | ||
|
admin
|
7fcb1d42b6 | ||
|
admin
|
e55684bf4f | ||
|
admin
|
ddf3b158e7 |
@@ -63,7 +63,7 @@ jobs:
|
||||
|
||||
- name: Android lint
|
||||
working-directory: android-app
|
||||
run: gradle --no-daemon :app:lintDebug
|
||||
run: gradle --no-daemon :app:lintDebug :app:lintRelease
|
||||
|
||||
- name: Print complete lint failures
|
||||
if: failure()
|
||||
@@ -130,6 +130,14 @@ jobs:
|
||||
if-no-files-found: error
|
||||
retention-days: 30
|
||||
|
||||
- name: Upload unsigned release candidate
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: DH-Inspeccion-${{ steps.package.outputs.version }}-vc${{ steps.package.outputs.version_code }}-${{ steps.package.outputs.short_sha }}-UNSIGNED
|
||||
path: android-app/app/build/outputs/apk/release/app-release-unsigned.apk
|
||||
if-no-files-found: error
|
||||
retention-days: 30
|
||||
|
||||
- name: Upload Android diagnostics
|
||||
if: always()
|
||||
uses: actions/upload-artifact@v4
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Checklist final Android 0.19.0
|
||||
# Checklist final Android 0.19.1
|
||||
|
||||
La candidata sólo se promueve si el mismo SHA cumple:
|
||||
|
||||
|
||||
+24
-4
@@ -1,10 +1,10 @@
|
||||
# DH Inspección Android · release final de campo 0.19.0
|
||||
# DH Inspección Android · release final de campo 0.19.1
|
||||
|
||||
## Candidata vigente
|
||||
|
||||
- Fase funcional: **Flujo final de campo · Inspección → Acta → Hallazgos → Firma**.
|
||||
- `versionName`: **0.19.0**.
|
||||
- `versionCode`: **28**.
|
||||
- `versionName`: **0.19.1**.
|
||||
- `versionCode`: **29**.
|
||||
- Application ID release: `com.korexlabs.dhinspeccion`.
|
||||
- Application ID debug/QA: `com.korexlabs.dhinspeccion.debug`.
|
||||
- API: `https://dhv2.korexlabs.com/api/v3/`.
|
||||
@@ -13,7 +13,7 @@ La variante debug es independiente de la app productiva y puede instalarse para
|
||||
|
||||
## Procedimiento operativo validado
|
||||
|
||||
La APK 0.19.0 fija como recorrido principal de campo:
|
||||
La APK 0.19.1 fija como recorrido principal de campo:
|
||||
|
||||
1. **Iniciar Inspección**. Al iniciarla se habilitan Actas, Hallazgos e Inventario de campo.
|
||||
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.
|
||||
@@ -95,3 +95,23 @@ Antes de distribuir una APK productiva:
|
||||
- realizar actualización sobre al menos una tablet con la versión productiva anterior cuando corresponda;
|
||||
- ejecutar smoke funcional: ingreso, iniciar Inspección, crear Acta, seleccionar/crear Instalación o Subinstalación, GPS/foto, Hallazgo, cerrar Acta → Pendiente de firma, firma/manifestación, cierre de Acta y cierre de Inspección;
|
||||
- registrar el SHA Git y SHA-256 de la APK distribuida.
|
||||
|
||||
## Revisión 0.19.1
|
||||
|
||||
- Renovación de sesión coordinada entre los cuatro clientes API; no cierra sesión por pérdida de red, HTTP 429/500 o cancelación.
|
||||
- Una respuesta tardía no puede restaurar una sesión cerrada ni usar la de otro inspector.
|
||||
- Guardia de escrituras contra doble toque y conteo correcto de operaciones pendientes.
|
||||
- Búsquedas descartan respuestas antiguas. Cambio de inspección limpia el Acta anterior.
|
||||
- Mensajes visibles de permisos/GPS en evidencia y respeto de barras de sistema/teclado.
|
||||
- Diez nuevas pruebas de comportamiento sobre sesión y concurrencia.
|
||||
|
||||
### Alcance real
|
||||
|
||||
Esta candidata requiere conexión. No implementa trabajo offline ni cola persistente de sincronización; un fallo de red no equivale a guardado. Tras un timeout de escritura debe verificarse el registro antes de repetir. No se presenta el artefacto debug como una release productiva. La firma histórica y el smoke en tablet siguen siendo requisitos para distribuir la release final.
|
||||
|
||||
### Segunda pasada funcional
|
||||
|
||||
- Coordenadas normalizadas al contrato API (6 decimales, precisión 3).
|
||||
- Yacimiento seleccionable para Hallazgos y como padre explícito de nuevas Instalaciones. Se elimina el fallback que podía presentar un tipo Yacimiento como alta de Instalación.
|
||||
- Formulario Datos técnicos sobre el elemento seleccionado: carga y guarda las definiciones/valores por familia mediante los endpoints existentes del Dashboard; valida obligatorios, números, Sí/No, fechas y opciones. Es un paso separado del alta estructural y GPS/foto.
|
||||
- Se agregan siete pruebas para coordenadas y valores técnicos.
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
# DH Android 0.19.1 · revisión de candidata
|
||||
|
||||
## Idea funcional verificada contra código y API
|
||||
|
||||
La app es la herramienta del inspector en campo. Oficina administra territorio, operadoras, clasificaciones, campos y catálogo; la APK consulta esas fuentes. Una Inspección contiene varias Actas, con una sola en elaboración simultánea. El Hallazgo pertenece al Acta y al elemento seleccionado. Cerrar contenido lo deja inmutable y pendiente de firma. Firma del inspector y manifestación/firma o negativa de empresa permiten sellar el Acta. La Inspección exige todas sus Actas activas selladas.
|
||||
|
||||
Yacimiento, Instalación y Subinstalación son destinos de Hallazgos. Una Instalación nueva debe crearse dentro de un Yacimiento y una Subinstalación dentro de una Instalación compatible. El inventario nacido en campo necesita GPS y foto antes del Hallazgo.
|
||||
|
||||
## Hallazgos corregidos
|
||||
|
||||
| Problema observado | Corrección |
|
||||
| --- | --- |
|
||||
| Cuatro clientes renovaban por separado la misma sesión | Coordinador compartido; protege rotación, logout y cambio de usuario |
|
||||
| Cortes de red durante refresh borraban la sesión | Sólo una respuesta 401 de la sesión vigente la invalida |
|
||||
| Operaciones solapadas liberaban ocupado antes de terminar | Conteo de pendientes y rechazo del segundo guardado |
|
||||
| Respuestas de búsquedas antiguas sobrescribían resultados recientes | Generación de búsqueda y verificación del ID de inspección |
|
||||
| Un Acta anterior podía persistir al cambiar de inspección | Limpieza de estado de Acta al abrir otra inspección |
|
||||
| Coordenadas crudas excedían decimales admitidos | Normalización 6 decimales para coordenadas y 3 para precisión |
|
||||
| Inventario móvil ocultaba Yacimientos | Selección para Hallazgos y alta de Instalación dentro de Yacimiento |
|
||||
| Alta de Instalación podía adoptar otro tipo por fallback | Eliminado; pide elegir el Yacimiento padre correcto |
|
||||
| Datos técnicos por familia no estaban editables | Formulario conectado a technical-values; mismos campos de oficina |
|
||||
| Fallos de GPS/permisos en evidencia sin mensaje | Error visible y accionable |
|
||||
| Barras del sistema/teclado podían tapar controles | Insets de sistema y teclado en la raíz |
|
||||
|
||||
## Evidencia automática
|
||||
|
||||
25 pruebas Android: 8 contratos existentes y 17 pruebas nuevas de comportamiento (sesión 7, concurrencia 3, GPS 3, campos técnicos 4). Lint debug/release y compilación debug/release en workflow Android. CI general comprueba API, WEB, scripts y migraciones; la auditoría de dependencias se ejecuta separadamente. Consultar las ejecuciones del SHA de la entrega, no sólo un resultado anterior.
|
||||
|
||||
## Límites de esta candidata
|
||||
|
||||
- Requiere conexión. No existe cola persistente offline ni resolución de conflictos sin señal.
|
||||
- Un timeout de escritura puede ocurrir después de guardar en servidor. Revisar el registro antes de repetir; no se afirma idempotencia general de todas las escrituras.
|
||||
- Los datos técnicos por familia se completan en un paso separado tras seleccionar/crear el elemento. GPS/foto continúa siendo la barrera de Hallazgos del servidor.
|
||||
- No se ejecutó aceptación en tablet física: quedan por comprobar cámara, GPS, biometría, rotación/recreación de actividad, firmas y actualización sobre la APK instalada.
|
||||
- La release compila sin firma. Se requiere la clave histórica y su certificado de referencia para distribuir una actualización productiva. No crear otra clave como sustituto.
|
||||
- La candidata debug usa com.korexlabs.dhinspeccion.debug y no reemplaza la app productiva. La compatibilidad con una debug anterior depende también de su certificado; no desinstalar una app con información pendiente sin revisar antes.
|
||||
|
||||
## Recorrido de aceptación en tablet
|
||||
|
||||
1. Ingresar con inspector y cargar inspecciones asignadas.
|
||||
2. Iniciar una inspección, crear Acta, seleccionar Yacimiento/Instalación/Subinstalación.
|
||||
3. Crear Instalación bajo Yacimiento y Subinstalación compatible; probar GPS permitido/denegado y foto tomada/cancelada.
|
||||
4. Completar campos técnicos requeridos, incluyendo No booleano, decimal con coma, fecha y opción de lista; volver a abrir para comprobar persistencia.
|
||||
5. Crear Hallazgo catalogado y OTROS, adjuntar evidencia.
|
||||
6. Cerrar contenido, comprobar inmutabilidad y estado Pendiente de firma.
|
||||
7. Registrar firmas o negativa de empresa; sellar Acta.
|
||||
8. Crear otra Acta, comprobar que una pendiente impide cerrar la Inspección; completar y cerrar.
|
||||
9. Cortar conexión y recuperarla: errores visibles, sin pérdida de sesión por red ni falso aviso de guardado.
|
||||
10. Verificar en Dashboard los mismos registros y documentos.
|
||||
@@ -12,8 +12,8 @@ android {
|
||||
applicationId = "com.korexlabs.dhinspeccion"
|
||||
minSdk = 26
|
||||
targetSdk = 36
|
||||
versionCode = 28
|
||||
versionName = "0.19.0"
|
||||
versionCode = 29
|
||||
versionName = "0.19.1"
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
vectorDrawables.useSupportLibrary = true
|
||||
|
||||
@@ -6,6 +6,7 @@ import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.lifecycle.AndroidViewModel
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import com.korexlabs.dhinspeccion.data.FieldCoordinates
|
||||
import com.korexlabs.dhinspeccion.data.CreateFieldFindingRequest
|
||||
import com.korexlabs.dhinspeccion.data.CreateFieldInventoryRequest
|
||||
import com.korexlabs.dhinspeccion.data.DhRepository
|
||||
@@ -24,11 +25,14 @@ import com.korexlabs.dhinspeccion.data.MobileResponsibleRequest
|
||||
import com.korexlabs.dhinspeccion.data.StoredSession
|
||||
import com.korexlabs.dhinspeccion.data.VisitDetail
|
||||
import com.korexlabs.dhinspeccion.data.VisitSummary
|
||||
import kotlinx.coroutines.CancellationException
|
||||
import kotlinx.coroutines.launch
|
||||
import java.io.File
|
||||
import java.time.Instant
|
||||
|
||||
class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
private val operations = OperationTracker()
|
||||
private var inventorySearchGeneration = 0
|
||||
private val repository = DhRepository(application)
|
||||
private val findingsRepository = FieldFindingsRepository(application)
|
||||
private val actsRepository = MobileActsRepository(application)
|
||||
@@ -84,7 +88,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
error = "Ingresá usuario y contraseña."
|
||||
return
|
||||
}
|
||||
launchBusy {
|
||||
launchBusy(mutation = true) {
|
||||
session = repository.login(identifier, password)
|
||||
notice = "Sesión iniciada."
|
||||
loadVisitsInternal()
|
||||
@@ -113,7 +117,9 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
}
|
||||
|
||||
fun openVisit(id: String) = launchBusy {
|
||||
visit = repository.visit(id)
|
||||
val loadedVisit = repository.visit(id)
|
||||
clearActState()
|
||||
visit = loadedVisit
|
||||
inventory = emptyList()
|
||||
inventoryParentId = visit?.scopeAsset?.id ?: visit?.operationalArea?.id
|
||||
fieldTypes = emptyList()
|
||||
@@ -123,6 +129,8 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
}
|
||||
|
||||
fun closeVisitView() {
|
||||
if (busy) return
|
||||
inventorySearchGeneration += 1
|
||||
visit = null
|
||||
inventory = emptyList()
|
||||
inventoryParentId = null
|
||||
@@ -135,7 +143,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
|
||||
fun startVisit() {
|
||||
val id = visit?.id ?: return
|
||||
launchBusy {
|
||||
launchBusy(mutation = true) {
|
||||
visit = repository.startVisit(id)
|
||||
inventoryParentId = visit?.scopeAsset?.id ?: visit?.operationalArea?.id
|
||||
notice = "Inspección iniciada."
|
||||
@@ -172,7 +180,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
error = "Ya existe un Acta en elaboración. Cerrala o cancelala antes de crear la siguiente."
|
||||
return
|
||||
}
|
||||
launchBusy {
|
||||
launchBusy(mutation = true) {
|
||||
val created = actsRepository.create(
|
||||
currentVisit.id,
|
||||
asset?.id,
|
||||
@@ -194,8 +202,10 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
|
||||
fun searchInventory(search: String, parentId: String? = null) {
|
||||
val currentVisit = visit ?: return
|
||||
val generation = ++inventorySearchGeneration
|
||||
launchBusy {
|
||||
inventory = repository.fieldInventory(currentVisit.id, search, parentId).data
|
||||
val result = repository.fieldInventory(currentVisit.id, search, parentId).data
|
||||
if (generation == inventorySearchGeneration && visit?.id == currentVisit.id) inventory = result
|
||||
}
|
||||
}
|
||||
|
||||
@@ -203,6 +213,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
val currentVisit = visit ?: return
|
||||
launchBusy {
|
||||
val effectiveParentId = parentId ?: currentVisit.scopeAsset?.id ?: currentVisit.operationalArea?.id
|
||||
inventorySearchGeneration += 1
|
||||
inventoryParentId = effectiveParentId
|
||||
fieldTypes = repository.fieldTypes(currentVisit.id, parentId).data
|
||||
inventory = repository.fieldInventory(currentVisit.id, null, effectiveParentId).data
|
||||
@@ -216,7 +227,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
|
||||
fun selectExisting(item: FieldInventoryItem) {
|
||||
val visitId = visit?.id ?: return
|
||||
launchBusy {
|
||||
launchBusy(mutation = true) {
|
||||
selectedFieldAsset = repository.selectFieldAsset(visitId, item.id)
|
||||
notice = "Inventario agregado a la Inspección."
|
||||
reloadCurrentInventory(visitId)
|
||||
@@ -252,7 +263,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
error = "Elegí una clasificación técnica o la opción Otro / no catalogado."
|
||||
return
|
||||
}
|
||||
launchBusy {
|
||||
launchBusy(mutation = true) {
|
||||
val request = CreateFieldInventoryRequest(
|
||||
typeId = type.id,
|
||||
parentId = parentId,
|
||||
@@ -261,9 +272,9 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
commonName = commonName?.trim()?.takeIf { it.isNotBlank() },
|
||||
description = description?.trim()?.takeIf { it.isNotBlank() },
|
||||
attributes = attributes,
|
||||
deviceLatitude = latitude,
|
||||
deviceLongitude = longitude,
|
||||
deviceAccuracyM = accuracyM,
|
||||
deviceLatitude = FieldCoordinates.latitude(latitude),
|
||||
deviceLongitude = FieldCoordinates.longitude(longitude),
|
||||
deviceAccuracyM = accuracyM?.let(FieldCoordinates::accuracy),
|
||||
deviceCapturedAt = Instant.now().toString(),
|
||||
)
|
||||
selectedFieldAsset = repository.createFieldAsset(visitId, request)
|
||||
@@ -283,7 +294,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
error = "Explicá brevemente por qué se trata de un duplicado."
|
||||
return
|
||||
}
|
||||
launchBusy {
|
||||
launchBusy(mutation = true) {
|
||||
val result = repository.mergeFieldAsset(
|
||||
visitId = visitId,
|
||||
assetId = source.id,
|
||||
@@ -310,7 +321,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
) {
|
||||
val visitId = visit?.id ?: return
|
||||
val asset = selectedFieldAsset?.asset ?: return
|
||||
launchBusy {
|
||||
launchBusy(mutation = true) {
|
||||
val response = repository.uploadFieldPhoto(
|
||||
visitId = visitId,
|
||||
assetId = asset.id,
|
||||
@@ -345,7 +356,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
error = "Creá o seleccioná el Acta en elaboración antes de registrar Hallazgos."
|
||||
return
|
||||
}
|
||||
launchBusy {
|
||||
launchBusy(mutation = true) {
|
||||
selectedAct = actsRepository.ensureAsset(draft.id, assetId)
|
||||
loadActsInternal(visitId, selectDraft = false)
|
||||
loadFindingOptionsInternal(visitId, assetId, draft.id)
|
||||
@@ -379,7 +390,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
error = "La gravedad debe estar entre 1 y 10."
|
||||
return
|
||||
}
|
||||
launchBusy {
|
||||
launchBusy(mutation = true) {
|
||||
selectedAct = actsRepository.ensureAsset(actId, assetId)
|
||||
val response = findingsRepository.create(
|
||||
visitId,
|
||||
@@ -410,7 +421,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
title: String? = null,
|
||||
description: String? = null,
|
||||
) {
|
||||
launchBusy {
|
||||
launchBusy(mutation = true) {
|
||||
findingsRepository.uploadObservationPhoto(
|
||||
findingId = findingId,
|
||||
file = file,
|
||||
@@ -442,7 +453,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
error = "Completá nombre, documento y cargo del responsable de la empresa."
|
||||
return
|
||||
}
|
||||
launchBusy {
|
||||
launchBusy(mutation = true) {
|
||||
actClosure = actsRepository.setResponsible(
|
||||
actId,
|
||||
MobileResponsibleRequest(
|
||||
@@ -465,7 +476,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
error = "Indicá un motivo de ausencia de al menos 10 caracteres."
|
||||
return
|
||||
}
|
||||
launchBusy {
|
||||
launchBusy(mutation = true) {
|
||||
actClosure = actsRepository.setResponsible(
|
||||
actId,
|
||||
MobileResponsibleRequest(
|
||||
@@ -479,7 +490,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
|
||||
fun prepareSelectedAct() {
|
||||
val actId = selectedAct?.id ?: return
|
||||
launchBusy {
|
||||
launchBusy(mutation = true) {
|
||||
actClosure = actsRepository.lock(actId)
|
||||
refreshSelectedActInternal(actId)
|
||||
notice = "Acta cerrada y pendiente de firma. Su contenido quedó inmutable; las firmas y manifestaciones pueden completarse a continuación."
|
||||
@@ -497,7 +508,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
accuracyM: Double?,
|
||||
) {
|
||||
val actId = selectedAct?.id ?: return
|
||||
launchBusy {
|
||||
launchBusy(mutation = true) {
|
||||
actClosure = actsRepository.signInspector(actId, png, latitude, longitude, accuracyM)
|
||||
notice = "Firma del inspector incorporada al Acta."
|
||||
}
|
||||
@@ -512,7 +523,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
statement: String?,
|
||||
) {
|
||||
val actId = selectedAct?.id ?: return
|
||||
launchBusy {
|
||||
launchBusy(mutation = true) {
|
||||
actClosure = actsRepository.signCompany(
|
||||
actId, png, latitude, longitude, accuracyM, manifestation, statement,
|
||||
)
|
||||
@@ -534,7 +545,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
error = "Indicá un motivo de al menos 10 caracteres."
|
||||
return
|
||||
}
|
||||
launchBusy {
|
||||
launchBusy(mutation = true) {
|
||||
actClosure = actsRepository.companyOutcome(actId, status, reason)
|
||||
notice = "Negativa a firmar asentada."
|
||||
}
|
||||
@@ -543,7 +554,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
fun closeSelectedAct() {
|
||||
val currentVisit = visit ?: return
|
||||
val actId = selectedAct?.id ?: return
|
||||
launchBusy {
|
||||
launchBusy(mutation = true) {
|
||||
actClosure = actsRepository.seal(actId)
|
||||
refreshSelectedActInternal(actId)
|
||||
loadActsInternal(currentVisit.id, selectDraft = false)
|
||||
@@ -554,7 +565,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
|
||||
fun closeInspection() {
|
||||
val visitId = visit?.id ?: return
|
||||
launchBusy {
|
||||
launchBusy(mutation = true) {
|
||||
visit = actsRepository.closeVisit(visitId)
|
||||
loadVisitsInternal()
|
||||
notice = "Inspección cerrada. Todas sus Actas quedaron firmadas y disponibles para el circuito de oficina."
|
||||
@@ -637,17 +648,21 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
fieldFindingEvidence = emptyMap()
|
||||
}
|
||||
|
||||
private fun launchBusy(block: suspend () -> Unit) {
|
||||
private fun launchBusy(mutation: Boolean = false, block: suspend () -> Unit) {
|
||||
if (!operations.begin(mutation)) return
|
||||
busy = operations.busy
|
||||
viewModelScope.launch {
|
||||
busy = true
|
||||
error = null
|
||||
try {
|
||||
block()
|
||||
} catch (cancelled: CancellationException) {
|
||||
throw cancelled
|
||||
} catch (throwable: Throwable) {
|
||||
error = DhRepository.humanError(throwable)
|
||||
if (repository.currentSession() == null) session = null
|
||||
} finally {
|
||||
busy = false
|
||||
operations.end()
|
||||
busy = operations.busy
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
package com.korexlabs.dhinspeccion
|
||||
|
||||
/** Main-thread gate: reads may overlap; a second write is never queued by a double tap. */
|
||||
internal class OperationTracker {
|
||||
private var pending = 0
|
||||
val busy: Boolean get() = pending > 0
|
||||
fun begin(mutation: Boolean): Boolean {
|
||||
if (mutation && busy) return false
|
||||
pending += 1
|
||||
return true
|
||||
}
|
||||
fun end() {
|
||||
check(pending > 0)
|
||||
pending -= 1
|
||||
}
|
||||
}
|
||||
@@ -7,8 +7,6 @@ import android.util.Base64
|
||||
import com.korexlabs.dhinspeccion.BuildConfig
|
||||
import com.squareup.moshi.Moshi
|
||||
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
|
||||
import kotlinx.coroutines.sync.Mutex
|
||||
import kotlinx.coroutines.sync.withLock
|
||||
import okhttp3.MediaType.Companion.toMediaType
|
||||
import okhttp3.MultipartBody
|
||||
import okhttp3.OkHttpClient
|
||||
@@ -451,7 +449,6 @@ class SecureSessionStore(context: Context) {
|
||||
|
||||
class DhRepository(context: Context) {
|
||||
private val store = SecureSessionStore(context.applicationContext)
|
||||
private val refreshMutex = Mutex()
|
||||
private val moshi = Moshi.Builder().addLast(KotlinJsonAdapterFactory()).build()
|
||||
private val api: DhApi = Retrofit.Builder()
|
||||
.baseUrl(BuildConfig.API_BASE_URL)
|
||||
@@ -530,13 +527,13 @@ class DhRepository(context: Context) {
|
||||
visitId = visitId,
|
||||
assetId = assetId,
|
||||
file = part,
|
||||
latitude = latitude.toString().toRequestBody(text),
|
||||
longitude = longitude.toString().toRequestBody(text),
|
||||
accuracy = accuracyM?.toString()?.toRequestBody(text),
|
||||
latitude = FieldCoordinates.latitude(latitude).toString().toRequestBody(text),
|
||||
longitude = FieldCoordinates.longitude(longitude).toString().toRequestBody(text),
|
||||
accuracy = accuracyM?.let(FieldCoordinates::accuracy)?.toString()?.toRequestBody(text),
|
||||
capturedAt = capturedAt.toRequestBody(text),
|
||||
deviceLabel = "DH Android".toRequestBody(text),
|
||||
exifLatitude = latitude.toString().toRequestBody(text),
|
||||
exifLongitude = longitude.toString().toRequestBody(text),
|
||||
exifLatitude = FieldCoordinates.latitude(latitude).toString().toRequestBody(text),
|
||||
exifLongitude = FieldCoordinates.longitude(longitude).toString().toRequestBody(text),
|
||||
exifCapturedAt = capturedAt.toRequestBody(text),
|
||||
)
|
||||
}
|
||||
@@ -548,23 +545,19 @@ class DhRepository(context: Context) {
|
||||
} catch (error: HttpException) {
|
||||
if (error.code() != 401) throw error
|
||||
}
|
||||
session = refresh(session.refreshToken)
|
||||
session = refresh(session)
|
||||
return block(session)
|
||||
}
|
||||
|
||||
private suspend fun refresh(previousRefreshToken: String): StoredSession = refreshMutex.withLock {
|
||||
val latest = store.load() ?: throw IllegalStateException("Sesión no iniciada")
|
||||
if (latest.refreshToken != previousRefreshToken) return@withLock latest
|
||||
try {
|
||||
store.save(api.refresh(RefreshRequest(previousRefreshToken)))
|
||||
} catch (error: Throwable) {
|
||||
store.clear()
|
||||
throw error
|
||||
}
|
||||
}
|
||||
private suspend fun refresh(previous: StoredSession): StoredSession =
|
||||
MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear, api::refresh)
|
||||
|
||||
|
||||
companion object {
|
||||
fun humanError(error: Throwable): String {
|
||||
if (error is java.io.IOException) {
|
||||
return "No se pudo conectar. Revisá la señal. Si estabas guardando, comprobá el registro antes de reintentar."
|
||||
}
|
||||
if (error is HttpException) {
|
||||
val body = runCatching { error.response()?.errorBody()?.string() }.getOrNull()
|
||||
val message = runCatching { JSONObject(body.orEmpty()).optString("message") }.getOrNull()
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
package com.korexlabs.dhinspeccion.data
|
||||
|
||||
import java.math.BigDecimal
|
||||
import java.math.RoundingMode
|
||||
|
||||
internal object FieldCoordinates {
|
||||
private fun normalized(value: Double, scale: Int, min: Double, max: Double): Double {
|
||||
require(value.isFinite() && value in min..max) { "La ubicación GPS recibida no es válida." }
|
||||
return BigDecimal.valueOf(value).setScale(scale, RoundingMode.HALF_UP).toDouble()
|
||||
}
|
||||
fun latitude(value: Double) = normalized(value, 6, -90.0, 90.0)
|
||||
fun longitude(value: Double) = normalized(value, 6, -180.0, 180.0)
|
||||
fun accuracy(value: Double) = normalized(value, 3, 0.0, 100000.0)
|
||||
}
|
||||
+7
-17
@@ -4,8 +4,6 @@ import android.content.Context
|
||||
import com.korexlabs.dhinspeccion.BuildConfig
|
||||
import com.squareup.moshi.Moshi
|
||||
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
|
||||
import kotlinx.coroutines.sync.Mutex
|
||||
import kotlinx.coroutines.sync.withLock
|
||||
import okhttp3.MediaType.Companion.toMediaType
|
||||
import okhttp3.MultipartBody
|
||||
import okhttp3.OkHttpClient
|
||||
@@ -176,7 +174,6 @@ private interface FieldFindingsApi {
|
||||
*/
|
||||
class FieldFindingsRepository(context: Context) {
|
||||
private val store = SecureSessionStore(context.applicationContext)
|
||||
private val refreshMutex = Mutex()
|
||||
private val moshi = Moshi.Builder().addLast(KotlinJsonAdapterFactory()).build()
|
||||
private val api: FieldFindingsApi = Retrofit.Builder()
|
||||
.baseUrl(BuildConfig.API_BASE_URL)
|
||||
@@ -227,9 +224,9 @@ class FieldFindingsRepository(context: Context) {
|
||||
title = title?.trim()?.takeIf { it.isNotBlank() }?.toRequestBody(text),
|
||||
description = description?.trim()?.takeIf { it.isNotBlank() }?.toRequestBody(text),
|
||||
capturedAt = capturedAt.toRequestBody(text),
|
||||
latitude = latitude.toString().toRequestBody(text),
|
||||
longitude = longitude.toString().toRequestBody(text),
|
||||
accuracyM = accuracyM?.toString()?.toRequestBody(text),
|
||||
latitude = FieldCoordinates.latitude(latitude).toString().toRequestBody(text),
|
||||
longitude = FieldCoordinates.longitude(longitude).toString().toRequestBody(text),
|
||||
accuracyM = accuracyM?.let(FieldCoordinates::accuracy)?.toString()?.toRequestBody(text),
|
||||
deviceLabel = "DH Android".toRequestBody(text),
|
||||
)
|
||||
}
|
||||
@@ -241,18 +238,11 @@ class FieldFindingsRepository(context: Context) {
|
||||
} catch (error: HttpException) {
|
||||
if (error.code() != 401) throw error
|
||||
}
|
||||
session = refresh(session.refreshToken)
|
||||
session = refresh(session)
|
||||
return block(session)
|
||||
}
|
||||
|
||||
private suspend fun refresh(previousRefreshToken: String): StoredSession = refreshMutex.withLock {
|
||||
val latest = store.load() ?: throw IllegalStateException("Sesión no iniciada")
|
||||
if (latest.refreshToken != previousRefreshToken) return@withLock latest
|
||||
try {
|
||||
store.save(api.refresh(RefreshRequest(previousRefreshToken)))
|
||||
} catch (error: Throwable) {
|
||||
store.clear()
|
||||
throw error
|
||||
}
|
||||
}
|
||||
private suspend fun refresh(previous: StoredSession): StoredSession =
|
||||
MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear, api::refresh)
|
||||
|
||||
}
|
||||
|
||||
@@ -4,8 +4,6 @@ import android.content.Context
|
||||
import com.korexlabs.dhinspeccion.BuildConfig
|
||||
import com.squareup.moshi.Moshi
|
||||
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
|
||||
import kotlinx.coroutines.sync.Mutex
|
||||
import kotlinx.coroutines.sync.withLock
|
||||
import okhttp3.MediaType.Companion.toMediaType
|
||||
import okhttp3.MultipartBody
|
||||
import okhttp3.OkHttpClient
|
||||
@@ -310,7 +308,6 @@ private interface MobileActsApi {
|
||||
|
||||
class MobileActsRepository(context: Context) {
|
||||
private val store = SecureSessionStore(context.applicationContext)
|
||||
private val refreshMutex = Mutex()
|
||||
private val moshi = Moshi.Builder().addLast(KotlinJsonAdapterFactory()).build()
|
||||
private val api: MobileActsApi = Retrofit.Builder()
|
||||
.baseUrl(BuildConfig.API_BASE_URL)
|
||||
@@ -429,9 +426,9 @@ class MobileActsRepository(context: Context) {
|
||||
val consent = "true".toRequestBody(text)
|
||||
val signedAt = Instant.now().toString().toRequestBody(text)
|
||||
val device = "DH Android".toRequestBody(text)
|
||||
val lat = latitude?.toString()?.toRequestBody(text)
|
||||
val lon = longitude?.toString()?.toRequestBody(text)
|
||||
val accuracy = accuracyM?.toString()?.toRequestBody(text)
|
||||
val lat = latitude?.let(FieldCoordinates::latitude)?.toString()?.toRequestBody(text)
|
||||
val lon = longitude?.let(FieldCoordinates::longitude)?.toString()?.toRequestBody(text)
|
||||
val accuracy = accuracyM?.let(FieldCoordinates::accuracy)?.toString()?.toRequestBody(text)
|
||||
if (company) {
|
||||
api.signCompany(
|
||||
"Bearer ${session.accessToken}", actId, file, consent, signedAt,
|
||||
@@ -454,18 +451,11 @@ class MobileActsRepository(context: Context) {
|
||||
} catch (error: HttpException) {
|
||||
if (error.code() != 401) throw error
|
||||
}
|
||||
session = refresh(session.refreshToken)
|
||||
session = refresh(session)
|
||||
return block(session)
|
||||
}
|
||||
|
||||
private suspend fun refresh(previousRefreshToken: String): StoredSession = refreshMutex.withLock {
|
||||
val latest = store.load() ?: throw IllegalStateException("Sesión no iniciada")
|
||||
if (latest.refreshToken != previousRefreshToken) return@withLock latest
|
||||
try {
|
||||
store.save(api.refresh(RefreshRequest(previousRefreshToken)))
|
||||
} catch (error: Throwable) {
|
||||
store.clear()
|
||||
throw error
|
||||
}
|
||||
}
|
||||
private suspend fun refresh(previous: StoredSession): StoredSession =
|
||||
MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear, api::refresh)
|
||||
|
||||
}
|
||||
|
||||
+4
-14
@@ -4,8 +4,6 @@ import android.content.Context
|
||||
import com.korexlabs.dhinspeccion.BuildConfig
|
||||
import com.squareup.moshi.Moshi
|
||||
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
|
||||
import kotlinx.coroutines.sync.Mutex
|
||||
import kotlinx.coroutines.sync.withLock
|
||||
import okhttp3.OkHttpClient
|
||||
import retrofit2.HttpException
|
||||
import retrofit2.Retrofit
|
||||
@@ -55,7 +53,6 @@ private interface MobileInspectionOpenApi {
|
||||
|
||||
class MobileInspectionOpenRepository(context: Context) {
|
||||
private val store = SecureSessionStore(context.applicationContext)
|
||||
private val refreshMutex = Mutex()
|
||||
private val moshi = Moshi.Builder().addLast(KotlinJsonAdapterFactory()).build()
|
||||
private val api: MobileInspectionOpenApi = Retrofit.Builder()
|
||||
.baseUrl(BuildConfig.API_BASE_URL)
|
||||
@@ -86,18 +83,11 @@ class MobileInspectionOpenRepository(context: Context) {
|
||||
} catch (error: HttpException) {
|
||||
if (error.code() != 401) throw error
|
||||
}
|
||||
session = refresh(session.refreshToken)
|
||||
session = refresh(session)
|
||||
return block(session)
|
||||
}
|
||||
|
||||
private suspend fun refresh(previousRefreshToken: String): StoredSession = refreshMutex.withLock {
|
||||
val latest = store.load() ?: throw IllegalStateException("Sesión no iniciada")
|
||||
if (latest.refreshToken != previousRefreshToken) return@withLock latest
|
||||
try {
|
||||
store.save(api.refresh(RefreshRequest(previousRefreshToken)))
|
||||
} catch (error: Throwable) {
|
||||
store.clear()
|
||||
throw error
|
||||
}
|
||||
}
|
||||
private suspend fun refresh(previous: StoredSession): StoredSession =
|
||||
MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear, api::refresh)
|
||||
|
||||
}
|
||||
|
||||
+32
@@ -0,0 +1,32 @@
|
||||
package com.korexlabs.dhinspeccion.data
|
||||
|
||||
import kotlinx.coroutines.sync.Mutex
|
||||
import kotlinx.coroutines.sync.withLock
|
||||
import retrofit2.HttpException
|
||||
|
||||
/** One refresh lock for every API client sharing the encrypted session. */
|
||||
internal object MobileSessionCoordinator {
|
||||
private val mutex = Mutex()
|
||||
|
||||
suspend fun refresh(
|
||||
previous: StoredSession,
|
||||
load: () -> StoredSession?,
|
||||
save: (MobileSessionResponse) -> StoredSession,
|
||||
clear: () -> Unit,
|
||||
request: suspend (RefreshRequest) -> MobileSessionResponse,
|
||||
): StoredSession = mutex.withLock {
|
||||
val latest = load() ?: throw IllegalStateException("Sesión no iniciada")
|
||||
check(latest.userId == previous.userId) { "La sesión cambió. Volvé a abrir la operación." }
|
||||
if (latest.refreshToken != previous.refreshToken) return@withLock latest
|
||||
val response = try {
|
||||
request(RefreshRequest(previous.refreshToken))
|
||||
} catch (error: HttpException) {
|
||||
// Network failures and server outages must not discard the saved login.
|
||||
if (error.code() == 401 && load()?.refreshToken == previous.refreshToken) clear()
|
||||
throw error
|
||||
}
|
||||
// A logout or another login during the request must never be undone.
|
||||
check(load()?.refreshToken == previous.refreshToken) { "La sesión cambió. Volvé a ingresar." }
|
||||
save(response)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,64 @@
|
||||
package com.korexlabs.dhinspeccion.data
|
||||
|
||||
import android.content.Context
|
||||
import com.korexlabs.dhinspeccion.BuildConfig
|
||||
import com.squareup.moshi.Moshi
|
||||
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
|
||||
import retrofit2.HttpException
|
||||
import retrofit2.Retrofit
|
||||
import retrofit2.converter.moshi.MoshiConverterFactory
|
||||
import retrofit2.http.*
|
||||
import java.time.LocalDate
|
||||
import java.time.OffsetDateTime
|
||||
|
||||
internal data class TechnicalDefinition(
|
||||
val id: String, val code: String, val name: String, val dataType: String,
|
||||
val isRequired: Boolean = false, val isActive: Boolean = true,
|
||||
val unit: String? = null, val options: List<String>? = null,
|
||||
)
|
||||
internal data class TechnicalValues(
|
||||
val assetId: String, val family: FieldInventoryFamily,
|
||||
val definitions: List<TechnicalDefinition>, val values: Map<String, Any?>,
|
||||
)
|
||||
internal data class TechnicalValuesRequest(val values: Map<String, Any?>)
|
||||
private interface TechnicalApi {
|
||||
@GET("assets/{id}/technical-values")
|
||||
suspend fun get(@Header("Authorization") auth: String, @Path("id") id: String): TechnicalValues
|
||||
@PUT("assets/{id}/technical-values")
|
||||
suspend fun put(@Header("Authorization") auth: String, @Path("id") id: String, @Body body: TechnicalValuesRequest): TechnicalValues
|
||||
@POST("auth/mobile/refresh")
|
||||
suspend fun refresh(@Body request: RefreshRequest): MobileSessionResponse
|
||||
}
|
||||
internal class TechnicalRepository(context: Context) {
|
||||
private val store = SecureSessionStore(context.applicationContext)
|
||||
private val api = Retrofit.Builder().baseUrl(BuildConfig.API_BASE_URL)
|
||||
.addConverterFactory(MoshiConverterFactory.create(Moshi.Builder().addLast(KotlinJsonAdapterFactory()).build()))
|
||||
.build().create(TechnicalApi::class.java)
|
||||
suspend fun get(id: String) = authorized { api.get("Bearer ${it.accessToken}", id) }
|
||||
suspend fun save(id: String, values: Map<String, Any?>) = authorized {
|
||||
api.put("Bearer ${it.accessToken}", id, TechnicalValuesRequest(values))
|
||||
}
|
||||
private suspend fun <T> authorized(block: suspend (StoredSession) -> T): T {
|
||||
val previous = store.load() ?: error("Sesión no iniciada")
|
||||
try { return block(previous) }
|
||||
catch (error: HttpException) { if (error.code() != 401) throw error }
|
||||
val current = MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear, api::refresh)
|
||||
return block(current)
|
||||
}
|
||||
}
|
||||
|
||||
/** Keeps IDs and typed JSON values identical to the Dashboard contract. */
|
||||
internal fun technicalInputValue(definition: TechnicalDefinition, text: String): Any? {
|
||||
val value = text.trim()
|
||||
require(value.isNotBlank() || !definition.isRequired) { "Completá ${definition.name}." }
|
||||
if (value.isBlank()) return null
|
||||
fun invalid(): Nothing = throw IllegalArgumentException("Revisá el valor de ${definition.name}.")
|
||||
return when (definition.dataType) {
|
||||
"NUMBER" -> value.replace(',', '.').toDoubleOrNull()?.takeIf { it.isFinite() } ?: invalid()
|
||||
"BOOLEAN" -> when (value) { "true" -> true; "false" -> false; else -> invalid() }
|
||||
"DATE" -> runCatching { LocalDate.parse(value).toString() }.getOrElse { invalid() }
|
||||
"DATETIME" -> runCatching { OffsetDateTime.parse(value).toInstant().toString() }.getOrElse { invalid() }
|
||||
"SELECT" -> value.takeIf { it in definition.options.orEmpty() } ?: invalid()
|
||||
else -> value.takeIf { it.length <= 4000 } ?: invalid()
|
||||
}
|
||||
}
|
||||
@@ -75,6 +75,7 @@ fun FieldFindingScreen(model: MainViewModel) {
|
||||
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) }
|
||||
@@ -110,6 +111,7 @@ fun FieldFindingScreen(model: MainViewModel) {
|
||||
pendingPhotoFindingId = findingId
|
||||
takePicture.launch(uri)
|
||||
}
|
||||
.onFailure { localError = it.message ?: "No se pudo capturar la ubicación GPS." }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -122,6 +124,7 @@ fun FieldFindingScreen(model: MainViewModel) {
|
||||
val findingId = requestedFindingId
|
||||
requestedFindingId = null
|
||||
if (camera && location && findingId != null) beginPhoto(findingId)
|
||||
else localError = "Permití cámara y ubicación para adjuntar una foto con GPS."
|
||||
}
|
||||
|
||||
fun requestPhoto(findingId: String) {
|
||||
@@ -192,6 +195,7 @@ fun FieldFindingScreen(model: MainViewModel) {
|
||||
}
|
||||
}
|
||||
|
||||
localError?.let { Text(it, color = MaterialTheme.colorScheme.error) }
|
||||
model.error?.let {
|
||||
Card(colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.errorContainer)) {
|
||||
Text(it, Modifier.padding(12.dp))
|
||||
|
||||
@@ -11,6 +11,10 @@ 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.safeDrawingPadding
|
||||
import androidx.compose.foundation.layout.imePadding
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.Visibility
|
||||
import androidx.compose.material.icons.filled.VisibilityOff
|
||||
@@ -80,7 +84,7 @@ fun DhRoot(model: MainViewModel, activity: FragmentActivity) {
|
||||
}
|
||||
|
||||
DhTheme {
|
||||
Surface(Modifier.fillMaxSize()) {
|
||||
Surface(Modifier.fillMaxSize().safeDrawingPadding().imePadding()) {
|
||||
when {
|
||||
model.session == null -> EnhancedLoginScreen(model) {
|
||||
passwordLoginInFlight = true
|
||||
@@ -106,10 +110,10 @@ fun DhRoot(model: MainViewModel, activity: FragmentActivity) {
|
||||
@Composable
|
||||
private fun EnhancedLoginScreen(model: MainViewModel, onPasswordLogin: () -> Unit) {
|
||||
var identifier by rememberSaveable { mutableStateOf("") }
|
||||
var password by rememberSaveable { mutableStateOf("") }
|
||||
var password by remember { mutableStateOf("") }
|
||||
var passwordVisible by rememberSaveable { mutableStateOf(false) }
|
||||
|
||||
Box(Modifier.fillMaxSize().padding(24.dp), contentAlignment = Alignment.Center) {
|
||||
Box(Modifier.fillMaxSize().verticalScroll(rememberScrollState()).padding(24.dp), contentAlignment = Alignment.Center) {
|
||||
Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(14.dp), horizontalAlignment = Alignment.CenterHorizontally) {
|
||||
Image(
|
||||
painter = painterResource(R.drawable.ic_mendoza_launcher_exact),
|
||||
@@ -203,7 +207,7 @@ private fun BiometricUnlockScreen(
|
||||
|
||||
LaunchedEffect(Unit) { authenticate() }
|
||||
|
||||
Box(Modifier.fillMaxSize().padding(24.dp), contentAlignment = Alignment.Center) {
|
||||
Box(Modifier.fillMaxSize().verticalScroll(rememberScrollState()).padding(24.dp), contentAlignment = Alignment.Center) {
|
||||
Column(
|
||||
Modifier.fillMaxWidth(),
|
||||
verticalArrangement = Arrangement.spacedBy(14.dp),
|
||||
|
||||
@@ -329,13 +329,13 @@ private fun ModernFieldInventoryScreen(model: MainViewModel, onBack: () -> Unit)
|
||||
model.loadFieldTypes(null)
|
||||
}
|
||||
|
||||
fun startInstallation() {
|
||||
fun startInstallation(parent: FieldInventoryItem? = null) {
|
||||
model.clearSelectedFieldAsset()
|
||||
modeName = ModernInventoryMode.CREATE_INSTALLATION.name
|
||||
parentId = null
|
||||
parentLabel = visit.scopeAsset?.name ?: "Yacimiento de la inspección"
|
||||
parentId = parent?.id
|
||||
parentLabel = parent?.name ?: visit.scopeAsset?.name ?: "Yacimiento de la inspección"
|
||||
resetForm()
|
||||
model.loadFieldTypes(null)
|
||||
model.loadFieldTypes(parent?.id)
|
||||
}
|
||||
|
||||
fun startSubinstallation() {
|
||||
@@ -349,6 +349,10 @@ private fun ModernFieldInventoryScreen(model: MainViewModel, onBack: () -> Unit)
|
||||
}
|
||||
|
||||
fun chooseParent(item: FieldInventoryItem) {
|
||||
if (modernItemTypeCode(item) == "yacimiento") {
|
||||
startInstallation(item)
|
||||
return
|
||||
}
|
||||
keyboard?.hide()
|
||||
focusManager.clearFocus()
|
||||
parentId = item.id
|
||||
@@ -385,8 +389,8 @@ private fun ModernFieldInventoryScreen(model: MainViewModel, onBack: () -> Unit)
|
||||
ModernInventoryMode.CREATE_SUBINSTALLATION -> normalized.contains("subinstalacion")
|
||||
else -> false
|
||||
}
|
||||
} ?: model.fieldTypes.firstOrNull()
|
||||
if (model.fieldTypes.none { it.id == selectedTypeId }) {
|
||||
}
|
||||
if (selectedTypeId != preferred?.id) {
|
||||
selectedTypeId = preferred?.id
|
||||
selectedFamilyId = null
|
||||
familySearch = ""
|
||||
@@ -435,7 +439,7 @@ private fun ModernFieldInventoryScreen(model: MainViewModel, onBack: () -> Unit)
|
||||
|
||||
fun createWithLocation() {
|
||||
val type = selectedType ?: return
|
||||
val effectiveParent = if (mode == ModernInventoryMode.CREATE_SUBINSTALLATION) parentId else null
|
||||
val effectiveParent = parentId
|
||||
scope.launch {
|
||||
runCatching { currentModernGeo(context) }
|
||||
.onSuccess { geo ->
|
||||
@@ -544,6 +548,9 @@ private fun ModernFieldInventoryScreen(model: MainViewModel, onBack: () -> Unit)
|
||||
}
|
||||
|
||||
if (selectedCapture != null) {
|
||||
if (modernItemTypeCode(selectedCapture.asset) in setOf("instalacion", "subinstalacion")) {
|
||||
TechnicalFieldsButton(selectedCapture.asset.id, enabled = !model.busy)
|
||||
}
|
||||
ModernCaptureCard(
|
||||
item = selectedCapture.asset,
|
||||
gps = selectedCapture.capture.creationGpsCaptured,
|
||||
@@ -735,8 +742,9 @@ private fun ModernFieldInventoryScreen(model: MainViewModel, onBack: () -> Unit)
|
||||
}
|
||||
}
|
||||
|
||||
if (model.fieldTypes.isEmpty() && !model.busy) {
|
||||
ModernLocalError("No hay un tipo habilitado para esta ubicación.") {}
|
||||
if (selectedType == null && !model.busy) {
|
||||
ModernLocalError("Elegí un Yacimiento en Inventario y tocá Agregar Instalación. No se puede crear una Instalación directamente dentro de un Área.") {}
|
||||
OutlinedButton(onClick = { backToBrowse() }) { Text("Elegir Yacimiento") }
|
||||
}
|
||||
|
||||
if (model.fieldTypes.size > 1) {
|
||||
@@ -886,7 +894,7 @@ private fun ModernInventoryBrowse(
|
||||
) {
|
||||
val focusManager = LocalFocusManager.current
|
||||
val keyboard = LocalSoftwareKeyboardController.current
|
||||
val rows = model.inventory.filter { modernItemTypeCode(it) in setOf("instalacion", "subinstalacion") }
|
||||
val rows = model.inventory.filter { modernItemTypeCode(it) in setOf("yacimiento", "instalacion", "subinstalacion") }
|
||||
Column(Modifier.fillMaxSize().padding(horizontal = 18.dp)) {
|
||||
Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(10.dp)) {
|
||||
Button(onClick = onStartSubinstallation, modifier = Modifier.weight(1f)) {
|
||||
@@ -934,7 +942,7 @@ private fun ModernInventoryCard(item: FieldInventoryItem, onInspect: () -> Unit,
|
||||
Text(item.name, fontWeight = FontWeight.Bold)
|
||||
Text(item.code, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant)
|
||||
}
|
||||
StatusPill(if (typeCode == "subinstalacion") "Subinstalación" else "Instalación")
|
||||
StatusPill(when (typeCode) { "subinstalacion" -> "Subinstalación"; "yacimiento" -> "Yacimiento"; else -> "Instalación" })
|
||||
}
|
||||
item.commonName?.takeIf { it.isNotBlank() }?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
|
||||
Text(
|
||||
@@ -946,11 +954,11 @@ private fun ModernInventoryCard(item: FieldInventoryItem, onInspect: () -> Unit,
|
||||
Button(onClick = onInspect, modifier = Modifier.fillMaxWidth()) {
|
||||
Text(if (item.selectedInInspection) "Abrir para Hallazgo" else "Seleccionar para Hallazgo")
|
||||
}
|
||||
if (typeCode == "instalacion") {
|
||||
if (typeCode in setOf("yacimiento", "instalacion")) {
|
||||
OutlinedButton(onClick = onAddChild, modifier = Modifier.fillMaxWidth()) {
|
||||
Icon(Icons.Filled.Add, null)
|
||||
Spacer(Modifier.width(6.dp))
|
||||
Text("Agregar Subinstalación")
|
||||
Text(if (typeCode == "yacimiento") "Agregar Instalación" else "Agregar Subinstalación")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,99 @@
|
||||
package com.korexlabs.dhinspeccion.ui
|
||||
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.material3.*
|
||||
import androidx.compose.runtime.*
|
||||
import androidx.compose.runtime.saveable.rememberSaveable
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.unit.dp
|
||||
import com.korexlabs.dhinspeccion.data.*
|
||||
import kotlinx.coroutines.CancellationException
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
@Composable
|
||||
internal fun TechnicalFieldsButton(assetId: String, enabled: Boolean) {
|
||||
val context = LocalContext.current
|
||||
val repository = remember { TechnicalRepository(context) }
|
||||
val scope = rememberCoroutineScope()
|
||||
var open by rememberSaveable(assetId) { mutableStateOf(false) }
|
||||
var busy by remember(assetId) { mutableStateOf(false) }
|
||||
var snapshot by remember(assetId) { mutableStateOf<TechnicalValues?>(null) }
|
||||
var error by remember(assetId) { mutableStateOf<String?>(null) }
|
||||
var saved by remember(assetId) { mutableStateOf(false) }
|
||||
val values = remember(assetId) { mutableStateMapOf<String, String>() }
|
||||
|
||||
OutlinedButton(onClick = { open = true }, enabled = enabled,
|
||||
modifier = Modifier.fillMaxWidth().padding(horizontal = 18.dp)) {
|
||||
Text(if (saved) "Datos técnicos guardados · Revisar" else "Completar datos técnicos")
|
||||
}
|
||||
if (!open) return
|
||||
LaunchedEffect(assetId, open) {
|
||||
busy = true; error = null; snapshot = null
|
||||
try {
|
||||
val loaded = repository.get(assetId)
|
||||
snapshot = loaded
|
||||
values.clear()
|
||||
loaded.values.forEach { (id, value) -> values[id] = value?.toString().orEmpty() }
|
||||
} catch (cancelled: CancellationException) { throw cancelled }
|
||||
catch (failure: Exception) { error = DhRepository.humanError(failure) }
|
||||
finally { busy = false }
|
||||
}
|
||||
AlertDialog(
|
||||
onDismissRequest = { if (!busy) open = false },
|
||||
title = { Text(snapshot?.family?.name ?: "Datos técnicos") },
|
||||
text = {
|
||||
Column(Modifier.fillMaxWidth().heightIn(max = 460.dp).verticalScroll(rememberScrollState()),
|
||||
verticalArrangement = Arrangement.spacedBy(10.dp)) {
|
||||
Text("Son los mismos campos de la clasificación administrada en oficina. Los marcados con * son obligatorios.")
|
||||
if (busy) LinearProgressIndicator(Modifier.fillMaxWidth())
|
||||
error?.let { Text(it, color = MaterialTheme.colorScheme.error) }
|
||||
snapshot?.definitions?.filter { it.isActive }?.forEach { definition ->
|
||||
val label = definition.name + (if (definition.isRequired) " *" else "") + (definition.unit?.let { " ($it)" } ?: "")
|
||||
val current = values[definition.id].orEmpty()
|
||||
if (definition.dataType in setOf("BOOLEAN", "SELECT")) {
|
||||
Text(label)
|
||||
val options = if (definition.dataType == "BOOLEAN") listOf("true", "false") else definition.options.orEmpty()
|
||||
options.forEach { option ->
|
||||
FilterChip(selected = current == option, enabled = !busy,
|
||||
onClick = { values[definition.id] = option },
|
||||
label = { Text(if (definition.dataType == "BOOLEAN") if (option == "true") "Sí" else "No" else option) })
|
||||
}
|
||||
if (!definition.isRequired) TextButton(enabled = !busy, onClick = { values[definition.id] = "" }) { Text("Sin dato") }
|
||||
} else {
|
||||
OutlinedTextField(value = current, onValueChange = { values[definition.id] = it },
|
||||
label = { Text(label) }, enabled = !busy, modifier = Modifier.fillMaxWidth(),
|
||||
supportingText = {
|
||||
when (definition.dataType) {
|
||||
"DATE" -> Text("AAAA-MM-DD")
|
||||
"DATETIME" -> Text("AAAA-MM-DDTHH:MM:SS-03:00")
|
||||
else -> Unit
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
if (snapshot?.definitions?.none { it.isActive } == true) Text("Esta clasificación no tiene campos técnicos activos.")
|
||||
}
|
||||
},
|
||||
confirmButton = {
|
||||
TextButton(enabled = !busy && snapshot != null, onClick = {
|
||||
val current = snapshot ?: return@TextButton
|
||||
busy = true; error = null
|
||||
scope.launch {
|
||||
try {
|
||||
val payload = current.definitions.filter { it.isActive }.mapNotNull { definition ->
|
||||
technicalInputValue(definition, values[definition.id].orEmpty())?.let { definition.id to it }
|
||||
}.toMap()
|
||||
snapshot = repository.save(assetId, payload)
|
||||
saved = true; open = false
|
||||
} catch (cancelled: CancellationException) { throw cancelled }
|
||||
catch (failure: Exception) { error = DhRepository.humanError(failure) }
|
||||
finally { busy = false }
|
||||
}
|
||||
}) { Text("Guardar datos") }
|
||||
},
|
||||
dismissButton = { TextButton(enabled = !busy, onClick = { open = false }) { Text("Cerrar") } },
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
package com.korexlabs.dhinspeccion
|
||||
import com.korexlabs.dhinspeccion.data.FieldCoordinates
|
||||
import org.junit.Assert.*
|
||||
import org.junit.Test
|
||||
class FieldCoordinatesTest {
|
||||
@Test fun realGpsIsRoundedToApiPrecision() {
|
||||
assertEquals(-32.889459, FieldCoordinates.latitude(-32.889458762), 0.0)
|
||||
assertEquals(-68.845839, FieldCoordinates.longitude(-68.845838912), 0.0)
|
||||
assertEquals(4.123, FieldCoordinates.accuracy(4.123456789), 0.0)
|
||||
}
|
||||
@Test fun boundsAndZeroRemainValid() {
|
||||
assertEquals(90.0, FieldCoordinates.latitude(90.0), 0.0)
|
||||
assertEquals(-180.0, FieldCoordinates.longitude(-180.0), 0.0)
|
||||
assertEquals(0.0, FieldCoordinates.accuracy(0.0), 0.0)
|
||||
}
|
||||
@Test fun invalidCoordinatesAreRejected() {
|
||||
for (value in listOf(Double.NaN, Double.POSITIVE_INFINITY, 90.1, -90.1)) {
|
||||
try { FieldCoordinates.latitude(value); fail("Invalid latitude accepted") }
|
||||
catch (_: IllegalArgumentException) { }
|
||||
}
|
||||
try { FieldCoordinates.accuracy(-1.0); fail("Negative accuracy accepted") }
|
||||
catch (_: IllegalArgumentException) { }
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -38,7 +38,7 @@ class FinalFieldFlowContractTest {
|
||||
@Test
|
||||
fun structuralSelectionUsesTheServerTypeCode() {
|
||||
assertTrue(visit.contains("type.code.ifBlank { type.typeName ?: type.name }"))
|
||||
assertTrue(visit.contains("modernItemTypeCode(it) in setOf(\"instalacion\", \"subinstalacion\")"))
|
||||
assertTrue(visit.contains("modernItemTypeCode(it) in setOf(\"yacimiento\", \"instalacion\", \"subinstalacion\")"))
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
+105
@@ -0,0 +1,105 @@
|
||||
package com.korexlabs.dhinspeccion
|
||||
|
||||
import com.korexlabs.dhinspeccion.data.*
|
||||
import java.io.IOException
|
||||
import kotlinx.coroutines.*
|
||||
import okhttp3.ResponseBody.Companion.toResponseBody
|
||||
import org.junit.Assert.*
|
||||
import org.junit.Test
|
||||
import retrofit2.HttpException
|
||||
import retrofit2.Response
|
||||
|
||||
class MobileSessionCoordinatorTest {
|
||||
private fun old() = StoredSession("u1", "inspector", "Inspector", "a1", "r1")
|
||||
private fun response() = MobileSessionResponse(MobileUser("u1", "inspector"), "a2", "r2", 900)
|
||||
private fun http(code: Int) = HttpException(Response.error<Unit>(code, "error".toResponseBody()))
|
||||
|
||||
private class Store(var value: StoredSession?) {
|
||||
var clears = 0
|
||||
fun load() = value
|
||||
fun clear() { clears++; value = null }
|
||||
fun save(r: MobileSessionResponse): StoredSession =
|
||||
StoredSession(r.user.id, r.user.username, r.user.username, r.accessToken, r.refreshToken).also { value = it }
|
||||
}
|
||||
|
||||
@Test fun concurrentClientsRotateTheTokenOnlyOnce() = runBlocking {
|
||||
val previous = old(); val store = Store(previous); var calls = 0
|
||||
val results = coroutineScope {
|
||||
(1..4).map {
|
||||
async {
|
||||
MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear) {
|
||||
calls++; delay(20); response()
|
||||
}
|
||||
}
|
||||
}.awaitAll()
|
||||
}
|
||||
assertEquals(1, calls)
|
||||
assertTrue(results.all { it.refreshToken == "r2" })
|
||||
assertEquals(0, store.clears)
|
||||
}
|
||||
|
||||
@Test fun networkAndServerFailuresKeepSessionForRetry() = runBlocking {
|
||||
for (failure in listOf(IOException("offline"), http(500), http(429))) {
|
||||
val previous = old(); val store = Store(previous)
|
||||
try {
|
||||
MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear) { throw failure }
|
||||
fail("Expected request failure")
|
||||
} catch (caught: Exception) { assertSame(failure, caught) }
|
||||
assertEquals(previous, store.value)
|
||||
assertEquals(0, store.clears)
|
||||
}
|
||||
}
|
||||
|
||||
@Test fun invalidRefreshClearsOnlyTheExpiredSession() = runBlocking {
|
||||
val previous = old(); val store = Store(previous)
|
||||
try {
|
||||
MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear) { throw http(401) }
|
||||
fail("Expected unauthorized")
|
||||
} catch (caught: HttpException) { assertEquals(401, caught.code()) }
|
||||
assertNull(store.value)
|
||||
assertEquals(1, store.clears)
|
||||
}
|
||||
|
||||
@Test fun cancelledRefreshKeepsSession() = runBlocking {
|
||||
val previous = old(); val store = Store(previous)
|
||||
try {
|
||||
MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear) { throw CancellationException("cancel") }
|
||||
fail("Expected cancellation")
|
||||
} catch (_: CancellationException) { }
|
||||
assertEquals(previous, store.value)
|
||||
}
|
||||
|
||||
@Test fun logoutDuringRefreshCannotBeUndone() = runBlocking {
|
||||
val previous = old(); val store = Store(previous)
|
||||
try {
|
||||
MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear) {
|
||||
store.clear(); response()
|
||||
}
|
||||
fail("Must reject a refresh after logout")
|
||||
} catch (_: IllegalStateException) { }
|
||||
assertNull(store.value)
|
||||
}
|
||||
|
||||
@Test fun staleRequestCannotUseAnotherInspectorsSession() = runBlocking {
|
||||
val previous = old(); val store = Store(previous.copy(userId = "u2", refreshToken = "other"))
|
||||
try {
|
||||
MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear) {
|
||||
fail("No refresh allowed for another inspector"); response()
|
||||
}
|
||||
fail("Must reject account switch")
|
||||
} catch (_: IllegalStateException) { }
|
||||
assertEquals("u2", store.value?.userId)
|
||||
}
|
||||
|
||||
@Test fun lateUnauthorizedDoesNotClearANewLogin() = runBlocking {
|
||||
val previous = old(); val store = Store(previous)
|
||||
try {
|
||||
MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear) {
|
||||
store.value = previous.copy(refreshToken = "new-login")
|
||||
throw http(401)
|
||||
}
|
||||
} catch (_: HttpException) { }
|
||||
assertEquals("new-login", store.value?.refreshToken)
|
||||
assertEquals(0, store.clears)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
package com.korexlabs.dhinspeccion
|
||||
|
||||
import org.junit.Assert.*
|
||||
import org.junit.Test
|
||||
|
||||
class OperationTrackerTest {
|
||||
@Test fun doubleTapCannotQueueASecondWrite() {
|
||||
val tracker = OperationTracker()
|
||||
assertTrue(tracker.begin(mutation = true))
|
||||
assertFalse(tracker.begin(mutation = true))
|
||||
tracker.end()
|
||||
assertFalse(tracker.busy)
|
||||
assertTrue(tracker.begin(mutation = true))
|
||||
}
|
||||
@Test fun BusyRemainsUntilEveryReadCompletes() {
|
||||
val tracker = OperationTracker()
|
||||
assertTrue(tracker.begin(false)); assertTrue(tracker.begin(false))
|
||||
tracker.end(); assertTrue(tracker.busy)
|
||||
assertFalse(tracker.begin(true))
|
||||
tracker.end(); assertFalse(tracker.busy)
|
||||
}
|
||||
@Test fun readDuringWriteDoesNotReleaseItsGuardEarly() {
|
||||
val tracker = OperationTracker()
|
||||
assertTrue(tracker.begin(true)); assertTrue(tracker.begin(false))
|
||||
tracker.end(); assertFalse(tracker.begin(true))
|
||||
tracker.end(); assertTrue(tracker.begin(true))
|
||||
}
|
||||
}
|
||||
@@ -8,8 +8,8 @@ class ReleaseMetadataTest {
|
||||
@Test
|
||||
fun debugBuildKeepsSeparateApplicationIdentity() {
|
||||
assertEquals("com.korexlabs.dhinspeccion.debug", BuildConfig.APPLICATION_ID)
|
||||
assertEquals(28, BuildConfig.VERSION_CODE)
|
||||
assertEquals("0.19.0-debug", BuildConfig.VERSION_NAME)
|
||||
assertEquals(29, BuildConfig.VERSION_CODE)
|
||||
assertEquals("0.19.1-debug", BuildConfig.VERSION_NAME)
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
package com.korexlabs.dhinspeccion
|
||||
import com.korexlabs.dhinspeccion.data.*
|
||||
import org.junit.Assert.*
|
||||
import org.junit.Test
|
||||
class TechnicalValuesTest {
|
||||
private fun field(type: String, required: Boolean = false) = TechnicalDefinition("id", "code", "Campo", type, required, options = listOf("A", "B"))
|
||||
@Test fun decimalCommaAndBooleanFalseKeepTheirTypes() {
|
||||
assertEquals(12.5, technicalInputValue(field("NUMBER"), "12,5"))
|
||||
assertEquals(false, technicalInputValue(field("BOOLEAN", true), "false"))
|
||||
assertEquals(0.0, technicalInputValue(field("NUMBER", true), "0"))
|
||||
}
|
||||
@Test fun optionalBlankIsOmittedButRequiredBlankFails() {
|
||||
assertNull(technicalInputValue(field("TEXT"), " "))
|
||||
try { technicalInputValue(field("TEXT", true), ""); fail("Required missing") }
|
||||
catch (_: IllegalArgumentException) { }
|
||||
}
|
||||
@Test fun invalidNumbersDatesAndOptionsFailBeforeSave() {
|
||||
for ((type, value) in listOf("NUMBER" to "NaN", "DATE" to "2026-02-30", "SELECT" to "C", "BOOLEAN" to "quizás")) {
|
||||
try { technicalInputValue(field(type), value); fail("Invalid value accepted") }
|
||||
catch (_: IllegalArgumentException) { }
|
||||
}
|
||||
}
|
||||
@Test fun validDatesAndSelectRemainCanonical() {
|
||||
assertEquals("2026-09-14", technicalInputValue(field("DATE"), "2026-09-14"))
|
||||
assertEquals("A", technicalInputValue(field("SELECT"), "A"))
|
||||
assertEquals("2026-09-14T13:00:00Z", technicalInputValue(field("DATETIME"), "2026-09-14T10:00:00-03:00"))
|
||||
}
|
||||
}
|
||||
@@ -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 = 28/);
|
||||
assert.match(gradle, /versionName = "0\.19\.0"/);
|
||||
assert.match(gradle, /versionCode = 29/);
|
||||
assert.match(gradle, /versionName = "0\.19\.1"/);
|
||||
assert.match(gradle, /https:\/\/dhv2\.korexlabs\.com\/api\/v3\//);
|
||||
assert.match(gradle, /applicationIdSuffix = "\.debug"/);
|
||||
});
|
||||
|
||||
@@ -3,6 +3,14 @@ set -Eeuo pipefail
|
||||
|
||||
APP="/var/www/dhv2.korexlabs.com"
|
||||
BACKUP_ROOT="/root/DH_V2_BACKUPS"
|
||||
LOCK="/var/lock/dhv2-deploy.lock"
|
||||
|
||||
exec 9>"$LOCK"
|
||||
|
||||
if ! flock -n 9; then
|
||||
echo "Otro deploy de DH V2 ya está en curso. No se realiza ninguna modificación."
|
||||
exit 0
|
||||
fi
|
||||
DEPLOY_REF="${DHV2_DEPLOY_REF:-deploy}"
|
||||
STAMP="$(date +%Y%m%d_%H%M%S)"
|
||||
BACKUP="$BACKUP_ROOT/GITEA_DEPLOY_${STAMP}"
|
||||
|
||||
@@ -245,8 +245,8 @@ export function AuthoritativeInventoryConfigPage() {
|
||||
{canManage && <div style={{ marginTop: 18, borderTop: '1px solid var(--border)', paddingTop: 18 }}>
|
||||
<h3 style={{ marginTop: 0 }}>+ Nuevo tipo</h3>
|
||||
<label className="field"><span>Nombre</span><input value={newTypeName} onChange={(event) => setNewTypeName(event.target.value)} placeholder={level === 'INSTALLATION' ? 'Ej. Planta de tratamiento' : 'Ej. Bomba centrífuga'} /></label>
|
||||
{level === 'SUBINSTALLATION' && <div className="field"><span>Puede estar dentro de</span><div style={{ display: 'grid', gap: 8, marginTop: 8 }}>
|
||||
{installationFamilies.filter((family) => family.isActive !== false).map((family) => <label key={family.id} style={{ display: 'flex', alignItems: 'center', gap: 8 }}><input type="checkbox" checked={newTypeParents.includes(family.id)} onChange={() => toggleParent(family.id)} />{family.name}</label>)}
|
||||
{level === 'SUBINSTALLATION' && <div className="field"><span>Puede estar dentro de</span><div className="inventory-parent-options">
|
||||
{installationFamilies.filter((family) => family.isActive !== false).map((family) => <label key={family.id} className="inventory-parent-option"><input type="checkbox" checked={newTypeParents.includes(family.id)} onChange={() => toggleParent(family.id)} /><span>{family.name}</span></label>)}
|
||||
</div></div>}
|
||||
<button type="button" className="button primary" disabled={saving || !newTypeName.trim()} onClick={() => void createType()}><Icon name="plus" />Crear tipo</button>
|
||||
</div>}
|
||||
@@ -265,10 +265,10 @@ export function AuthoritativeInventoryConfigPage() {
|
||||
|
||||
{selectedFamily.level === 'SUBINSTALLATION' && <div style={{ marginBottom: 22 }}>
|
||||
<strong>Puede estar dentro de:</strong>
|
||||
<div style={{ display: 'grid', gap: 8, marginTop: 10 }}>
|
||||
{installationFamilies.filter((family) => family.isActive !== false).map((family) => <label key={family.id} style={{ display: 'flex', gap: 8, alignItems: 'center' }}>
|
||||
<div className="inventory-parent-options">
|
||||
{installationFamilies.filter((family) => family.isActive !== false).map((family) => <label key={family.id} className="inventory-parent-option">
|
||||
<input type="checkbox" disabled={!canManage || saving} checked={selectedFamily.parentFamilyIds.includes(family.id)} onChange={() => void toggleSelectedParent(family.id)} />
|
||||
{family.name}
|
||||
<span>{family.name}</span>
|
||||
</label>)}
|
||||
</div>
|
||||
</div>}
|
||||
|
||||
@@ -1296,3 +1296,55 @@ code { color: #5e6677; font-family: ui-monospace, monospace; font-size: 9px; }
|
||||
/* D5.6.4 · combobox buscable global */
|
||||
.searchable-select{position:relative;width:100%;min-width:0}.searchable-select-native{position:absolute!important;inset:0;width:1px!important;height:1px!important;opacity:0;pointer-events:none}.searchable-select-trigger{display:flex;width:100%;min-height:41px;align-items:center;justify-content:space-between;gap:10px;padding:9px 11px;border:1px solid #d7dce5;border-radius:8px;background:#fff;color:var(--ink);font-size:13px;text-align:left;cursor:pointer;outline:none}.searchable-select-trigger:hover{border-color:#bcc6d6}.searchable-select-trigger:focus-visible{border-color:#6b95ed;box-shadow:0 0 0 3px rgba(40,100,220,.1)}.searchable-select-trigger:disabled{cursor:not-allowed;color:#9199a8;background:#f1f3f6}.searchable-select-trigger>span{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.searchable-select-trigger .placeholder{color:#7e8796}.searchable-select-trigger .icon{flex:0 0 auto;transform:rotate(90deg)}.searchable-select-popup{position:fixed;z-index:10000;max-height:315px;padding:6px;border:1px solid #ccd4e0;border-radius:10px;background:#fff;box-shadow:0 14px 40px rgba(18,31,53,.18)}.searchable-select-search{display:flex;align-items:center;gap:7px;padding:5px 7px 7px;border-bottom:1px solid var(--line)}.searchable-select-search input{width:100%;min-width:0;height:34px;padding:6px 8px;border:0;outline:0;background:transparent;color:var(--ink);font-size:12px}.searchable-select-options{max-height:245px;overflow:auto;padding-top:4px}.searchable-select-options>button{display:flex;width:100%;align-items:center;justify-content:space-between;gap:8px;padding:8px 9px;border:0;border-radius:7px;background:transparent;color:var(--ink);font-size:12px;text-align:left;cursor:pointer}.searchable-select-options>button:hover,.searchable-select-options>button:focus-visible{background:#f2f5fa;outline:none}.searchable-select-options>button.selected{background:#eef4ff;color:#174ea6;font-weight:750}.searchable-select-options>button:disabled{cursor:not-allowed;color:#a0a7b3;background:transparent}.searchable-select-empty{padding:14px 10px;color:var(--muted);font-size:11px;text-align:center}.select-field>.searchable-select{width:100%}.survey-inline-select.searchable-select{min-width:130px;margin-top:6px;padding:0;border:0;background:transparent}.survey-inline-select.wide.searchable-select{min-width:175px;margin-top:0}.survey-inline-select .searchable-select-trigger{min-height:33px;padding:6px 8px;border-radius:7px;font-size:9px}.operational-context-selectors .searchable-select-trigger{min-height:36px;padding:7px 9px;font-size:10px}.parent-picker .searchable-select-trigger{border-radius:5px 5px 8px 8px}
|
||||
.inspection-quick-create{max-width:980px;margin-left:auto;margin-right:auto}.inspection-quick-create .form-grid{grid-template-columns:repeat(2,minmax(0,1fr))}.inspection-generated-code{display:flex;align-items:center;justify-content:space-between;gap:12px;margin-bottom:14px;padding:10px 12px;border:1px solid var(--line);border-radius:9px;background:var(--soft)}.inspection-generated-code small{color:var(--muted);font-weight:700}.inspection-generated-code strong{font-size:15px;letter-spacing:.02em}@media(max-width:760px){.inspection-quick-create .form-grid{grid-template-columns:1fr}}
|
||||
|
||||
/* Parent choices need fixed-size controls even inside a generic form field. */
|
||||
.inventory-parent-options {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fit, minmax(min(100%, 210px), 1fr));
|
||||
gap: 8px;
|
||||
margin: 10px 0 14px;
|
||||
}
|
||||
.inventory-parent-option {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: flex-start;
|
||||
gap: 10px;
|
||||
min-width: 0;
|
||||
min-height: 42px;
|
||||
padding: 10px 12px;
|
||||
border: 1px solid var(--line);
|
||||
border-radius: 8px;
|
||||
background: #fff;
|
||||
color: var(--ink);
|
||||
font-size: 12px;
|
||||
font-weight: 600;
|
||||
line-height: 1.4;
|
||||
cursor: pointer;
|
||||
}
|
||||
.inventory-parent-option input[type="checkbox"] {
|
||||
flex: 0 0 17px;
|
||||
width: 17px;
|
||||
height: 17px;
|
||||
min-height: 17px;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
accent-color: var(--blue);
|
||||
cursor: inherit;
|
||||
}
|
||||
.inventory-parent-option > span {
|
||||
display: block;
|
||||
min-width: 0;
|
||||
overflow-wrap: anywhere;
|
||||
}
|
||||
.inventory-parent-option:has(input:checked) {
|
||||
border-color: #9db9ed;
|
||||
background: #eef4ff;
|
||||
}
|
||||
.inventory-parent-option:has(input:focus-visible) {
|
||||
outline: 2px solid var(--blue);
|
||||
outline-offset: 2px;
|
||||
}
|
||||
.inventory-parent-option:has(input:disabled) {
|
||||
cursor: default;
|
||||
opacity: .65;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user