Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a57d6633bd | ||
|
|
e18e86e918 | ||
|
|
cadf766d3c | ||
|
|
1b151fe964 | ||
|
|
c748aba650 | ||
|
|
b8b578a3f0 | ||
|
|
2455a89c3e | ||
|
|
2a99183d31 | ||
|
|
675d01bea7 | ||
|
|
26d79f1e4d | ||
|
|
496bb785c1 | ||
|
|
f513817388 | ||
|
|
92a21d8f15 | ||
|
|
753fa9915f | ||
|
|
ec0ef732f7 | ||
|
|
87adf71114 | ||
|
|
0a856a1857 | ||
|
|
247c652d40 | ||
|
|
b5ee17ce95 | ||
|
|
cca2d38b98 | ||
|
|
ebce2bb957 | ||
|
|
963485618b | ||
|
|
8f051158c1 | ||
|
|
2d8425dec5 | ||
|
|
cfae2bb9ac | ||
|
|
5d8949d7d2 | ||
|
|
304adcd9b0 | ||
|
|
20dd110928 | ||
|
|
80ffb35065 | ||
|
|
6f79abbcff | ||
|
|
d18375b85b | ||
|
|
85a84e0f63 | ||
|
|
03f42209b9 | ||
|
|
74ff64182c | ||
|
|
a9e300d6a4 | ||
|
|
143db53552 | ||
|
|
d9fbd95da3 |
@@ -0,0 +1,15 @@
|
||||
# Checklist final Android 0.19.0
|
||||
|
||||
La candidata sólo se promueve si el mismo SHA cumple:
|
||||
|
||||
- iniciar Inspección;
|
||||
- crear/abrir Acta;
|
||||
- seleccionar o crear Instalación/Subinstalación;
|
||||
- exigir GPS + fotografía para Inventario nacido en campo antes de Hallazgos;
|
||||
- registrar Hallazgos sobre el elemento seleccionado;
|
||||
- cerrar contenido del Acta y mostrar **Pendiente de firma**;
|
||||
- completar firma del Inspector y manifestación/firma o negativa de la empresa;
|
||||
- mostrar el Acta como **Firmada y cerrada**;
|
||||
- permitir cerrar la Inspección sólo con todas las Actas activas firmadas y cerradas;
|
||||
- no exponer estados internos en inglés en la interfaz de campo;
|
||||
- Android CI / RC, DH V2 CI y auditoría de dependencias en verde.
|
||||
+57
-26
@@ -1,40 +1,71 @@
|
||||
# DH Inspección Android · release Campo Moderno 0.18.0
|
||||
# DH Inspección Android · release final de campo 0.19.0
|
||||
|
||||
## Candidata vigente
|
||||
|
||||
- Fase funcional: **Campo Moderno / UX dinámica de Inventario y Actas**.
|
||||
- `versionName`: **0.18.0**.
|
||||
- `versionCode`: **27**.
|
||||
- Fase funcional: **Flujo final de campo · Inspección → Acta → Hallazgos → Firma**.
|
||||
- `versionName`: **0.19.0**.
|
||||
- `versionCode`: **28**.
|
||||
- Application ID release: `com.korexlabs.dhinspeccion`.
|
||||
- Application ID debug/QA: `com.korexlabs.dhinspeccion.debug`.
|
||||
- API: `https://dhv2.korexlabs.com/api/v3/`.
|
||||
|
||||
La variante debug es independiente de la app productiva y puede instalarse para QA/presentación sin sobrescribir una instalación release histórica.
|
||||
|
||||
## Novedades de campo 0.18.0
|
||||
## Procedimiento operativo validado
|
||||
|
||||
La APK adopta una capa visual Material 3 propia de DH: superficies más limpias, jerarquía visual más clara, botones y estados más legibles, tarjetas con menor ruido y una navegación consistente entre Inspección, Actas e Inventario.
|
||||
La APK 0.19.0 fija como recorrido principal de campo:
|
||||
|
||||
La carga de una Subinstalación mantiene la integridad del modelo físico pero reduce pasos:
|
||||
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.
|
||||
3. **Agregar Hallazgos** sobre una Instalación o Subinstalación seleccionada.
|
||||
4. Si el elemento ya existe, se lo selecciona desde el Inventario del Área/Yacimiento de la Inspección.
|
||||
5. Si no existe, se da de alta desde campo sin abandonar el Acta.
|
||||
6. Un elemento nuevo debe completar **GPS + fotografía** antes de poder recibir Hallazgos.
|
||||
7. Al terminar el contenido del Acta se usa **Cerrar Acta y dejar pendiente de firma**. Desde ese momento el contenido queda inmutable y el estado visible es **Pendiente de firma**.
|
||||
8. La firma del Inspector y la manifestación/firma o negativa de la empresa completan el Acta, que pasa a **Firmada y cerrada**.
|
||||
9. La Inspección sólo puede cerrarse cuando todas sus Actas no canceladas están firmadas y cerradas.
|
||||
|
||||
1. el buscador de **Instalaciones padre** ahora consulta mientras el inspector escribe;
|
||||
2. cada coincidencia aparece como tarjeta seleccionable y tocarla avanza directamente a la identificación de la Subinstalación;
|
||||
3. la clasificación técnica continúa filtrada por compatibilidad con la Instalación elegida;
|
||||
4. **Guardar y tomar foto** captura GPS y abre la cámara automáticamente.
|
||||
La nomenclatura técnica interna de API (`DRAFT`, `LOCKED`, `SEALED`, etc.) no se muestra al inspector: la interfaz usa textos operativos en castellano.
|
||||
|
||||
Se conserva la regla de que un elemento nacido en campo no puede recibir Hallazgos hasta contar con GPS y fotografía.
|
||||
## Alta de Instalaciones y Subinstalaciones
|
||||
|
||||
## Actas en Android
|
||||
El alta móvil queda alineada con el Dashboard y con las validaciones del servidor.
|
||||
|
||||
El espacio de Actas fue rediseñado para mostrar con claridad:
|
||||
### Instalación
|
||||
|
||||
- contexto de la Inspección y Yacimiento;
|
||||
- estado de cada Acta y cantidad de Hallazgos;
|
||||
- urgencia mediante selección explícita;
|
||||
- responsable de empresa, bloqueo, firmas, manifestación y sellado;
|
||||
- condición necesaria para cerrar la Inspección.
|
||||
- contexto territorial: Yacimiento/Área de la Inspección;
|
||||
- clasificación técnica compatible;
|
||||
- **Nombre técnico** obligatorio;
|
||||
- Nombre habitual opcional;
|
||||
- Descripción opcional;
|
||||
- atributos técnicos definidos por el tipo; sólo los marcados como obligatorios bloquean el guardado;
|
||||
- código DH generado por el sistema cuando corresponde;
|
||||
- GPS de la tablet;
|
||||
- fotografía obligatoria antes de crear Hallazgos.
|
||||
|
||||
El listado que consume Android usa un read-model móvil liviano (`/inspection-visits/:visitId/acts/mobile`). Esta lectura no depende del módulo documental de oficina ni de `inspection_reports`, de modo que entrar a una Inspección en campo no queda acoplado a la proyección de Informes/GEDO.
|
||||
### Subinstalación
|
||||
|
||||
Además de lo anterior requiere elegir primero la **Instalación padre**. El buscador consulta mientras se escribe y cada resultado es seleccionable tocando la tarjeta.
|
||||
|
||||
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.
|
||||
|
||||
## Actas y firma
|
||||
|
||||
La terminología visible se simplifica:
|
||||
|
||||
- `DRAFT` → **En elaboración**;
|
||||
- `LOCKED` → **Pendiente de firma**;
|
||||
- `SEALED` → **Firmada y cerrada**.
|
||||
|
||||
Cerrar el contenido no cierra automáticamente la Inspección y tampoco obliga a terminar la firma en ese instante: puede continuarse con otra Acta. Una vez cerrado el contenido, el Acta es inmutable.
|
||||
|
||||
Después de la firma/cierre definitivo se mantiene el circuito documental existente: PDF del Acta e informe INF editable (DOCX) para oficina.
|
||||
|
||||
## Castellano e identidad visual
|
||||
|
||||
Se revisaron las pantallas activas de campo para evitar exponer estados y opciones internas en inglés. Entre otros cambios: Pasaporte/Otro en documentos, estados de Inspección/Acta/Hallazgo en castellano, Correo electrónico, Huella de integridad y terminología de cierre orientada al usuario.
|
||||
|
||||
La pantalla de ingreso y el desbloqueo biométrico utilizan la identidad visual de Mendoza ya incorporada al proyecto.
|
||||
|
||||
## Barrera obligatoria
|
||||
|
||||
@@ -42,16 +73,16 @@ Todo cambio Android o de API que pueda afectar al cliente móvil debe pasar `And
|
||||
|
||||
1. validación de identidad, HTTPS y políticas básicas del manifest;
|
||||
2. Android lint;
|
||||
3. unit tests Android reales, con verificación de que exista al menos una prueba ejecutada;
|
||||
3. pruebas unitarias Android reales, con verificación de que exista al menos una prueba ejecutada;
|
||||
4. `assembleDebug`;
|
||||
5. `assembleRelease` para comprobar que la variante productiva compile;
|
||||
6. empaquetado del APK debug con SHA-256 y metadata de commit/versionado.
|
||||
|
||||
Además, `DH V2 CI` debe mantener verdes API, WEB y contrato Docker/migraciones antes de promover el cambio.
|
||||
Además, `DH V2 CI` debe mantener verdes API, WEB y contrato Docker/migraciones antes de promover cambios que afecten al servidor.
|
||||
|
||||
## Firma release
|
||||
|
||||
La clave histórica de firma **no se versiona ni se reemplaza**. La CI compila la variante release para detectar roturas, pero la APK productiva final debe firmarse con la clave histórica antes de instalarse como actualización de `com.korexlabs.dhinspeccion`.
|
||||
La clave histórica de firma **no se versiona ni se reemplaza**. La CI compila la variante release para detectar roturas, pero una APK productiva que deba actualizar `com.korexlabs.dhinspeccion` tiene que firmarse con la clave histórica.
|
||||
|
||||
No se debe crear una clave nueva para resolver una falta de acceso: eso rompería la continuidad de actualización de tablets que ya tengan una versión firmada con la clave anterior.
|
||||
|
||||
@@ -60,7 +91,7 @@ No se debe crear una clave nueva para resolver una falta de acceso: eso romperí
|
||||
Antes de distribuir una APK productiva:
|
||||
|
||||
- todas las barreras de CI del SHA exacto deben estar verdes;
|
||||
- comprobar certificado/huella de firma contra la versión histórica;
|
||||
- realizar actualización sobre al menos una tablet con la versión productiva anterior;
|
||||
- ejecutar smoke funcional contra el entorno objetivo: login, abrir Inspección, abrir Actas sin error, crear Acta, búsqueda dinámica de Instalación, selección de padre, alta de Subinstalación, GPS/foto, Hallazgo y cierre;
|
||||
- comprobar certificado/huella de firma contra la versión histórica si se distribuirá como actualización 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.
|
||||
|
||||
@@ -12,8 +12,8 @@ android {
|
||||
applicationId = "com.korexlabs.dhinspeccion"
|
||||
minSdk = 26
|
||||
targetSdk = 36
|
||||
versionCode = 27
|
||||
versionName = "0.18.0"
|
||||
versionCode = 28
|
||||
versionName = "0.19.0"
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
vectorDrawables.useSupportLibrary = true
|
||||
|
||||
@@ -169,7 +169,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
return
|
||||
}
|
||||
if (acts.any { it.status == "DRAFT" }) {
|
||||
error = "Ya existe un Acta en borrador. Bloqueala o cancelala antes de crear la siguiente."
|
||||
error = "Ya existe un Acta en elaboración. Cerrala o cancelala antes de crear la siguiente."
|
||||
return
|
||||
}
|
||||
launchBusy {
|
||||
@@ -241,6 +241,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
latitude: Double,
|
||||
longitude: Double,
|
||||
accuracyM: Double?,
|
||||
description: String? = null,
|
||||
) {
|
||||
val visitId = visit?.id ?: return
|
||||
if (visit?.status != "IN_PROGRESS") {
|
||||
@@ -258,6 +259,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
familyId = familyId,
|
||||
name = name.trim(),
|
||||
commonName = commonName?.trim()?.takeIf { it.isNotBlank() },
|
||||
description = description?.trim()?.takeIf { it.isNotBlank() },
|
||||
attributes = attributes,
|
||||
deviceLatitude = latitude,
|
||||
deviceLongitude = longitude,
|
||||
@@ -340,7 +342,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
val assetId = selectedFieldAsset?.asset?.id ?: return
|
||||
val draft = selectedDraftAct()
|
||||
if (draft == null) {
|
||||
error = "Creá o seleccioná el Acta en borrador antes de registrar Hallazgos."
|
||||
error = "Creá o seleccioná el Acta en elaboración antes de registrar Hallazgos."
|
||||
return
|
||||
}
|
||||
launchBusy {
|
||||
@@ -362,7 +364,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
val assetId = selectedFieldAsset?.asset?.id ?: return
|
||||
val actId = selectedDraftAct()?.id
|
||||
if (actId == null) {
|
||||
error = "No hay un Acta en borrador seleccionada."
|
||||
error = "No hay un Acta en elaboración seleccionada."
|
||||
return
|
||||
}
|
||||
if (description.isBlank()) {
|
||||
@@ -471,7 +473,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
absenceReason = reason.trim(),
|
||||
),
|
||||
)
|
||||
notice = "Ausencia del responsable registrada. La manifestación de empresa quedará pendiente y deberá resolverse antes de sellar el Acta."
|
||||
notice = "Ausencia del responsable registrada. La manifestación de empresa quedará pendiente y deberá resolverse antes de firmar y cerrar el Acta."
|
||||
}
|
||||
}
|
||||
|
||||
@@ -480,12 +482,12 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
launchBusy {
|
||||
actClosure = actsRepository.lock(actId)
|
||||
refreshSelectedActInternal(actId)
|
||||
notice = "Acta bloqueada. Su contenido quedó inmutable; ahora deben resolverse las firmas y manifestaciones."
|
||||
notice = "Acta cerrada y pendiente de firma. Su contenido quedó inmutable; las firmas y manifestaciones pueden completarse a continuación."
|
||||
}
|
||||
}
|
||||
|
||||
fun reopenSelectedAct() {
|
||||
error = "Un Acta bloqueada es inmutable y no puede volver a borrador."
|
||||
error = "Un Acta pendiente de firma es inmutable y no puede volver a edición."
|
||||
}
|
||||
|
||||
fun signSelectedActAsInspector(
|
||||
@@ -546,7 +548,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
refreshSelectedActInternal(actId)
|
||||
loadActsInternal(currentVisit.id, selectDraft = false)
|
||||
clearFindingState()
|
||||
notice = "${selectedAct?.code ?: "Acta"} SELLADA e inmutable. Podés crear otra Acta o continuar hacia el cierre de la Inspección."
|
||||
notice = "${selectedAct?.code ?: "Acta"} firmada y cerrada. Podés crear otra Acta o continuar hacia el cierre de la Inspección."
|
||||
}
|
||||
}
|
||||
|
||||
@@ -555,7 +557,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
launchBusy {
|
||||
visit = actsRepository.closeVisit(visitId)
|
||||
loadVisitsInternal()
|
||||
notice = "Inspección cerrada. Todas sus Actas quedaron SELLADAS y disponibles para el circuito de oficina."
|
||||
notice = "Inspección cerrada. Todas sus Actas quedaron firmadas y disponibles para el circuito de oficina."
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -185,7 +185,7 @@ fun FieldFindingScreen(model: MainViewModel) {
|
||||
Text(asset.name, fontWeight = FontWeight.Bold)
|
||||
Text("${asset.code} · Acta ${options.act.code}", style = MaterialTheme.typography.bodySmall)
|
||||
Text(
|
||||
"GPS + foto del Inventario: ${if (options.capture.readyForFinding) "OK" else "pendiente"}",
|
||||
"GPS + foto del Inventario: ${if (options.capture.readyForFinding) "completo" else "pendiente"}",
|
||||
color = if (options.capture.readyForFinding) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error,
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
)
|
||||
@@ -210,7 +210,7 @@ fun FieldFindingScreen(model: MainViewModel) {
|
||||
Card(Modifier.fillMaxWidth()) {
|
||||
Column(Modifier.padding(10.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
|
||||
Text("${finding.code} · ${finding.title}", fontWeight = FontWeight.SemiBold)
|
||||
Text("Gravedad: ${finding.severity ?: "s/d"} · ${finding.status}", style = MaterialTheme.typography.bodySmall)
|
||||
Text("Gravedad: ${finding.severity ?: "s/d"} · ${findingStatusLabelEs(finding.status)}", style = MaterialTheme.typography.bodySmall)
|
||||
Text(
|
||||
"Evidencias: ${evidence.size} · Fotos: ${evidence.count { it.kind == "PHOTO" }}",
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
|
||||
@@ -3,11 +3,13 @@ package com.korexlabs.dhinspeccion.ui
|
||||
import android.content.Context
|
||||
import androidx.biometric.BiometricManager
|
||||
import androidx.biometric.BiometricPrompt
|
||||
import androidx.compose.foundation.Image
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
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.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.Visibility
|
||||
@@ -29,7 +31,9 @@ import androidx.compose.runtime.saveable.rememberSaveable
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.layout.ContentScale
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.text.input.PasswordVisualTransformation
|
||||
import androidx.compose.ui.text.input.VisualTransformation
|
||||
@@ -37,6 +41,7 @@ import androidx.compose.ui.unit.dp
|
||||
import androidx.core.content.ContextCompat
|
||||
import androidx.fragment.app.FragmentActivity
|
||||
import com.korexlabs.dhinspeccion.MainViewModel
|
||||
import com.korexlabs.dhinspeccion.R
|
||||
|
||||
private const val BIOMETRIC_PREFS = "dh_v2_biometric"
|
||||
private const val BIOMETRIC_ENABLED = "enabled"
|
||||
@@ -105,7 +110,13 @@ private fun EnhancedLoginScreen(model: MainViewModel, onPasswordLogin: () -> Uni
|
||||
var passwordVisible by rememberSaveable { mutableStateOf(false) }
|
||||
|
||||
Box(Modifier.fillMaxSize().padding(24.dp), contentAlignment = Alignment.Center) {
|
||||
Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(14.dp)) {
|
||||
Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(14.dp), horizontalAlignment = Alignment.CenterHorizontally) {
|
||||
Image(
|
||||
painter = painterResource(R.drawable.ic_mendoza_launcher_exact),
|
||||
contentDescription = "Gobierno de Mendoza",
|
||||
modifier = Modifier.fillMaxWidth().height(170.dp),
|
||||
contentScale = ContentScale.Fit,
|
||||
)
|
||||
Text("DH Inspección", style = MaterialTheme.typography.headlineMedium, fontWeight = FontWeight.Bold)
|
||||
Text("Aplicación de campo · Dirección de Hidrocarburos")
|
||||
model.error?.let { Text(it, color = MaterialTheme.colorScheme.error) }
|
||||
@@ -113,7 +124,7 @@ private fun EnhancedLoginScreen(model: MainViewModel, onPasswordLogin: () -> Uni
|
||||
OutlinedTextField(
|
||||
value = identifier,
|
||||
onValueChange = { identifier = it },
|
||||
label = { Text("Usuario o email") },
|
||||
label = { Text("Usuario o correo electrónico") },
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
singleLine = true,
|
||||
)
|
||||
@@ -198,6 +209,12 @@ private fun BiometricUnlockScreen(
|
||||
verticalArrangement = Arrangement.spacedBy(14.dp),
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
) {
|
||||
Image(
|
||||
painter = painterResource(R.drawable.ic_mendoza_launcher_exact),
|
||||
contentDescription = "Gobierno de Mendoza",
|
||||
modifier = Modifier.fillMaxWidth().height(140.dp),
|
||||
contentScale = ContentScale.Fit,
|
||||
)
|
||||
Text("DH Inspección", style = MaterialTheme.typography.headlineMedium, fontWeight = FontWeight.Bold)
|
||||
Text("Ingresá con tu huella")
|
||||
error?.let { Text(it, color = MaterialTheme.colorScheme.error) }
|
||||
|
||||
@@ -215,7 +215,7 @@ private fun MobileVisitCard(visit: VisitSummary, onOpen: () -> Unit) {
|
||||
Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
|
||||
Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
|
||||
Text(visit.code, fontWeight = FontWeight.Bold)
|
||||
Text(visit.status)
|
||||
Text(visitStatusLabelEs(visit.status))
|
||||
}
|
||||
Text(visit.operatorCompany?.name ?: "Operadora sin definir")
|
||||
Text(visit.operationalArea?.name ?: "Área sin definir", style = MaterialTheme.typography.bodySmall)
|
||||
|
||||
+17
-23
@@ -245,7 +245,7 @@ fun ModernMobileActsScreen(
|
||||
) {
|
||||
Text(
|
||||
if (newActUrgency == "URGENT") {
|
||||
"El plazo urgente se computará desde el Acta conforme a la política institucional vigente al bloquearla."
|
||||
"El plazo urgente se computará desde el Acta conforme a la política institucional vigente al cerrar su contenido."
|
||||
} else {
|
||||
"El plazo no urgente comienza con la oficialización GEDO, no al crear el Acta."
|
||||
},
|
||||
@@ -319,12 +319,12 @@ fun ModernMobileActsScreen(
|
||||
OutlinedTextField(fullName, { fullName = it }, label = { Text("Nombre y apellido *") }, modifier = Modifier.fillMaxWidth(), singleLine = true)
|
||||
Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(6.dp)) {
|
||||
listOf("DNI", "CUIL", "PASSPORT", "OTHER").forEach { kind ->
|
||||
FilterChip(selected = documentType == kind, onClick = { documentType = kind }, label = { Text(kind) })
|
||||
FilterChip(selected = documentType == kind, onClick = { documentType = kind }, label = { Text(documentTypeLabelEs(kind)) })
|
||||
}
|
||||
}
|
||||
OutlinedTextField(documentNumber, { documentNumber = it }, label = { Text("Documento *") }, modifier = Modifier.fillMaxWidth(), singleLine = true)
|
||||
OutlinedTextField(position, { position = it }, label = { Text("Cargo *") }, modifier = Modifier.fillMaxWidth(), singleLine = true)
|
||||
OutlinedTextField(email, { email = it }, label = { Text("Email") }, modifier = Modifier.fillMaxWidth(), singleLine = true)
|
||||
OutlinedTextField(email, { email = it }, label = { Text("Correo electrónico") }, modifier = Modifier.fillMaxWidth(), singleLine = true)
|
||||
OutlinedTextField(phone, { phone = it }, label = { Text("Teléfono") }, modifier = Modifier.fillMaxWidth(), singleLine = true)
|
||||
Button(
|
||||
onClick = { model.setCompanyResponsiblePresent(fullName, documentType, documentNumber, position, email, phone) },
|
||||
@@ -353,17 +353,17 @@ fun ModernMobileActsScreen(
|
||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||
Icon(Icons.Filled.Lock, null, tint = MaterialTheme.colorScheme.error)
|
||||
Spacer(Modifier.width(8.dp))
|
||||
Text("Finalizar contenido", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
|
||||
Text("Cerrar Acta", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
|
||||
}
|
||||
Text(
|
||||
"Al bloquear el Acta, su contenido y sus Hallazgos quedan inmutables.",
|
||||
"Al cerrar el contenido, el Acta queda inmutable y pasa a Pendiente de firma. Podés firmarla ahora o continuar con otra Acta.",
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
)
|
||||
Button(
|
||||
onClick = { model.prepareSelectedAct() },
|
||||
enabled = !model.busy && closure?.responsible != null,
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
) { Text("Finalizar y BLOQUEAR Acta") }
|
||||
) { Text("Cerrar Acta y dejar pendiente de firma") }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -379,10 +379,10 @@ fun ModernMobileActsScreen(
|
||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||
Icon(Icons.Filled.Lock, null, tint = MaterialTheme.colorScheme.secondary)
|
||||
Spacer(Modifier.width(8.dp))
|
||||
Text("Acta BLOQUEADA", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
|
||||
Text("Acta pendiente de firma", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
|
||||
}
|
||||
Text("El contenido ya es inmutable. Restan firmas y manifestaciones para poder sellarla.")
|
||||
closure?.closure?.preparedSha256?.let { Text("Hash · $it", style = MaterialTheme.typography.bodySmall) }
|
||||
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)
|
||||
@@ -403,7 +403,7 @@ fun ModernMobileActsScreen(
|
||||
val detail = when (companyOutcome.status) {
|
||||
"SIGNED" -> if (companyOutcome.companyManifestation == "DISSENT") "Firma en disidencia" else "Firma en conformidad"
|
||||
"REFUSED" -> "Negativa a firmar"
|
||||
else -> companyOutcome.status
|
||||
else -> humanBackendLabelEs(companyOutcome.status)
|
||||
}
|
||||
SuccessLine(detail)
|
||||
companyOutcome.reason?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
|
||||
@@ -413,7 +413,7 @@ fun ModernMobileActsScreen(
|
||||
Row(Modifier.padding(12.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
Icon(Icons.Filled.ErrorOutline, null, tint = MaterialTheme.colorScheme.error)
|
||||
Text(
|
||||
"La ausencia no resuelve la manifestación. Debe registrarse firma o negativa antes de sellar.",
|
||||
"La ausencia no resuelve la manifestación. Debe registrarse firma o negativa antes de firmar y cerrar el Acta.",
|
||||
Modifier.weight(1f),
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
)
|
||||
@@ -462,7 +462,7 @@ fun ModernMobileActsScreen(
|
||||
) {
|
||||
Icon(Icons.Filled.CheckCircle, null)
|
||||
Spacer(Modifier.width(6.dp))
|
||||
Text("SELLAR Acta definitivamente")
|
||||
Text("Firmar y cerrar Acta")
|
||||
}
|
||||
} else {
|
||||
Text(
|
||||
@@ -480,8 +480,8 @@ fun ModernMobileActsScreen(
|
||||
Row(Modifier.padding(18.dp), horizontalArrangement = Arrangement.spacedBy(10.dp), verticalAlignment = Alignment.Top) {
|
||||
Icon(Icons.Filled.CheckCircle, null, tint = MaterialTheme.colorScheme.primary)
|
||||
Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(5.dp)) {
|
||||
Text("Acta SELLADA e inmutable", fontWeight = FontWeight.Bold)
|
||||
Text("Desde este sellado se genera el PDF del Acta y el INF Word editable para el Inspector.")
|
||||
Text("Acta firmada y cerrada", fontWeight = FontWeight.Bold)
|
||||
Text("Desde este cierre se genera el PDF del Acta y el informe INF editable (DOCX) para el Inspector.")
|
||||
closure?.closure?.finalSha256?.let { Text("SHA-256 · $it", style = MaterialTheme.typography.bodySmall) }
|
||||
}
|
||||
}
|
||||
@@ -503,10 +503,10 @@ fun ModernMobileActsScreen(
|
||||
Column(Modifier.padding(18.dp), verticalArrangement = Arrangement.spacedBy(9.dp)) {
|
||||
Text("Finalizar Inspección", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
|
||||
if (pendingActs.isEmpty()) {
|
||||
SuccessLine("Todas las Actas están SELLADAS")
|
||||
SuccessLine("Todas las Actas están firmadas y cerradas")
|
||||
} else {
|
||||
Text(
|
||||
"Falta SELLAR: ${pendingActs.joinToString { it.code }}",
|
||||
"Falta firmar y cerrar: ${pendingActs.joinToString { it.code }}",
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
color = MaterialTheme.colorScheme.error,
|
||||
)
|
||||
@@ -531,13 +531,7 @@ private fun SuccessLine(text: String) {
|
||||
}
|
||||
}
|
||||
|
||||
private fun modernActStatusLabel(status: String): String = when (status) {
|
||||
"DRAFT" -> "Borrador"
|
||||
"LOCKED" -> "Bloqueada"
|
||||
"SEALED" -> "Sellada"
|
||||
"CANCELLED" -> "Cancelada"
|
||||
else -> status
|
||||
}
|
||||
private fun modernActStatusLabel(status: String): String = actStatusLabelEs(status)
|
||||
|
||||
private fun hasModernActLocation(context: Context): Boolean =
|
||||
ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED ||
|
||||
|
||||
@@ -274,7 +274,7 @@ private fun ModernChecklistCard(visit: VisitDetail) {
|
||||
)
|
||||
}
|
||||
if (checklist.stale) {
|
||||
Text("El checklist requiere actualización.", color = MaterialTheme.colorScheme.error)
|
||||
Text("La lista de control requiere actualización.", color = MaterialTheme.colorScheme.error)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -296,6 +296,7 @@ private fun ModernFieldInventoryScreen(model: MainViewModel, onBack: () -> Unit)
|
||||
var parentLabel by rememberSaveable(visit.id) { mutableStateOf("") }
|
||||
var name by rememberSaveable(visit.id) { mutableStateOf("") }
|
||||
var commonName by rememberSaveable(visit.id) { mutableStateOf("") }
|
||||
var description by rememberSaveable(visit.id) { mutableStateOf("") }
|
||||
var selectedTypeId by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
|
||||
var selectedFamilyId by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
|
||||
var familySearch by rememberSaveable(visit.id) { mutableStateOf("") }
|
||||
@@ -311,6 +312,7 @@ private fun ModernFieldInventoryScreen(model: MainViewModel, onBack: () -> Unit)
|
||||
fun resetForm() {
|
||||
name = ""
|
||||
commonName = ""
|
||||
description = ""
|
||||
selectedTypeId = null
|
||||
selectedFamilyId = null
|
||||
familySearch = ""
|
||||
@@ -444,6 +446,7 @@ private fun ModernFieldInventoryScreen(model: MainViewModel, onBack: () -> Unit)
|
||||
familyId = selectedFamilyId,
|
||||
name = name,
|
||||
commonName = commonName,
|
||||
description = description,
|
||||
attributes = buildModernAttributes(type, attributeValues),
|
||||
latitude = geo.latitude,
|
||||
longitude = geo.longitude,
|
||||
@@ -800,18 +803,26 @@ private fun ModernFieldInventoryScreen(model: MainViewModel, onBack: () -> Unit)
|
||||
OutlinedTextField(
|
||||
value = name,
|
||||
onValueChange = { name = it },
|
||||
label = { Text("Nombre o código visible *") },
|
||||
supportingText = { Text("Usá lo que figura en placa o identifica el elemento en campo.") },
|
||||
label = { Text("Nombre técnico *") },
|
||||
supportingText = { Text("Usá la denominación técnica del elemento. El código DH se genera automáticamente.") },
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
singleLine = true,
|
||||
)
|
||||
OutlinedTextField(
|
||||
value = commonName,
|
||||
onValueChange = { commonName = it },
|
||||
label = { Text("Nombre habitual") },
|
||||
label = { Text("Nombre habitual (opcional)") },
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
singleLine = true,
|
||||
)
|
||||
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,
|
||||
)
|
||||
|
||||
selectedType?.attributes?.forEach { definition ->
|
||||
OutlinedTextField(
|
||||
@@ -1066,20 +1077,14 @@ private fun ModernStepHeader(step: Int, title: String) {
|
||||
|
||||
private fun modernItemTypeCode(item: FieldInventoryItem): String {
|
||||
val type = item.type ?: return ""
|
||||
return modernNormalize(type.typeName ?: type.name)
|
||||
return modernNormalize(type.code.ifBlank { type.typeName ?: type.name })
|
||||
}
|
||||
|
||||
private fun modernNormalize(value: String): String = value.trim().lowercase()
|
||||
.replace('ó', 'o').replace('í', 'i').replace('á', 'a').replace('é', 'e').replace('ú', 'u')
|
||||
.replace("_", "").replace("-", "").replace(" ", "")
|
||||
|
||||
private fun modernStatusLabel(status: String): String = when (status) {
|
||||
"PLANNED" -> "Planificada"
|
||||
"IN_PROGRESS" -> "En curso"
|
||||
"CLOSED" -> "Cerrada"
|
||||
"CANCELLED" -> "Cancelada"
|
||||
else -> status
|
||||
}
|
||||
private fun modernStatusLabel(status: String): String = visitStatusLabelEs(status)
|
||||
|
||||
private fun buildModernAttributes(type: FieldType, values: Map<String, String>): Map<String, Any?> =
|
||||
type.attributes.mapNotNull { definition ->
|
||||
|
||||
@@ -49,7 +49,7 @@ fun SignaturePad(
|
||||
Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
Text(label, fontWeight = androidx.compose.ui.text.font.FontWeight.SemiBold)
|
||||
Text(
|
||||
"Firmá dentro del recuadro. La imagen se guarda como PNG y se incorpora al hash del Acta.",
|
||||
"Firmá dentro del recuadro. La imagen se guarda como PNG y se incorpora a la huella de integridad del Acta.",
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
)
|
||||
Canvas(
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
package com.korexlabs.dhinspeccion.ui
|
||||
|
||||
import java.util.Locale
|
||||
|
||||
internal fun visitStatusLabelEs(status: String?): String = when (status?.uppercase(Locale.ROOT)) {
|
||||
"PLANNED" -> "Planificada"
|
||||
"IN_PROGRESS" -> "En curso"
|
||||
"CLOSED" -> "Cerrada"
|
||||
"CANCELLED" -> "Cancelada"
|
||||
null, "" -> "Sin estado"
|
||||
else -> humanBackendLabelEs(status)
|
||||
}
|
||||
|
||||
internal fun actStatusLabelEs(status: String?): String = when (status?.uppercase(Locale.ROOT)) {
|
||||
"DRAFT" -> "En elaboración"
|
||||
"LOCKED" -> "Pendiente de firma"
|
||||
"SEALED" -> "Firmada y cerrada"
|
||||
"CLOSED" -> "Cerrada"
|
||||
"RECTIFIED" -> "Rectificada"
|
||||
"CANCELLED" -> "Cancelada"
|
||||
null, "" -> "Sin estado"
|
||||
else -> humanBackendLabelEs(status)
|
||||
}
|
||||
|
||||
internal fun findingStatusLabelEs(status: String?): String = when (status?.uppercase(Locale.ROOT)) {
|
||||
"OPEN" -> "Abierto"
|
||||
"PENDING" -> "Pendiente"
|
||||
"COMPANY_RESPONSE_PENDING" -> "Pendiente de respuesta de la empresa"
|
||||
"COMPANY_RESPONDED" -> "Respondido por la empresa"
|
||||
"VERIFICATION_PENDING" -> "Pendiente de verificación"
|
||||
"VERIFICATION_SCHEDULED" -> "Verificación programada"
|
||||
"READY_TO_CLOSE" -> "Listo para cierre"
|
||||
"CLOSED" -> "Cerrado"
|
||||
"CANCELLED" -> "Cancelado"
|
||||
null, "" -> "Sin estado"
|
||||
else -> humanBackendLabelEs(status)
|
||||
}
|
||||
|
||||
internal fun documentTypeLabelEs(type: String): String = when (type.uppercase(Locale.ROOT)) {
|
||||
"DNI" -> "DNI"
|
||||
"CUIL" -> "CUIL"
|
||||
"PASSPORT" -> "Pasaporte"
|
||||
"OTHER" -> "Otro"
|
||||
else -> humanBackendLabelEs(type)
|
||||
}
|
||||
|
||||
internal fun humanBackendLabelEs(value: String): String {
|
||||
val clean = value.trim().replace('_', ' ').replace('-', ' ').lowercase(Locale("es", "AR"))
|
||||
return clean.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale("es", "AR")) else it.toString() }
|
||||
}
|
||||
+57
@@ -0,0 +1,57 @@
|
||||
package com.korexlabs.dhinspeccion
|
||||
|
||||
import java.io.File
|
||||
import org.junit.Assert.assertFalse
|
||||
import org.junit.Assert.assertTrue
|
||||
import org.junit.Test
|
||||
|
||||
class FinalFieldFlowContractTest {
|
||||
private val visit = File("src/main/java/com/korexlabs/dhinspeccion/ui/ModernVisitRoot.kt").readText()
|
||||
private val acts = File("src/main/java/com/korexlabs/dhinspeccion/ui/ModernMobileActsScreen.kt").readText()
|
||||
private val findings = File("src/main/java/com/korexlabs/dhinspeccion/ui/FieldFindingScreen.kt").readText()
|
||||
private val home = File("src/main/java/com/korexlabs/dhinspeccion/ui/MobileHomeScreen.kt").readText()
|
||||
private val labels = File("src/main/java/com/korexlabs/dhinspeccion/ui/UiSpanishLabels.kt").readText()
|
||||
|
||||
@Test
|
||||
fun inspectionActFindingFlowMatchesFieldProcedure() {
|
||||
assertTrue(visit.contains("Iniciar inspección"))
|
||||
assertTrue(acts.contains("Crear nueva Acta"))
|
||||
assertTrue(acts.contains("Agregar Hallazgo"))
|
||||
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(labels.contains("\"LOCKED\" -> \"Pendiente de firma\""))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun fieldCreateKeepsDashboardEquivalentMinimumAndCaptureBarrier() {
|
||||
assertTrue(visit.contains("Nombre técnico *"))
|
||||
assertTrue(visit.contains("Nombre habitual (opcional)"))
|
||||
assertTrue(visit.contains("Descripción (opcional)"))
|
||||
assertTrue(visit.contains("familyReady"))
|
||||
assertTrue(visit.contains("attributesReady"))
|
||||
assertTrue(visit.contains("GPS + foto"))
|
||||
assertTrue(visit.contains("La foto es obligatoria antes de registrar Hallazgos"))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun structuralSelectionUsesTheServerTypeCode() {
|
||||
assertTrue(visit.contains("type.code.ifBlank { type.typeName ?: type.name }"))
|
||||
assertTrue(visit.contains("modernItemTypeCode(it) in setOf(\"instalacion\", \"subinstalacion\")"))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun currentFieldUiDoesNotExposeBackendEnglishStates() {
|
||||
assertTrue(home.contains("visitStatusLabelEs(visit.status)"))
|
||||
assertTrue(findings.contains("findingStatusLabelEs(finding.status)"))
|
||||
assertTrue(acts.contains("documentTypeLabelEs(kind)"))
|
||||
assertTrue(labels.contains("\"PASSPORT\" -> \"Pasaporte\""))
|
||||
assertTrue(labels.contains("\"OTHER\" -> \"Otro\""))
|
||||
assertFalse(acts.contains("Finalizar y BLOQUEAR Acta"))
|
||||
assertFalse(acts.contains("Acta BLOQUEADA"))
|
||||
assertFalse(acts.contains("SELLAR Acta"))
|
||||
assertFalse(acts.contains("Acta SELLADA"))
|
||||
assertFalse(acts.contains("Text(\"Email\")"))
|
||||
}
|
||||
}
|
||||
@@ -8,8 +8,8 @@ class ReleaseMetadataTest {
|
||||
@Test
|
||||
fun debugBuildKeepsSeparateApplicationIdentity() {
|
||||
assertEquals("com.korexlabs.dhinspeccion.debug", BuildConfig.APPLICATION_ID)
|
||||
assertEquals(27, BuildConfig.VERSION_CODE)
|
||||
assertEquals("0.18.0-debug", BuildConfig.VERSION_NAME)
|
||||
assertEquals(28, BuildConfig.VERSION_CODE)
|
||||
assertEquals("0.19.0-debug", BuildConfig.VERSION_NAME)
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@@ -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 = 27/);
|
||||
assert.match(gradle, /versionName = "0\.18\.0"/);
|
||||
assert.match(gradle, /versionCode = 28/);
|
||||
assert.match(gradle, /versionName = "0\.19\.0"/);
|
||||
assert.match(gradle, /https:\/\/dhv2\.korexlabs\.com\/api\/v3\//);
|
||||
assert.match(gradle, /applicationIdSuffix = "\.debug"/);
|
||||
});
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
import type { AuthUser } from '../lib/api';
|
||||
|
||||
function normalizeRole(value: string) {
|
||||
return value
|
||||
.normalize('NFD')
|
||||
.replace(/[\u0300-\u036f]/g, '')
|
||||
.toLowerCase()
|
||||
.replace(/[^a-z0-9]+/g, ' ')
|
||||
.trim();
|
||||
}
|
||||
|
||||
const ADMIN_ROLES = new Set([
|
||||
'admin',
|
||||
'administrator',
|
||||
'administrador',
|
||||
'superadmin',
|
||||
'super admin',
|
||||
'superadministrator',
|
||||
'super administrator',
|
||||
'superadministrador',
|
||||
'super administrador',
|
||||
]);
|
||||
|
||||
export function hasAdministratorRole(user: AuthUser | null) {
|
||||
return Boolean(user?.roles.some((role) => ADMIN_ROLES.has(normalizeRole(role))));
|
||||
}
|
||||
@@ -0,0 +1,215 @@
|
||||
.asset-compact-form {
|
||||
gap: 0;
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.asset-compact-section {
|
||||
display: grid;
|
||||
gap: 14px;
|
||||
padding: 20px 22px;
|
||||
border-bottom: 1px solid var(--line);
|
||||
}
|
||||
|
||||
.asset-compact-section-heading {
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
justify-content: space-between;
|
||||
gap: 16px;
|
||||
}
|
||||
|
||||
.asset-compact-section-heading h2 {
|
||||
margin: 0;
|
||||
font-size: 17px;
|
||||
}
|
||||
|
||||
.asset-compact-primary-grid {
|
||||
gap: 12px;
|
||||
}
|
||||
|
||||
.asset-compact-meta {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.asset-compact-meta > span {
|
||||
min-width: 0;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 7px;
|
||||
padding: 7px 10px;
|
||||
border: 1px solid #e0e5ed;
|
||||
border-radius: 8px;
|
||||
background: #f8fafc;
|
||||
}
|
||||
|
||||
.asset-compact-meta small {
|
||||
color: var(--muted);
|
||||
font-size: 9px;
|
||||
font-weight: 700;
|
||||
text-transform: uppercase;
|
||||
letter-spacing: .05em;
|
||||
}
|
||||
|
||||
.asset-compact-meta strong {
|
||||
min-width: 0;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
color: var(--ink);
|
||||
font-size: 11px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.asset-compact-context-button {
|
||||
min-height: 34px;
|
||||
padding: 7px 11px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.asset-compact-context-grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
.asset-compact-context-item {
|
||||
min-width: 0;
|
||||
display: grid;
|
||||
gap: 3px;
|
||||
padding: 12px 13px;
|
||||
border: 1px solid #e1e6ee;
|
||||
border-radius: 10px;
|
||||
background: #f8fafc;
|
||||
}
|
||||
|
||||
.asset-compact-context-item small {
|
||||
color: var(--muted);
|
||||
font-size: 9px;
|
||||
font-weight: 750;
|
||||
text-transform: uppercase;
|
||||
letter-spacing: .05em;
|
||||
}
|
||||
|
||||
.asset-compact-context-item strong {
|
||||
overflow: hidden;
|
||||
color: var(--ink);
|
||||
font-size: 12px;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.asset-compact-context-item span {
|
||||
overflow: hidden;
|
||||
color: var(--muted);
|
||||
font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
|
||||
font-size: 9px;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.asset-compact-details {
|
||||
border-bottom: 1px solid var(--line);
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
.asset-compact-details > summary {
|
||||
min-height: 54px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 14px;
|
||||
padding: 13px 22px;
|
||||
cursor: pointer;
|
||||
list-style: none;
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
.asset-compact-details > summary::-webkit-details-marker {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.asset-compact-details > summary:hover {
|
||||
background: #f8fafc;
|
||||
}
|
||||
|
||||
.asset-compact-details > summary > span:first-child {
|
||||
min-width: 0;
|
||||
display: grid;
|
||||
gap: 2px;
|
||||
}
|
||||
|
||||
.asset-compact-details > summary strong {
|
||||
color: var(--ink);
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.asset-compact-details > summary small {
|
||||
overflow: hidden;
|
||||
color: var(--muted);
|
||||
font-size: 10px;
|
||||
font-weight: 500;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.asset-compact-details > summary > span:last-child {
|
||||
color: #7b8496;
|
||||
font-size: 16px;
|
||||
transition: transform .18s ease;
|
||||
}
|
||||
|
||||
.asset-compact-details[open] > summary > span:last-child {
|
||||
transform: rotate(180deg);
|
||||
}
|
||||
|
||||
.asset-compact-details-body {
|
||||
display: grid;
|
||||
gap: 16px;
|
||||
padding: 2px 22px 20px;
|
||||
}
|
||||
|
||||
.asset-compact-technical {
|
||||
display: grid;
|
||||
gap: 12px;
|
||||
padding-top: 2px;
|
||||
}
|
||||
|
||||
.asset-compact-technical h3 {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.asset-compact-form > .form-actions {
|
||||
padding: 16px 22px 18px;
|
||||
background: #fafbfc;
|
||||
}
|
||||
|
||||
@media (max-width: 720px) {
|
||||
.asset-compact-section {
|
||||
padding: 17px;
|
||||
}
|
||||
|
||||
.asset-compact-section-heading {
|
||||
display: grid;
|
||||
}
|
||||
|
||||
.asset-compact-context-button {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.asset-compact-context-grid {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
|
||||
.asset-compact-details > summary {
|
||||
padding: 13px 17px;
|
||||
}
|
||||
|
||||
.asset-compact-details-body {
|
||||
padding: 2px 17px 18px;
|
||||
}
|
||||
|
||||
.asset-compact-form > .form-actions {
|
||||
padding: 14px 17px 17px;
|
||||
}
|
||||
}
|
||||
@@ -1,11 +1,18 @@
|
||||
import './AssetEditorPage.css';
|
||||
import { SearchableSelect } from '../components/SearchableSelect';
|
||||
import { lazy, Suspense, useEffect, useMemo, useState } from 'react';
|
||||
import type { FormEvent } from 'react';
|
||||
import type { FormEvent, ReactNode } from 'react';
|
||||
import { Link, useNavigate, useParams, useSearchParams } from 'react-router';
|
||||
import { useAuth } from '../auth/AuthContext';
|
||||
import { Alert, LoadingBlock, errorMessage } from '../components/Feedback';
|
||||
import { Icon } from '../components/Icon';
|
||||
import { ASSET_OPERATIONAL_STATUSES, ASSET_STATUSES, assetOperationalStatusLabel, assetStatusClass, assetStatusLabel } from '../features/assets/assetPresentation';
|
||||
import {
|
||||
ASSET_OPERATIONAL_STATUSES,
|
||||
ASSET_STATUSES,
|
||||
assetOperationalStatusLabel,
|
||||
assetStatusClass,
|
||||
assetStatusLabel,
|
||||
} from '../features/assets/assetPresentation';
|
||||
import { AssetHistoryPanel } from '../features/assets/AssetHistoryPanel';
|
||||
import { AssetDossierPanel } from '../features/assets/AssetDossierPanel';
|
||||
import { AssetMediaPanel } from '../features/assets/AssetMediaPanel';
|
||||
@@ -15,15 +22,31 @@ import { AssetRegistryPanel } from '../features/assets/AssetRegistryPanel';
|
||||
import { AssetContextHistoryPanel } from '../features/assets/AssetContextHistoryPanel';
|
||||
import { AssetFindingCatalogPanel } from '../features/assets/AssetFindingCatalogPanel';
|
||||
import {
|
||||
createAsset, getAsset, getAssetLineage, listAssetParentOptions, listAssetTypes, listCompaniesForArea,
|
||||
listOperationalAreas, updateAsset, updateAssetInformationStatus, updateAssetOperationalStatus,
|
||||
createAsset,
|
||||
getAsset,
|
||||
getAssetLineage,
|
||||
listAssetParentOptions,
|
||||
listAssetTypes,
|
||||
listCompaniesForArea,
|
||||
listOperationalAreas,
|
||||
updateAsset,
|
||||
updateAssetInformationStatus,
|
||||
updateAssetOperationalStatus,
|
||||
} from '../lib/api';
|
||||
import type {
|
||||
AssetAttributeDefinition, AssetDetail, AssetInformationStatus, AssetOperationalStatus,
|
||||
AssetLineageItem, AssetListItem, AssetType, OperationalAssetSummary,
|
||||
AssetAttributeDefinition,
|
||||
AssetDetail,
|
||||
AssetInformationStatus,
|
||||
AssetOperationalStatus,
|
||||
AssetLineageItem,
|
||||
AssetListItem,
|
||||
AssetType,
|
||||
OperationalAssetSummary,
|
||||
} from '../lib/api';
|
||||
|
||||
const AssetGeometryEditor = lazy(() => import('../features/map/AssetGeometryEditor').then((module) => ({ default: module.AssetGeometryEditor })));
|
||||
const AssetGeometryEditor = lazy(() =>
|
||||
import('../features/map/AssetGeometryEditor').then((module) => ({ default: module.AssetGeometryEditor })),
|
||||
);
|
||||
|
||||
type DetailTab = 'summary' | 'dossier' | 'findings' | 'location' | 'registry' | 'files' | 'history';
|
||||
|
||||
@@ -35,16 +58,34 @@ function localDateTime(value: unknown): string {
|
||||
return local.toISOString().slice(0, 16);
|
||||
}
|
||||
|
||||
function normalizeAttributeValues(definitions: AssetAttributeDefinition[], values: Record<string, unknown>): Record<string, unknown> {
|
||||
function normalizeAttributeValues(
|
||||
definitions: AssetAttributeDefinition[],
|
||||
values: Record<string, unknown>,
|
||||
): Record<string, unknown> {
|
||||
const result: Record<string, unknown> = {};
|
||||
definitions.filter((item) => item.isActive).forEach((definition) => {
|
||||
const raw = values[definition.id];
|
||||
if (definition.dataType === 'BOOLEAN') result[definition.id] = Boolean(raw);
|
||||
else if (raw !== undefined && raw !== null && raw !== '') result[definition.id] = definition.dataType === 'NUMBER' ? Number(raw) : raw;
|
||||
else if (raw !== undefined && raw !== null && raw !== '') {
|
||||
result[definition.id] = definition.dataType === 'NUMBER' ? Number(raw) : raw;
|
||||
}
|
||||
});
|
||||
return result;
|
||||
}
|
||||
|
||||
function hasAttributeValue(definition: AssetAttributeDefinition, value: unknown): boolean {
|
||||
if (definition.dataType === 'BOOLEAN') return value === true;
|
||||
return value !== undefined && value !== null && String(value).trim() !== '';
|
||||
}
|
||||
|
||||
function normalizeStructuralType(value: string | null | undefined): string {
|
||||
return (value ?? '')
|
||||
.normalize('NFD')
|
||||
.replace(/[\u0300-\u036f]/g, '')
|
||||
.trim()
|
||||
.toLowerCase();
|
||||
}
|
||||
|
||||
export function AssetEditorPage() {
|
||||
const { id } = useParams();
|
||||
const editing = Boolean(id);
|
||||
@@ -52,7 +93,11 @@ export function AssetEditorPage() {
|
||||
const [searchParams] = useSearchParams();
|
||||
const contextParentId = !editing ? searchParams.get('parentId') : null;
|
||||
const requestedTab = searchParams.get('tab') as DetailTab | null;
|
||||
const tab: DetailTab = requestedTab && ['summary','dossier','findings','location','registry','files','history'].includes(requestedTab) ? requestedTab : 'summary';
|
||||
const tab: DetailTab = requestedTab
|
||||
&& ['summary', 'dossier', 'findings', 'location', 'registry', 'files', 'history'].includes(requestedTab)
|
||||
? requestedTab
|
||||
: 'summary';
|
||||
|
||||
const { hasPermission } = useAuth();
|
||||
const canEdit = editing ? hasPermission('assets.update') : hasPermission('assets.create');
|
||||
const canCreate = hasPermission('assets.create');
|
||||
@@ -104,10 +149,14 @@ export function AssetEditorPage() {
|
||||
const [success, setSuccess] = useState('');
|
||||
const [historyRefreshKey, setHistoryRefreshKey] = useState(0);
|
||||
|
||||
const canDirectContextEdit = !editing || Boolean(asset?.dataOrigin === 'FIELD_SURVEY' && asset.informationStatus === 'DRAFT');
|
||||
const canDirectContextEdit = !editing
|
||||
|| Boolean(asset?.dataOrigin === 'FIELD_SURVEY' && asset.informationStatus === 'DRAFT');
|
||||
|
||||
const selectedType = types.find((type) => type.id === typeId) ?? null;
|
||||
const definitions = useMemo(() => selectedType?.attributes.filter((item) => item.isActive) ?? [], [selectedType]);
|
||||
const definitions = useMemo(
|
||||
() => selectedType?.attributes.filter((item) => item.isActive) ?? [],
|
||||
[selectedType],
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
Promise.all([
|
||||
@@ -119,13 +168,26 @@ export function AssetEditorPage() {
|
||||
setTypes(loadedTypes);
|
||||
setLineage(loadedLineage);
|
||||
if (loadedAsset) {
|
||||
setAsset(loadedAsset); setCode(loadedAsset.code); setName(loadedAsset.name); setCommonName(loadedAsset.commonName ?? ''); setTypeId(loadedAsset.type.id);
|
||||
setParentId(loadedAsset.parent?.id ?? ''); setOperationalAreaId(loadedAsset.operationalArea?.id ?? '');
|
||||
setOperatorCompanyId(loadedAsset.operatorCompany?.id ?? ''); setDescription(loadedAsset.description ?? '');
|
||||
setStatus(loadedAsset.informationStatus); setOperationalStatus(loadedAsset.operationalStatus);
|
||||
setAttributeValues(Object.fromEntries(loadedAsset.attributes.map((attribute) => [attribute.definitionId, attribute.dataType === 'DATETIME' ? localDateTime(attribute.value) : attribute.value ?? ''])));
|
||||
setAsset(loadedAsset);
|
||||
setCode(loadedAsset.code);
|
||||
setName(loadedAsset.name);
|
||||
setCommonName(loadedAsset.commonName ?? '');
|
||||
setTypeId(loadedAsset.type.id);
|
||||
setParentId(loadedAsset.parent?.id ?? '');
|
||||
setOperationalAreaId(loadedAsset.operationalArea?.id ?? '');
|
||||
setOperatorCompanyId(loadedAsset.operatorCompany?.id ?? '');
|
||||
setDescription(loadedAsset.description ?? '');
|
||||
setStatus(loadedAsset.informationStatus);
|
||||
setOperationalStatus(loadedAsset.operationalStatus);
|
||||
setAttributeValues(Object.fromEntries(
|
||||
loadedAsset.attributes.map((attribute) => [
|
||||
attribute.definitionId,
|
||||
attribute.dataType === 'DATETIME' ? localDateTime(attribute.value) : attribute.value ?? '',
|
||||
]),
|
||||
));
|
||||
} else if (!contextParentId) {
|
||||
const first = loadedTypes.find((type) => type.isActive && type.canBeRoot) ?? loadedTypes.find((type) => type.isActive);
|
||||
const first = loadedTypes.find((type) => type.isActive && type.canBeRoot)
|
||||
?? loadedTypes.find((type) => type.isActive);
|
||||
if (first) setTypeId(first.id);
|
||||
}
|
||||
})
|
||||
@@ -135,38 +197,56 @@ export function AssetEditorPage() {
|
||||
|
||||
useEffect(() => {
|
||||
if (editing || !contextParentId || types.length === 0) return;
|
||||
Promise.all([getAsset(contextParentId), getAssetLineage(contextParentId)]).then(([parent, parentLineage]) => {
|
||||
setContextParent(parent);
|
||||
setLineage(parentLineage);
|
||||
const compatible = types.find((type) => type.isActive && type.allowedParentTypes.some((allowed) => allowed.id === parent.type.id));
|
||||
if (compatible) {
|
||||
setTypeId(compatible.id); setParentId(parent.id);
|
||||
const parentType = types.find((type) => type.id === parent.type.id);
|
||||
if (parentType?.operationalRole === 'AREA') setOperationalAreaId(parent.id);
|
||||
else if (parent.operationalArea) setOperationalAreaId(parent.operationalArea.id);
|
||||
}
|
||||
}).catch((requestError) => setError(errorMessage(requestError)));
|
||||
Promise.all([getAsset(contextParentId), getAssetLineage(contextParentId)])
|
||||
.then(([parent, parentLineage]) => {
|
||||
setContextParent(parent);
|
||||
setLineage(parentLineage);
|
||||
const compatible = types.find(
|
||||
(type) => type.isActive && type.allowedParentTypes.some((allowed) => allowed.id === parent.type.id),
|
||||
);
|
||||
if (compatible) {
|
||||
setTypeId(compatible.id);
|
||||
setParentId(parent.id);
|
||||
const parentType = types.find((type) => type.id === parent.type.id);
|
||||
if (parentType?.operationalRole === 'AREA') setOperationalAreaId(parent.id);
|
||||
else if (parent.operationalArea) setOperationalAreaId(parent.operationalArea.id);
|
||||
}
|
||||
})
|
||||
.catch((requestError) => setError(errorMessage(requestError)));
|
||||
}, [editing, contextParentId, types]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!typeId) { setParents([]); return; }
|
||||
const timer = window.setTimeout(() => listAssetParentOptions(typeId, id, parentSearch).then(setParents).catch((requestError) => setError(errorMessage(requestError))), 220);
|
||||
if (!typeId) {
|
||||
setParents([]);
|
||||
return;
|
||||
}
|
||||
const timer = window.setTimeout(
|
||||
() => listAssetParentOptions(typeId, id, parentSearch)
|
||||
.then(setParents)
|
||||
.catch((requestError) => setError(errorMessage(requestError))),
|
||||
220,
|
||||
);
|
||||
return () => window.clearTimeout(timer);
|
||||
}, [typeId, id, parentSearch]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!canReadRelations || selectedType?.operationalRole !== 'GENERIC' || !parentId) {
|
||||
setOperationalAreas([]);
|
||||
if (!parentId) { setOperationalAreaId(''); if (!editing) setOperatorCompanyId(''); }
|
||||
return;
|
||||
}
|
||||
listOperationalAreas(parentId).then((loadedAreas) => {
|
||||
setOperationalAreas(loadedAreas);
|
||||
if (operationalAreaId && !loadedAreas.some((area) => area.id === operationalAreaId)) {
|
||||
if (!parentId) {
|
||||
setOperationalAreaId('');
|
||||
if (!editing) setOperatorCompanyId('');
|
||||
}
|
||||
}).catch((requestError) => setError(errorMessage(requestError)));
|
||||
return;
|
||||
}
|
||||
listOperationalAreas(parentId)
|
||||
.then((loadedAreas) => {
|
||||
setOperationalAreas(loadedAreas);
|
||||
if (operationalAreaId && !loadedAreas.some((area) => area.id === operationalAreaId)) {
|
||||
setOperationalAreaId('');
|
||||
if (!editing) setOperatorCompanyId('');
|
||||
}
|
||||
})
|
||||
.catch((requestError) => setError(errorMessage(requestError)));
|
||||
}, [canReadRelations, selectedType?.operationalRole, parentId, editing]);
|
||||
|
||||
useEffect(() => {
|
||||
@@ -174,39 +254,85 @@ export function AssetEditorPage() {
|
||||
setOperationalCompanies([]);
|
||||
return;
|
||||
}
|
||||
listCompaniesForArea(operationalAreaId).then((loadedCompanies) => {
|
||||
setOperationalCompanies(loadedCompanies);
|
||||
setOperatorCompanyId((current) => loadedCompanies.some((company) => company.id === current)
|
||||
? current
|
||||
: loadedCompanies.length === 1 ? (loadedCompanies[0]?.id ?? '') : '');
|
||||
}).catch((requestError) => {
|
||||
setOperationalCompanies([]);
|
||||
setOperatorCompanyId('');
|
||||
setError(errorMessage(requestError));
|
||||
});
|
||||
listCompaniesForArea(operationalAreaId)
|
||||
.then((loadedCompanies) => {
|
||||
setOperationalCompanies(loadedCompanies);
|
||||
setOperatorCompanyId((current) => loadedCompanies.some((company) => company.id === current)
|
||||
? current
|
||||
: loadedCompanies.length === 1 ? (loadedCompanies[0]?.id ?? '') : '');
|
||||
})
|
||||
.catch((requestError) => {
|
||||
setOperationalCompanies([]);
|
||||
setOperatorCompanyId('');
|
||||
setError(errorMessage(requestError));
|
||||
});
|
||||
}, [editing, canReadRelations, operationalAreaId, selectedType?.operationalRole]);
|
||||
|
||||
const changeType = (nextTypeId: string) => { setTypeId(nextTypeId); setParentId(''); setOperationalAreaId(''); if (!editing) setOperatorCompanyId(''); setAttributeValues({}); setParentSearch(''); };
|
||||
const setAttribute = (definitionId: string, value: unknown) => setAttributeValues((current) => ({ ...current, [definitionId]: value }));
|
||||
const changeType = (nextTypeId: string) => {
|
||||
setTypeId(nextTypeId);
|
||||
setParentId('');
|
||||
setOperationalAreaId('');
|
||||
if (!editing) setOperatorCompanyId('');
|
||||
setAttributeValues({});
|
||||
setParentSearch('');
|
||||
};
|
||||
|
||||
const setAttribute = (definitionId: string, value: unknown) =>
|
||||
setAttributeValues((current) => ({ ...current, [definitionId]: value }));
|
||||
|
||||
const save = async (event: FormEvent) => {
|
||||
event.preventDefault(); if (!selectedType) return;
|
||||
setSaving(true); setError(''); setSuccess('');
|
||||
event.preventDefault();
|
||||
if (!selectedType) return;
|
||||
setSaving(true);
|
||||
setError('');
|
||||
setSuccess('');
|
||||
try {
|
||||
const attributes = normalizeAttributeValues(definitions, attributeValues);
|
||||
let saved: AssetDetail;
|
||||
if (editing && id) {
|
||||
if (canEdit) saved = await updateAsset(id, { typeId: canDirectContextEdit ? typeId : undefined, code, name, commonName: commonName.trim() || null, parentId: canDirectContextEdit ? parentId || null : undefined, operationalAreaId: canDirectContextEdit ? operationalAreaId || null : undefined, description: description.trim() || null, attributes });
|
||||
else if (asset) saved = asset; else return;
|
||||
if (canChangeStatus && saved.informationStatus !== status) saved = await updateAssetInformationStatus(id, status);
|
||||
if (canChangeOperationalStatus && saved.operationalStatus !== operationalStatus) saved = await updateAssetOperationalStatus(id, operationalStatus);
|
||||
setAsset(saved); setSuccess('Registro actualizado correctamente'); setHistoryRefreshKey((current) => current + 1);
|
||||
if (canEdit) {
|
||||
saved = await updateAsset(id, {
|
||||
typeId: canDirectContextEdit ? typeId : undefined,
|
||||
code,
|
||||
name,
|
||||
commonName: commonName.trim() || null,
|
||||
parentId: canDirectContextEdit ? parentId || null : undefined,
|
||||
operationalAreaId: canDirectContextEdit ? operationalAreaId || null : undefined,
|
||||
description: description.trim() || null,
|
||||
attributes,
|
||||
});
|
||||
} else if (asset) saved = asset;
|
||||
else return;
|
||||
|
||||
if (canChangeStatus && saved.informationStatus !== status) {
|
||||
saved = await updateAssetInformationStatus(id, status);
|
||||
}
|
||||
if (canChangeOperationalStatus && saved.operationalStatus !== operationalStatus) {
|
||||
saved = await updateAssetOperationalStatus(id, operationalStatus);
|
||||
}
|
||||
setAsset(saved);
|
||||
setSuccess('Registro actualizado correctamente');
|
||||
setHistoryRefreshKey((current) => current + 1);
|
||||
} else {
|
||||
saved = await createAsset({ code, name, commonName: commonName.trim() || null, typeId, parentId: parentId || null, operationalAreaId: operationalAreaId || null, operatorCompanyId: operatorCompanyId || null, description: description.trim() || null, informationStatus: canChangeStatus ? status : 'DRAFT', attributes });
|
||||
saved = await createAsset({
|
||||
code,
|
||||
name,
|
||||
commonName: commonName.trim() || null,
|
||||
typeId,
|
||||
parentId: parentId || null,
|
||||
operationalAreaId: operationalAreaId || null,
|
||||
operatorCompanyId: operatorCompanyId || null,
|
||||
description: description.trim() || null,
|
||||
informationStatus: canChangeStatus ? status : 'DRAFT',
|
||||
attributes,
|
||||
});
|
||||
navigate(`/inventarios/${saved.id}`, { replace: true });
|
||||
}
|
||||
} catch (requestError) { setError(errorMessage(requestError)); }
|
||||
finally { setSaving(false); }
|
||||
} catch (requestError) {
|
||||
setError(errorMessage(requestError));
|
||||
} finally {
|
||||
setSaving(false);
|
||||
}
|
||||
};
|
||||
|
||||
if (loading) return <LoadingBlock label="Cargando registro…" />;
|
||||
@@ -221,44 +347,627 @@ export function AssetEditorPage() {
|
||||
{ key: 'history', label: 'Historial', show: editing && canReadHistory },
|
||||
] as const;
|
||||
|
||||
const breadcrumbSection = asset?.type.code === 'empresa' || contextParent?.type.code === 'empresa' ? 'companies' : 'territory';
|
||||
const breadcrumbSection = asset?.type.code === 'empresa' || contextParent?.type.code === 'empresa'
|
||||
? 'companies'
|
||||
: 'territory';
|
||||
|
||||
const structuralTypeCode = normalizeStructuralType(selectedType?.code);
|
||||
const structuralTypeName = normalizeStructuralType(selectedType?.name);
|
||||
const compactStructuralSummary = editing && (
|
||||
['instalacion', 'instalacion-superficie', 'instalacion_de_superficie', 'instalacion-de-superficie', 'subinstalacion']
|
||||
.includes(structuralTypeCode)
|
||||
|| structuralTypeName === 'instalacion'
|
||||
|| structuralTypeName === 'instalacion de superficie'
|
||||
|| structuralTypeName === 'subinstalacion'
|
||||
);
|
||||
|
||||
const technicalFilledCount = definitions.filter(
|
||||
(definition) => hasAttributeValue(definition, attributeValues[definition.id]),
|
||||
).length;
|
||||
const missingRequiredTechnical = definitions.some(
|
||||
(definition) => definition.isRequired && !hasAttributeValue(definition, attributeValues[definition.id]),
|
||||
);
|
||||
|
||||
const handleContextChanged = (saved: AssetDetail) => {
|
||||
setAsset(saved);
|
||||
setParentId(saved.parent?.id ?? '');
|
||||
setOperationalAreaId(saved.operationalArea?.id ?? '');
|
||||
setOperatorCompanyId(saved.operatorCompany?.id ?? '');
|
||||
setLineage([]);
|
||||
getAssetLineage(saved.id).then(setLineage).catch(() => undefined);
|
||||
setHistoryRefreshKey((current) => current + 1);
|
||||
};
|
||||
|
||||
const renderAttributes = (): ReactNode => {
|
||||
if (definitions.length === 0) {
|
||||
return <div className="inline-empty">Este tipo no requiere datos técnicos adicionales.</div>;
|
||||
}
|
||||
|
||||
return <div className="dynamic-attributes">
|
||||
{definitions.map((definition) => {
|
||||
const value = attributeValues[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) => setAttribute(definition.id, event.target.checked)}
|
||||
disabled={!canEdit}
|
||||
/>
|
||||
<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) => setAttribute(definition.id, event.target.value)}
|
||||
disabled={!canEdit}
|
||||
required={definition.isRequired}
|
||||
>
|
||||
<option value="">Seleccionar…</option>
|
||||
{definition.options?.map((option) =>
|
||||
<option key={option} value={option}>{option}</option>)}
|
||||
</SearchableSelect>
|
||||
</label>;
|
||||
}
|
||||
|
||||
const inputType = definition.dataType === 'NUMBER'
|
||||
? 'number'
|
||||
: definition.dataType === 'DATE'
|
||||
? 'date'
|
||||
: definition.dataType === 'DATETIME'
|
||||
? 'datetime-local'
|
||||
: 'text';
|
||||
|
||||
return <label className="field" key={definition.id}>
|
||||
{label}
|
||||
<input
|
||||
type={inputType}
|
||||
value={String(value ?? '')}
|
||||
onChange={(event) => setAttribute(definition.id, event.target.value)}
|
||||
disabled={!canEdit}
|
||||
required={definition.isRequired}
|
||||
step={definition.dataType === 'NUMBER' ? 'any' : undefined}
|
||||
maxLength={definition.dataType === 'TEXT' ? 4000 : undefined}
|
||||
/>
|
||||
</label>;
|
||||
})}
|
||||
</div>;
|
||||
};
|
||||
|
||||
const renderSaveActions = () => canSave && <div className="form-actions">
|
||||
<Link className="button secondary" to="/inventarios">Cancelar</Link>
|
||||
<button className="button primary" disabled={saving}>
|
||||
<Icon name="check" />
|
||||
{saving ? 'Guardando…' : editing && !canEdit ? 'Actualizar estado' : editing ? 'Guardar cambios' : 'Crear registro'}
|
||||
</button>
|
||||
</div>;
|
||||
|
||||
const renderCompactStructuralForm = () => <form className="panel form-panel asset-compact-form" onSubmit={save}>
|
||||
<section className="asset-compact-section">
|
||||
<div className="asset-compact-section-heading">
|
||||
<div>
|
||||
<h2>Datos principales</h2>
|
||||
<p className="section-copy">Lo que se usa todos los días para reconocer este registro.</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="form-grid asset-compact-primary-grid">
|
||||
<label className="field">
|
||||
<span>Nombre técnico</span>
|
||||
<input
|
||||
value={name}
|
||||
onChange={(event) => setName(event.target.value)}
|
||||
disabled={!canEdit}
|
||||
required
|
||||
maxLength={200}
|
||||
/>
|
||||
</label>
|
||||
<label className="field">
|
||||
<span>Nombre habitual / sobrenombre <em>opcional</em></span>
|
||||
<input
|
||||
value={commonName}
|
||||
onChange={(event) => setCommonName(event.target.value)}
|
||||
disabled={!canEdit}
|
||||
maxLength={200}
|
||||
placeholder="Ej.: planta vieja, celda principal…"
|
||||
/>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div className="asset-compact-meta">
|
||||
<span><small>Código DH</small><strong>{code}</strong></span>
|
||||
<span><small>Tipo</small><strong>{selectedType?.name ?? 'Sin tipo'}</strong></span>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section className="asset-compact-section">
|
||||
<div className="asset-compact-section-heading">
|
||||
<div>
|
||||
<h2>Ubicación actual</h2>
|
||||
<p className="section-copy">Dónde está contenido el elemento dentro del Inventario.</p>
|
||||
</div>
|
||||
{canReadHistory && id && <Link className="button secondary asset-compact-context-button" to={`/inventarios/${id}?tab=history`}>
|
||||
<Icon name="edit" />Cambiar / ver historial
|
||||
</Link>}
|
||||
</div>
|
||||
|
||||
<div className="asset-compact-context-grid">
|
||||
<div className="asset-compact-context-item">
|
||||
<small>Registro padre</small>
|
||||
<strong>{asset?.parent?.name ?? 'Sin padre'}</strong>
|
||||
{asset?.parent?.code && <span>{asset.parent.code}</span>}
|
||||
</div>
|
||||
<div className="asset-compact-context-item">
|
||||
<small>Área</small>
|
||||
<strong>{asset?.operationalArea?.name ?? 'Sin área asignada'}</strong>
|
||||
{asset?.operationalArea?.code && <span>{asset.operationalArea.code}</span>}
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
{(canChangeStatus || canChangeOperationalStatus) && <details className="asset-compact-details">
|
||||
<summary>
|
||||
<span><strong>Estado y opciones</strong><small>Calidad del dato y situación operativa</small></span>
|
||||
<span aria-hidden="true">⌄</span>
|
||||
</summary>
|
||||
<div className="asset-compact-details-body">
|
||||
<div className="form-grid">
|
||||
{canChangeStatus && <label className="field">
|
||||
<span>Estado del dato</span>
|
||||
<SearchableSelect
|
||||
value={status}
|
||||
onChange={(event) => setStatus(event.target.value as AssetInformationStatus)}
|
||||
disabled={!canEdit && !canChangeStatus}
|
||||
>
|
||||
{ASSET_STATUSES.map((item) =>
|
||||
<option key={item.value} value={item.value}>{item.label}</option>)}
|
||||
</SearchableSelect>
|
||||
</label>}
|
||||
{canChangeOperationalStatus && <label className="field">
|
||||
<span>Estado operativo</span>
|
||||
<SearchableSelect
|
||||
value={operationalStatus}
|
||||
onChange={(event) => setOperationalStatus(event.target.value as AssetOperationalStatus)}
|
||||
>
|
||||
{ASSET_OPERATIONAL_STATUSES.map((item) =>
|
||||
<option key={item.value} value={item.value}>{item.label}</option>)}
|
||||
</SearchableSelect>
|
||||
</label>}
|
||||
</div>
|
||||
</div>
|
||||
</details>}
|
||||
|
||||
<details className="asset-compact-details" open={missingRequiredTechnical || canDirectContextEdit}>
|
||||
<summary>
|
||||
<span>
|
||||
<strong>Más datos</strong>
|
||||
<small>
|
||||
{description.trim() ? 'Descripción cargada' : 'Sin descripción'}
|
||||
{' · '}
|
||||
{technicalFilledCount}/{definitions.length} datos técnicos cargados
|
||||
</small>
|
||||
</span>
|
||||
<span aria-hidden="true">⌄</span>
|
||||
</summary>
|
||||
<div className="asset-compact-details-body">
|
||||
<div className="form-grid">
|
||||
<label className="field">
|
||||
<span>Código DH</span>
|
||||
<input
|
||||
value={code}
|
||||
onChange={(event) => setCode(event.target.value.toUpperCase())}
|
||||
disabled={!canEdit}
|
||||
required
|
||||
maxLength={120}
|
||||
pattern="[A-Z0-9][A-Z0-9._/-]*"
|
||||
/>
|
||||
</label>
|
||||
|
||||
{canDirectContextEdit && <label className="field">
|
||||
<span>Tipo de elemento</span>
|
||||
<SearchableSelect
|
||||
value={typeId}
|
||||
onChange={(event) => changeType(event.target.value)}
|
||||
disabled={!canEdit}
|
||||
required
|
||||
>
|
||||
<option value="">Seleccionar…</option>
|
||||
{types.filter((type) => type.isActive || type.id === typeId).map((type) =>
|
||||
<option key={type.id} value={type.id}>{type.name}</option>)}
|
||||
</SearchableSelect>
|
||||
</label>}
|
||||
</div>
|
||||
|
||||
{canDirectContextEdit && <div className="form-grid">
|
||||
<div className="field parent-picker">
|
||||
<span>Registro padre {!selectedType?.canBeRoot && <em>obligatorio</em>}</span>
|
||||
<input
|
||||
className="parent-search"
|
||||
value={parentSearch}
|
||||
onChange={(event) => setParentSearch(event.target.value)}
|
||||
disabled={!canEdit}
|
||||
placeholder="Buscar planta, batería, estación…"
|
||||
/>
|
||||
<SearchableSelect
|
||||
value={parentId}
|
||||
onChange={(event) => {
|
||||
setParentId(event.target.value);
|
||||
setParentSearch('');
|
||||
}}
|
||||
disabled={!canEdit}
|
||||
required={!selectedType?.canBeRoot}
|
||||
>
|
||||
<option value="">
|
||||
{selectedType?.canBeRoot ? 'Sin padre · registro raíz' : 'Seleccionar registro padre…'}
|
||||
</option>
|
||||
{parents.map((parent) =>
|
||||
<option key={parent.id} value={parent.id}>{parent.name} · {parent.code} ({parent.type.name})</option>)}
|
||||
</SearchableSelect>
|
||||
</div>
|
||||
|
||||
{selectedType?.operationalRole === 'GENERIC' && canReadRelations && <label className="field">
|
||||
<span>Área</span>
|
||||
<SearchableSelect
|
||||
value={operationalAreaId}
|
||||
onChange={(event) => setOperationalAreaId(event.target.value)}
|
||||
disabled={!canEdit}
|
||||
>
|
||||
<option value="">Sin asignación operativa</option>
|
||||
{operationalAreas.map((area) =>
|
||||
<option key={area.id} value={area.id}>{area.name}</option>)}
|
||||
</SearchableSelect>
|
||||
</label>}
|
||||
</div>}
|
||||
|
||||
<label className="field">
|
||||
<span>Descripción <em>opcional</em></span>
|
||||
<textarea
|
||||
value={description}
|
||||
onChange={(event) => setDescription(event.target.value)}
|
||||
disabled={!canEdit}
|
||||
maxLength={4000}
|
||||
rows={2}
|
||||
/>
|
||||
</label>
|
||||
|
||||
<div className="asset-compact-technical">
|
||||
<div>
|
||||
<h3>Datos técnicos</h3>
|
||||
<p className="section-copy">Sólo completá lo que corresponda para este tipo.</p>
|
||||
</div>
|
||||
{renderAttributes()}
|
||||
</div>
|
||||
</div>
|
||||
</details>
|
||||
|
||||
{renderSaveActions()}
|
||||
</form>;
|
||||
|
||||
const renderFullForm = () => <form className="panel form-panel" onSubmit={save}>
|
||||
<div className="form-section">
|
||||
<div>
|
||||
<h2>Identificación</h2>
|
||||
<p className="section-copy">Conservá el nombre técnico y, cuando exista, agregá el nombre habitual usado en campo.</p>
|
||||
</div>
|
||||
<div className="form-grid">
|
||||
<label className="field">
|
||||
<span>Código DH</span>
|
||||
<input
|
||||
value={code}
|
||||
onChange={(event) => setCode(event.target.value.toUpperCase())}
|
||||
disabled={!canEdit}
|
||||
required
|
||||
maxLength={120}
|
||||
pattern="[A-Z0-9][A-Z0-9._/-]*"
|
||||
/>
|
||||
</label>
|
||||
<label className="field">
|
||||
<span>Nombre técnico</span>
|
||||
<input value={name} onChange={(event) => setName(event.target.value)} disabled={!canEdit} required maxLength={200} />
|
||||
</label>
|
||||
<label className="field">
|
||||
<span>Nombre habitual / sobrenombre <em>opcional</em></span>
|
||||
<input
|
||||
value={commonName}
|
||||
onChange={(event) => setCommonName(event.target.value)}
|
||||
disabled={!canEdit}
|
||||
maxLength={200}
|
||||
placeholder="Ej.: tanque grande, ET vieja, batería norte…"
|
||||
/>
|
||||
<small>También se usa en las búsquedas del Inventario.</small>
|
||||
</label>
|
||||
</div>
|
||||
<label className="field">
|
||||
<span>Descripción <em>opcional</em></span>
|
||||
<textarea
|
||||
value={description}
|
||||
onChange={(event) => setDescription(event.target.value)}
|
||||
disabled={!canEdit}
|
||||
maxLength={4000}
|
||||
rows={2}
|
||||
/>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div className="form-section">
|
||||
<div>
|
||||
<h2>Ubicación en la estructura</h2>
|
||||
<p className="section-copy">
|
||||
Elegí qué es y dónde está contenido. La ubicación física es independiente de la Operadora del Área.
|
||||
Los registros ya consolidados cambian de ubicación desde el bloque histórico inferior.
|
||||
</p>
|
||||
</div>
|
||||
<div className="form-grid">
|
||||
<label className="field">
|
||||
<span>Tipo de elemento</span>
|
||||
<SearchableSelect
|
||||
value={typeId}
|
||||
onChange={(event) => changeType(event.target.value)}
|
||||
disabled={(editing && !(asset?.dataOrigin === 'FIELD_SURVEY' && asset.informationStatus === 'DRAFT')) || !canEdit}
|
||||
required
|
||||
>
|
||||
<option value="">Seleccionar…</option>
|
||||
{types.filter((type) => type.isActive || type.id === typeId).map((type) =>
|
||||
<option key={type.id} value={type.id}>{type.name}</option>)}
|
||||
</SearchableSelect>
|
||||
</label>
|
||||
|
||||
<div className="field parent-picker">
|
||||
<span>Registro padre {!selectedType?.canBeRoot && <em>obligatorio</em>}</span>
|
||||
<input
|
||||
className="parent-search"
|
||||
value={parentSearch}
|
||||
onChange={(event) => setParentSearch(event.target.value)}
|
||||
disabled={!canEdit || !canDirectContextEdit}
|
||||
placeholder="Buscar planta, batería, estación…"
|
||||
/>
|
||||
<SearchableSelect
|
||||
value={parentId}
|
||||
onChange={(event) => {
|
||||
setParentId(event.target.value);
|
||||
setParentSearch('');
|
||||
}}
|
||||
disabled={!canEdit || !canDirectContextEdit}
|
||||
required={!selectedType?.canBeRoot}
|
||||
>
|
||||
<option value="">
|
||||
{selectedType?.canBeRoot ? 'Sin padre · registro raíz' : 'Seleccionar registro padre…'}
|
||||
</option>
|
||||
{parents.map((parent) =>
|
||||
<option key={parent.id} value={parent.id}>{parent.name} · {parent.code} ({parent.type.name})</option>)}
|
||||
</SearchableSelect>
|
||||
<small>Escribí para buscar entre los registros compatibles.</small>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="form-grid">
|
||||
{canChangeStatus && <label className="field">
|
||||
<span>Estado del dato</span>
|
||||
<SearchableSelect
|
||||
value={status}
|
||||
onChange={(event) => setStatus(event.target.value as AssetInformationStatus)}
|
||||
disabled={!canEdit && !canChangeStatus}
|
||||
>
|
||||
{ASSET_STATUSES.map((item) =>
|
||||
<option key={item.value} value={item.value}>{item.label}</option>)}
|
||||
</SearchableSelect>
|
||||
<small>Calidad y validación del registro.</small>
|
||||
</label>}
|
||||
|
||||
{editing && canChangeOperationalStatus && <label className="field">
|
||||
<span>Estado operativo</span>
|
||||
<SearchableSelect
|
||||
value={operationalStatus}
|
||||
onChange={(event) => setOperationalStatus(event.target.value as AssetOperationalStatus)}
|
||||
>
|
||||
{ASSET_OPERATIONAL_STATUSES.map((item) =>
|
||||
<option key={item.value} value={item.value}>{item.label}</option>)}
|
||||
</SearchableSelect>
|
||||
<small>Situación física u operativa del elemento.</small>
|
||||
</label>}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{selectedType?.operationalRole === 'GENERIC' && canReadRelations && <div className="form-section">
|
||||
<div>
|
||||
<h2>{editing ? 'Área física' : 'Área y operadora al alta'}</h2>
|
||||
<p className="section-copy">
|
||||
{editing
|
||||
? 'El Inventario pertenece físicamente al Área. La Operadora vigente se administra en las relaciones temporales del Área y no se reescribe dentro del Inventario.'
|
||||
: 'Al crear el registro, la Operadora activa del Área queda guardada únicamente como snapshot histórico de alta.'}
|
||||
</p>
|
||||
</div>
|
||||
<div className="form-grid">
|
||||
<label className="field">
|
||||
<span>Área</span>
|
||||
<SearchableSelect
|
||||
value={operationalAreaId}
|
||||
onChange={(event) => {
|
||||
setOperationalAreaId(event.target.value);
|
||||
if (!editing) setOperatorCompanyId('');
|
||||
}}
|
||||
disabled={!canEdit || !canDirectContextEdit}
|
||||
>
|
||||
<option value="">Sin asignación operativa</option>
|
||||
{operationalAreas.map((area) =>
|
||||
<option key={area.id} value={area.id}>{area.name}</option>)}
|
||||
</SearchableSelect>
|
||||
{editing && <small>La Operadora se resuelve por la relación Área↔Empresa vigente.</small>}
|
||||
</label>
|
||||
|
||||
{!editing && <label className="field">
|
||||
<span>Operadora {operationalAreaId && <em>obligatoria</em>}</span>
|
||||
<SearchableSelect
|
||||
value={operatorCompanyId}
|
||||
onChange={(event) => setOperatorCompanyId(event.target.value)}
|
||||
disabled={!canEdit || !operationalAreaId}
|
||||
required={Boolean(operationalAreaId)}
|
||||
>
|
||||
<option value="">{operationalAreaId ? 'Seleccionar operadora…' : 'Primero seleccioná un área'}</option>
|
||||
{operationalCompanies.map((company) =>
|
||||
<option key={company.id} value={company.id}>{company.name}</option>)}
|
||||
</SearchableSelect>
|
||||
</label>}
|
||||
</div>
|
||||
|
||||
{!editing && operationalAreaId && operatorCompanyId && <div className="temporal-notice">
|
||||
<Icon name="check" />
|
||||
<p><strong>Contexto de alta confirmado.</strong> La Operadora seleccionada se conservará como referencia histórica; futuros cambios se harán en la relación temporal del Área.</p>
|
||||
</div>}
|
||||
|
||||
{editing && asset?.operatorCompany && <div className="temporal-notice">
|
||||
<Icon name="layers" />
|
||||
<p><strong>Snapshot histórico de alta:</strong> {asset.operatorCompany.name}. No se modifica desde este registro.</p>
|
||||
</div>}
|
||||
</div>}
|
||||
|
||||
<div className="form-section">
|
||||
<div>
|
||||
<h2>Datos técnicos</h2>
|
||||
<p className="section-copy">Campos definidos para el tipo seleccionado.</p>
|
||||
</div>
|
||||
{renderAttributes()}
|
||||
</div>
|
||||
|
||||
{renderSaveActions()}
|
||||
</form>;
|
||||
|
||||
return <section className="narrow-section asset-detail-page">
|
||||
<nav className="breadcrumb asset-detail-breadcrumb" aria-label="Ruta del inventario">
|
||||
<Link to="/inventarios">Inventarios</Link><span>›</span>
|
||||
<Link to={breadcrumbSection === 'companies' ? '/inventarios?section=companies' : '/inventarios?section=territory'}>{breadcrumbSection === 'companies' ? 'Empresas' : 'Áreas y yacimientos'}</Link>
|
||||
<Link to={breadcrumbSection === 'companies' ? '/inventarios?section=companies' : '/inventarios?section=territory'}>
|
||||
{breadcrumbSection === 'companies' ? 'Empresas' : 'Áreas y yacimientos'}
|
||||
</Link>
|
||||
{lineage.map((item, index) => {
|
||||
const isLast = index === lineage.length - 1;
|
||||
const showAsCurrent = editing ? isLast : false;
|
||||
return <span className="asset-detail-crumb-part" key={item.id}><span>›</span>{showAsCurrent ? <strong>{item.name}</strong> : <Link to={`/inventarios?section=${breadcrumbSection}&parentId=${item.id}`}>{item.name}</Link>}</span>;
|
||||
return <span className="asset-detail-crumb-part" key={item.id}>
|
||||
<span>›</span>
|
||||
{showAsCurrent
|
||||
? <strong>{item.name}</strong>
|
||||
: <Link to={`/inventarios?section=${breadcrumbSection}&parentId=${item.id}`}>{item.name}</Link>}
|
||||
</span>;
|
||||
})}
|
||||
{!editing && <><span>›</span><strong>Nuevo registro</strong></>}
|
||||
</nav>
|
||||
<div className="page-heading asset-editor-heading"><div><span className="eyebrow">INVENTARIO</span><h1>{editing ? asset?.name ?? 'Registro' : contextParent ? `Agregar en ${contextParent.name}` : 'Nuevo registro'}</h1><p>{editing ? `${asset?.type.name} · ${asset?.code}` : contextParent ? `El sistema heredará el contexto disponible de ${contextParent.code}.` : 'Creá una entidad con identidad, jerarquía y atributos propios.'}</p></div><div className="asset-heading-actions">{editing && asset && <div className="heading-statuses"><span className={`status-badge ${assetStatusClass(asset.informationStatus)}`}>{assetStatusLabel(asset.informationStatus)}</span><small>{assetOperationalStatusLabel(asset.operationalStatus)}</small></div>}{editing && id && canCreate && <Link className="button primary" to={`/inventarios/nuevo?parentId=${id}`}><Icon name="plus" />Agregar registro aquí</Link>}</div></div>
|
||||
{error && <Alert>{error}</Alert>}{success && <Alert type="success">{success}</Alert>}
|
||||
|
||||
{editing && <nav className="asset-detail-tabs">{detailTabs.filter((item) => item.show).map((item) => <Link key={item.key} className={tab === item.key ? 'active' : ''} to={`/inventarios/${id}${item.key === 'summary' ? '' : `?tab=${item.key}`}`}>{item.label}</Link>)}</nav>}
|
||||
<div className="page-heading asset-editor-heading">
|
||||
<div>
|
||||
<span className="eyebrow">INVENTARIO</span>
|
||||
<h1>{editing ? asset?.name ?? 'Registro' : contextParent ? `Agregar en ${contextParent.name}` : 'Nuevo registro'}</h1>
|
||||
<p>
|
||||
{editing
|
||||
? `${asset?.type.name} · ${asset?.code}`
|
||||
: contextParent
|
||||
? `El sistema heredará el contexto disponible de ${contextParent.code}.`
|
||||
: 'Creá una entidad con identidad, jerarquía y atributos propios.'}
|
||||
</p>
|
||||
</div>
|
||||
<div className="asset-heading-actions">
|
||||
{editing && asset && <div className="heading-statuses">
|
||||
<span className={`status-badge ${assetStatusClass(asset.informationStatus)}`}>
|
||||
{assetStatusLabel(asset.informationStatus)}
|
||||
</span>
|
||||
<small>{assetOperationalStatusLabel(asset.operationalStatus)}</small>
|
||||
</div>}
|
||||
{editing && id && canCreate && <Link className="button primary" to={`/inventarios/nuevo?parentId=${id}`}>
|
||||
<Icon name="plus" />Agregar registro aquí
|
||||
</Link>}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{error && <Alert>{error}</Alert>}
|
||||
{success && <Alert type="success">{success}</Alert>}
|
||||
|
||||
{editing && <nav className="asset-detail-tabs">
|
||||
{detailTabs.filter((item) => item.show).map((item) =>
|
||||
<Link
|
||||
key={item.key}
|
||||
className={tab === item.key ? 'active' : ''}
|
||||
to={`/inventarios/${id}${item.key === 'summary' ? '' : `?tab=${item.key}`}`}
|
||||
>
|
||||
{item.label}
|
||||
</Link>)}
|
||||
</nav>}
|
||||
|
||||
{(!editing || tab === 'summary') && <>
|
||||
{contextParent && !editing && <div className="context-create-banner"><Icon name="layers" /><div><strong>Alta contextual</strong><span>{contextParent.name} · {contextParent.code}</span></div><Link to={`/inventarios/${contextParent.id}`}>Ver padre</Link></div>}
|
||||
<form className="panel form-panel" onSubmit={save}>
|
||||
<div className="form-section"><div><h2>Identificación</h2><p className="section-copy">Conservá el nombre técnico y, cuando exista, agregá el nombre habitual usado en campo.</p></div><div className="form-grid"><label className="field"><span>Código DH</span><input value={code} onChange={(event) => setCode(event.target.value.toUpperCase())} disabled={!canEdit} required maxLength={120} pattern="[A-Z0-9][A-Z0-9._/-]*" /></label><label className="field"><span>Nombre técnico</span><input value={name} onChange={(event) => setName(event.target.value)} disabled={!canEdit} required maxLength={200} /></label><label className="field"><span>Nombre habitual / sobrenombre <em>opcional</em></span><input value={commonName} onChange={(event) => setCommonName(event.target.value)} disabled={!canEdit} maxLength={200} placeholder="Ej.: tanque grande, ET vieja, batería norte…" /><small>También se usa en las búsquedas del Inventario.</small></label></div><label className="field"><span>Descripción <em>opcional</em></span><textarea value={description} onChange={(event) => setDescription(event.target.value)} disabled={!canEdit} maxLength={4000} rows={2} /></label></div>
|
||||
{contextParent && !editing && <div className="context-create-banner">
|
||||
<Icon name="layers" />
|
||||
<div><strong>Alta contextual</strong><span>{contextParent.name} · {contextParent.code}</span></div>
|
||||
<Link to={`/inventarios/${contextParent.id}`}>Ver padre</Link>
|
||||
</div>}
|
||||
|
||||
<div className="form-section"><div><h2>Ubicación en la estructura</h2><p className="section-copy">Elegí qué es y dónde está contenido. La ubicación física es independiente de la Operadora del Área. Los registros ya consolidados cambian de ubicación desde el bloque histórico inferior.</p></div><div className="form-grid"><label className="field"><span>Tipo de elemento</span><SearchableSelect value={typeId} onChange={(event) => changeType(event.target.value)} disabled={(editing && !(asset?.dataOrigin === 'FIELD_SURVEY' && asset.informationStatus === 'DRAFT')) || !canEdit} required><option value="">Seleccionar…</option>{types.filter((type) => type.isActive || type.id === typeId).map((type) => <option key={type.id} value={type.id}>{type.name}</option>)}</SearchableSelect></label><div className="field parent-picker"><span>Registro padre {!selectedType?.canBeRoot && <em>obligatorio</em>}</span><input className="parent-search" value={parentSearch} onChange={(event) => setParentSearch(event.target.value)} disabled={!canEdit || !canDirectContextEdit} placeholder="Buscar planta, batería, estación…" /><SearchableSelect value={parentId} onChange={(event) => { setParentId(event.target.value); setParentSearch(''); }} disabled={!canEdit || !canDirectContextEdit} required={!selectedType?.canBeRoot}><option value="">{selectedType?.canBeRoot ? 'Sin padre · registro raíz' : 'Seleccionar registro padre…'}</option>{parents.map((parent) => <option key={parent.id} value={parent.id}>{parent.name} · {parent.code} ({parent.type.name})</option>)}</SearchableSelect><small>Escribí para buscar entre los registros compatibles.</small></div></div><div className="form-grid">{canChangeStatus && <label className="field"><span>Estado del dato</span><SearchableSelect value={status} onChange={(event) => setStatus(event.target.value as AssetInformationStatus)} disabled={!canEdit && !canChangeStatus}>{ASSET_STATUSES.map((item) => <option key={item.value} value={item.value}>{item.label}</option>)}</SearchableSelect><small>Calidad y validación del registro.</small></label>}{editing && canChangeOperationalStatus && <label className="field"><span>Estado operativo</span><SearchableSelect value={operationalStatus} onChange={(event) => setOperationalStatus(event.target.value as AssetOperationalStatus)}>{ASSET_OPERATIONAL_STATUSES.map((item) => <option key={item.value} value={item.value}>{item.label}</option>)}</SearchableSelect><small>Situación física u operativa del elemento.</small></label>}</div></div>
|
||||
{compactStructuralSummary ? renderCompactStructuralForm() : renderFullForm()}
|
||||
|
||||
{selectedType?.operationalRole === 'GENERIC' && canReadRelations && <div className="form-section"><div><h2>{editing ? 'Área física' : 'Área y operadora al alta'}</h2><p className="section-copy">{editing ? 'El Inventario pertenece físicamente al Área. La Operadora vigente se administra en las relaciones temporales del Área y no se reescribe dentro del Inventario.' : 'Al crear el registro, la Operadora activa del Área queda guardada únicamente como snapshot histórico de alta.'}</p></div><div className="form-grid"><label className="field"><span>Área</span><SearchableSelect value={operationalAreaId} onChange={(event) => { setOperationalAreaId(event.target.value); if (!editing) setOperatorCompanyId(''); }} disabled={!canEdit || !canDirectContextEdit}><option value="">Sin asignación operativa</option>{operationalAreas.map((area) => <option key={area.id} value={area.id}>{area.name}</option>)}</SearchableSelect>{editing && <small>La Operadora se resuelve por la relación Área↔Empresa vigente.</small>}</label>{!editing && <label className="field"><span>Operadora {operationalAreaId && <em>obligatoria</em>}</span><SearchableSelect value={operatorCompanyId} onChange={(event) => setOperatorCompanyId(event.target.value)} disabled={!canEdit || !operationalAreaId} required={Boolean(operationalAreaId)}><option value="">{operationalAreaId ? 'Seleccionar operadora…' : 'Primero seleccioná un área'}</option>{operationalCompanies.map((company) => <option key={company.id} value={company.id}>{company.name}</option>)}</SearchableSelect></label>}</div>{!editing && operationalAreaId && operatorCompanyId && <div className="temporal-notice"><Icon name="check" /><p><strong>Contexto de alta confirmado.</strong> La Operadora seleccionada se conservará como referencia histórica; futuros cambios se harán en la relación temporal del Área.</p></div>}{editing && asset?.operatorCompany && <div className="temporal-notice"><Icon name="layers" /><p><strong>Snapshot histórico de alta:</strong> {asset.operatorCompany.name}. No se modifica desde este registro.</p></div>}</div>}
|
||||
{!compactStructuralSummary && editing && id && asset && selectedType && canReadHistory
|
||||
&& <AssetContextHistoryPanel
|
||||
asset={asset}
|
||||
type={selectedType}
|
||||
canManage={canManageContext}
|
||||
onChanged={handleContextChanged}
|
||||
/>}
|
||||
|
||||
<div className="form-section"><div><h2>Datos técnicos</h2><p className="section-copy">Campos definidos para el tipo seleccionado.</p></div>{definitions.length === 0 ? <div className="inline-empty">Este tipo no requiere datos técnicos adicionales.</div> : <div className="dynamic-attributes">{definitions.map((definition) => { const value = attributeValues[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) => setAttribute(definition.id, event.target.checked)} disabled={!canEdit} /><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) => setAttribute(definition.id, event.target.value)} disabled={!canEdit} required={definition.isRequired}><option value="">Seleccionar…</option>{definition.options?.map((option) => <option key={option} value={option}>{option}</option>)}</SearchableSelect></label>; const inputType = definition.dataType === 'NUMBER' ? 'number' : definition.dataType === 'DATE' ? 'date' : definition.dataType === 'DATETIME' ? 'datetime-local' : 'text'; return <label className="field" key={definition.id}>{label}<input type={inputType} value={String(value ?? '')} onChange={(event) => setAttribute(definition.id, event.target.value)} disabled={!canEdit} required={definition.isRequired} step={definition.dataType === 'NUMBER' ? 'any' : undefined} maxLength={definition.dataType === 'TEXT' ? 4000 : undefined} /></label>; })}</div>}</div>
|
||||
{canSave && <div className="form-actions"><Link className="button secondary" to="/inventarios">Cancelar</Link><button className="button primary" disabled={saving}><Icon name="check" />{saving ? 'Guardando…' : editing && !canEdit ? 'Actualizar estado' : editing ? 'Guardar cambios' : 'Crear registro'}</button></div>}
|
||||
</form>
|
||||
{editing && id && asset && selectedType && canReadHistory && <AssetContextHistoryPanel asset={asset} type={selectedType} canManage={canManageContext} onChanged={(saved) => { setAsset(saved); setParentId(saved.parent?.id ?? ''); setOperationalAreaId(saved.operationalArea?.id ?? ''); setOperatorCompanyId(saved.operatorCompany?.id ?? ''); setLineage([]); getAssetLineage(saved.id).then(setLineage).catch(() => undefined); setHistoryRefreshKey((current) => current + 1); }} />}
|
||||
{editing && id && asset && canReadRelations && selectedType && selectedType.operationalRole !== 'GENERIC' && <AssetOperationalRelationsPanel assetId={id} role={selectedType.operationalRole} canManage={canManageRelations} />}
|
||||
{editing && id && asset && canReadRelations && selectedType && selectedType.operationalRole !== 'GENERIC'
|
||||
&& <AssetOperationalRelationsPanel assetId={id} role={selectedType.operationalRole} canManage={canManageRelations} />}
|
||||
</>}
|
||||
|
||||
{editing && id && asset && tab === 'findings' && canReadFindingCatalog && <AssetFindingCatalogPanel assetId={id} canManage={canManageFindingCatalog} />}
|
||||
{editing && id && asset && tab === 'dossier' && canReadDossier && <AssetDossierPanel assetId={id} />}
|
||||
{editing && id && asset && tab === 'location' && <Suspense fallback={<div className="panel"><LoadingBlock label="Cargando ubicación…" /></div>}><AssetGeometryEditor assetId={id} assetName={asset.name} canEdit={canEditGeometry} onChanged={() => setHistoryRefreshKey((current) => current + 1)} /></Suspense>}
|
||||
{editing && id && asset && tab === 'registry' && <div className="asset-tab-stack">{canReadRegistry && selectedType && <AssetRegistryPanel assetId={id} assetName={asset.name} role={selectedType.operationalRole} canManage={canManageRegistry} onChanged={() => setHistoryRefreshKey((current) => current + 1)} />}{canReadProvenance && <AssetProvenancePanel assetId={id} canManage={canManageProvenance} canVerify={canVerifyProvenance} onChanged={() => setHistoryRefreshKey((current) => current + 1)} />}</div>}
|
||||
{editing && id && asset && tab === 'files' && canReadMedia && <AssetMediaPanel assetId={id} assetName={asset.name} canManage={canManageMedia} onChanged={() => setHistoryRefreshKey((current) => current + 1)} />}
|
||||
{editing && id && tab === 'history' && canReadHistory && <AssetHistoryPanel assetId={id} refreshKey={historyRefreshKey} />}
|
||||
{editing && id && asset && tab === 'findings' && canReadFindingCatalog
|
||||
&& <AssetFindingCatalogPanel assetId={id} canManage={canManageFindingCatalog} />}
|
||||
|
||||
{editing && id && asset && tab === 'dossier' && canReadDossier
|
||||
&& <AssetDossierPanel assetId={id} />}
|
||||
|
||||
{editing && id && asset && tab === 'location'
|
||||
&& <Suspense fallback={<div className="panel"><LoadingBlock label="Cargando ubicación…" /></div>}>
|
||||
<AssetGeometryEditor
|
||||
assetId={id}
|
||||
assetName={asset.name}
|
||||
canEdit={canEditGeometry}
|
||||
onChanged={() => setHistoryRefreshKey((current) => current + 1)}
|
||||
/>
|
||||
</Suspense>}
|
||||
|
||||
{editing && id && asset && tab === 'registry' && <div className="asset-tab-stack">
|
||||
{canReadRegistry && selectedType && <AssetRegistryPanel
|
||||
assetId={id}
|
||||
assetName={asset.name}
|
||||
role={selectedType.operationalRole}
|
||||
canManage={canManageRegistry}
|
||||
onChanged={() => setHistoryRefreshKey((current) => current + 1)}
|
||||
/>}
|
||||
{canReadProvenance && <AssetProvenancePanel
|
||||
assetId={id}
|
||||
canManage={canManageProvenance}
|
||||
canVerify={canVerifyProvenance}
|
||||
onChanged={() => setHistoryRefreshKey((current) => current + 1)}
|
||||
/>}
|
||||
</div>}
|
||||
|
||||
{editing && id && asset && tab === 'files' && canReadMedia
|
||||
&& <AssetMediaPanel
|
||||
assetId={id}
|
||||
assetName={asset.name}
|
||||
canManage={canManageMedia}
|
||||
onChanged={() => setHistoryRefreshKey((current) => current + 1)}
|
||||
/>}
|
||||
|
||||
{editing && id && tab === 'history' && canReadHistory && <div className="asset-tab-stack">
|
||||
{compactStructuralSummary && asset && selectedType && <AssetContextHistoryPanel
|
||||
asset={asset}
|
||||
type={selectedType}
|
||||
canManage={canManageContext}
|
||||
onChanged={handleContextChanged}
|
||||
/>}
|
||||
<AssetHistoryPanel assetId={id} refreshKey={historyRefreshKey} />
|
||||
</div>}
|
||||
</section>;
|
||||
}
|
||||
|
||||
@@ -1,14 +1,18 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { useParams, useSearchParams } from 'react-router';
|
||||
import { useAuth } from '../auth/AuthContext';
|
||||
import { hasAdministratorRole } from '../auth/adminAccess';
|
||||
import { Alert, LoadingBlock, errorMessage } from '../components/Feedback';
|
||||
import { getAsset } from '../lib/api';
|
||||
import type { AssetDetail } from '../lib/api';
|
||||
import { AssetEditorPage } from './AssetEditorPage';
|
||||
import { CompanyInventoryPage } from './CompanyInventoryPage';
|
||||
import { TerritorialInventoryPage, isTerritorialInventoryAsset } from './TerritorialInventoryPage';
|
||||
|
||||
export function InventoryDetailPage() {
|
||||
const { id } = useParams();
|
||||
const [params] = useSearchParams();
|
||||
const { user } = useAuth();
|
||||
const [asset, setAsset] = useState<AssetDetail | null>(null);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [error, setError] = useState('');
|
||||
@@ -30,10 +34,18 @@ export function InventoryDetailPage() {
|
||||
if (loading) return <LoadingBlock label="Cargando registro…" />;
|
||||
if (!asset) return <Alert>{error || 'No se pudo cargar el registro.'}</Alert>;
|
||||
|
||||
const advancedRequested = params.get('advanced') === '1';
|
||||
const advancedAllowed = hasAdministratorRole(user);
|
||||
const advanced = advancedRequested && advancedAllowed;
|
||||
const isCompany = asset.type.code.toLowerCase() === 'empresa';
|
||||
if (isCompany && params.get('advanced') !== '1') {
|
||||
|
||||
if (isCompany && !advanced) {
|
||||
return <CompanyInventoryPage initialAsset={asset} />;
|
||||
}
|
||||
|
||||
if (isTerritorialInventoryAsset(asset) && !advanced) {
|
||||
return <TerritorialInventoryPage initialAsset={asset} />;
|
||||
}
|
||||
|
||||
return <AssetEditorPage />;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,276 @@
|
||||
import { useEffect, useMemo, useState } from 'react';
|
||||
import type { FormEvent } from 'react';
|
||||
import { Link, useSearchParams } from 'react-router';
|
||||
import { useAuth } from '../auth/AuthContext';
|
||||
import { hasAdministratorRole } from '../auth/adminAccess';
|
||||
import { Alert, LoadingBlock, errorMessage } from '../components/Feedback';
|
||||
import { Icon } from '../components/Icon';
|
||||
import { AssetHistoryPanel } from '../features/assets/AssetHistoryPanel';
|
||||
import { assetStatusClass, assetStatusLabel } from '../features/assets/assetPresentation';
|
||||
import {
|
||||
getAssetLineage,
|
||||
listAreaCompanyRelations,
|
||||
listAssetTreeChildren,
|
||||
listInspectionVisits,
|
||||
updateAsset,
|
||||
} from '../lib/api';
|
||||
import type { AreaCompanyRelation, AssetDetail, AssetLineageItem, AssetListItem } from '../lib/api';
|
||||
import {
|
||||
listInspectionActsGlobalF4,
|
||||
type InspectionActStatusF4,
|
||||
} from '../lib/inspectionActF4Api';
|
||||
import { listInspectionReportsF4 } from '../lib/reportWorkflowApi';
|
||||
import './territorialInventory.css';
|
||||
|
||||
type TerritoryTab = 'summary' | 'history';
|
||||
|
||||
function normalized(value: string) {
|
||||
return value
|
||||
.normalize('NFD')
|
||||
.replace(/[\u0300-\u036f]/g, '')
|
||||
.toLowerCase()
|
||||
.replace(/[^a-z0-9]+/g, ' ')
|
||||
.trim();
|
||||
}
|
||||
|
||||
function tokensForType(type: { code: string; name: string }) {
|
||||
return new Set(`${normalized(type.code)} ${normalized(type.name)}`.split(' ').filter(Boolean));
|
||||
}
|
||||
|
||||
function typeTokens(asset: AssetDetail) {
|
||||
return tokensForType(asset.type);
|
||||
}
|
||||
|
||||
export function isTerritorialInventoryAsset(asset: AssetDetail) {
|
||||
const tokens = typeTokens(asset);
|
||||
return tokens.has('departamento') || tokens.has('area') || tokens.has('yacimiento');
|
||||
}
|
||||
|
||||
function isOperationalArea(asset: AssetDetail) {
|
||||
return typeTokens(asset).has('area');
|
||||
}
|
||||
|
||||
function isYacimiento(asset: AssetDetail) {
|
||||
return typeTokens(asset).has('yacimiento');
|
||||
}
|
||||
|
||||
function lineageArea(lineage: AssetLineageItem[]) {
|
||||
return [...lineage].reverse().find((item) => tokensForType(item.type).has('area')) ?? null;
|
||||
}
|
||||
|
||||
function relationRoleLabel(role: AreaCompanyRelation['relationRole']) {
|
||||
if (role === 'OPERATOR') return 'Operadora';
|
||||
if (role === 'TECHNICAL_OPERATOR') return 'Operadora técnica';
|
||||
if (role === 'CONCESSIONAIRE') return 'Concesionaria / titular';
|
||||
if (role === 'PERMIT_HOLDER') return 'Permisionaria';
|
||||
if (role === 'PARTICIPANT') return 'Participante';
|
||||
return 'Vinculada';
|
||||
}
|
||||
|
||||
export function TerritorialInventoryPage({ initialAsset }: { initialAsset: AssetDetail }) {
|
||||
const [params, setParams] = useSearchParams();
|
||||
const requestedTab = params.get('tab') as TerritoryTab | null;
|
||||
const tab: TerritoryTab = requestedTab === 'history' ? 'history' : 'summary';
|
||||
const { user, hasPermission } = useAuth();
|
||||
const canEdit = hasPermission('assets.update');
|
||||
const canCreate = hasPermission('assets.create');
|
||||
const canReadHistory = hasPermission('assets.read_history');
|
||||
const canReadRelations = hasPermission('asset_relations.read');
|
||||
const canReadActs = hasPermission('inspection_acts.read');
|
||||
const canReadReports = hasPermission('inspection_reports.read');
|
||||
const canReadInspections = hasPermission('inspections.read');
|
||||
const canAdvanced = hasAdministratorRole(user);
|
||||
|
||||
const [asset, setAsset] = useState(initialAsset);
|
||||
const [children, setChildren] = useState<AssetListItem[]>([]);
|
||||
const [childrenHasMore, setChildrenHasMore] = useState(false);
|
||||
const [lineage, setLineage] = useState<AssetLineageItem[]>([]);
|
||||
const [relations, setRelations] = useState<AreaCompanyRelation[]>([]);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [error, setError] = useState('');
|
||||
const [success, setSuccess] = useState('');
|
||||
const [editing, setEditing] = useState(false);
|
||||
const [saving, setSaving] = useState(false);
|
||||
const [name, setName] = useState(initialAsset.name);
|
||||
const [description, setDescription] = useState(initialAsset.description ?? '');
|
||||
const [metrics, setMetrics] = useState({ activeInspections: 0, acts: 0, reports: 0 });
|
||||
|
||||
const area = isOperationalArea(asset);
|
||||
const yacimiento = isYacimiento(asset);
|
||||
const activeRelations = useMemo(() => relations.filter((item) => item.active), [relations]);
|
||||
const relationAreaContext = useMemo(() => {
|
||||
if (area) return { id: asset.id, code: asset.code, name: asset.name };
|
||||
if (asset.operationalArea) return asset.operationalArea;
|
||||
const ancestor = lineageArea(lineage);
|
||||
return ancestor ? { id: ancestor.id, code: ancestor.code, name: ancestor.name } : null;
|
||||
}, [area, asset.id, asset.code, asset.name, asset.operationalArea, lineage]);
|
||||
|
||||
const loadSummary = async () => {
|
||||
setLoading(true);
|
||||
setError('');
|
||||
try {
|
||||
const loadedLineage = await getAssetLineage(asset.id);
|
||||
const ancestorArea = lineageArea(loadedLineage);
|
||||
const relationAreaId = area
|
||||
? asset.id
|
||||
: asset.operationalArea?.id ?? ancestorArea?.id ?? null;
|
||||
const [childPage, loadedRelations] = await Promise.all([
|
||||
listAssetTreeChildren({ parentId: asset.id, limit: 100 }),
|
||||
relationAreaId && canReadRelations
|
||||
? listAreaCompanyRelations({ areaId: relationAreaId, includeHistory: true })
|
||||
: Promise.resolve([]),
|
||||
]);
|
||||
setLineage(loadedLineage);
|
||||
setChildren(childPage.data);
|
||||
setChildrenHasMore(childPage.meta.hasMore);
|
||||
setRelations(loadedRelations);
|
||||
} catch (requestError) {
|
||||
setError(errorMessage(requestError));
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => { void loadSummary(); }, [asset.id, area, canReadRelations]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!area) {
|
||||
setMetrics({ activeInspections: 0, acts: 0, reports: 0 });
|
||||
return;
|
||||
}
|
||||
let cancelled = false;
|
||||
const loadMetrics = async () => {
|
||||
try {
|
||||
const actStatuses: InspectionActStatusF4[] = ['SEALED', 'CLOSED', 'RECTIFIED'];
|
||||
const [planned, inProgress, actPages, reportPage] = await Promise.all([
|
||||
canReadInspections ? listInspectionVisits({ areaId: asset.id, status: 'PLANNED', pageSize: 1 }) : Promise.resolve(null),
|
||||
canReadInspections ? listInspectionVisits({ areaId: asset.id, status: 'IN_PROGRESS', pageSize: 1 }) : Promise.resolve(null),
|
||||
canReadActs
|
||||
? Promise.all(actStatuses.map((status) => listInspectionActsGlobalF4({ areaId: asset.id, status, pageSize: 1 })))
|
||||
: Promise.resolve([]),
|
||||
canReadReports ? listInspectionReportsF4({ areaId: asset.id, pageSize: 1 }) : Promise.resolve(null),
|
||||
]);
|
||||
if (cancelled) return;
|
||||
setMetrics({
|
||||
activeInspections: (planned?.meta.total ?? 0) + (inProgress?.meta.total ?? 0),
|
||||
acts: actPages.reduce((total, page) => total + page.meta.total, 0),
|
||||
reports: reportPage?.meta.total ?? 0,
|
||||
});
|
||||
} catch {
|
||||
if (!cancelled) setMetrics({ activeInspections: 0, acts: 0, reports: 0 });
|
||||
}
|
||||
};
|
||||
void loadMetrics();
|
||||
return () => { cancelled = true; };
|
||||
}, [asset.id, area, canReadActs, canReadReports, canReadInspections]);
|
||||
|
||||
const save = async (event: FormEvent) => {
|
||||
event.preventDefault();
|
||||
if (!canEdit || !name.trim()) return;
|
||||
setSaving(true); setError(''); setSuccess('');
|
||||
try {
|
||||
const saved = await updateAsset(asset.id, {
|
||||
name: name.trim(),
|
||||
description: description.trim() || null,
|
||||
});
|
||||
setAsset(saved);
|
||||
setName(saved.name);
|
||||
setDescription(saved.description ?? '');
|
||||
setEditing(false);
|
||||
setSuccess('Datos actualizados.');
|
||||
} catch (requestError) {
|
||||
setError(errorMessage(requestError));
|
||||
} finally {
|
||||
setSaving(false);
|
||||
}
|
||||
};
|
||||
|
||||
const setTab = (next: TerritoryTab) => {
|
||||
const nextParams = new URLSearchParams(params);
|
||||
next === 'summary' ? nextParams.delete('tab') : nextParams.set('tab', next);
|
||||
nextParams.delete('advanced');
|
||||
setParams(nextParams);
|
||||
};
|
||||
|
||||
return <section className="narrow-section territory-page">
|
||||
<nav className="breadcrumb territory-breadcrumb" aria-label="Ruta territorial">
|
||||
<Link to="/inventarios">Inventarios</Link><span>›</span>
|
||||
<Link to="/inventarios?section=territory">Áreas y yacimientos</Link><span>›</span><strong>{asset.name}</strong>
|
||||
</nav>
|
||||
|
||||
<header className="territory-hero">
|
||||
<div>
|
||||
<span className="eyebrow">{asset.type.name.toUpperCase()}</span>
|
||||
<h1>{asset.name}</h1>
|
||||
<p><strong>{asset.code}</strong></p>
|
||||
</div>
|
||||
<div className="territory-hero-actions">
|
||||
<span className={`status-badge ${assetStatusClass(asset.informationStatus)}`}>{assetStatusLabel(asset.informationStatus)}</span>
|
||||
{canEdit && tab === 'summary' && <button type="button" className="button secondary" onClick={() => setEditing((current) => !current)}><Icon name="edit" />{editing ? 'Cancelar edición' : 'Editar'}</button>}
|
||||
{canCreate && tab === 'summary' && <Link className="button primary" to={`/inventarios/nuevo?parentId=${asset.id}`}><Icon name="plus" />Agregar elemento</Link>}
|
||||
</div>
|
||||
</header>
|
||||
|
||||
<div className="territory-purpose-note"><Icon name="map" /><span>Este nivel organiza el territorio y la navegación. Los hallazgos se cargan sobre elementos inspeccionables, no sobre {asset.type.name.toLowerCase()}s.</span></div>
|
||||
|
||||
<nav className="territory-tabs" aria-label="Secciones territoriales">
|
||||
<button type="button" className={tab === 'summary' ? 'active' : ''} onClick={() => setTab('summary')}>Resumen</button>
|
||||
{canReadHistory && <button type="button" className={tab === 'history' ? 'active' : ''} onClick={() => setTab('history')}>Historial</button>}
|
||||
</nav>
|
||||
|
||||
{error && <Alert>{error}</Alert>}{success && <Alert type="success">{success}</Alert>}
|
||||
|
||||
{tab === 'summary' && <div className="territory-stack">
|
||||
<article className="panel territory-card">
|
||||
<div className="territory-card-heading">
|
||||
<div><span className="eyebrow">DATOS BÁSICOS</span><h2>Identificación</h2></div>
|
||||
</div>
|
||||
{editing ? <form className="territory-edit-form" onSubmit={save}>
|
||||
<label className="field"><span>Nombre</span><input value={name} onChange={(event) => setName(event.target.value)} required maxLength={200} /></label>
|
||||
<label className="field"><span>Descripción <em>opcional</em></span><textarea value={description} onChange={(event) => setDescription(event.target.value)} rows={3} maxLength={4000} /></label>
|
||||
<div className="form-actions"><button type="button" className="button secondary" onClick={() => { setEditing(false); setName(asset.name); setDescription(asset.description ?? ''); }}>Cancelar</button><button className="button primary" disabled={saving}><Icon name="check" />{saving ? 'Guardando…' : 'Guardar'}</button></div>
|
||||
</form> : <div className="territory-data-grid">
|
||||
<div><small>Tipo</small><strong>{asset.type.name}</strong></div>
|
||||
<div><small>Código DH</small><strong>{asset.code}</strong></div>
|
||||
{asset.description && <div className="wide"><small>Descripción</small><strong>{asset.description}</strong></div>}
|
||||
</div>}
|
||||
</article>
|
||||
|
||||
<article className="panel territory-card">
|
||||
<div className="territory-card-heading">
|
||||
<div><span className="eyebrow">CONTENIDO</span><h2>Registros dentro de {asset.name}</h2><p>Acceso directo a los niveles que dependen de este registro.</p></div>
|
||||
<span className="count-pill">{children.length}{childrenHasMore ? '+' : ''}</span>
|
||||
</div>
|
||||
{loading ? <LoadingBlock label="Cargando contenido…" /> : children.length === 0 ? <div className="inline-empty">Todavía no hay registros dentro de {asset.name}.</div> : <div className="territory-child-list">
|
||||
{children.map((child) => <Link to={`/inventarios/${child.id}`} key={child.id} className="territory-child-row">
|
||||
<span className="asset-symbol"><Icon name="layers" /></span>
|
||||
<span><strong>{child.name}</strong><small>{child.type.name} · {child.code}</small></span>
|
||||
<span className={`status-badge ${assetStatusClass(child.informationStatus)}`}>{assetStatusLabel(child.informationStatus)}</span>
|
||||
<Icon name="chevron" size={16} />
|
||||
</Link>)}
|
||||
</div>}
|
||||
{childrenHasMore && <div className="territory-card-actions"><Link className="button secondary" to={`/inventarios?section=territory&parentId=${asset.id}`}>Ver contenido completo</Link></div>}
|
||||
</article>
|
||||
|
||||
{relationAreaContext && canReadRelations && <article className="panel territory-card">
|
||||
<div className="territory-card-heading"><div><span className="eyebrow">OPERACIÓN</span><h2>Empresas vinculadas</h2><p>{area ? 'Quién opera o participa actualmente en esta área.' : yacimiento ? `Empresas que operan o participan en el Área ${relationAreaContext.name}, contexto operativo de este yacimiento.` : `Empresas vinculadas al Área ${relationAreaContext.name}.`}</p></div><span className="count-pill">{activeRelations.length}</span></div>
|
||||
{loading ? <LoadingBlock label="Cargando empresas…" /> : activeRelations.length === 0 ? <div className="inline-empty">No hay empresas con vínculo vigente en el Área {relationAreaContext.name}.</div> : <div className="territory-company-list">
|
||||
{activeRelations.map((relation) => <Link to={`/inventarios/${relation.company.id}`} key={relation.id} className="territory-company-row"><span><strong>{relation.company.name}</strong><small>{relationRoleLabel(relation.relationRole)}{!area ? ` · ${relation.area.name}` : ''}</small></span><Icon name="chevron" size={16} /></Link>)}
|
||||
</div>}
|
||||
</article>}
|
||||
|
||||
{area && (canReadInspections || canReadActs || canReadReports) && <article className="panel territory-card">
|
||||
<div className="territory-card-heading"><div><span className="eyebrow">ACTIVIDAD</span><h2>Actividad del área</h2><p>Resumen documental y operativo, sin mezclarlo con hallazgos de los elementos inspeccionados.</p></div></div>
|
||||
<div className="territory-metrics">
|
||||
{canReadInspections && <div><small>Inspecciones activas</small><strong>{metrics.activeInspections}</strong></div>}
|
||||
{canReadActs && <div><small>Actas emitidas</small><strong>{metrics.acts}</strong></div>}
|
||||
{canReadReports && <div><small>Informes</small><strong>{metrics.reports}</strong></div>}
|
||||
</div>
|
||||
</article>}
|
||||
|
||||
{canAdvanced && <div className="territory-advanced-link"><span>Los datos estructurales, procedencia, ubicación y opciones técnicas quedan fuera de la vista cotidiana.</span><Link to={`/inventarios/${asset.id}?advanced=1`}>Administración avanzada</Link></div>}
|
||||
</div>}
|
||||
|
||||
{tab === 'history' && canReadHistory && <AssetHistoryPanel assetId={asset.id} />}
|
||||
</section>;
|
||||
}
|
||||
@@ -0,0 +1,106 @@
|
||||
.territory-page { display: grid; gap: 18px; }
|
||||
.territory-breadcrumb { margin-bottom: 0; }
|
||||
|
||||
.territory-hero {
|
||||
display: flex;
|
||||
align-items: flex-end;
|
||||
justify-content: space-between;
|
||||
gap: 24px;
|
||||
padding: 4px 0 2px;
|
||||
}
|
||||
.territory-hero h1 { margin: 6px 0 5px; font-size: clamp(31px, 3.5vw, 44px); line-height: 1.02; letter-spacing: -.045em; }
|
||||
.territory-hero p { margin: 0; color: var(--muted); font-size: 13px; }
|
||||
.territory-hero-actions { display: flex; align-items: center; gap: 10px; flex-wrap: wrap; }
|
||||
|
||||
.territory-purpose-note {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 9px;
|
||||
padding: 11px 13px;
|
||||
border: 1px solid #dbe4f2;
|
||||
border-radius: 10px;
|
||||
color: #536078;
|
||||
background: #f7f9fd;
|
||||
font-size: 11px;
|
||||
line-height: 1.45;
|
||||
}
|
||||
.territory-purpose-note .icon { color: var(--blue); flex: 0 0 auto; }
|
||||
|
||||
.territory-tabs {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 4px;
|
||||
overflow-x: auto;
|
||||
padding: 0 0 1px;
|
||||
border-bottom: 1px solid var(--line);
|
||||
}
|
||||
.territory-tabs button {
|
||||
position: relative;
|
||||
min-height: 43px;
|
||||
padding: 9px 13px;
|
||||
border: 0;
|
||||
color: #566178;
|
||||
background: transparent;
|
||||
cursor: pointer;
|
||||
white-space: nowrap;
|
||||
font-size: 12px;
|
||||
font-weight: 700;
|
||||
}
|
||||
.territory-tabs button:hover { color: var(--ink); }
|
||||
.territory-tabs button.active { color: var(--blue); }
|
||||
.territory-tabs button.active::after { content: ''; position: absolute; left: 10px; right: 10px; bottom: -1px; height: 2px; border-radius: 2px; background: var(--blue); }
|
||||
|
||||
.territory-stack { display: grid; gap: 15px; }
|
||||
.territory-card { padding: 22px; }
|
||||
.territory-card-heading { display: flex; align-items: flex-start; justify-content: space-between; gap: 18px; margin-bottom: 16px; }
|
||||
.territory-card-heading h2 { margin: 4px 0; }
|
||||
.territory-card-heading p { max-width: 680px; margin: 0; color: var(--muted); font-size: 12px; line-height: 1.5; }
|
||||
.territory-card-actions { display: flex; justify-content: flex-end; margin-top: 14px; }
|
||||
|
||||
.territory-data-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 1px; overflow: hidden; border: 1px solid var(--line); border-radius: 11px; background: var(--line); }
|
||||
.territory-data-grid > div { min-height: 74px; padding: 15px 16px; background: #fff; }
|
||||
.territory-data-grid > div.wide { grid-column: 1 / -1; }
|
||||
.territory-data-grid small, .territory-data-grid strong { display: block; }
|
||||
.territory-data-grid small { margin-bottom: 7px; color: var(--muted); font-size: 10px; font-weight: 700; text-transform: uppercase; letter-spacing: .04em; }
|
||||
.territory-data-grid strong { font-size: 13px; font-weight: 750; line-height: 1.45; }
|
||||
.territory-edit-form { display: grid; gap: 15px; }
|
||||
|
||||
.territory-child-list, .territory-company-list { display: grid; gap: 8px; }
|
||||
.territory-child-row, .territory-company-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 12px;
|
||||
min-height: 60px;
|
||||
padding: 11px 13px;
|
||||
border: 1px solid #e2e7ef;
|
||||
border-radius: 10px;
|
||||
color: inherit;
|
||||
background: #fbfcfd;
|
||||
text-decoration: none;
|
||||
}
|
||||
.territory-child-row:hover, .territory-company-row:hover { border-color: #bfd0ee; background: #f7faff; }
|
||||
.territory-child-row > span:nth-child(2), .territory-company-row > span:first-child { flex: 1; min-width: 0; }
|
||||
.territory-child-row strong, .territory-child-row small, .territory-company-row strong, .territory-company-row small { display: block; }
|
||||
.territory-child-row strong, .territory-company-row strong { font-size: 12px; }
|
||||
.territory-child-row small, .territory-company-row small { margin-top: 4px; color: var(--muted); font-size: 10px; }
|
||||
.territory-child-row > .icon:last-child, .territory-company-row > .icon:last-child { color: #8b96aa; }
|
||||
|
||||
.territory-metrics { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 10px; }
|
||||
.territory-metrics > div { display: grid; gap: 6px; padding: 16px; border: 1px solid #e2e7ef; border-radius: 11px; background: #f8faff; }
|
||||
.territory-metrics small { color: var(--muted); font-size: 10px; font-weight: 700; text-transform: uppercase; letter-spacing: .05em; }
|
||||
.territory-metrics strong { color: #173b7a; font-size: 25px; line-height: 1; letter-spacing: -.04em; }
|
||||
|
||||
.territory-advanced-link { display: flex; align-items: center; justify-content: space-between; gap: 15px; padding: 12px 15px; border: 1px dashed #ccd4e2; border-radius: 10px; color: var(--muted); background: rgba(255,255,255,.55); font-size: 11px; }
|
||||
.territory-advanced-link a { color: var(--blue); font-weight: 750; text-decoration: none; }
|
||||
|
||||
@media (max-width: 760px) {
|
||||
.territory-hero { align-items: flex-start; flex-direction: column; }
|
||||
.territory-hero-actions { width: 100%; }
|
||||
.territory-card { padding: 18px; }
|
||||
.territory-card-heading { align-items: flex-start; flex-direction: column; }
|
||||
.territory-data-grid, .territory-metrics { grid-template-columns: 1fr; }
|
||||
.territory-data-grid > div.wide { grid-column: auto; }
|
||||
.territory-child-row { align-items: flex-start; flex-wrap: wrap; }
|
||||
.territory-child-row .status-badge { margin-left: 44px; }
|
||||
.territory-advanced-link { align-items: flex-start; flex-direction: column; }
|
||||
}
|
||||
Reference in New Issue
Block a user