Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0a9cfdffb1 | ||
|
|
dde3f32021 | ||
|
|
7ae79af595 | ||
|
|
f2754d87ed | ||
|
|
dea9358451 | ||
|
|
9fffafc447 | ||
|
|
466fb29089 | ||
|
|
b23d7736c0 | ||
|
|
5b1593ed78 | ||
|
|
ff7706497d | ||
|
|
cb002c60f9 | ||
|
|
74b91d0c8a | ||
|
|
53c8f2b4ab | ||
|
|
b7baea652b | ||
|
|
9e6d9e45cb | ||
|
|
82b587ea6a | ||
|
|
88e7e8de65 | ||
|
|
b265769047 | ||
|
|
9a40f5cbd0 | ||
|
|
ce579d1667 | ||
|
|
bc6d4604e3 | ||
|
|
5c69892815 | ||
|
|
c1eeb5f078 | ||
|
|
324a73d35c | ||
|
|
97f34a471f | ||
|
|
a5d954b4c7 | ||
|
|
a80ef4477c | ||
|
|
b21810f166 | ||
|
|
64486f40f6 | ||
|
|
a407bf46c5 | ||
|
|
bfb7eed608 | ||
|
|
c74fd80620 | ||
|
|
9bd1adbdb5 | ||
|
|
cc8d650aa4 | ||
|
|
9d0d1f33ce | ||
|
|
e5f1615665 | ||
|
|
7be5d89204 |
@@ -0,0 +1,26 @@
|
||||
name: Inspection planning smoke
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches: [main]
|
||||
paths:
|
||||
- 'api-v3/src/inspection-visits/**'
|
||||
- 'api-v3/src/database/migrations/**'
|
||||
- 'api-v3/src/reference-data/**'
|
||||
- 'web-v2/src/pages/InspectionVisitCreateF61Page.tsx'
|
||||
- 'web-v2/src/pages/FieldBriefingsPage.tsx'
|
||||
- 'web-v2/src/layout/AppLayout.tsx'
|
||||
- 'scripts/ci-inspection-planning-smoke.sh'
|
||||
- '.github/workflows/inspection-planning-smoke.yml'
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
create-inspection:
|
||||
name: F6.1 · real inspection create
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Rehearse hierarchy and create a real Inspection
|
||||
run: bash scripts/ci-inspection-planning-smoke.sh
|
||||
@@ -12,8 +12,8 @@ android {
|
||||
applicationId = "com.korexlabs.dhinspeccion"
|
||||
minSdk = 26
|
||||
targetSdk = 36
|
||||
versionCode = 23
|
||||
versionName = "0.15.1"
|
||||
versionCode = 25
|
||||
versionName = "0.16.0"
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
vectorDrawables.useSupportLibrary = true
|
||||
|
||||
@@ -9,8 +9,8 @@
|
||||
|
||||
<application
|
||||
android:allowBackup="false"
|
||||
android:icon="@drawable/ic_mendoza_launcher"
|
||||
android:roundIcon="@drawable/ic_mendoza_launcher"
|
||||
android:icon="@drawable/ic_mendoza_launcher_exact"
|
||||
android:roundIcon="@drawable/ic_mendoza_launcher_exact"
|
||||
android:label="@string/app_name"
|
||||
android:supportsRtl="true"
|
||||
android:theme="@style/Theme.DHInspeccion"
|
||||
|
||||
@@ -115,7 +115,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
fun openVisit(id: String) = launchBusy {
|
||||
visit = repository.visit(id)
|
||||
inventory = emptyList()
|
||||
inventoryParentId = visit?.operationalArea?.id
|
||||
inventoryParentId = visit?.scopeAsset?.id ?: visit?.operationalArea?.id
|
||||
fieldTypes = emptyList()
|
||||
selectedFieldAsset = null
|
||||
clearFindingState()
|
||||
@@ -137,7 +137,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
val id = visit?.id ?: return
|
||||
launchBusy {
|
||||
visit = repository.startVisit(id)
|
||||
inventoryParentId = visit?.operationalArea?.id
|
||||
inventoryParentId = visit?.scopeAsset?.id ?: visit?.operationalArea?.id
|
||||
notice = "Inspección iniciada."
|
||||
loadActsInternal(id, selectDraft = true)
|
||||
loadVisitsInternal()
|
||||
@@ -168,10 +168,6 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
error = "Elegí si el Acta es urgente o no urgente."
|
||||
return
|
||||
}
|
||||
if (asset == null) {
|
||||
error = "Seleccioná primero una Instalación o Subinstalación para iniciar el Acta."
|
||||
return
|
||||
}
|
||||
if (acts.any { it.status == "DRAFT" }) {
|
||||
error = "Ya existe un Acta en borrador. Bloqueala o cancelala antes de crear la siguiente."
|
||||
return
|
||||
@@ -179,7 +175,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
launchBusy {
|
||||
val created = actsRepository.create(
|
||||
currentVisit.id,
|
||||
asset.id,
|
||||
asset?.id,
|
||||
currentVisit.code,
|
||||
urgency,
|
||||
)
|
||||
@@ -188,24 +184,25 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
loadActsInternal(currentVisit.id, selectDraft = false)
|
||||
val urgencyLabel = if (urgency == "URGENT") "urgente" else "no urgente"
|
||||
notice = "${created.code} creada como $urgencyLabel. Los Hallazgos nuevos quedarán vinculados explícitamente a esta Acta."
|
||||
if (selectedFieldAsset?.capture?.readyForFinding == true) {
|
||||
if (asset != null && selectedFieldAsset?.capture?.readyForFinding == true) {
|
||||
loadFindingOptionsInternal(currentVisit.id, asset.id, created.id)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun createAct(urgency: String = "NON_URGENT") = createActForSelectedInventory(urgency)
|
||||
|
||||
fun searchInventory(search: String, parentId: String? = null) {
|
||||
val currentVisit = visit ?: return
|
||||
launchBusy {
|
||||
val effectiveParentId = parentId ?: inventoryParentId ?: currentVisit.operationalArea?.id
|
||||
inventory = repository.fieldInventory(currentVisit.id, search, effectiveParentId).data
|
||||
inventory = repository.fieldInventory(currentVisit.id, search, parentId).data
|
||||
}
|
||||
}
|
||||
|
||||
fun loadFieldTypes(parentId: String? = null) {
|
||||
val currentVisit = visit ?: return
|
||||
launchBusy {
|
||||
val effectiveParentId = parentId ?: currentVisit.operationalArea?.id
|
||||
val effectiveParentId = parentId ?: currentVisit.scopeAsset?.id ?: currentVisit.operationalArea?.id
|
||||
inventoryParentId = effectiveParentId
|
||||
fieldTypes = repository.fieldTypes(currentVisit.id, parentId).data
|
||||
inventory = repository.fieldInventory(currentVisit.id, null, effectiveParentId).data
|
||||
@@ -213,7 +210,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
||||
}
|
||||
|
||||
private suspend fun reloadCurrentInventory(visitId: String) {
|
||||
val effectiveParentId = inventoryParentId ?: visit?.operationalArea?.id
|
||||
val effectiveParentId = inventoryParentId ?: visit?.scopeAsset?.id ?: visit?.operationalArea?.id
|
||||
inventory = repository.fieldInventory(visitId, null, effectiveParentId).data
|
||||
}
|
||||
|
||||
|
||||
@@ -154,6 +154,7 @@ data class VisitDetail(
|
||||
val code: String,
|
||||
val objective: String? = null,
|
||||
val status: String,
|
||||
val scopeAsset: AssetSummary? = null,
|
||||
val operationalArea: AssetSummary? = null,
|
||||
val operatorCompany: AssetSummary? = null,
|
||||
val leadInspector: PersonSummary? = null,
|
||||
|
||||
@@ -329,7 +329,7 @@ class MobileActsRepository(context: Context) {
|
||||
|
||||
suspend fun create(
|
||||
visitId: String,
|
||||
assetId: String,
|
||||
assetId: String? = null,
|
||||
visitCode: String,
|
||||
urgency: String = "NON_URGENT",
|
||||
): MobileActDetail = authorized { session ->
|
||||
@@ -341,7 +341,7 @@ class MobileActsRepository(context: Context) {
|
||||
urgency = urgency,
|
||||
title = "Acta de inspección $visitCode",
|
||||
summary = "Acta de inspección en curso. Los Hallazgos y observaciones se incorporan de forma trazable durante la inspección.",
|
||||
assetIds = listOf(assetId),
|
||||
assetIds = listOfNotNull(assetId),
|
||||
),
|
||||
)
|
||||
}
|
||||
|
||||
@@ -86,7 +86,10 @@ fun F3VisitRoot(model: MainViewModel) {
|
||||
inventoryMode = true
|
||||
},
|
||||
)
|
||||
inventoryMode -> F3FieldInventoryScreen(model, onBack = { inventoryMode = false })
|
||||
inventoryMode -> F3FieldInventoryScreen(model, onBack = {
|
||||
inventoryMode = false
|
||||
actsMode = true
|
||||
})
|
||||
else -> F3VisitOverview(
|
||||
model = model,
|
||||
onInventory = { inventoryMode = true },
|
||||
@@ -119,6 +122,9 @@ private fun F3VisitOverview(
|
||||
}
|
||||
Text(visit.code, style = MaterialTheme.typography.headlineMedium, fontWeight = FontWeight.Bold)
|
||||
Text("${visit.operatorCompany?.name ?: "Sin operadora"} · ${visit.operationalArea?.name ?: "Sin área"}")
|
||||
visit.scopeAsset?.let {
|
||||
Text("Yacimiento: ${it.name}", style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.SemiBold)
|
||||
}
|
||||
visit.plannedStartAt?.let {
|
||||
Text("Planificada: ${f3ShortDate(it)}", style = MaterialTheme.typography.bodySmall)
|
||||
}
|
||||
@@ -138,10 +144,10 @@ private fun F3VisitOverview(
|
||||
colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer),
|
||||
) {
|
||||
Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
Text("La inspección todavía no comenzó", fontWeight = FontWeight.Bold)
|
||||
Text("Iniciarla registra fecha/hora real y tu usuario como actor de campo.")
|
||||
Text("Todo listo para comenzar", fontWeight = FontWeight.Bold)
|
||||
Text("Al iniciar, pasás directamente a las Actas de esta inspección.")
|
||||
Button(
|
||||
onClick = { model.startVisit() },
|
||||
onClick = { model.startVisit(); onActs() },
|
||||
enabled = !model.busy,
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
) { Text(if (model.busy) "Iniciando…" else "Iniciar inspección") }
|
||||
@@ -150,12 +156,12 @@ private fun F3VisitOverview(
|
||||
}
|
||||
|
||||
if (visit.status == "IN_PROGRESS") {
|
||||
Button(onClick = onInventory, modifier = Modifier.fillMaxWidth()) {
|
||||
Text("Abrir Inventario de campo")
|
||||
}
|
||||
OutlinedButton(onClick = onActs, modifier = Modifier.fillMaxWidth()) {
|
||||
Button(onClick = onActs, modifier = Modifier.fillMaxWidth()) {
|
||||
val open = model.acts.count { it.status == "DRAFT" || it.status == "READY" }
|
||||
Text("Actas de la inspección · ${model.acts.size}${if (open > 0) " · $open abiertas" else ""}")
|
||||
Text("Abrir Actas · ${model.acts.size}${if (open > 0) " · $open abiertas" else ""}")
|
||||
}
|
||||
OutlinedButton(onClick = onInventory, modifier = Modifier.fillMaxWidth()) {
|
||||
Text("Inventario / Hallazgos")
|
||||
}
|
||||
} else if (visit.status == "CLOSED") {
|
||||
OutlinedButton(onClick = onActs, modifier = Modifier.fillMaxWidth()) {
|
||||
@@ -163,7 +169,7 @@ private fun F3VisitOverview(
|
||||
}
|
||||
} else if (visit.status == "PLANNED") {
|
||||
Text(
|
||||
"Primero iniciá la inspección para habilitar altas, fotografías, Actas y Hallazgos.",
|
||||
"Primero iniciá la inspección para habilitar Actas, Hallazgos y altas de campo.",
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
)
|
||||
}
|
||||
@@ -209,7 +215,9 @@ private fun F3FieldInventoryScreen(model: MainViewModel, onBack: () -> Unit) {
|
||||
var search by rememberSaveable(visit.id) { mutableStateOf("") }
|
||||
var showCreate by rememberSaveable(visit.id) { mutableStateOf(false) }
|
||||
var parentId by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
|
||||
var parentLabel by rememberSaveable(visit.id) { mutableStateOf("Área de la inspección") }
|
||||
var parentLabel by rememberSaveable(visit.id) {
|
||||
mutableStateOf(visit.scopeAsset?.name ?: "Yacimiento de la inspección")
|
||||
}
|
||||
var name by rememberSaveable(visit.id) { mutableStateOf("") }
|
||||
var commonName by rememberSaveable(visit.id) { mutableStateOf("") }
|
||||
var selectedTypeId by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
|
||||
@@ -323,10 +331,10 @@ private fun F3FieldInventoryScreen(model: MainViewModel, onBack: () -> Unit) {
|
||||
horizontalArrangement = Arrangement.SpaceBetween,
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
) {
|
||||
OutlinedButton(onClick = onBack) { Text("Volver") }
|
||||
OutlinedButton(onClick = onBack) { Text("Acta") }
|
||||
Column(horizontalAlignment = Alignment.End) {
|
||||
Text("Inventario de campo", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
|
||||
Text("Área → Yacimiento → Instalación → Subinstalación", style = MaterialTheme.typography.bodySmall)
|
||||
Text("Nuevo Hallazgo", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
|
||||
Text("Elegí una Instalación o Subinstalación", style = MaterialTheme.typography.bodySmall)
|
||||
}
|
||||
}
|
||||
Column(Modifier.padding(horizontal = 16.dp)) { F3MessageStrip(model) }
|
||||
@@ -410,170 +418,182 @@ private fun F3FieldInventoryScreen(model: MainViewModel, onBack: () -> Unit) {
|
||||
}
|
||||
}
|
||||
|
||||
Row(
|
||||
Modifier.fillMaxWidth().padding(horizontal = 16.dp),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
) {
|
||||
OutlinedTextField(
|
||||
value = search,
|
||||
onValueChange = { search = it },
|
||||
label = { Text("Buscar por nombre o código") },
|
||||
modifier = Modifier.weight(1f),
|
||||
singleLine = true,
|
||||
)
|
||||
Spacer(Modifier.width(8.dp))
|
||||
Button(onClick = { model.searchInventory(search) }, enabled = !model.busy) { Text("Buscar") }
|
||||
}
|
||||
|
||||
Row(
|
||||
Modifier.fillMaxWidth().padding(16.dp),
|
||||
horizontalArrangement = Arrangement.SpaceBetween,
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
) {
|
||||
Column {
|
||||
Text("Alta en campo", fontWeight = FontWeight.Bold)
|
||||
Text("Padre: $parentLabel", style = MaterialTheme.typography.bodySmall)
|
||||
Card(Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 4.dp)) {
|
||||
Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
Text("¿Dónde encontraste el Hallazgo?", fontWeight = FontWeight.Bold)
|
||||
OutlinedTextField(
|
||||
value = search,
|
||||
onValueChange = { search = it },
|
||||
label = { Text("Buscar instalación o subinstalación") },
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
singleLine = true,
|
||||
)
|
||||
Row(
|
||||
Modifier.fillMaxWidth(),
|
||||
horizontalArrangement = Arrangement.spacedBy(8.dp),
|
||||
) {
|
||||
Button(
|
||||
onClick = { model.searchInventory(search) },
|
||||
enabled = !model.busy,
|
||||
modifier = Modifier.weight(1f),
|
||||
) { Text("Buscar") }
|
||||
OutlinedButton(
|
||||
onClick = {
|
||||
showCreate = !showCreate
|
||||
if (showCreate) model.loadFieldTypes(parentId)
|
||||
},
|
||||
modifier = Modifier.weight(1f),
|
||||
) { Text(if (showCreate) "Cancelar" else "+ Agregar") }
|
||||
}
|
||||
}
|
||||
OutlinedButton(onClick = {
|
||||
showCreate = !showCreate
|
||||
if (showCreate) model.loadFieldTypes(parentId)
|
||||
}) { Text(if (showCreate) "Ocultar" else "Agregar") }
|
||||
}
|
||||
|
||||
if (showCreate) {
|
||||
Column(
|
||||
Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(horizontal = 16.dp)
|
||||
.verticalScroll(rememberScrollState())
|
||||
.weight(1f, fill = false),
|
||||
verticalArrangement = Arrangement.spacedBy(10.dp),
|
||||
) {
|
||||
if (parentId != null) {
|
||||
OutlinedButton(onClick = {
|
||||
parentId = null
|
||||
parentLabel = "Área de la inspección"
|
||||
resetCreateForm()
|
||||
selectedTypeId = null
|
||||
model.loadFieldTypes(null)
|
||||
}) { Text("Volver al Área") }
|
||||
}
|
||||
Card(Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 6.dp)) {
|
||||
Column(
|
||||
Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(12.dp)
|
||||
.verticalScroll(rememberScrollState())
|
||||
.weight(1f, fill = false),
|
||||
verticalArrangement = Arrangement.spacedBy(10.dp),
|
||||
) {
|
||||
Text("Nueva alta de campo", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
|
||||
Text("Ubicación: $parentLabel", style = MaterialTheme.typography.bodySmall)
|
||||
if (parentId != null) {
|
||||
OutlinedButton(onClick = {
|
||||
parentId = null
|
||||
parentLabel = visit.scopeAsset?.name ?: "Yacimiento de la inspección"
|
||||
resetCreateForm()
|
||||
selectedTypeId = null
|
||||
model.loadFieldTypes(null)
|
||||
}) { Text("Volver al Yacimiento") }
|
||||
}
|
||||
|
||||
if (model.fieldTypes.isEmpty()) {
|
||||
Text("Este nivel no admite más hijos estructurales.")
|
||||
} else {
|
||||
Text("Vas a crear", style = MaterialTheme.typography.bodySmall)
|
||||
LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
items(model.fieldTypes, key = { it.id }) { type ->
|
||||
AssistChip(
|
||||
onClick = {
|
||||
selectedTypeId = type.id
|
||||
selectedFamilyId = null
|
||||
attributeValues.clear()
|
||||
},
|
||||
label = { Text(if (type.id == selectedTypeId) "✓ ${type.name}" else type.name) },
|
||||
)
|
||||
if (model.fieldTypes.isEmpty()) {
|
||||
Text("No hay un tipo disponible para esta ubicación.")
|
||||
} else {
|
||||
Text("Tipo de registro", style = MaterialTheme.typography.bodySmall)
|
||||
LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
items(model.fieldTypes, key = { it.id }) { type ->
|
||||
AssistChip(
|
||||
onClick = {
|
||||
selectedTypeId = type.id
|
||||
selectedFamilyId = null
|
||||
attributeValues.clear()
|
||||
},
|
||||
label = { Text(if (type.id == selectedTypeId) "✓ ${type.name}" else type.name) },
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (selectedType?.familyRequired == true) {
|
||||
Text("Familia técnica", fontWeight = FontWeight.Bold)
|
||||
Text(
|
||||
"Elegí la que corresponda al Excel. Si no existe, usá Otro / no catalogado; nunca quedás bloqueado.",
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
)
|
||||
LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
items(selectedType.families, key = { it.id }) { family ->
|
||||
AssistChip(
|
||||
onClick = { selectedFamilyId = family.id },
|
||||
label = {
|
||||
val prefix = when {
|
||||
selectedFamilyId == family.id -> "✓ "
|
||||
family.isOther -> "+ "
|
||||
else -> ""
|
||||
}
|
||||
Text(prefix + family.name)
|
||||
},
|
||||
)
|
||||
if (selectedType?.familyRequired == true) {
|
||||
Text("Clasificación", fontWeight = FontWeight.Bold)
|
||||
Text(
|
||||
"Elegí el tipo técnico. Si no está catalogado, usá Otro / no catalogado.",
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
)
|
||||
LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
items(selectedType.families, key = { it.id }) { family ->
|
||||
AssistChip(
|
||||
onClick = { selectedFamilyId = family.id },
|
||||
label = {
|
||||
val prefix = when {
|
||||
selectedFamilyId == family.id -> "✓ "
|
||||
family.isOther -> "+ "
|
||||
else -> ""
|
||||
}
|
||||
Text(prefix + family.name)
|
||||
},
|
||||
)
|
||||
}
|
||||
}
|
||||
selectedFamily?.let { family ->
|
||||
if (family.isOther) {
|
||||
Text(
|
||||
"Se registrará como no catalogado para revisión posterior en oficina.",
|
||||
color = MaterialTheme.colorScheme.secondary,
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
)
|
||||
}
|
||||
if (family.informationLabels.isNotEmpty()) {
|
||||
Text(
|
||||
"Información esperada: ${family.informationLabels.joinToString(" · ")}",
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
selectedFamily?.let { family ->
|
||||
if (family.isOther) {
|
||||
Text(
|
||||
"Se registrará como familia no catalogada para revisión posterior en oficina.",
|
||||
color = MaterialTheme.colorScheme.secondary,
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
)
|
||||
}
|
||||
if (family.informationLabels.isNotEmpty()) {
|
||||
Text(
|
||||
"Información esperada: ${family.informationLabels.joinToString(" · ")}",
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
OutlinedTextField(
|
||||
value = name,
|
||||
onValueChange = { name = it },
|
||||
label = { Text("Nombre identificable *") },
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
)
|
||||
OutlinedTextField(
|
||||
value = commonName,
|
||||
onValueChange = { commonName = it },
|
||||
label = { Text("Nombre habitual") },
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
)
|
||||
|
||||
selectedType?.attributes?.forEach { definition ->
|
||||
OutlinedTextField(
|
||||
value = attributeValues[definition.code].orEmpty(),
|
||||
onValueChange = { attributeValues[definition.code] = it },
|
||||
label = { Text(definition.name + if (definition.isRequired) " *" else "") },
|
||||
supportingText = {
|
||||
val details = listOfNotNull(definition.unit, definition.options?.toString()).joinToString(" · ")
|
||||
if (details.isNotBlank()) Text(details)
|
||||
},
|
||||
keyboardOptions = KeyboardOptions(
|
||||
keyboardType = if (
|
||||
definition.dataType.uppercase() in setOf("NUMBER", "DECIMAL", "INTEGER", "FLOAT")
|
||||
) KeyboardType.Decimal else KeyboardType.Text,
|
||||
),
|
||||
value = name,
|
||||
onValueChange = { name = it },
|
||||
label = { Text("Nombre o código identificable *") },
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
)
|
||||
OutlinedTextField(
|
||||
value = commonName,
|
||||
onValueChange = { commonName = it },
|
||||
label = { Text("Nombre habitual") },
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
)
|
||||
}
|
||||
|
||||
val attributesReady = selectedType?.attributes
|
||||
?.filter { it.isRequired }
|
||||
?.all { attributeValues[it.code].orEmpty().isNotBlank() }
|
||||
?: false
|
||||
val familyReady = selectedType?.familyRequired != true || selectedFamilyId != null
|
||||
Button(
|
||||
onClick = {
|
||||
if (f3HasLocation(context)) createWithLocation()
|
||||
else locationPermissionLauncher.launch(
|
||||
arrayOf(
|
||||
Manifest.permission.ACCESS_FINE_LOCATION,
|
||||
Manifest.permission.ACCESS_COARSE_LOCATION,
|
||||
selectedType?.attributes?.forEach { definition ->
|
||||
OutlinedTextField(
|
||||
value = attributeValues[definition.code].orEmpty(),
|
||||
onValueChange = { attributeValues[definition.code] = it },
|
||||
label = { Text(definition.name + if (definition.isRequired) " *" else "") },
|
||||
supportingText = {
|
||||
val details = listOfNotNull(definition.unit, definition.options?.toString()).joinToString(" · ")
|
||||
if (details.isNotBlank()) Text(details)
|
||||
},
|
||||
keyboardOptions = KeyboardOptions(
|
||||
keyboardType = if (
|
||||
definition.dataType.uppercase() in setOf("NUMBER", "DECIMAL", "INTEGER", "FLOAT")
|
||||
) KeyboardType.Decimal else KeyboardType.Text,
|
||||
),
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
)
|
||||
},
|
||||
enabled = selectedType != null && name.isNotBlank() && attributesReady && familyReady && !model.busy,
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
) { Text("Capturar GPS y crear") }
|
||||
HorizontalDivider()
|
||||
}
|
||||
|
||||
val attributesReady = selectedType?.attributes
|
||||
?.filter { it.isRequired }
|
||||
?.all { attributeValues[it.code].orEmpty().isNotBlank() }
|
||||
?: false
|
||||
val familyReady = selectedType?.familyRequired != true || selectedFamilyId != null
|
||||
Button(
|
||||
onClick = {
|
||||
if (f3HasLocation(context)) createWithLocation()
|
||||
else locationPermissionLauncher.launch(
|
||||
arrayOf(
|
||||
Manifest.permission.ACCESS_FINE_LOCATION,
|
||||
Manifest.permission.ACCESS_COARSE_LOCATION,
|
||||
),
|
||||
)
|
||||
},
|
||||
enabled = selectedType != null && name.isNotBlank() && attributesReady && familyReady && !model.busy,
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
) { Text("Guardar alta y capturar GPS") }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Text("Estructura disponible", modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp), fontWeight = FontWeight.Bold)
|
||||
Text(
|
||||
"Instalaciones y subinstalaciones",
|
||||
modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
|
||||
fontWeight = FontWeight.Bold,
|
||||
)
|
||||
LazyColumn(
|
||||
Modifier.fillMaxSize().padding(horizontal = 16.dp),
|
||||
verticalArrangement = Arrangement.spacedBy(8.dp),
|
||||
) {
|
||||
items(model.inventory, key = { it.id }) { item ->
|
||||
items(
|
||||
model.inventory.filter { candidate ->
|
||||
candidate.type?.let(::f3TypeCode) in setOf("instalacion", "subinstalacion")
|
||||
},
|
||||
key = { it.id },
|
||||
) { item ->
|
||||
F3InventoryCard(
|
||||
item = item,
|
||||
onInspect = { model.selectExisting(item) },
|
||||
@@ -611,10 +631,10 @@ private fun F3CaptureCard(
|
||||
if (captureRequired) {
|
||||
Text("GPS de alta: ${if (gps) "OK" else "pendiente"} · Fotos: $photos")
|
||||
if (!ready) {
|
||||
Text("Antes de registrar Hallazgos, completá GPS + foto.", color = MaterialTheme.colorScheme.error)
|
||||
Text("Antes de registrar el Hallazgo, completá GPS + foto.", color = MaterialTheme.colorScheme.error)
|
||||
Button(onClick = onPhoto, modifier = Modifier.fillMaxWidth()) { Text("Tomar foto obligatoria") }
|
||||
} else {
|
||||
Text("Captura completa · listo para Hallazgos", color = MaterialTheme.colorScheme.primary)
|
||||
Text("Captura completa · listo para el Hallazgo", color = MaterialTheme.colorScheme.primary)
|
||||
}
|
||||
} else {
|
||||
Text("Registro existente seleccionado.", style = MaterialTheme.typography.bodySmall)
|
||||
@@ -631,8 +651,8 @@ private fun F3InventoryCard(
|
||||
) {
|
||||
val typeCode = item.type?.let(::f3TypeCode).orEmpty()
|
||||
val canHaveFinding = typeCode in setOf("instalacion", "subinstalacion")
|
||||
val canHaveChild = typeCode in setOf("yacimiento", "instalacion")
|
||||
val childLabel = if (typeCode == "yacimiento") "Agregar instalación aquí" else "Agregar subinstalación aquí"
|
||||
val canHaveChild = typeCode == "instalacion"
|
||||
val childLabel = "+ Agregar subinstalación"
|
||||
|
||||
Card(Modifier.fillMaxWidth()) {
|
||||
Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
|
||||
@@ -646,12 +666,12 @@ private fun F3InventoryCard(
|
||||
}
|
||||
if (canHaveFinding) {
|
||||
Text(
|
||||
if (item.readyForFinding) "Disponible para Hallazgos" else "GPS/foto pendiente",
|
||||
if (item.readyForFinding) "Disponible" else "GPS/foto pendiente",
|
||||
color = if (item.readyForFinding) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error,
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
)
|
||||
OutlinedButton(onClick = onInspect, modifier = Modifier.fillMaxWidth()) {
|
||||
Text(if (item.selectedInInspection) "Abrir Hallazgos" else "Usar en esta inspección")
|
||||
Button(onClick = onInspect, modifier = Modifier.fillMaxWidth()) {
|
||||
Text(if (item.selectedInInspection) "Seleccionar para Hallazgo" else "Usar para Hallazgo")
|
||||
}
|
||||
}
|
||||
if (canHaveChild) {
|
||||
|
||||
@@ -126,13 +126,14 @@ fun MobileActsScreen(
|
||||
Text("Actas", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
|
||||
}
|
||||
Text("${visit.code} · ${visit.operatorCompany?.name.orEmpty()}")
|
||||
visit.scopeAsset?.let { Text("Yacimiento: ${it.name}", style = MaterialTheme.typography.bodySmall) }
|
||||
F32ActMessage(model)
|
||||
|
||||
Card(Modifier.fillMaxWidth()) {
|
||||
Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
Text("Actas de esta Inspección", fontWeight = FontWeight.Bold)
|
||||
Text("Actas de esta inspección", fontWeight = FontWeight.Bold)
|
||||
if (model.acts.isEmpty()) {
|
||||
Text("Todavía no hay Actas. La primera se inicia sobre una Instalación/Subinstalación seleccionada.")
|
||||
Text("Todavía no hay Actas. Creá la primera y después agregá los Hallazgos.")
|
||||
}
|
||||
model.acts.forEach { act ->
|
||||
val active = selected?.id == act.id
|
||||
@@ -156,15 +157,15 @@ fun MobileActsScreen(
|
||||
Modifier.fillMaxWidth(),
|
||||
colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer),
|
||||
) {
|
||||
Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
Text("Nueva Acta", fontWeight = FontWeight.Bold)
|
||||
Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) {
|
||||
Text("Nueva Acta", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
|
||||
if (model.acts.any { it.status == "LOCKED" }) {
|
||||
Text(
|
||||
"Podés abrir una nueva Acta aunque otra esté BLOQUEADA esperando firmas. Sólo se permite un borrador a la vez.",
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
)
|
||||
}
|
||||
Text("Urgencia del Acta", fontWeight = FontWeight.Bold)
|
||||
Text("Urgencia", fontWeight = FontWeight.Bold)
|
||||
Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
AssistChip(
|
||||
onClick = { newActUrgency = "NON_URGENT" },
|
||||
@@ -183,20 +184,15 @@ fun MobileActsScreen(
|
||||
},
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
)
|
||||
val selectedInventory = model.selectedFieldAsset?.asset
|
||||
if (selectedInventory == null) {
|
||||
Text("Primero elegí una Instalación o Subinstalación desde Inventario de campo. Ese registro será el primer elemento del Acta.")
|
||||
Button(onClick = onGoInventory, modifier = Modifier.fillMaxWidth()) {
|
||||
Text("Ir a Inventario y elegir")
|
||||
}
|
||||
} else {
|
||||
Text("Inventario inicial: ${selectedInventory.name} · ${selectedInventory.code}")
|
||||
Button(
|
||||
onClick = { model.createActForSelectedInventory(newActUrgency) },
|
||||
enabled = !model.busy,
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
) { Text("Crear nueva Acta") }
|
||||
}
|
||||
Text(
|
||||
"Abrí el Acta primero. Después elegís la Instalación o Subinstalación al agregar cada Hallazgo.",
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
)
|
||||
Button(
|
||||
onClick = { model.createAct(newActUrgency) },
|
||||
enabled = !model.busy,
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
) { Text("Crear nueva Acta") }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -220,7 +216,21 @@ fun MobileActsScreen(
|
||||
|
||||
when (selected.status) {
|
||||
"DRAFT" -> {
|
||||
Text("1. Responsable de la empresa", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
|
||||
Card(
|
||||
Modifier.fillMaxWidth(),
|
||||
colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer),
|
||||
) {
|
||||
Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
Text("Hallazgos", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
|
||||
Text("Buscá una Instalación o Subinstalación existente. Si no está, podés agregarla en campo en el mismo flujo.")
|
||||
Button(onClick = onGoInventory, modifier = Modifier.fillMaxWidth()) {
|
||||
Text("+ Agregar Hallazgo")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
HorizontalDivider()
|
||||
Text("Responsable de la empresa", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
|
||||
Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
AssistChip(onClick = { attendance = "PRESENT" }, label = { Text(if (attendance == "PRESENT") "✓ Presente" else "Presente") })
|
||||
AssistChip(onClick = { attendance = "ABSENT" }, label = { Text(if (attendance == "ABSENT") "✓ Ausente" else "Ausente") })
|
||||
@@ -259,12 +269,7 @@ fun MobileActsScreen(
|
||||
}
|
||||
|
||||
HorizontalDivider()
|
||||
Text("2. Hallazgos / verificaciones", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
|
||||
Text("Los Hallazgos se cargan desde Inventario y quedan vinculados explícitamente a ${selected.code}. El Acta también puede finalizar sin Hallazgos cuando corresponde dejar constancia de una inspección o verificación sin nuevos incumplimientos.")
|
||||
Button(onClick = onGoInventory, modifier = Modifier.fillMaxWidth()) { Text("Ir a Inventario / Hallazgos") }
|
||||
|
||||
HorizontalDivider()
|
||||
Text("3. Finalizar contenido", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
|
||||
Text("Finalizar contenido", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
|
||||
Text("Al BLOQUEAR el Acta, el contenido y los Hallazgos quedan inmutables. Esta acción no se puede deshacer.")
|
||||
Button(
|
||||
onClick = { model.prepareSelectedAct() },
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 6.5 KiB |
@@ -8,8 +8,8 @@ class ReleaseMetadataTest {
|
||||
@Test
|
||||
fun debugBuildKeepsSeparateApplicationIdentity() {
|
||||
assertEquals("com.korexlabs.dhinspeccion.debug", BuildConfig.APPLICATION_ID)
|
||||
assertEquals(23, BuildConfig.VERSION_CODE)
|
||||
assertEquals("0.15.1-debug", BuildConfig.VERSION_NAME)
|
||||
assertEquals(25, BuildConfig.VERSION_CODE)
|
||||
assertEquals("0.16.0-debug", BuildConfig.VERSION_NAME)
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@@ -36,6 +36,20 @@ export interface FieldBriefingAct {
|
||||
findings: FieldBriefingFinding[];
|
||||
}
|
||||
|
||||
function toIsoDate(value: unknown): string {
|
||||
const parsed = value instanceof Date
|
||||
? value
|
||||
: value == null
|
||||
? new Date()
|
||||
: new Date(String(value));
|
||||
|
||||
if (Number.isNaN(parsed.getTime())) {
|
||||
throw new Error('La fecha planificada de la inspección no es válida');
|
||||
}
|
||||
|
||||
return parsed.toISOString().slice(0, 10);
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class FieldBriefingService {
|
||||
constructor(private readonly dataSource: DataSource) {}
|
||||
@@ -67,7 +81,9 @@ export class FieldBriefingService {
|
||||
});
|
||||
}
|
||||
|
||||
const plannedOn = String(visit.plannedStartAt ?? new Date().toISOString()).slice(0, 10);
|
||||
// PostgreSQL/pg entrega los timestamptz como Date. String(date).slice(0, 10)
|
||||
// produce textos como "Thu Sep 17", que PostgreSQL rechaza al castear a date.
|
||||
const plannedOn = toIsoDate(visit.plannedStartAt);
|
||||
|
||||
const rows = (await this.dataSource.query(`
|
||||
WITH prior_acts AS (
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
||||
|
||||
export class F62FreezeInspectionContext1790098200000 implements MigrationInterface {
|
||||
name = 'F62FreezeInspectionContext1790098200000';
|
||||
|
||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
||||
await queryRunner.query(`
|
||||
CREATE OR REPLACE FUNCTION prevent_inspection_context_mutation()
|
||||
RETURNS trigger LANGUAGE plpgsql AS $$
|
||||
BEGIN
|
||||
IF NEW.operational_area_id IS DISTINCT FROM OLD.operational_area_id
|
||||
OR NEW.scope_asset_id IS DISTINCT FROM OLD.scope_asset_id
|
||||
OR NEW.operator_company_id IS DISTINCT FROM OLD.operator_company_id THEN
|
||||
RAISE EXCEPTION USING
|
||||
ERRCODE='23514',
|
||||
MESSAGE='El Área, Yacimiento y Operadora de una Inspección quedan fijos desde su creación';
|
||||
END IF;
|
||||
RETURN NEW;
|
||||
END $$
|
||||
`);
|
||||
|
||||
await queryRunner.query(`
|
||||
DROP TRIGGER IF EXISTS trg_inspection_context_immutable ON inspection_visits
|
||||
`);
|
||||
await queryRunner.query(`
|
||||
CREATE TRIGGER trg_inspection_context_immutable
|
||||
BEFORE UPDATE OF operational_area_id, scope_asset_id, operator_company_id
|
||||
ON inspection_visits
|
||||
FOR EACH ROW EXECUTE FUNCTION prevent_inspection_context_mutation()
|
||||
`);
|
||||
}
|
||||
|
||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
||||
await queryRunner.query(`
|
||||
DROP TRIGGER IF EXISTS trg_inspection_context_immutable ON inspection_visits
|
||||
`);
|
||||
await queryRunner.query('DROP FUNCTION IF EXISTS prevent_inspection_context_mutation()');
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
||||
|
||||
export class F63MobileFieldCommonAttributes1790099100000 implements MigrationInterface {
|
||||
name = 'F63MobileFieldCommonAttributes1790099100000';
|
||||
|
||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
||||
await queryRunner.query(`
|
||||
WITH target_types AS (
|
||||
SELECT id
|
||||
FROM asset_types
|
||||
WHERE lower(code) IN ('instalacion','subinstalacion')
|
||||
), fields(code,name,sort_order) AS (
|
||||
VALUES
|
||||
('campo_marca','Marca',10),
|
||||
('campo_modelo','Modelo',20),
|
||||
('campo_capacidad','Capacidad',30),
|
||||
('campo_numero_serie','Número de serie',40),
|
||||
('campo_funcion','Función',50)
|
||||
)
|
||||
INSERT INTO asset_attribute_definitions (
|
||||
asset_type_id, code, name, data_type, is_required, is_active, sort_order
|
||||
)
|
||||
SELECT target.id, fields.code, fields.name, 'TEXT'::asset_attribute_data_type,
|
||||
false, true, fields.sort_order
|
||||
FROM target_types target
|
||||
CROSS JOIN fields
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1
|
||||
FROM asset_attribute_definitions existing
|
||||
WHERE existing.asset_type_id=target.id
|
||||
AND lower(existing.code)=lower(fields.code)
|
||||
)
|
||||
`);
|
||||
}
|
||||
|
||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
||||
await queryRunner.query(`
|
||||
DELETE FROM asset_attribute_values value
|
||||
USING asset_attribute_definitions definition, asset_types type
|
||||
WHERE value.definition_id=definition.id
|
||||
AND definition.asset_type_id=type.id
|
||||
AND lower(type.code) IN ('instalacion','subinstalacion')
|
||||
AND definition.code IN (
|
||||
'campo_marca','campo_modelo','campo_capacidad','campo_numero_serie','campo_funcion'
|
||||
)
|
||||
`);
|
||||
await queryRunner.query(`
|
||||
DELETE FROM asset_attribute_definitions definition
|
||||
USING asset_types type
|
||||
WHERE definition.asset_type_id=type.id
|
||||
AND lower(type.code) IN ('instalacion','subinstalacion')
|
||||
AND definition.code IN (
|
||||
'campo_marca','campo_modelo','campo_capacidad','campo_numero_serie','campo_funcion'
|
||||
)
|
||||
`);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,240 @@
|
||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
||||
|
||||
const TARGET_CODES = [
|
||||
'departamento',
|
||||
'area',
|
||||
'yacimiento',
|
||||
'instalacion',
|
||||
'subinstalacion',
|
||||
] as const;
|
||||
|
||||
const DELETE_ORDER = [
|
||||
'subinstalacion',
|
||||
'instalacion',
|
||||
'yacimiento',
|
||||
'area',
|
||||
'departamento',
|
||||
] as const;
|
||||
|
||||
type ProtectedSnapshot = {
|
||||
users: string;
|
||||
companies: string;
|
||||
companyProfiles: string;
|
||||
assetTypes: string;
|
||||
assetAttributes: string;
|
||||
inventoryFamilies: string;
|
||||
familyAttributes: string;
|
||||
findingCategories: string;
|
||||
findingItems: string;
|
||||
};
|
||||
|
||||
export class ResetOperationalHierarchyData1790099200000 implements MigrationInterface {
|
||||
name = 'ResetOperationalHierarchyData1790099200000';
|
||||
|
||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
||||
// This is a one-time live-data cleanup, not a new canonical empty seed.
|
||||
// Fresh CI/bootstrap databases intentionally have no admin account while
|
||||
// replaying the historical migration chain, so they must retain the F6.1
|
||||
// presentation seed used by hierarchy/planning contract tests.
|
||||
const adminRows = (await queryRunner.query(`
|
||||
SELECT id
|
||||
FROM users
|
||||
WHERE lower(btrim(username))='admin'
|
||||
ORDER BY id
|
||||
`)) as Array<{ id: string }>;
|
||||
if (adminRows.length === 0) {
|
||||
// eslint-disable-next-line no-console
|
||||
console.log('[hierarchy-reset] skipped: no live admin account on migration replay');
|
||||
return;
|
||||
}
|
||||
if (adminRows.length !== 1) {
|
||||
throw new Error(
|
||||
`Hierarchy reset aborted: expected exactly one live admin account, found ${adminRows.length}`,
|
||||
);
|
||||
}
|
||||
|
||||
const targetTypes = (await queryRunner.query(
|
||||
`
|
||||
SELECT lower(code) AS code
|
||||
FROM asset_types
|
||||
WHERE lower(code)=ANY($1::text[])
|
||||
ORDER BY lower(code)
|
||||
`,
|
||||
[[...TARGET_CODES]],
|
||||
)) as Array<{ code: string }>;
|
||||
|
||||
const found = new Set(targetTypes.map((row) => row.code));
|
||||
const missing = TARGET_CODES.filter((code) => !found.has(code));
|
||||
if (missing.length > 0) {
|
||||
throw new Error(`Hierarchy reset aborted: missing asset types ${missing.join(', ')}`);
|
||||
}
|
||||
|
||||
const before = await this.protectedSnapshot(queryRunner);
|
||||
|
||||
await queryRunner.query(
|
||||
`
|
||||
CREATE TEMP TABLE reset_target_assets ON COMMIT DROP AS
|
||||
SELECT asset.id
|
||||
FROM assets asset
|
||||
JOIN asset_types type ON type.id=asset.asset_type_id
|
||||
WHERE lower(type.code)=ANY($1::text[])
|
||||
`,
|
||||
[[...TARGET_CODES]],
|
||||
);
|
||||
await queryRunner.query(`CREATE UNIQUE INDEX reset_target_assets_pk ON reset_target_assets(id)`);
|
||||
|
||||
const [targetCount] = (await queryRunner.query(
|
||||
`SELECT COUNT(*)::integer AS total FROM reset_target_assets`,
|
||||
)) as Array<{ total: number }>;
|
||||
|
||||
// An Inspection freezes Area/Yacimiento/Operadora from creation and several
|
||||
// inspection tables hold RESTRICT references to the hierarchy. Keeping a
|
||||
// transaction that points to deleted territory would be invalid, so the
|
||||
// complete disposable inspection graph is cleared first.
|
||||
await queryRunner.query('TRUNCATE TABLE inspection_visits CASCADE');
|
||||
|
||||
// Legacy administrative departments are also presentation/operational data.
|
||||
// Current F6 Departments live in assets, but this prevents old rows from
|
||||
// resurfacing through compatibility paths.
|
||||
await queryRunner.query('TRUNCATE TABLE administrative_departments CASCADE');
|
||||
|
||||
// Legal-right participants depend on area_legal_rights rather than directly
|
||||
// on assets. Remove them before the generic direct-FK cleanup below.
|
||||
await queryRunner.query(`
|
||||
DELETE FROM area_legal_right_organizations organization
|
||||
USING area_legal_rights legal_right
|
||||
WHERE organization.right_id=legal_right.id
|
||||
AND legal_right.area_id IN (SELECT id FROM reset_target_assets)
|
||||
`);
|
||||
|
||||
// Clean every table that directly references one of the hierarchy assets.
|
||||
// This deliberately discovers the current schema instead of maintaining a
|
||||
// fragile hand-written list as new dossier/history tables are added.
|
||||
await queryRunner.query(`
|
||||
DO $$
|
||||
DECLARE dependency record;
|
||||
BEGIN
|
||||
FOR dependency IN
|
||||
SELECT
|
||||
namespace.nspname AS schema_name,
|
||||
relation.relname AS table_name,
|
||||
attribute.attname AS column_name
|
||||
FROM pg_constraint constraint_row
|
||||
JOIN pg_class relation ON relation.oid=constraint_row.conrelid
|
||||
JOIN pg_namespace namespace ON namespace.oid=relation.relnamespace
|
||||
JOIN LATERAL unnest(constraint_row.conkey) WITH ORDINALITY local_key(attnum,ordinality)
|
||||
ON true
|
||||
JOIN LATERAL unnest(constraint_row.confkey) WITH ORDINALITY referenced_key(attnum,ordinality)
|
||||
ON referenced_key.ordinality=local_key.ordinality
|
||||
JOIN pg_attribute attribute
|
||||
ON attribute.attrelid=constraint_row.conrelid
|
||||
AND attribute.attnum=local_key.attnum
|
||||
JOIN pg_attribute referenced_attribute
|
||||
ON referenced_attribute.attrelid=constraint_row.confrelid
|
||||
AND referenced_attribute.attnum=referenced_key.attnum
|
||||
WHERE constraint_row.contype='f'
|
||||
AND constraint_row.confrelid='assets'::regclass
|
||||
AND constraint_row.conrelid<>'assets'::regclass
|
||||
AND array_length(constraint_row.conkey,1)=1
|
||||
AND referenced_attribute.attname='id'
|
||||
ORDER BY namespace.nspname,relation.relname,attribute.attname
|
||||
LOOP
|
||||
EXECUTE format(
|
||||
'DELETE FROM %I.%I WHERE %I IN (SELECT id FROM reset_target_assets)',
|
||||
dependency.schema_name,
|
||||
dependency.table_name,
|
||||
dependency.column_name
|
||||
);
|
||||
END LOOP;
|
||||
END $$;
|
||||
`);
|
||||
|
||||
// parent_id is RESTRICT, therefore physical hierarchy rows are deleted from
|
||||
// the leaves upward. Company/Operator assets are intentionally not targets.
|
||||
for (const code of DELETE_ORDER) {
|
||||
await queryRunner.query(
|
||||
`
|
||||
DELETE FROM assets asset
|
||||
USING asset_types type
|
||||
WHERE asset.asset_type_id=type.id
|
||||
AND lower(type.code)=$1
|
||||
`,
|
||||
[code],
|
||||
);
|
||||
}
|
||||
|
||||
const after = await this.protectedSnapshot(queryRunner);
|
||||
for (const key of Object.keys(before) as Array<keyof ProtectedSnapshot>) {
|
||||
if (before[key] !== after[key]) {
|
||||
throw new Error(
|
||||
`Hierarchy reset verification failed: protected ${key} changed (${before[key]} -> ${after[key]})`,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
const [verification] = (await queryRunner.query(`
|
||||
SELECT
|
||||
(
|
||||
SELECT COUNT(*)::integer
|
||||
FROM assets asset
|
||||
JOIN asset_types type ON type.id=asset.asset_type_id
|
||||
WHERE lower(type.code)=ANY($1::text[])
|
||||
) AS hierarchy_assets,
|
||||
(SELECT COUNT(*)::integer FROM administrative_departments) AS administrative_departments,
|
||||
(SELECT COUNT(*)::integer FROM inspection_visits) AS inspection_visits
|
||||
`, [[...TARGET_CODES]])) as Array<{
|
||||
hierarchy_assets: number;
|
||||
administrative_departments: number;
|
||||
inspection_visits: number;
|
||||
}>;
|
||||
|
||||
if (
|
||||
!verification
|
||||
|| Number(verification.hierarchy_assets) !== 0
|
||||
|| Number(verification.administrative_departments) !== 0
|
||||
|| Number(verification.inspection_visits) !== 0
|
||||
) {
|
||||
throw new Error(`Hierarchy reset verification failed: ${JSON.stringify(verification ?? {})}`);
|
||||
}
|
||||
|
||||
// eslint-disable-next-line no-console
|
||||
console.log(
|
||||
`[hierarchy-reset] removed ${Number(targetCount?.total ?? 0)} Departamento/Área/Yacimiento/Instalación/Subinstalación assets; inspections and legacy departments cleared; users=${after.users}; companies=${after.companies} preserved`,
|
||||
);
|
||||
}
|
||||
|
||||
public async down(): Promise<void> {
|
||||
throw new Error(
|
||||
'ResetOperationalHierarchyData is intentionally destructive; restore the automatic deploy PRE database backup instead.',
|
||||
);
|
||||
}
|
||||
|
||||
private async protectedSnapshot(queryRunner: QueryRunner): Promise<ProtectedSnapshot> {
|
||||
const [snapshot] = (await queryRunner.query(`
|
||||
SELECT
|
||||
(SELECT COUNT(*)::text FROM users) AS "users",
|
||||
(
|
||||
SELECT COUNT(*)::text
|
||||
FROM assets asset
|
||||
JOIN asset_types type ON type.id=asset.asset_type_id
|
||||
WHERE type.operational_role='COMPANY'
|
||||
) AS "companies",
|
||||
(
|
||||
SELECT COUNT(*)::text
|
||||
FROM organization_profiles profile
|
||||
JOIN assets asset ON asset.id=profile.asset_id
|
||||
JOIN asset_types type ON type.id=asset.asset_type_id
|
||||
WHERE type.operational_role='COMPANY'
|
||||
) AS "companyProfiles",
|
||||
(SELECT COUNT(*)::text FROM asset_types) AS "assetTypes",
|
||||
(SELECT COUNT(*)::text FROM asset_attribute_definitions) AS "assetAttributes",
|
||||
(SELECT COUNT(*)::text FROM inventory_families) AS "inventoryFamilies",
|
||||
(SELECT COUNT(*)::text FROM inventory_family_attribute_definitions) AS "familyAttributes",
|
||||
(SELECT COUNT(*)::text FROM finding_categories) AS "findingCategories",
|
||||
(SELECT COUNT(*)::text FROM finding_catalog_items) AS "findingItems"
|
||||
`)) as ProtectedSnapshot[];
|
||||
|
||||
if (!snapshot) throw new Error('Hierarchy reset aborted: could not snapshot protected masters');
|
||||
return snapshot;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,173 @@
|
||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
||||
|
||||
/**
|
||||
* One-time full live-data reset requested before loading the definitive source files.
|
||||
*
|
||||
* The database is left with only the single `admin` user and the minimum product
|
||||
* scaffolding required to keep authentication/authorization and the core asset
|
||||
* model functional. Every business, operational, imported, catalog, history,
|
||||
* document, inspection and tenant/company row is removed.
|
||||
*
|
||||
* Fresh migration replays/CI do not have the live `admin` account at this point,
|
||||
* so this migration intentionally no-ops there.
|
||||
*/
|
||||
export class FullLiveDataReset1790103000000 implements MigrationInterface {
|
||||
name = 'FullLiveDataReset1790103000000';
|
||||
|
||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
||||
const adminRows = (await queryRunner.query(`
|
||||
SELECT id, username
|
||||
FROM users
|
||||
WHERE lower(btrim(username))='admin'
|
||||
ORDER BY id
|
||||
`)) as Array<{ id: string; username: string }>;
|
||||
|
||||
if (adminRows.length === 0) {
|
||||
// eslint-disable-next-line no-console
|
||||
console.log('[full-live-reset] skipped: no live admin account on migration replay');
|
||||
return;
|
||||
}
|
||||
|
||||
if (adminRows.length !== 1) {
|
||||
throw new Error(
|
||||
`Full live reset aborted: expected exactly one username admin, found ${adminRows.length}`,
|
||||
);
|
||||
}
|
||||
|
||||
const adminId = adminRows[0].id;
|
||||
|
||||
// These are product/schema scaffolding, not customer/business data.
|
||||
// Everything else in public is disposable live data for this reset.
|
||||
const structuralTables = [
|
||||
'roles',
|
||||
'permissions',
|
||||
'role_permissions',
|
||||
'asset_types',
|
||||
'asset_attribute_definitions',
|
||||
'asset_type_parent_rules',
|
||||
] as const;
|
||||
|
||||
const preservedTables = new Set<string>([
|
||||
'typeorm_migrations',
|
||||
'users',
|
||||
'user_roles',
|
||||
...structuralTables,
|
||||
]);
|
||||
|
||||
const structuralCounts = new Map<string, string>();
|
||||
for (const table of structuralTables) {
|
||||
const safeTable = `"${table.replace(/"/g, '""')}"`;
|
||||
const rows = (await queryRunner.query(
|
||||
`SELECT count(*)::text AS total FROM ${safeTable}`,
|
||||
)) as Array<{ total: string }>;
|
||||
structuralCounts.set(table, rows[0]?.total ?? '0');
|
||||
}
|
||||
|
||||
const adminRolesBefore = (await queryRunner.query(
|
||||
`SELECT count(*)::text AS total FROM user_roles WHERE user_id=$1`,
|
||||
[adminId],
|
||||
)) as Array<{ total: string }>;
|
||||
const adminRoleCount = adminRolesBefore[0]?.total ?? '0';
|
||||
if (adminRoleCount === '0') {
|
||||
throw new Error('Full live reset aborted: admin has no assigned role');
|
||||
}
|
||||
|
||||
const tableRows = (await queryRunner.query(`
|
||||
SELECT table_name
|
||||
FROM information_schema.tables
|
||||
WHERE table_schema='public'
|
||||
AND table_type='BASE TABLE'
|
||||
ORDER BY table_name
|
||||
`)) as Array<{ table_name: string }>;
|
||||
|
||||
const disposableTables = tableRows
|
||||
.map((row) => row.table_name)
|
||||
.filter((table) => !preservedTables.has(table));
|
||||
|
||||
if (disposableTables.length > 0) {
|
||||
const quoted = disposableTables
|
||||
.map((table) => `"${table.replace(/"/g, '""')}"`)
|
||||
.join(', ');
|
||||
await queryRunner.query(`TRUNCATE TABLE ${quoted} RESTART IDENTITY CASCADE`);
|
||||
}
|
||||
|
||||
// Keep only the owner's administrator account. user_roles for other users
|
||||
// are removed through their FK cascade.
|
||||
await queryRunner.query(`DELETE FROM users WHERE id<>$1`, [adminId]);
|
||||
|
||||
// Invalidate any previous login state and unlock the preserved account.
|
||||
await queryRunner.query(
|
||||
`
|
||||
UPDATE users
|
||||
SET failed_login_attempts=0,
|
||||
locked_until=NULL,
|
||||
last_login_at=NULL,
|
||||
updated_at=CURRENT_TIMESTAMP
|
||||
WHERE id=$1
|
||||
`,
|
||||
[adminId],
|
||||
);
|
||||
|
||||
const finalUsers = (await queryRunner.query(`
|
||||
SELECT
|
||||
count(*)::text AS total,
|
||||
count(*) FILTER (WHERE lower(btrim(username))='admin')::text AS admins
|
||||
FROM users
|
||||
`)) as Array<{ total: string; admins: string }>;
|
||||
|
||||
if (finalUsers[0]?.total !== '1' || finalUsers[0]?.admins !== '1') {
|
||||
throw new Error('Full live reset verification failed: users table is not admin-only');
|
||||
}
|
||||
|
||||
const finalAdminRoles = (await queryRunner.query(
|
||||
`
|
||||
SELECT
|
||||
count(*) FILTER (WHERE user_id=$1)::text AS total,
|
||||
count(*) FILTER (WHERE user_id<>$1)::text AS foreign_users
|
||||
FROM user_roles
|
||||
`,
|
||||
[adminId],
|
||||
)) as Array<{ total: string; foreign_users: string }>;
|
||||
|
||||
if (
|
||||
finalAdminRoles[0]?.total !== adminRoleCount ||
|
||||
finalAdminRoles[0]?.foreign_users !== '0'
|
||||
) {
|
||||
throw new Error('Full live reset verification failed: admin role assignments changed');
|
||||
}
|
||||
|
||||
for (const table of structuralTables) {
|
||||
const safeTable = `"${table.replace(/"/g, '""')}"`;
|
||||
const rows = (await queryRunner.query(
|
||||
`SELECT count(*)::text AS total FROM ${safeTable}`,
|
||||
)) as Array<{ total: string }>;
|
||||
const before = structuralCounts.get(table) ?? '0';
|
||||
if (rows[0]?.total !== before) {
|
||||
throw new Error(
|
||||
`Full live reset verification failed: structural table ${table} changed (${before} -> ${rows[0]?.total ?? 'unknown'})`,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
for (const table of disposableTables) {
|
||||
const safeTable = `"${table.replace(/"/g, '""')}"`;
|
||||
const rows = (await queryRunner.query(
|
||||
`SELECT count(*)::text AS total FROM ${safeTable}`,
|
||||
)) as Array<{ total: string }>;
|
||||
if (rows[0]?.total !== '0') {
|
||||
throw new Error(`Full live reset verification failed: ${table} is not empty`);
|
||||
}
|
||||
}
|
||||
|
||||
// eslint-disable-next-line no-console
|
||||
console.log(
|
||||
`[full-live-reset] kept admin=${adminRows[0].username} (${adminId}); preserved ${structuralTables.length} product tables; cleared ${disposableTables.length} data tables`,
|
||||
);
|
||||
}
|
||||
|
||||
public async down(): Promise<void> {
|
||||
throw new Error(
|
||||
'FullLiveDataReset is intentionally destructive; restore the automatic deploy PRE database backup instead.',
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,6 @@
|
||||
import { Transform } from 'class-transformer';
|
||||
import {
|
||||
ArrayMaxSize,
|
||||
ArrayMinSize,
|
||||
ArrayUnique,
|
||||
IsArray,
|
||||
IsEnum,
|
||||
@@ -42,7 +41,6 @@ export class CreateInspectionActDto {
|
||||
observations?: string | null;
|
||||
|
||||
@IsArray()
|
||||
@ArrayMinSize(1)
|
||||
@ArrayMaxSize(200)
|
||||
@ArrayUnique()
|
||||
@IsUUID('4', { each: true })
|
||||
|
||||
@@ -656,6 +656,7 @@ export class InspectionActsService {
|
||||
visitId: string,
|
||||
assetIds: string[],
|
||||
): Promise<void> {
|
||||
if (assetIds.length === 0) return;
|
||||
const [row] = (await manager.query(`
|
||||
SELECT COUNT(*)::integer AS count
|
||||
FROM inspection_visit_assets
|
||||
@@ -663,7 +664,7 @@ export class InspectionActsService {
|
||||
AND asset_id = ANY($2::uuid[])
|
||||
AND included = true
|
||||
`, [visitId, assetIds])) as Array<{ count: number }>;
|
||||
if (assetIds.length < 1 || Number(row?.count ?? 0) !== assetIds.length) {
|
||||
if (Number(row?.count ?? 0) !== assetIds.length) {
|
||||
throw new BadRequestException({
|
||||
code: 'INSPECTION_ACT_ASSET_INVALID',
|
||||
message: 'Cada inventario del acta debe estar incluido en la inspección',
|
||||
|
||||
@@ -1,9 +1,18 @@
|
||||
import { IsISO8601, IsUUID } from 'class-validator';
|
||||
import { IsISO8601, IsOptional, IsUUID } from 'class-validator';
|
||||
|
||||
export class CreateInspectionVisitDto {
|
||||
@IsUUID('4')
|
||||
operationalAreaId!: string;
|
||||
|
||||
/**
|
||||
* Yacimiento concreto de la Inspección. Se mantiene opcional sólo para no
|
||||
* romper clientes Android anteriores, que todavía abren una Inspección a
|
||||
* nivel Área; la WEB F6.1 siempre lo envía.
|
||||
*/
|
||||
@IsOptional()
|
||||
@IsUUID('4')
|
||||
scopeAssetId?: string;
|
||||
|
||||
@IsUUID('4')
|
||||
operatorCompanyId!: string;
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import { Transform } from 'class-transformer';
|
||||
import {
|
||||
IsEmpty,
|
||||
IsISO8601,
|
||||
IsOptional,
|
||||
IsString,
|
||||
IsUUID,
|
||||
MaxLength,
|
||||
} from 'class-validator';
|
||||
|
||||
@@ -17,15 +17,15 @@ export class UpdateInspectionVisitDto {
|
||||
objective?: string | null;
|
||||
|
||||
@IsOptional()
|
||||
@IsUUID('4')
|
||||
@IsEmpty({ message: 'El Yacimiento se fija al crear la Inspección y no puede modificarse' })
|
||||
scopeAssetId?: string | null;
|
||||
|
||||
@IsOptional()
|
||||
@IsUUID('4')
|
||||
@IsEmpty({ message: 'El Área se fija al crear la Inspección y no puede modificarse' })
|
||||
operationalAreaId?: string | null;
|
||||
|
||||
@IsOptional()
|
||||
@IsUUID('4')
|
||||
@IsEmpty({ message: 'La Operadora se fija al crear la Inspección y no puede modificarse' })
|
||||
operatorCompanyId?: string | null;
|
||||
|
||||
@IsOptional()
|
||||
|
||||
@@ -61,7 +61,7 @@ export class F3FieldInventoryStructureService {
|
||||
principal: AuthPrincipal,
|
||||
) {
|
||||
const base = await this.fieldInventory.types(visitId, parentId, principal) as unknown as FieldTypesBase;
|
||||
const effectiveParentId = parentId ?? base.context.area.id;
|
||||
const effectiveParentId = parentId ?? base.parent.id;
|
||||
const parent = await this.parent(effectiveParentId);
|
||||
const expectedTypeCode = STRUCTURAL_CHILD[parent.typeCode.toLowerCase()];
|
||||
const data = expectedTypeCode
|
||||
|
||||
@@ -4,15 +4,25 @@ import { AuditService } from '../audit/audit.service';
|
||||
import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
|
||||
import type { CreateInspectionVisitDto } from './dto/create-inspection-visit.dto';
|
||||
import type { ListInspectionVisitsQueryDto } from './dto/list-inspection-visits-query.dto';
|
||||
import type { InspectionVisitView } from './inspection-visits.service';
|
||||
import type {
|
||||
InspectionChecklistItemKind,
|
||||
InspectionVisitView,
|
||||
} from './inspection-visits.service';
|
||||
import { InspectionVisitsService } from './inspection-visits.service';
|
||||
|
||||
type F4ChecklistClassification = {
|
||||
findingId: string;
|
||||
itemKind: InspectionChecklistItemKind;
|
||||
referenceOn: string | null;
|
||||
};
|
||||
|
||||
/**
|
||||
* Capa activa F4 sobre el servicio de Inspecciones.
|
||||
*
|
||||
* Conserva las operaciones de planificación/equipo/Inventario ya probadas y aplica
|
||||
* la clasificación técnica F4 del checklist. El contrato público de Inspección ya
|
||||
* no expone título independiente ni fecha prevista de fin.
|
||||
* El checklist persistido es una generación histórica append-only. F4 necesita
|
||||
* mostrar la clasificación vigente de controles, pero una lectura nunca debe
|
||||
* reescribir esa generación. La clasificación se deriva con SELECT y se aplica
|
||||
* sólo a la vista devuelta por la API.
|
||||
*/
|
||||
@Injectable()
|
||||
export class F4InspectionVisitsService extends InspectionVisitsService {
|
||||
@@ -32,8 +42,8 @@ export class F4InspectionVisitsService extends InspectionVisitsService {
|
||||
}
|
||||
|
||||
override async getById(id: string): Promise<InspectionVisitView> {
|
||||
await this.reclassifyCurrentChecklist(id);
|
||||
return this.normalizeChecklist(await super.getById(id));
|
||||
const visit = await super.getById(id);
|
||||
return this.normalizeChecklist(await this.classifyChecklistView(visit));
|
||||
}
|
||||
|
||||
override async create(
|
||||
@@ -41,9 +51,8 @@ export class F4InspectionVisitsService extends InspectionVisitsService {
|
||||
principal: AuthPrincipal,
|
||||
request: RequestWithContext,
|
||||
): Promise<InspectionVisitView> {
|
||||
const created = await super.create(dto, principal, request);
|
||||
await this.reclassifyCurrentChecklist(created.id);
|
||||
return this.normalizeChecklist(await super.getById(created.id));
|
||||
const visit = await super.create(dto, principal, request);
|
||||
return this.normalizeChecklist(await this.classifyChecklistView(visit));
|
||||
}
|
||||
|
||||
override async generateChecklist(
|
||||
@@ -51,88 +60,106 @@ export class F4InspectionVisitsService extends InspectionVisitsService {
|
||||
principal: AuthPrincipal,
|
||||
request: RequestWithContext,
|
||||
): Promise<InspectionVisitView> {
|
||||
await super.generateChecklist(id, principal, request);
|
||||
await this.reclassifyCurrentChecklist(id);
|
||||
return this.normalizeChecklist(await super.getById(id));
|
||||
const visit = await super.generateChecklist(id, principal, request);
|
||||
return this.normalizeChecklist(await this.classifyChecklistView(visit));
|
||||
}
|
||||
|
||||
private normalizeChecklist<T>(visit: T): T {
|
||||
if (!visit || typeof visit !== 'object' || !('checklist' in visit)) return visit;
|
||||
const view = visit as T & InspectionVisitView;
|
||||
const items = view.checklist.items.filter((item) => item.itemKind !== 'COMPANY_OVERDUE');
|
||||
const actionableAssetIds = new Set(
|
||||
items
|
||||
.filter((item) => ['VERIFICATION_OVERDUE', 'UPCOMING_CONTROL'].includes(item.itemKind))
|
||||
.map((item) => item.asset.id),
|
||||
);
|
||||
view.checklist = {
|
||||
...view.checklist,
|
||||
antecedents: items.filter((item) => item.itemKind === 'ANTECEDENT').length,
|
||||
companyOverdue: 0,
|
||||
items: view.checklist.items.filter((item) => item.itemKind !== 'COMPANY_OVERDUE'),
|
||||
verificationOverdue: items.filter((item) => item.itemKind === 'VERIFICATION_OVERDUE').length,
|
||||
upcomingControls: items.filter((item) => item.itemKind === 'UPCOMING_CONTROL').length,
|
||||
actionableAssets: actionableAssetIds.size,
|
||||
items,
|
||||
};
|
||||
return view;
|
||||
}
|
||||
|
||||
private async reclassifyCurrentChecklist(visitId: string): Promise<void> {
|
||||
await this.f4DataSource.transaction(async (manager) => {
|
||||
const [visit] = await manager.query(`
|
||||
SELECT checklist_generation AS generation, planned_start_at AS "plannedStartAt"
|
||||
FROM inspection_visits
|
||||
WHERE id=$1
|
||||
FOR UPDATE
|
||||
`, [visitId]) as Array<{ generation: number; plannedStartAt: Date | null }>;
|
||||
if (!visit || Number(visit.generation) < 1 || !visit.plannedStartAt) return;
|
||||
/**
|
||||
* Deriva el estado F4 actual de los ítems sin mutar la generación persistida.
|
||||
* La fuente administrativa de empresa vive a nivel Acta; en este checklist de
|
||||
* campo sólo importan próximos controles y verificaciones no resueltas.
|
||||
*/
|
||||
private async classifyChecklistView(visit: InspectionVisitView): Promise<InspectionVisitView> {
|
||||
if (!visit.plannedStartAt || visit.checklist.items.length === 0) return visit;
|
||||
const findingIds = [...new Set(visit.checklist.items.map((item) => item.findingId))];
|
||||
if (findingIds.length === 0) return visit;
|
||||
const targetDate = new Date(visit.plannedStartAt).toISOString().slice(0, 10);
|
||||
|
||||
const targetDate = new Date(visit.plannedStartAt).toISOString().slice(0, 10);
|
||||
await manager.query(`
|
||||
UPDATE inspection_visit_checklist_items item
|
||||
SET
|
||||
item_kind = CASE
|
||||
WHEN finding.status='OPEN'
|
||||
AND finding.next_control_on IS NOT NULL
|
||||
AND finding.next_control_on < $3::date
|
||||
AND COALESCE((
|
||||
SELECT verification.outcome
|
||||
FROM inspection_finding_verification_visits verification
|
||||
WHERE verification.finding_id=finding.id
|
||||
AND verification.outcome IS NOT NULL
|
||||
ORDER BY verification.result_recorded_at DESC NULLS LAST,
|
||||
verification.created_at DESC,
|
||||
verification.id DESC
|
||||
LIMIT 1
|
||||
), '') <> 'RESOLVED'
|
||||
THEN 'VERIFICATION_OVERDUE'
|
||||
WHEN finding.status='OPEN'
|
||||
AND finding.next_control_on IS NOT NULL
|
||||
AND finding.next_control_on BETWEEN $3::date AND ($3::date + 30)
|
||||
AND COALESCE((
|
||||
SELECT verification.outcome
|
||||
FROM inspection_finding_verification_visits verification
|
||||
WHERE verification.finding_id=finding.id
|
||||
AND verification.outcome IS NOT NULL
|
||||
ORDER BY verification.result_recorded_at DESC NULLS LAST,
|
||||
verification.created_at DESC,
|
||||
verification.id DESC
|
||||
LIMIT 1
|
||||
), '') <> 'RESOLVED'
|
||||
THEN 'UPCOMING_CONTROL'
|
||||
ELSE 'ANTECEDENT'
|
||||
END,
|
||||
reference_on = CASE
|
||||
WHEN finding.status='OPEN'
|
||||
AND finding.next_control_on IS NOT NULL
|
||||
AND COALESCE((
|
||||
SELECT verification.outcome
|
||||
FROM inspection_finding_verification_visits verification
|
||||
WHERE verification.finding_id=finding.id
|
||||
AND verification.outcome IS NOT NULL
|
||||
ORDER BY verification.result_recorded_at DESC NULLS LAST,
|
||||
verification.created_at DESC,
|
||||
verification.id DESC
|
||||
LIMIT 1
|
||||
), '') <> 'RESOLVED'
|
||||
THEN finding.next_control_on
|
||||
ELSE NULL
|
||||
END
|
||||
FROM inspection_findings finding
|
||||
WHERE item.visit_id=$1
|
||||
AND item.generation_number=$2
|
||||
AND finding.id=item.finding_id
|
||||
`, [visitId, visit.generation, targetDate]);
|
||||
});
|
||||
const classifications = (await this.f4DataSource.query(`
|
||||
SELECT
|
||||
finding.id AS "findingId",
|
||||
CASE
|
||||
WHEN finding.status='OPEN'
|
||||
AND finding.next_control_on IS NOT NULL
|
||||
AND finding.next_control_on < $2::date
|
||||
AND COALESCE((
|
||||
SELECT verification.outcome
|
||||
FROM inspection_finding_verification_visits verification
|
||||
WHERE verification.finding_id=finding.id
|
||||
AND verification.outcome IS NOT NULL
|
||||
ORDER BY verification.result_recorded_at DESC NULLS LAST,
|
||||
verification.created_at DESC,
|
||||
verification.id DESC
|
||||
LIMIT 1
|
||||
), '') <> 'RESOLVED'
|
||||
THEN 'VERIFICATION_OVERDUE'
|
||||
WHEN finding.status='OPEN'
|
||||
AND finding.next_control_on IS NOT NULL
|
||||
AND finding.next_control_on BETWEEN $2::date AND ($2::date + 30)
|
||||
AND COALESCE((
|
||||
SELECT verification.outcome
|
||||
FROM inspection_finding_verification_visits verification
|
||||
WHERE verification.finding_id=finding.id
|
||||
AND verification.outcome IS NOT NULL
|
||||
ORDER BY verification.result_recorded_at DESC NULLS LAST,
|
||||
verification.created_at DESC,
|
||||
verification.id DESC
|
||||
LIMIT 1
|
||||
), '') <> 'RESOLVED'
|
||||
THEN 'UPCOMING_CONTROL'
|
||||
ELSE 'ANTECEDENT'
|
||||
END AS "itemKind",
|
||||
CASE
|
||||
WHEN finding.status='OPEN'
|
||||
AND finding.next_control_on IS NOT NULL
|
||||
AND COALESCE((
|
||||
SELECT verification.outcome
|
||||
FROM inspection_finding_verification_visits verification
|
||||
WHERE verification.finding_id=finding.id
|
||||
AND verification.outcome IS NOT NULL
|
||||
ORDER BY verification.result_recorded_at DESC NULLS LAST,
|
||||
verification.created_at DESC,
|
||||
verification.id DESC
|
||||
LIMIT 1
|
||||
), '') <> 'RESOLVED'
|
||||
THEN finding.next_control_on::text
|
||||
ELSE NULL
|
||||
END AS "referenceOn"
|
||||
FROM inspection_findings finding
|
||||
WHERE finding.id=ANY($1::uuid[])
|
||||
`, [findingIds, targetDate])) as F4ChecklistClassification[];
|
||||
|
||||
const byFinding = new Map(classifications.map((item) => [item.findingId, item]));
|
||||
visit.checklist = {
|
||||
...visit.checklist,
|
||||
items: visit.checklist.items.map((item) => {
|
||||
const classification = byFinding.get(item.findingId);
|
||||
return classification
|
||||
? { ...item, itemKind: classification.itemKind, referenceOn: classification.referenceOn }
|
||||
: item;
|
||||
}),
|
||||
};
|
||||
return visit;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -129,6 +129,7 @@ export class FieldFindingsService {
|
||||
visit.id AS "visitId",
|
||||
visit.code AS "visitCode",
|
||||
visit.status AS "visitStatus",
|
||||
COALESCE(visit.scope_asset_id, visit.operational_area_id) AS "scopeAssetId",
|
||||
visit.operational_area_id AS "areaId",
|
||||
area.code AS "areaCode",
|
||||
area.name AS "areaName",
|
||||
@@ -139,8 +140,7 @@ export class FieldFindingsService {
|
||||
asset_type.code AS "assetTypeCode",
|
||||
asset.inventory_family_id AS "inventoryFamilyId",
|
||||
(
|
||||
asset.operational_area_id=visit.operational_area_id
|
||||
OR asset.id=visit.operational_area_id
|
||||
asset.id=COALESCE(visit.scope_asset_id, visit.operational_area_id)
|
||||
OR EXISTS (
|
||||
WITH RECURSIVE ancestors AS (
|
||||
SELECT id,parent_id FROM assets WHERE id=asset.parent_id
|
||||
@@ -148,9 +148,11 @@ export class FieldFindingsService {
|
||||
SELECT parent.id,parent.parent_id
|
||||
FROM assets parent JOIN ancestors child ON parent.id=child.parent_id
|
||||
)
|
||||
SELECT 1 FROM ancestors WHERE id=visit.operational_area_id LIMIT 1
|
||||
SELECT 1 FROM ancestors
|
||||
WHERE id=COALESCE(visit.scope_asset_id, visit.operational_area_id)
|
||||
LIMIT 1
|
||||
)
|
||||
) AS "insideArea",
|
||||
) AS "insideScope",
|
||||
EXISTS (
|
||||
SELECT 1
|
||||
FROM area_company_relations relation
|
||||
@@ -213,6 +215,7 @@ export class FieldFindingsService {
|
||||
visitId: string;
|
||||
visitCode: string;
|
||||
visitStatus: string;
|
||||
scopeAssetId: string | null;
|
||||
areaId: string | null;
|
||||
areaCode: string | null;
|
||||
areaName: string | null;
|
||||
@@ -222,7 +225,7 @@ export class FieldFindingsService {
|
||||
assetId: string | null;
|
||||
assetTypeCode: string | null;
|
||||
inventoryFamilyId: string | null;
|
||||
insideArea: boolean;
|
||||
insideScope: boolean;
|
||||
operatorRelationValid: boolean;
|
||||
assigned: boolean;
|
||||
selected: boolean;
|
||||
@@ -278,10 +281,10 @@ export class FieldFindingsService {
|
||||
message: 'La Instalación/Subinstalación debe tener una clasificación técnica antes de registrar Hallazgos',
|
||||
});
|
||||
}
|
||||
if (!row.insideArea) {
|
||||
if (!row.insideScope) {
|
||||
throw new BadRequestException({
|
||||
code: 'FIELD_FINDING_INVENTORY_OUTSIDE_CONTEXT',
|
||||
message: 'El Inventario no pertenece al Área de esta inspección',
|
||||
message: 'El Inventario no pertenece al Yacimiento definido como alcance de esta inspección',
|
||||
});
|
||||
}
|
||||
if (!row.selected) {
|
||||
|
||||
@@ -23,6 +23,7 @@ interface MobileVisitContext {
|
||||
code: string;
|
||||
status: string;
|
||||
areaId: string;
|
||||
scopeAssetId: string;
|
||||
areaCode: string;
|
||||
areaName: string;
|
||||
companyId: string;
|
||||
@@ -80,12 +81,12 @@ export class FieldInventoryService {
|
||||
const context = await this.requireVisitContext(visitId, principal, false);
|
||||
if (query.parentId) await this.requireParentInContext(query.parentId, context);
|
||||
|
||||
// Empresa is visit context, never physical ownership. Search by Area ancestry.
|
||||
const args: unknown[] = [context.areaId, visitId];
|
||||
// Empresa is visit context, never physical ownership. Search stays inside the frozen Yacimiento scope.
|
||||
const args: unknown[] = [context.scopeAssetId, visitId];
|
||||
const conditions = [
|
||||
"asset.information_status <> 'INACTIVE'",
|
||||
`(
|
||||
asset.operational_area_id = $1::uuid
|
||||
asset.id = $1::uuid
|
||||
OR EXISTS (
|
||||
WITH RECURSIVE ancestors AS (
|
||||
SELECT id,parent_id FROM assets WHERE id=asset.parent_id
|
||||
@@ -198,7 +199,7 @@ export class FieldInventoryService {
|
||||
principal: AuthPrincipal,
|
||||
) {
|
||||
const context = await this.requireVisitContext(visitId, principal, false);
|
||||
const effectiveParentId = parentId ?? context.areaId;
|
||||
const effectiveParentId = parentId ?? context.scopeAssetId;
|
||||
const parent = await this.requireParentInContext(effectiveParentId, context);
|
||||
|
||||
const data = await this.dataSource.query(`
|
||||
@@ -272,7 +273,7 @@ export class FieldInventoryService {
|
||||
request: RequestWithContext,
|
||||
) {
|
||||
const context = await this.requireVisitContext(visitId, principal, true);
|
||||
const parentId = dto.parentId ?? context.areaId;
|
||||
const parentId = dto.parentId ?? context.scopeAssetId;
|
||||
await this.requireParentInContext(parentId, context);
|
||||
|
||||
const capturedAt = new Date(dto.deviceCapturedAt);
|
||||
@@ -412,6 +413,7 @@ export class FieldInventoryService {
|
||||
visit.id,
|
||||
visit.code,
|
||||
visit.status,
|
||||
COALESCE(visit.scope_asset_id, visit.operational_area_id) AS "scopeAssetId",
|
||||
visit.operational_area_id AS "areaId",
|
||||
area.code AS "areaCode",
|
||||
area.name AS "areaName",
|
||||
@@ -485,6 +487,7 @@ export class FieldInventoryService {
|
||||
private publicContext(context: MobileVisitContext) {
|
||||
return {
|
||||
inspection: { id: context.id, code: context.code, status: context.status },
|
||||
scopeAssetId: context.scopeAssetId,
|
||||
area: { id: context.areaId, code: context.areaCode, name: context.areaName },
|
||||
operatorCompany: {
|
||||
id: context.companyId,
|
||||
@@ -503,7 +506,6 @@ export class FieldInventoryService {
|
||||
asset.asset_type_id AS "typeId",
|
||||
(
|
||||
asset.id=$2::uuid
|
||||
OR asset.operational_area_id=$2::uuid
|
||||
OR EXISTS (
|
||||
WITH RECURSIVE ancestors AS (
|
||||
SELECT id,parent_id FROM assets WHERE id=asset.parent_id
|
||||
@@ -512,16 +514,16 @@ export class FieldInventoryService {
|
||||
FROM assets parent JOIN ancestors child ON parent.id=child.parent_id
|
||||
) SELECT 1 FROM ancestors WHERE id=$2::uuid LIMIT 1
|
||||
)
|
||||
) AS "insideArea"
|
||||
) AS "insideScope"
|
||||
FROM assets asset
|
||||
WHERE asset.id = $1::uuid
|
||||
AND asset.information_status <> 'INACTIVE'
|
||||
`, [parentId, context.areaId])) as Array<{
|
||||
`, [parentId, context.scopeAssetId])) as Array<{
|
||||
id: string;
|
||||
code: string;
|
||||
name: string;
|
||||
typeId: string;
|
||||
insideArea: boolean;
|
||||
insideScope: boolean;
|
||||
}>;
|
||||
|
||||
if (!parent) {
|
||||
@@ -530,10 +532,10 @@ export class FieldInventoryService {
|
||||
message: 'La ubicación padre no existe',
|
||||
});
|
||||
}
|
||||
if (!parent.insideArea) {
|
||||
if (!parent.insideScope) {
|
||||
throw new BadRequestException({
|
||||
code: 'FIELD_INVENTORY_PARENT_OUTSIDE_CONTEXT',
|
||||
message: 'La ubicación padre no pertenece al Área de la inspección',
|
||||
message: 'La ubicación padre no pertenece al Yacimiento definido como alcance de la inspección',
|
||||
});
|
||||
}
|
||||
return parent;
|
||||
@@ -545,7 +547,7 @@ export class FieldInventoryService {
|
||||
asset.id,
|
||||
(asset.is_inventory_instance=true OR lower(type.code)='yacimiento') AS "eligibleTarget",
|
||||
(
|
||||
asset.operational_area_id=$2::uuid
|
||||
asset.id=$2::uuid
|
||||
OR EXISTS (
|
||||
WITH RECURSIVE ancestors AS (
|
||||
SELECT id,parent_id FROM assets WHERE id=asset.parent_id
|
||||
@@ -554,15 +556,15 @@ export class FieldInventoryService {
|
||||
FROM assets parent JOIN ancestors child ON parent.id=child.parent_id
|
||||
) SELECT 1 FROM ancestors WHERE id=$2::uuid LIMIT 1
|
||||
)
|
||||
) AS "insideArea"
|
||||
) AS "insideScope"
|
||||
FROM assets asset
|
||||
JOIN asset_types type ON type.id=asset.asset_type_id
|
||||
WHERE asset.id = $1::uuid
|
||||
AND asset.information_status <> 'INACTIVE'
|
||||
`, [assetId, context.areaId])) as Array<{
|
||||
`, [assetId, context.scopeAssetId])) as Array<{
|
||||
id: string;
|
||||
eligibleTarget: boolean;
|
||||
insideArea: boolean;
|
||||
insideScope: boolean;
|
||||
}>;
|
||||
|
||||
if (!asset) {
|
||||
@@ -571,10 +573,10 @@ export class FieldInventoryService {
|
||||
message: 'Registro de Inventario no encontrado',
|
||||
});
|
||||
}
|
||||
if (!asset.insideArea) {
|
||||
if (!asset.insideScope) {
|
||||
throw new BadRequestException({
|
||||
code: 'FIELD_INVENTORY_OUTSIDE_CONTEXT',
|
||||
message: 'El registro no pertenece al Área de esta inspección',
|
||||
message: 'El registro no pertenece al Yacimiento definido como alcance de esta inspección',
|
||||
});
|
||||
}
|
||||
if (!asset.eligibleTarget) {
|
||||
|
||||
@@ -0,0 +1,250 @@
|
||||
import { BadRequestException, ConflictException, Injectable, Logger } from '@nestjs/common';
|
||||
import { DataSource } from 'typeorm';
|
||||
import { administrationAuditContext, isUniqueViolation } from '../administration/common/administration-audit';
|
||||
import { AuditService } from '../audit/audit.service';
|
||||
import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
|
||||
import { AuditAction, InspectionVisit, InspectionVisitStatus } from '../database/entities';
|
||||
import type { CreateInspectionVisitDto } from './dto/create-inspection-visit.dto';
|
||||
import { nextInspectionVisitCode } from './inspection-visit-code';
|
||||
import { validateInspectionPlanningScope } from './inspection-planning-scope';
|
||||
import { InspectionVisitsService } from './inspection-visits.service';
|
||||
|
||||
/**
|
||||
* Creación WEB F6.1. Separa explícitamente ubicación territorial y alcance:
|
||||
* Departamento → Área → Yacimiento. La Operadora no es un padre físico; se
|
||||
* valida contra la relación temporal vigente del Área para la fecha planificada.
|
||||
*/
|
||||
@Injectable()
|
||||
export class InspectionPlanningCreateService {
|
||||
private readonly logger = new Logger(InspectionPlanningCreateService.name);
|
||||
|
||||
constructor(
|
||||
private readonly dataSource: DataSource,
|
||||
private readonly audit: AuditService,
|
||||
private readonly visits: InspectionVisitsService,
|
||||
) {}
|
||||
|
||||
async create(
|
||||
dto: CreateInspectionVisitDto,
|
||||
principal: AuthPrincipal,
|
||||
request: RequestWithContext,
|
||||
) {
|
||||
const scopeAssetId = dto.scopeAssetId;
|
||||
if (!scopeAssetId) {
|
||||
throw new BadRequestException({
|
||||
code: 'INSPECTION_YACIMIENTO_REQUIRED',
|
||||
message: 'Seleccioná el Yacimiento de la Inspección',
|
||||
});
|
||||
}
|
||||
const plannedStartAt = new Date(dto.plannedStartAt);
|
||||
if (!Number.isFinite(plannedStartAt.getTime())) {
|
||||
throw new BadRequestException({
|
||||
code: 'INSPECTION_START_DATE_REQUIRED',
|
||||
message: 'Indicá una fecha y hora prevista de inicio válida',
|
||||
});
|
||||
}
|
||||
|
||||
let stage = 'transaction:start';
|
||||
try {
|
||||
const visitId = await this.dataSource.transaction(async (manager) => {
|
||||
stage = 'scope:validate';
|
||||
await validateInspectionPlanningScope(manager, dto.operationalAreaId, scopeAssetId);
|
||||
|
||||
stage = 'operator:validate';
|
||||
const [context] = await manager.query(`
|
||||
SELECT relation.id
|
||||
FROM area_company_relations relation
|
||||
INNER JOIN assets area ON area.id=relation.area_id
|
||||
INNER JOIN asset_types area_type ON area_type.id=area.asset_type_id
|
||||
INNER JOIN assets company ON company.id=relation.company_id
|
||||
INNER JOIN asset_types company_type ON company_type.id=company.asset_type_id
|
||||
WHERE relation.area_id=$1::uuid
|
||||
AND relation.company_id=$2::uuid
|
||||
AND relation.relation_role='OPERATOR'
|
||||
AND relation.valid_from <= $3::timestamptz
|
||||
AND (relation.valid_until IS NULL OR relation.valid_until > $3::timestamptz)
|
||||
AND area_type.operational_role='AREA'
|
||||
AND company_type.operational_role='COMPANY'
|
||||
AND area.information_status<>'INACTIVE'
|
||||
AND company.information_status<>'INACTIVE'
|
||||
LIMIT 1
|
||||
`, [dto.operationalAreaId, dto.operatorCompanyId, plannedStartAt]) as Array<{ id: string }>;
|
||||
if (!context) {
|
||||
throw new BadRequestException({
|
||||
code: 'INSPECTION_OPERATOR_NOT_ACTIVE_IN_AREA',
|
||||
message: 'La Operadora seleccionada no está vigente para el Área en la fecha de la Inspección',
|
||||
});
|
||||
}
|
||||
|
||||
stage = 'inspector:validate';
|
||||
const [inspector] = await manager.query(`
|
||||
SELECT user_account.id
|
||||
FROM users user_account
|
||||
WHERE user_account.id=$1::uuid
|
||||
AND user_account.status='ACTIVE'
|
||||
AND EXISTS (
|
||||
SELECT 1
|
||||
FROM user_roles user_role
|
||||
INNER JOIN role_permissions role_permission ON role_permission.role_id=user_role.role_id
|
||||
INNER JOIN permissions permission ON permission.id=role_permission.permission_id
|
||||
WHERE user_role.user_id=user_account.id
|
||||
AND permission.code='inspections.execute'
|
||||
)
|
||||
LIMIT 1
|
||||
`, [dto.leadInspectorUserId]) as Array<{ id: string }>;
|
||||
if (!inspector) {
|
||||
throw new BadRequestException({
|
||||
code: 'INSPECTION_MEMBER_INVALID',
|
||||
message: 'El Inspector responsable no está activo o no tiene permiso de ejecución',
|
||||
});
|
||||
}
|
||||
|
||||
stage = 'code:next';
|
||||
const code = await nextInspectionVisitCode(manager, plannedStartAt);
|
||||
const visit = manager.getRepository(InspectionVisit).create({
|
||||
code,
|
||||
objective: null,
|
||||
status: InspectionVisitStatus.DRAFT,
|
||||
scopeAssetId,
|
||||
operationalAreaId: dto.operationalAreaId,
|
||||
operatorCompanyId: dto.operatorCompanyId,
|
||||
leadInspectorUserId: dto.leadInspectorUserId,
|
||||
plannedStartAt,
|
||||
actualStartedAt: null,
|
||||
actualClosedAt: null,
|
||||
instructions: null,
|
||||
cancellationReason: null,
|
||||
checklistGeneration: 1,
|
||||
checklistGeneratedAt: new Date(),
|
||||
createdBy: principal.userId,
|
||||
updatedBy: principal.userId,
|
||||
});
|
||||
|
||||
stage = 'visit:save';
|
||||
await manager.getRepository(InspectionVisit).save(visit);
|
||||
|
||||
stage = 'member:insert';
|
||||
await manager.query(`
|
||||
INSERT INTO inspection_visit_members (visit_id,user_id,included,assigned_by)
|
||||
VALUES ($1::uuid,$2::uuid,true,$3::uuid)
|
||||
`, [visit.id, dto.leadInspectorUserId, principal.userId]);
|
||||
|
||||
// El checklist sigue el alcance físico del Yacimiento. No usa
|
||||
// assets.operator_company_id, que en F6 es sólo snapshot histórico.
|
||||
stage = 'checklist:insert';
|
||||
await manager.query(`
|
||||
INSERT INTO inspection_visit_checklist_items (
|
||||
visit_id,generation_number,finding_id,asset_id,item_kind,
|
||||
reference_on,finding_status,finding_code,finding_title,severity
|
||||
)
|
||||
SELECT
|
||||
$1::uuid,1,finding.id,finding.asset_id,
|
||||
CASE
|
||||
WHEN finding.status='OPEN'
|
||||
AND finding.next_control_on IS NOT NULL
|
||||
AND finding.next_control_on < $4::date THEN 'VERIFICATION_OVERDUE'
|
||||
WHEN finding.status='OPEN'
|
||||
AND finding.next_control_on IS NOT NULL
|
||||
AND finding.next_control_on BETWEEN $4::date AND ($4::date + 30) THEN 'UPCOMING_CONTROL'
|
||||
ELSE 'ANTECEDENT'
|
||||
END,
|
||||
CASE WHEN finding.next_control_on IS NOT NULL THEN finding.next_control_on ELSE NULL END,
|
||||
finding.status,finding.code,finding.title,finding.severity
|
||||
FROM inspection_findings finding
|
||||
INNER JOIN assets inventory ON inventory.id=finding.asset_id
|
||||
WHERE inventory.operational_area_id=$2::uuid
|
||||
AND finding.status<>'VOIDED'
|
||||
AND EXISTS (
|
||||
WITH RECURSIVE ancestors AS (
|
||||
SELECT current_asset.id,current_asset.parent_id
|
||||
FROM assets current_asset WHERE current_asset.id=finding.asset_id
|
||||
UNION ALL
|
||||
SELECT parent.id,parent.parent_id
|
||||
FROM assets parent INNER JOIN ancestors child ON child.parent_id=parent.id
|
||||
)
|
||||
SELECT 1 FROM ancestors WHERE id=$3::uuid LIMIT 1
|
||||
)
|
||||
ORDER BY finding.created_at,finding.id
|
||||
`, [visit.id, dto.operationalAreaId, scopeAssetId, plannedStartAt.toISOString().slice(0, 10)]);
|
||||
|
||||
stage = 'checklist:assets';
|
||||
await manager.query(`
|
||||
INSERT INTO inspection_visit_assets (
|
||||
visit_id, asset_id, included, planning_source, added_by
|
||||
)
|
||||
SELECT DISTINCT $1::uuid, item.asset_id, true, 'AUTOMATIC', $2::uuid
|
||||
FROM inspection_visit_checklist_items item
|
||||
WHERE item.visit_id=$1::uuid
|
||||
AND item.generation_number=1
|
||||
AND item.item_kind IN ('COMPANY_OVERDUE','VERIFICATION_OVERDUE','UPCOMING_CONTROL')
|
||||
ON CONFLICT (visit_id,asset_id) DO UPDATE SET
|
||||
included=true,
|
||||
planning_source=CASE
|
||||
WHEN inspection_visit_assets.planning_source='VERIFICATION' THEN 'VERIFICATION'
|
||||
ELSE 'AUTOMATIC'
|
||||
END,
|
||||
exclusion_reason=NULL,
|
||||
excluded_by=NULL,
|
||||
excluded_at=NULL,
|
||||
added_by=EXCLUDED.added_by,
|
||||
updated_at=CURRENT_TIMESTAMP
|
||||
`, [visit.id, principal.userId]);
|
||||
|
||||
stage = 'checklist:asset-events';
|
||||
await manager.query(`
|
||||
INSERT INTO inspection_visit_asset_events (
|
||||
visit_id, asset_id, event_type, reason, actor_user_id, metadata
|
||||
)
|
||||
SELECT DISTINCT
|
||||
$1::uuid, item.asset_id, 'AUTO_INCLUDED', NULL, $2::uuid,
|
||||
jsonb_build_object('generation',1,'source','F6.1_CREATE')
|
||||
FROM inspection_visit_checklist_items item
|
||||
WHERE item.visit_id=$1::uuid
|
||||
AND item.generation_number=1
|
||||
AND item.item_kind IN ('COMPANY_OVERDUE','VERIFICATION_OVERDUE','UPCOMING_CONTROL')
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM inspection_visit_asset_events event
|
||||
WHERE event.visit_id=$1::uuid
|
||||
AND event.asset_id=item.asset_id
|
||||
AND event.event_type='AUTO_INCLUDED'
|
||||
)
|
||||
`, [visit.id, principal.userId]);
|
||||
|
||||
stage = 'audit:record';
|
||||
await this.audit.record({
|
||||
...administrationAuditContext(principal, request),
|
||||
action: AuditAction.INSPECTION_VISIT_CREATED,
|
||||
entityType: 'inspection_visit',
|
||||
entityId: visit.id,
|
||||
afterData: {
|
||||
id: visit.id,
|
||||
code,
|
||||
status: visit.status,
|
||||
departmentHierarchy: 'Departamento → Área → Yacimiento',
|
||||
operationalAreaId: dto.operationalAreaId,
|
||||
scopeAssetId,
|
||||
operatorCompanyId: dto.operatorCompanyId,
|
||||
plannedStartAt: plannedStartAt.toISOString(),
|
||||
leadInspectorUserId: dto.leadInspectorUserId,
|
||||
},
|
||||
}, manager);
|
||||
return visit.id;
|
||||
});
|
||||
|
||||
stage = 'view:load';
|
||||
return await this.visits.getById(visitId);
|
||||
} catch (error) {
|
||||
if (isUniqueViolation(error)) {
|
||||
throw new ConflictException({
|
||||
code: 'INSPECTION_CODE_ALREADY_EXISTS',
|
||||
message: 'El identificador de Inspección ya existe; volvé a intentar',
|
||||
});
|
||||
}
|
||||
const technical = error instanceof Error
|
||||
? `${error.name}: ${error.message}${error.stack ? `\n${error.stack}` : ''}`
|
||||
: String(error);
|
||||
this.logger.error(`F6.1 inspection create failed at ${stage}: ${technical}`);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,109 @@
|
||||
import { BadRequestException, Injectable } from '@nestjs/common';
|
||||
import { DataSource } from 'typeorm';
|
||||
|
||||
export interface InspectionPlanningHierarchyItem {
|
||||
id: string;
|
||||
code: string;
|
||||
name: string;
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class InspectionPlanningHierarchyService {
|
||||
constructor(private readonly dataSource: DataSource) {}
|
||||
|
||||
async departments(): Promise<{ data: InspectionPlanningHierarchyItem[] }> {
|
||||
const data = await this.dataSource.query(`
|
||||
SELECT department.id, department.code, department.name
|
||||
FROM assets department
|
||||
INNER JOIN asset_types type ON type.id=department.asset_type_id
|
||||
WHERE lower(type.code)='departamento'
|
||||
AND type.is_active=true
|
||||
AND department.information_status<>'INACTIVE'
|
||||
AND EXISTS (
|
||||
SELECT 1
|
||||
FROM assets area
|
||||
INNER JOIN asset_types area_type ON area_type.id=area.asset_type_id
|
||||
WHERE area.parent_id=department.id
|
||||
AND lower(area_type.code)='area'
|
||||
AND area.information_status<>'INACTIVE'
|
||||
)
|
||||
ORDER BY department.name, department.code
|
||||
`) as InspectionPlanningHierarchyItem[];
|
||||
return { data };
|
||||
}
|
||||
|
||||
async areasForDepartment(departmentId: string): Promise<{ data: InspectionPlanningHierarchyItem[] }> {
|
||||
await this.requireType(departmentId, 'departamento', 'El Departamento seleccionado no es válido');
|
||||
const data = await this.dataSource.query(`
|
||||
SELECT area.id, area.code, area.name
|
||||
FROM assets area
|
||||
INNER JOIN asset_types type ON type.id=area.asset_type_id
|
||||
WHERE area.parent_id=$1::uuid
|
||||
AND lower(type.code)='area'
|
||||
AND type.is_active=true
|
||||
AND area.information_status<>'INACTIVE'
|
||||
ORDER BY area.name, area.code
|
||||
`, [departmentId]) as InspectionPlanningHierarchyItem[];
|
||||
return { data };
|
||||
}
|
||||
|
||||
async yacimientosForArea(areaId: string): Promise<{ data: InspectionPlanningHierarchyItem[] }> {
|
||||
await this.requireType(areaId, 'area', 'El Área seleccionada no es válida');
|
||||
const data = await this.dataSource.query(`
|
||||
SELECT yacimiento.id, yacimiento.code, yacimiento.name
|
||||
FROM assets yacimiento
|
||||
INNER JOIN asset_types type ON type.id=yacimiento.asset_type_id
|
||||
WHERE yacimiento.parent_id=$1::uuid
|
||||
AND lower(type.code)='yacimiento'
|
||||
AND type.is_active=true
|
||||
AND yacimiento.information_status<>'INACTIVE'
|
||||
ORDER BY yacimiento.name, yacimiento.code
|
||||
`, [areaId]) as InspectionPlanningHierarchyItem[];
|
||||
return { data };
|
||||
}
|
||||
|
||||
async operatorsForArea(
|
||||
areaId: string,
|
||||
at?: string,
|
||||
): Promise<{ data: InspectionPlanningHierarchyItem[] }> {
|
||||
await this.requireType(areaId, 'area', 'El Área seleccionada no es válida');
|
||||
const effectiveAt = at ? new Date(at) : new Date();
|
||||
if (!Number.isFinite(effectiveAt.getTime())) {
|
||||
throw new BadRequestException({
|
||||
code: 'INSPECTION_PLANNING_DATE_INVALID',
|
||||
message: 'La fecha de planificación no es válida',
|
||||
});
|
||||
}
|
||||
const data = await this.dataSource.query(`
|
||||
SELECT DISTINCT company.id, company.code, company.name
|
||||
FROM area_company_relations relation
|
||||
INNER JOIN assets company ON company.id=relation.company_id
|
||||
INNER JOIN asset_types type ON type.id=company.asset_type_id
|
||||
WHERE relation.area_id=$1::uuid
|
||||
AND relation.relation_role='OPERATOR'
|
||||
AND relation.valid_from <= $2::timestamptz
|
||||
AND (relation.valid_until IS NULL OR relation.valid_until > $2::timestamptz)
|
||||
AND type.operational_role='COMPANY'
|
||||
AND type.is_active=true
|
||||
AND company.information_status<>'INACTIVE'
|
||||
ORDER BY company.name, company.code
|
||||
`, [areaId, effectiveAt]) as InspectionPlanningHierarchyItem[];
|
||||
return { data };
|
||||
}
|
||||
|
||||
private async requireType(id: string, typeCode: string, message: string): Promise<void> {
|
||||
const [row] = await this.dataSource.query(`
|
||||
SELECT 1
|
||||
FROM assets asset
|
||||
INNER JOIN asset_types type ON type.id=asset.asset_type_id
|
||||
WHERE asset.id=$1::uuid
|
||||
AND lower(type.code)=lower($2)
|
||||
AND type.is_active=true
|
||||
AND asset.information_status<>'INACTIVE'
|
||||
LIMIT 1
|
||||
`, [id, typeCode]) as Array<{ '?column?': number }>;
|
||||
if (!row) {
|
||||
throw new BadRequestException({ code: 'INSPECTION_PLANNING_HIERARCHY_INVALID', message });
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
import { BadRequestException } from '@nestjs/common';
|
||||
import type { EntityManager } from 'typeorm';
|
||||
|
||||
/**
|
||||
* F6.1 keeps territorial levels explicit. operationalAreaId freezes the Area
|
||||
* context while scopeAssetId identifies the Yacimiento inspected inside it.
|
||||
* Legacy/mobile callers may still use the Area itself as scope until Android
|
||||
* supplies a Yacimiento explicitly.
|
||||
*/
|
||||
export async function validateInspectionPlanningScope(
|
||||
manager: EntityManager,
|
||||
operationalAreaId: string,
|
||||
scopeAssetId: string,
|
||||
): Promise<void> {
|
||||
if (scopeAssetId === operationalAreaId) return;
|
||||
|
||||
const [scope] = await manager.query(`
|
||||
SELECT 1
|
||||
FROM assets yacimiento
|
||||
INNER JOIN asset_types type ON type.id=yacimiento.asset_type_id
|
||||
WHERE yacimiento.id=$1::uuid
|
||||
AND yacimiento.parent_id=$2::uuid
|
||||
AND lower(type.code)='yacimiento'
|
||||
AND type.is_active=true
|
||||
AND yacimiento.information_status<>'INACTIVE'
|
||||
LIMIT 1
|
||||
`, [scopeAssetId, operationalAreaId]) as Array<{ '?column?': number }>;
|
||||
|
||||
if (!scope) {
|
||||
throw new BadRequestException({
|
||||
code: 'INSPECTION_YACIMIENTO_OUTSIDE_AREA',
|
||||
message: 'El Yacimiento seleccionado no pertenece al Área indicada',
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
import { Controller, Get, Param, ParseUUIDPipe, Query } from '@nestjs/common';
|
||||
import { RequirePermissions } from '../authorization/decorators/require-permissions.decorator';
|
||||
import { InspectionPreventiveCandidatesService } from './inspection-preventive-candidates.service';
|
||||
|
||||
@Controller('inspection-visits')
|
||||
export class InspectionPreventiveCandidatesController {
|
||||
constructor(private readonly candidates: InspectionPreventiveCandidatesService) {}
|
||||
|
||||
@Get(':id/preventive-candidates')
|
||||
@RequirePermissions('inspections.read')
|
||||
list(
|
||||
@Param('id', new ParseUUIDPipe({ version: '4' })) id: string,
|
||||
@Query('search') search?: string,
|
||||
) {
|
||||
return this.candidates.list(id, search);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,77 @@
|
||||
import { Injectable, NotFoundException } from '@nestjs/common';
|
||||
import { DataSource } from 'typeorm';
|
||||
|
||||
export interface InspectionPreventiveCandidate {
|
||||
id: string;
|
||||
code: string;
|
||||
name: string;
|
||||
typeName: string;
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class InspectionPreventiveCandidatesService {
|
||||
constructor(private readonly dataSource: DataSource) {}
|
||||
|
||||
async list(visitId: string, search?: string): Promise<{ data: InspectionPreventiveCandidate[] }> {
|
||||
const [context] = (await this.dataSource.query(`
|
||||
SELECT
|
||||
visit.operational_area_id AS "operationalAreaId",
|
||||
COALESCE(visit.scope_asset_id, visit.operational_area_id) AS "scopeAssetId"
|
||||
FROM inspection_visits visit
|
||||
WHERE visit.id = $1::uuid
|
||||
`, [visitId])) as Array<{
|
||||
operationalAreaId: string | null;
|
||||
scopeAssetId: string | null;
|
||||
}>;
|
||||
|
||||
if (!context) {
|
||||
throw new NotFoundException({
|
||||
code: 'INSPECTION_VISIT_NOT_FOUND',
|
||||
message: 'Visita de inspección no encontrada',
|
||||
});
|
||||
}
|
||||
|
||||
if (!context.operationalAreaId || !context.scopeAssetId) return { data: [] };
|
||||
|
||||
const term = search?.trim().slice(0, 200) ?? '';
|
||||
const rows = (await this.dataSource.query(`
|
||||
WITH RECURSIVE scope_tree AS (
|
||||
SELECT root.id
|
||||
FROM assets root
|
||||
WHERE root.id = $2::uuid
|
||||
UNION ALL
|
||||
SELECT child.id
|
||||
FROM assets child
|
||||
INNER JOIN scope_tree parent_scope ON parent_scope.id = child.parent_id
|
||||
)
|
||||
SELECT
|
||||
asset.id,
|
||||
asset.code,
|
||||
asset.name,
|
||||
asset_type.name AS "typeName"
|
||||
FROM scope_tree
|
||||
INNER JOIN assets asset ON asset.id = scope_tree.id
|
||||
INNER JOIN asset_types asset_type ON asset_type.id = asset.asset_type_id
|
||||
WHERE asset.id <> $2::uuid
|
||||
AND asset.operational_area_id = $3::uuid
|
||||
AND asset.information_status <> 'INACTIVE'
|
||||
AND lower(asset_type.code) IN ('instalacion', 'subinstalacion')
|
||||
AND NOT EXISTS (
|
||||
SELECT 1
|
||||
FROM inspection_visit_assets linked
|
||||
WHERE linked.visit_id = $1::uuid
|
||||
AND linked.asset_id = asset.id
|
||||
)
|
||||
AND (
|
||||
$4::text = ''
|
||||
OR asset.code ILIKE '%' || $4::text || '%'
|
||||
OR asset.name ILIKE '%' || $4::text || '%'
|
||||
OR COALESCE(asset.common_name, '') ILIKE '%' || $4::text || '%'
|
||||
)
|
||||
ORDER BY asset_type.name, asset.name, asset.code
|
||||
LIMIT 100
|
||||
`, [visitId, context.scopeAssetId, context.operationalAreaId, term])) as InspectionPreventiveCandidate[];
|
||||
|
||||
return { data: rows };
|
||||
}
|
||||
}
|
||||
@@ -23,6 +23,8 @@ import { OpenMobileInspectionDto } from './dto/open-mobile-inspection.dto';
|
||||
import { ReplaceInspectionVisitAssetsDto } from './dto/replace-inspection-visit-assets.dto';
|
||||
import { ReplaceInspectionVisitTeamDto } from './dto/replace-inspection-visit-team.dto';
|
||||
import { UpdateInspectionVisitDto } from './dto/update-inspection-visit.dto';
|
||||
import { InspectionPlanningCreateService } from './inspection-planning-create.service';
|
||||
import { InspectionPlanningHierarchyService } from './inspection-planning-hierarchy.service';
|
||||
import { InspectionVisitLifecycleService } from './inspection-visit-lifecycle.service';
|
||||
import { InspectionVisitsService } from './inspection-visits.service';
|
||||
|
||||
@@ -31,6 +33,8 @@ export class InspectionVisitsController {
|
||||
constructor(
|
||||
private readonly visits: InspectionVisitsService,
|
||||
private readonly lifecycle: InspectionVisitLifecycleService,
|
||||
private readonly planningHierarchy: InspectionPlanningHierarchyService,
|
||||
private readonly planningCreate: InspectionPlanningCreateService,
|
||||
) {}
|
||||
|
||||
@Get()
|
||||
@@ -45,6 +49,29 @@ export class InspectionVisitsController {
|
||||
return this.visits.listAssignees();
|
||||
}
|
||||
|
||||
@Get('planning-context/departments')
|
||||
@RequirePermissions('inspections.read')
|
||||
planningDepartments() {
|
||||
return this.planningHierarchy.departments();
|
||||
}
|
||||
|
||||
@Get('planning-context/departments/:departmentId/areas')
|
||||
@RequirePermissions('inspections.read')
|
||||
planningAreasForDepartment(
|
||||
@Param('departmentId', new ParseUUIDPipe({ version: '4' })) departmentId: string,
|
||||
) {
|
||||
return this.planningHierarchy.areasForDepartment(departmentId);
|
||||
}
|
||||
|
||||
@Get('planning-context/areas/:areaId/yacimientos')
|
||||
@RequirePermissions('inspections.read')
|
||||
planningYacimientos(
|
||||
@Param('areaId', new ParseUUIDPipe({ version: '4' })) areaId: string,
|
||||
) {
|
||||
return this.planningHierarchy.yacimientosForArea(areaId);
|
||||
}
|
||||
|
||||
/** Compatibilidad con clientes anteriores: lista todas las Áreas. */
|
||||
@Get('planning-context/areas')
|
||||
@RequirePermissions('inspections.read')
|
||||
planningAreas() {
|
||||
@@ -55,8 +82,9 @@ export class InspectionVisitsController {
|
||||
@RequirePermissions('inspections.read')
|
||||
planningOperators(
|
||||
@Param('areaId', new ParseUUIDPipe({ version: '4' })) areaId: string,
|
||||
@Query('at') at?: string,
|
||||
) {
|
||||
return this.visits.listPlanningOperators(areaId);
|
||||
return this.planningHierarchy.operatorsForArea(areaId, at);
|
||||
}
|
||||
|
||||
@Get('mobile/planning-context/areas')
|
||||
@@ -84,8 +112,8 @@ export class InspectionVisitsController {
|
||||
@Req() request: RequestWithContext,
|
||||
) {
|
||||
assertMobileInspector(principal);
|
||||
// Android no tiene un lifecycle paralelo: crea la visita y delega las
|
||||
// transiciones DRAFT → PLANNED → IN_PROGRESS a los servicios canónicos.
|
||||
// Android conserva por compatibilidad el alcance a nivel Área hasta que su
|
||||
// flujo también solicite Yacimiento. No se mezcla con la creación WEB F6.1.
|
||||
const created = await this.visits.create({
|
||||
operationalAreaId: dto.operationalAreaId,
|
||||
operatorCompanyId: dto.operatorCompanyId,
|
||||
@@ -109,7 +137,7 @@ export class InspectionVisitsController {
|
||||
@CurrentAuth() principal: AuthPrincipal,
|
||||
@Req() request: RequestWithContext,
|
||||
) {
|
||||
return this.visits.create(dto, principal, request);
|
||||
return this.planningCreate.create(dto, principal, request);
|
||||
}
|
||||
|
||||
@Patch(':id')
|
||||
|
||||
@@ -8,15 +8,27 @@ import { FieldFindingsController } from './field-findings.controller';
|
||||
import { FieldFindingsService } from './field-findings.service';
|
||||
import { FieldInventoryController } from './field-inventory.controller';
|
||||
import { FieldInventoryService } from './field-inventory.service';
|
||||
import { InspectionPlanningCreateService } from './inspection-planning-create.service';
|
||||
import { InspectionPlanningHierarchyService } from './inspection-planning-hierarchy.service';
|
||||
import { InspectionPreventiveCandidatesController } from './inspection-preventive-candidates.controller';
|
||||
import { InspectionPreventiveCandidatesService } from './inspection-preventive-candidates.service';
|
||||
import { InspectionVisitLifecycleService } from './inspection-visit-lifecycle.service';
|
||||
import { InspectionVisitsController } from './inspection-visits.controller';
|
||||
import { InspectionVisitsService } from './inspection-visits.service';
|
||||
|
||||
@Module({
|
||||
imports: [AuditModule, AssetMasterModule, InspectionFindingsModule],
|
||||
controllers: [InspectionVisitsController, FieldInventoryController, FieldFindingsController],
|
||||
controllers: [
|
||||
InspectionVisitsController,
|
||||
InspectionPreventiveCandidatesController,
|
||||
FieldInventoryController,
|
||||
FieldFindingsController,
|
||||
],
|
||||
providers: [
|
||||
{ provide: InspectionVisitsService, useClass: F4InspectionVisitsService },
|
||||
InspectionPlanningCreateService,
|
||||
InspectionPlanningHierarchyService,
|
||||
InspectionPreventiveCandidatesService,
|
||||
InspectionVisitLifecycleService,
|
||||
FieldInventoryService,
|
||||
F3FieldInventoryStructureService,
|
||||
|
||||
@@ -23,6 +23,7 @@ import type { ReplaceInspectionVisitAssetsDto } from './dto/replace-inspection-v
|
||||
import type { ReplaceInspectionVisitTeamDto } from './dto/replace-inspection-visit-team.dto';
|
||||
import type { UpdateInspectionVisitDto } from './dto/update-inspection-visit.dto';
|
||||
import { nextInspectionVisitCode } from './inspection-visit-code';
|
||||
import { validateInspectionPlanningScope } from './inspection-planning-scope';
|
||||
|
||||
export interface InspectionPerson {
|
||||
id: string;
|
||||
@@ -312,7 +313,7 @@ export class InspectionVisitsService {
|
||||
}
|
||||
const operationalAreaId = dto.operationalAreaId;
|
||||
const operatorCompanyId = dto.operatorCompanyId;
|
||||
await this.validatePlanningContext(manager, operationalAreaId, operatorCompanyId);
|
||||
await this.validatePlanningContext(manager, operationalAreaId, operatorCompanyId, plannedStartAt);
|
||||
await this.requireAsset(manager, operationalAreaId);
|
||||
await this.requireInspectors(manager, [dto.leadInspectorUserId]);
|
||||
const code = await nextInspectionVisitCode(manager, plannedStartAt);
|
||||
@@ -382,29 +383,24 @@ export class InspectionVisitsService {
|
||||
? visit.operatorCompanyId
|
||||
: dto.operatorCompanyId;
|
||||
const contextTouched = dto.operationalAreaId !== undefined || dto.operatorCompanyId !== undefined;
|
||||
const nextScope = contextTouched
|
||||
? nextAreaId
|
||||
: dto.scopeAssetId === undefined
|
||||
? visit.scopeAssetId
|
||||
: dto.scopeAssetId;
|
||||
await this.validatePlanningContext(manager, nextAreaId, nextCompanyId);
|
||||
const nextScope = dto.scopeAssetId === undefined ? visit.scopeAssetId : dto.scopeAssetId;
|
||||
await this.validatePlanningContext(manager, nextAreaId, nextCompanyId, nextStart);
|
||||
await this.requireAsset(manager, nextScope);
|
||||
if (contextTouched && nextAreaId && nextCompanyId) {
|
||||
await this.assertCurrentAssetsMatchContext(manager, id, nextAreaId, nextCompanyId);
|
||||
} else if (dto.scopeAssetId !== undefined) {
|
||||
if (nextAreaId && nextScope) {
|
||||
await validateInspectionPlanningScope(manager, nextAreaId, nextScope);
|
||||
await this.assertCurrentAssetsInScope(manager, id, nextScope);
|
||||
}
|
||||
if (dto.objective !== undefined) visit.objective = dto.objective;
|
||||
if (contextTouched) {
|
||||
visit.operationalAreaId = nextAreaId;
|
||||
visit.operatorCompanyId = nextCompanyId;
|
||||
visit.scopeAssetId = nextAreaId;
|
||||
} else if (dto.scopeAssetId !== undefined) {
|
||||
}
|
||||
if (dto.scopeAssetId !== undefined) {
|
||||
visit.scopeAssetId = dto.scopeAssetId;
|
||||
}
|
||||
if (dto.plannedStartAt !== undefined) visit.plannedStartAt = nextStart;
|
||||
if (dto.instructions !== undefined) visit.instructions = dto.instructions;
|
||||
if (contextTouched || dto.plannedStartAt !== undefined) visit.checklistGeneratedAt = null;
|
||||
if (contextTouched || dto.scopeAssetId !== undefined || dto.plannedStartAt !== undefined) visit.checklistGeneratedAt = null;
|
||||
visit.updatedBy = principal.userId;
|
||||
await manager.getRepository(InspectionVisit).save(visit);
|
||||
const updated = await this.loadView(manager, id);
|
||||
@@ -463,11 +459,10 @@ export class InspectionVisitsService {
|
||||
message: 'Seleccioná Área y Operadora antes de agregar registros preventivos',
|
||||
});
|
||||
}
|
||||
await this.assertAssetsMatchContext(
|
||||
await this.assertAssetsInScope(
|
||||
manager,
|
||||
additions,
|
||||
visit.operationalAreaId,
|
||||
visit.operatorCompanyId,
|
||||
visit.scopeAssetId ?? visit.operationalAreaId,
|
||||
);
|
||||
for (const assetId of additions) {
|
||||
await manager.query(`
|
||||
@@ -629,11 +624,10 @@ export class InspectionVisitsService {
|
||||
if (!visit.operationalAreaId || !visit.operatorCompanyId) {
|
||||
throw new BadRequestException({ code: 'INSPECTION_CONTEXT_REQUIRED', message: 'La visita no tiene Área y Operadora definidas' });
|
||||
}
|
||||
await this.assertAssetsMatchContext(
|
||||
await this.assertAssetsInScope(
|
||||
manager,
|
||||
[assetId],
|
||||
visit.operationalAreaId,
|
||||
visit.operatorCompanyId,
|
||||
visit.scopeAssetId ?? visit.operationalAreaId,
|
||||
);
|
||||
await manager.query(`
|
||||
UPDATE inspection_visit_assets
|
||||
@@ -920,6 +914,7 @@ export class InspectionVisitsService {
|
||||
manager: EntityManager,
|
||||
operationalAreaId: string | null,
|
||||
operatorCompanyId: string | null,
|
||||
effectiveAt: Date | null = null,
|
||||
): Promise<void> {
|
||||
if (!operationalAreaId && !operatorCompanyId) return;
|
||||
if (!operationalAreaId || !operatorCompanyId) {
|
||||
@@ -938,8 +933,8 @@ export class InspectionVisitsService {
|
||||
WHERE relation.area_id = area.id
|
||||
AND relation.company_id = company.id
|
||||
AND relation.relation_role = 'OPERATOR'
|
||||
AND relation.valid_from <= CURRENT_TIMESTAMP
|
||||
AND (relation.valid_until IS NULL OR relation.valid_until > CURRENT_TIMESTAMP)
|
||||
AND relation.valid_from <= $3::timestamptz
|
||||
AND (relation.valid_until IS NULL OR relation.valid_until > $3::timestamptz)
|
||||
) AS "activeOperatorRelation"
|
||||
FROM assets area
|
||||
INNER JOIN asset_types area_type ON area_type.id = area.asset_type_id
|
||||
@@ -951,7 +946,7 @@ export class InspectionVisitsService {
|
||||
AND company_type.operational_role = 'COMPANY'
|
||||
AND area.information_status <> 'INACTIVE'
|
||||
AND company.information_status <> 'INACTIVE'
|
||||
`, [operationalAreaId, operatorCompanyId])) as Array<{
|
||||
`, [operationalAreaId, operatorCompanyId, effectiveAt ?? new Date()])) as Array<{
|
||||
areaId: string;
|
||||
companyId: string;
|
||||
activeOperatorRelation: boolean;
|
||||
@@ -970,44 +965,6 @@ export class InspectionVisitsService {
|
||||
}
|
||||
}
|
||||
|
||||
private async assertAssetsMatchContext(
|
||||
manager: EntityManager,
|
||||
assetIds: string[],
|
||||
operationalAreaId: string,
|
||||
operatorCompanyId: string,
|
||||
): Promise<void> {
|
||||
if (assetIds.length === 0) return;
|
||||
const [row] = (await manager.query(`
|
||||
SELECT COUNT(*)::integer AS outside
|
||||
FROM assets asset
|
||||
WHERE asset.id = ANY($1::uuid[])
|
||||
AND (
|
||||
asset.operational_area_id IS DISTINCT FROM $2::uuid
|
||||
OR asset.operator_company_id IS DISTINCT FROM $3::uuid
|
||||
)
|
||||
`, [assetIds, operationalAreaId, operatorCompanyId])) as Array<{ outside: number }>;
|
||||
if (Number(row?.outside ?? 0) > 0) {
|
||||
throw new BadRequestException({
|
||||
code: 'INSPECTION_ASSET_OUTSIDE_OPERATIONAL_CONTEXT',
|
||||
message: 'Uno o más registros no pertenecen al Área y Operadora de la visita',
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
private async assertCurrentAssetsMatchContext(
|
||||
manager: EntityManager,
|
||||
visitId: string,
|
||||
operationalAreaId: string,
|
||||
operatorCompanyId: string,
|
||||
): Promise<void> {
|
||||
await this.assertAssetsMatchContext(
|
||||
manager,
|
||||
await this.activeAssetIds(manager, visitId),
|
||||
operationalAreaId,
|
||||
operatorCompanyId,
|
||||
);
|
||||
}
|
||||
|
||||
private async appendAssetEvent(
|
||||
manager: EntityManager,
|
||||
visitId: string,
|
||||
@@ -1041,7 +998,7 @@ export class InspectionVisitsService {
|
||||
message: 'Indicá la fecha prevista antes de generar el checklist',
|
||||
});
|
||||
}
|
||||
await this.validatePlanningContext(manager, visit.operationalAreaId, visit.operatorCompanyId);
|
||||
await this.validatePlanningContext(manager, visit.operationalAreaId, visit.operatorCompanyId, visit.plannedStartAt);
|
||||
const generation = visit.checklistGeneration + 1;
|
||||
await manager.query(`
|
||||
INSERT INTO inspection_visit_checklist_items (
|
||||
@@ -1106,14 +1063,25 @@ export class InspectionVisitsService {
|
||||
FROM inspection_findings finding
|
||||
INNER JOIN assets asset ON asset.id = finding.asset_id
|
||||
WHERE asset.operational_area_id = $3
|
||||
AND asset.operator_company_id = $4
|
||||
AND finding.status <> 'VOIDED'
|
||||
AND (
|
||||
asset.id=$4::uuid
|
||||
OR EXISTS (
|
||||
WITH RECURSIVE ancestors AS (
|
||||
SELECT id,parent_id FROM assets WHERE id=asset.parent_id
|
||||
UNION ALL
|
||||
SELECT parent.id,parent.parent_id
|
||||
FROM assets parent JOIN ancestors child ON parent.id=child.parent_id
|
||||
)
|
||||
SELECT 1 FROM ancestors WHERE id=$4::uuid LIMIT 1
|
||||
)
|
||||
)
|
||||
ORDER BY finding.created_at, finding.id
|
||||
`, [
|
||||
visit.id,
|
||||
generation,
|
||||
visit.operationalAreaId,
|
||||
visit.operatorCompanyId,
|
||||
visit.scopeAssetId ?? visit.operationalAreaId,
|
||||
visit.plannedStartAt.toISOString().slice(0, 10),
|
||||
]);
|
||||
|
||||
@@ -1295,7 +1263,12 @@ export class InspectionVisitsService {
|
||||
message: 'Seleccioná Área y Organización operadora antes de confirmar la planificación',
|
||||
});
|
||||
}
|
||||
await this.validatePlanningContext(manager, visit.operationalAreaId, visit.operatorCompanyId);
|
||||
await this.validatePlanningContext(
|
||||
manager,
|
||||
visit.operationalAreaId,
|
||||
visit.operatorCompanyId,
|
||||
visit.plannedStartAt,
|
||||
);
|
||||
if (!visit.scopeAssetId) {
|
||||
throw new BadRequestException({
|
||||
code: 'INSPECTION_SCOPE_REQUIRED',
|
||||
@@ -1350,13 +1323,10 @@ export class InspectionVisitsService {
|
||||
message: 'El equipo debe incluir al inspector responsable',
|
||||
});
|
||||
}
|
||||
// F6.1: Inventory membership is physical (Yacimiento scope).
|
||||
// Company is temporal Area context and must never be reconstructed from
|
||||
// assets.operator_company_id, which is only a creation/historical snapshot.
|
||||
await this.assertCurrentAssetsInScope(manager, visit.id, visit.scopeAssetId);
|
||||
await this.assertCurrentAssetsMatchContext(
|
||||
manager,
|
||||
visit.id,
|
||||
visit.operationalAreaId,
|
||||
visit.operatorCompanyId,
|
||||
);
|
||||
}
|
||||
|
||||
private async activeAssetIds(manager: EntityManager, visitId: string): Promise<string[]> {
|
||||
|
||||
@@ -7,16 +7,16 @@ function mountedRepoFile(path: string): string {
|
||||
return readFileSync(resolve(process.cwd(), '..', path), 'utf8');
|
||||
}
|
||||
|
||||
test('F6.1 Android test cut targets production API and has a distinct installable debug version', () => {
|
||||
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 = 23/);
|
||||
assert.match(gradle, /versionName = "0\.15\.1"/);
|
||||
assert.match(gradle, /versionCode = 25/);
|
||||
assert.match(gradle, /versionName = "0\.16\.0"/);
|
||||
assert.match(gradle, /https:\/\/dhv2\.korexlabs\.com\/api\/v3\//);
|
||||
assert.match(gradle, /applicationIdSuffix = "\.debug"/);
|
||||
});
|
||||
|
||||
test('F5/F6.1 field inventory exposes Other families as reviewable choices to Android', () => {
|
||||
test('F5/F6.3 field inventory exposes Other families as reviewable choices to Android', () => {
|
||||
const service = readFileSync(
|
||||
resolve(process.cwd(), 'src/inspection-visits/f3-field-inventory-structure.service.ts'),
|
||||
'utf8',
|
||||
@@ -25,4 +25,4 @@ test('F5/F6.1 field inventory exposes Other families as reviewable choices to An
|
||||
assert.match(service, /F5:SYSTEM:OTHER:%/);
|
||||
assert.match(service, /AS "isOther"/);
|
||||
assert.match(service, /isOtherFamily: family\.isOther/);
|
||||
});
|
||||
});
|
||||
@@ -113,7 +113,7 @@ test('F5 technical catalog is exactly final_modelov2 and resolves internal IDEM
|
||||
);
|
||||
});
|
||||
|
||||
test('F5 source contracts keep Empresa out of physical ownership and preserve sealed documents on merge', () => {
|
||||
test('F5/F6.1 source contracts keep Empresa out of physical ownership and preserve sealed documents on merge', () => {
|
||||
const mergeSource = readFileSync('src/asset-master/inventory-merge.service.ts', 'utf8');
|
||||
const fieldSource = readFileSync('src/inspection-visits/field-inventory.service.ts', 'utf8');
|
||||
const contextMigration = readFileSync('src/database/migrations/1790087250000-f5-operational-context-compatibility.ts', 'utf8');
|
||||
@@ -129,7 +129,8 @@ test('F5 source contracts keep Empresa out of physical ownership and preserve se
|
||||
assert.doesNotMatch(mergeSource, /source\.operatorCompanyId\s*!==\s*canonical\.operatorCompanyId/);
|
||||
assert.doesNotMatch(mergeSource, /misma Área y Operadora/);
|
||||
|
||||
assert.match(fieldSource, /Área de esta inspección/);
|
||||
assert.match(fieldSource, /Yacimiento definido como alcance de esta inspección/);
|
||||
assert.match(fieldSource, /scopeAssetId/);
|
||||
assert.match(fieldSource, /area_company_relations/);
|
||||
assert.doesNotMatch(fieldSource, /asset\.operator_company_id\s*=\s*\$2::uuid/);
|
||||
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import { readFileSync } from 'node:fs';
|
||||
import { resolve } from 'node:path';
|
||||
import test from 'node:test';
|
||||
|
||||
function source(path: string): string {
|
||||
return readFileSync(resolve(process.cwd(), path), 'utf8');
|
||||
}
|
||||
|
||||
test('F6.1 inspection planning exposes Departamento → Área → Yacimiento explicitly', () => {
|
||||
const hierarchy = source('src/inspection-visits/inspection-planning-hierarchy.service.ts');
|
||||
const controller = source('src/inspection-visits/inspection-visits.controller.ts');
|
||||
const createPage = source('../web-v2/src/pages/InspectionVisitCreateF61Page.tsx');
|
||||
|
||||
assert.match(hierarchy, /lower\(type\.code\)='departamento'/);
|
||||
assert.match(hierarchy, /area\.parent_id=\$1::uuid/);
|
||||
assert.match(hierarchy, /lower\(type\.code\)='yacimiento'/);
|
||||
assert.match(hierarchy, /yacimiento\.parent_id=\$1::uuid/);
|
||||
assert.match(controller, /planning-context\/departments/);
|
||||
assert.match(controller, /planning-context\/departments\/:departmentId\/areas/);
|
||||
assert.match(controller, /planning-context\/areas\/:areaId\/yacimientos/);
|
||||
assert.match(createPage, /Departamento → Área → Yacimiento/);
|
||||
assert.match(createPage, /<span>Departamento<\/span>/);
|
||||
assert.match(createPage, /<span>Área<\/span>/);
|
||||
assert.match(createPage, /<span>Yacimiento<\/span>/);
|
||||
assert.doesNotMatch(createPage, /Área \/ Yacimiento/);
|
||||
});
|
||||
|
||||
test('F6.1 WEB creation freezes Area and uses the selected Yacimiento as physical scope', () => {
|
||||
const dto = source('src/inspection-visits/dto/create-inspection-visit.dto.ts');
|
||||
const scope = source('src/inspection-visits/inspection-planning-scope.ts');
|
||||
const create = source('src/inspection-visits/inspection-planning-create.service.ts');
|
||||
const createPage = source('../web-v2/src/pages/InspectionVisitCreateF61Page.tsx');
|
||||
|
||||
assert.match(dto, /scopeAssetId\?: string/);
|
||||
assert.match(scope, /yacimiento\.parent_id=\$2::uuid/);
|
||||
assert.match(scope, /lower\(type\.code\)='yacimiento'/);
|
||||
assert.match(create, /scopeAssetId,/);
|
||||
assert.match(create, /operationalAreaId: dto\.operationalAreaId/);
|
||||
assert.match(create, /relation\.relation_role='OPERATOR'/);
|
||||
assert.match(create, /relation\.valid_from <= \$3::timestamptz/);
|
||||
assert.match(createPage, /scopeAssetId: yacimientoId/);
|
||||
});
|
||||
|
||||
test('F6.1 WEB inspection creation does not use Inventory operator snapshots', () => {
|
||||
const create = source('src/inspection-visits/inspection-planning-create.service.ts');
|
||||
|
||||
assert.match(create, /area_company_relations relation/);
|
||||
assert.doesNotMatch(create, /inventory\.operator_company_id/);
|
||||
assert.doesNotMatch(create, /asset\.operator_company_id/);
|
||||
});
|
||||
|
||||
test('F4 checklist classification is derived on read and never rewrites the persisted generation', () => {
|
||||
const f4 = source('src/inspection-visits/f4-inspection-visits.service.ts');
|
||||
const d55 = source('src/database/migrations/1789063200000-phase-d5-5-web-planning-checklist.ts');
|
||||
|
||||
assert.match(d55, /REVOKE UPDATE, DELETE ON TABLE[\s\S]*inspection_visit_checklist_items/);
|
||||
assert.match(f4, /classifyChecklistView/);
|
||||
assert.match(f4, /FROM inspection_findings finding/);
|
||||
assert.doesNotMatch(f4, /UPDATE inspection_visit_checklist_items/);
|
||||
assert.doesNotMatch(f4, /reclassifyCurrentChecklist/);
|
||||
});
|
||||
|
||||
test('Field preparation is an Inspection stage, not a parallel sidebar module', () => {
|
||||
const layout = source('../web-v2/src/layout/AppLayout.tsx');
|
||||
const briefing = source('../web-v2/src/pages/FieldBriefingsPage.tsx');
|
||||
const detail = source('../web-v2/src/pages/InspectionVisitDetailF61Page.tsx');
|
||||
const app = source('../web-v2/src/app/App.tsx');
|
||||
|
||||
assert.doesNotMatch(layout, /label: 'Preparación de campo'/);
|
||||
assert.match(briefing, /ETAPA DE LA INSPECCIÓN/);
|
||||
assert.match(briefing, /inspectionId/);
|
||||
assert.match(briefing, /Volver a la inspección/);
|
||||
assert.match(detail, /ETAPA PREVIA AL CAMPO/);
|
||||
assert.match(detail, /preparacion-campo\?inspectionId=/);
|
||||
assert.match(app, /InspectionVisitDetailF61Page/);
|
||||
});
|
||||
@@ -0,0 +1,78 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import { readFileSync } from 'node:fs';
|
||||
import { resolve } from 'node:path';
|
||||
import test from 'node:test';
|
||||
|
||||
const api = (path: string) => readFileSync(resolve(process.cwd(), path), 'utf8');
|
||||
const web = (path: string) => readFileSync(resolve(process.cwd(), '..', 'web-v2', path), 'utf8');
|
||||
|
||||
test('F6.1 field Inventory is bounded by the frozen Yacimiento scope', () => {
|
||||
const source = api('src/inspection-visits/field-inventory.service.ts');
|
||||
|
||||
assert.match(source, /COALESCE\(visit\.scope_asset_id, visit\.operational_area_id\) AS "scopeAssetId"/);
|
||||
assert.match(source, /const effectiveParentId = parentId \?\? context\.scopeAssetId/);
|
||||
assert.match(source, /const parentId = dto\.parentId \?\? context\.scopeAssetId/);
|
||||
assert.match(source, /\[parentId, context\.scopeAssetId\]/);
|
||||
assert.match(source, /\[assetId, context\.scopeAssetId\]/);
|
||||
assert.match(source, /AS "insideScope"/);
|
||||
assert.doesNotMatch(source, /insideArea/);
|
||||
});
|
||||
|
||||
test('F6.1 field Findings reject Inventory outside the frozen Yacimiento scope', () => {
|
||||
const source = api('src/inspection-visits/field-findings.service.ts');
|
||||
|
||||
assert.match(source, /COALESCE\(visit\.scope_asset_id, visit\.operational_area_id\) AS "scopeAssetId"/);
|
||||
assert.match(source, /AS "insideScope"/);
|
||||
assert.match(source, /if \(!row\.insideScope\)/);
|
||||
assert.match(source, /Yacimiento definido como alcance/);
|
||||
assert.doesNotMatch(source, /AS "insideArea"/);
|
||||
});
|
||||
|
||||
test('F6.1 planning preserves Yacimiento and never validates Inventory ownership from Company snapshot', () => {
|
||||
const source = api('src/inspection-visits/inspection-visits.service.ts');
|
||||
|
||||
assert.match(source, /const nextScope = dto\.scopeAssetId === undefined \? visit\.scopeAssetId : dto\.scopeAssetId/);
|
||||
assert.match(source, /validateInspectionPlanningScope\(manager, nextAreaId, nextScope\)/);
|
||||
assert.match(source, /visit\.scopeAssetId \?\? visit\.operationalAreaId/);
|
||||
assert.match(source, /visit\.plannedStartAt,/);
|
||||
assert.doesNotMatch(source, /visit\.scopeAssetId = nextAreaId/);
|
||||
assert.doesNotMatch(source, /assertAssetsMatchContext/);
|
||||
assert.doesNotMatch(source, /assertCurrentAssetsMatchContext/);
|
||||
assert.doesNotMatch(source, /asset\.operator_company_id IS DISTINCT FROM/);
|
||||
});
|
||||
|
||||
test('F6.1 creation selects actionable checklist Inventory automatically', () => {
|
||||
const source = api('src/inspection-visits/inspection-planning-create.service.ts');
|
||||
|
||||
assert.match(source, /INSERT INTO inspection_visit_assets/);
|
||||
assert.match(source, /COMPANY_OVERDUE','VERIFICATION_OVERDUE','UPCOMING_CONTROL/);
|
||||
assert.match(source, /'AUTO_INCLUDED'/);
|
||||
});
|
||||
|
||||
test('F6.1 operator choices are resolved at the planned timestamp', () => {
|
||||
const hierarchy = api('src/inspection-visits/inspection-planning-hierarchy.service.ts');
|
||||
const controller = api('src/inspection-visits/inspection-visits.controller.ts');
|
||||
const createPage = web('src/pages/InspectionVisitCreateF61Page.tsx');
|
||||
|
||||
assert.match(hierarchy, /operatorsForArea\([\s\S]*at\?: string/);
|
||||
assert.match(hierarchy, /relation\.valid_from <= \$2::timestamptz/);
|
||||
assert.match(hierarchy, /relation\.valid_until > \$2::timestamptz/);
|
||||
assert.match(controller, /@Query\('at'\) at\?: string/);
|
||||
assert.match(createPage, /operators\?at=\$\{at\}/);
|
||||
assert.match(createPage, /\[areaId, plannedStartAt\]/);
|
||||
});
|
||||
|
||||
test('F6.1 WEB keeps Area and Yacimiento as separate concepts and freezes context after creation', () => {
|
||||
const source = web('src/pages/InspectionVisitEditorF4Page.tsx');
|
||||
|
||||
assert.doesNotMatch(source, /<span>Área \/ Yacimiento<\/span>/);
|
||||
assert.match(source, /<span>Área<\/span>/);
|
||||
assert.match(source, /<span>Yacimiento<\/span>/);
|
||||
assert.match(source, /<span>Operadora<\/span>/);
|
||||
assert.match(source, /visit\.operationalArea\.name[\s\S]{0,160}readOnly/);
|
||||
assert.match(source, /visit\.scopeAsset\.name[\s\S]{0,160}readOnly/);
|
||||
assert.match(source, /visit\.operatorCompany\.name[\s\S]{0,160}readOnly/);
|
||||
assert.doesNotMatch(source, /updateInspectionVisit\(id, \{[\s\S]{0,300}scopeAssetId:/);
|
||||
assert.doesNotMatch(source, /updateInspectionVisit\(id, \{[\s\S]{0,300}operationalAreaId:/);
|
||||
assert.doesNotMatch(source, /updateInspectionVisit\(id, \{[\s\S]{0,300}operatorCompanyId:/);
|
||||
});
|
||||
@@ -75,12 +75,20 @@ test('F6.1 historical operational lists read Company and Area from the parent In
|
||||
assert.doesNotMatch(reports, /context_asset\.operator_company_id/);
|
||||
});
|
||||
|
||||
test('F6.1 WEB Inventory searches use physical Area and never the operator snapshot filter', () => {
|
||||
test('F6.1 WEB Inventory searches use physical scope and never the operator snapshot filter', () => {
|
||||
const inspectionEditor = source('../web-v2/src/pages/InspectionVisitEditorF4Page.tsx');
|
||||
const preventiveApi = source('../web-v2/src/features/inspections/preventiveCandidatesApi.ts');
|
||||
const preventiveService = source('src/inspection-visits/inspection-preventive-candidates.service.ts');
|
||||
const fieldDiscoveries = source('../web-v2/src/pages/FieldDiscoveriesPage.tsx');
|
||||
const inventoryMerge = source('../web-v2/src/lib/inventoryMergeApi.ts');
|
||||
|
||||
for (const page of [inspectionEditor, fieldDiscoveries, inventoryMerge]) {
|
||||
assert.match(inspectionEditor, /listInspectionPreventiveCandidates\(id, assetSearch\)/);
|
||||
assert.match(preventiveApi, /inspection-visits\/\$\{visitId\}\/preventive-candidates/);
|
||||
assert.match(preventiveService, /COALESCE\(visit\.scope_asset_id, visit\.operational_area_id\) AS "scopeAssetId"/);
|
||||
assert.doesNotMatch(preventiveService, /asset\.operator_company_id/);
|
||||
assert.doesNotMatch(inspectionEditor, /listAssets\(\{[\s\S]{0,300}operatorCompanyId:/);
|
||||
|
||||
for (const page of [fieldDiscoveries, inventoryMerge]) {
|
||||
assert.match(page, /listAssets\(\{[\s\S]{0,300}operationalAreaId:/);
|
||||
assert.doesNotMatch(page, /listAssets\(\{[\s\S]{0,300}operatorCompanyId:/);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import { readFileSync } from 'node:fs';
|
||||
import { resolve } from 'node:path';
|
||||
import test from 'node:test';
|
||||
|
||||
function source(path: string): string {
|
||||
return readFileSync(resolve(process.cwd(), path), 'utf8');
|
||||
}
|
||||
|
||||
test('F6.1 planning preloads the local start time and resolves the Area operator immediately', () => {
|
||||
const page = source('../web-v2/src/pages/InspectionVisitCreateF61Page.tsx');
|
||||
const hierarchy = source('src/inspection-visits/inspection-planning-hierarchy.service.ts');
|
||||
|
||||
assert.match(page, /function currentLocalDateTime\(\)/);
|
||||
assert.match(page, /useState\(currentLocalDateTime\)/);
|
||||
assert.match(page, /areas\/\$\{areaId\}\/operators\?at=\$\{at\}/);
|
||||
assert.match(page, /response\.data\.length === 1/);
|
||||
assert.match(page, /setOperatorId\(response\.data\[0\]\.id\)/);
|
||||
assert.match(page, /Sin Operadora vigente para esa fecha/);
|
||||
assert.match(hierarchy, /relation\.relation_role='OPERATOR'/);
|
||||
assert.match(hierarchy, /relation\.valid_from <= \$2::timestamptz/);
|
||||
assert.match(hierarchy, /relation\.valid_until IS NULL OR relation\.valid_until > \$2::timestamptz/);
|
||||
});
|
||||
|
||||
test('F6.1 WEB cancellation requires an explicit audited reason and is available while in progress', () => {
|
||||
const editor = source('../web-v2/src/pages/InspectionVisitEditorF4Page.tsx');
|
||||
const controller = source('src/inspection-visits/inspection-visits.controller.ts');
|
||||
const dto = source('src/inspection-visits/dto/cancel-inspection-visit.dto.ts');
|
||||
const lifecycle = source('src/inspection-visits/inspection-visit-lifecycle.service.ts');
|
||||
|
||||
assert.doesNotMatch(editor, /window\.prompt\('Indicá el motivo de cancelación/);
|
||||
assert.match(editor, /showCancelForm/);
|
||||
assert.match(editor, /cancelReason/);
|
||||
assert.match(editor, /<textarea/);
|
||||
assert.match(editor, /cancelReason\.trim\(\)\.length < 10/);
|
||||
assert.match(editor, /maxLength=\{500\}/);
|
||||
assert.match(editor, /'DRAFT', 'PLANNED', 'IN_PROGRESS'/);
|
||||
assert.match(editor, /Confirmar cancelación/);
|
||||
assert.match(controller, /@Post\(':id\/cancel'\)/);
|
||||
assert.match(dto, /@MinLength\(10\)/);
|
||||
assert.match(dto, /@MaxLength\(4000\)/);
|
||||
assert.match(lifecycle, /\[InspectionVisitStatus\.DRAFT, InspectionVisitStatus\.PLANNED, InspectionVisitStatus\.IN_PROGRESS\]\.includes\(visit\.status\)/);
|
||||
assert.match(lifecycle, /INSPECTION_WITH_SEALED_ACT_CANNOT_CANCEL/);
|
||||
});
|
||||
@@ -0,0 +1,45 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import { readFileSync } from 'node:fs';
|
||||
import { resolve } from 'node:path';
|
||||
import test from 'node:test';
|
||||
|
||||
function source(path: string): string {
|
||||
return readFileSync(resolve(process.cwd(), path), 'utf8');
|
||||
}
|
||||
|
||||
test('F6.2 planning uses the shared CSRF-aware API requester', () => {
|
||||
const page = source('../web-v2/src/pages/InspectionVisitCreateF61Page.tsx');
|
||||
const api = source('../web-v2/src/lib/api.ts');
|
||||
|
||||
assert.match(page, /import \{ apiRequest \} from '\.\.\/lib\/api';/);
|
||||
assert.doesNotMatch(page, /async function requestJson/);
|
||||
assert.doesNotMatch(page, /fetch\(`\/api\/v3/);
|
||||
assert.match(page, /apiRequest<CreatedInspection>\('\/inspection-visits'/);
|
||||
assert.match(api, /headers\.set\('x-csrf-token', token\)/);
|
||||
assert.match(api, /readCsrfCookie\(\)/);
|
||||
});
|
||||
|
||||
test('F6.2 removes the duplicated global operational bar and hidden persisted filters', () => {
|
||||
const layout = source('../web-v2/src/layout/AppLayout.tsx');
|
||||
const context = source('../web-v2/src/context/OperationalContext.tsx');
|
||||
|
||||
assert.doesNotMatch(layout, /OperationalContextBar/);
|
||||
assert.match(context, /localStorage\.removeItem\(LEGACY_STORAGE_KEY\)/);
|
||||
assert.doesNotMatch(context, /localStorage\.setItem/);
|
||||
assert.match(context, /useState\(''\)/);
|
||||
});
|
||||
|
||||
test('F6.2 exposes provisional PDF data contracts for Actas and Informes', () => {
|
||||
const projection = source('../web-v2/src/components/DocumentPdfProjection.tsx');
|
||||
const actPage = source('../web-v2/src/pages/InspectionActEditorPage.tsx');
|
||||
const reportPage = source('../web-v2/src/pages/ReportDetailPage.tsx');
|
||||
|
||||
assert.match(projection, /PDF PRELIMINAR · ESTRUCTURA PROYECTADA/);
|
||||
assert.match(projection, /Contrato de datos estable, renderer reemplazable/);
|
||||
assert.match(projection, /Identificación y contexto/);
|
||||
assert.match(projection, /Firmas y manifestaciones/);
|
||||
assert.match(projection, /GEDO e integridad/);
|
||||
assert.match(projection, /Anexo final/);
|
||||
assert.match(actPage, /<DocumentPdfProjection kind="act" \/>/);
|
||||
assert.match(reportPage, /<DocumentPdfProjection kind="report" \/>/);
|
||||
});
|
||||
@@ -0,0 +1,40 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import { readFileSync } from 'node:fs';
|
||||
import { resolve } from 'node:path';
|
||||
import test from 'node:test';
|
||||
|
||||
const api = (path: string) => readFileSync(resolve(process.cwd(), path), 'utf8');
|
||||
const web = (path: string) => readFileSync(resolve(process.cwd(), '..', 'web-v2', path), 'utf8');
|
||||
|
||||
test('F6.2 protects the frozen Inspection context at database level', () => {
|
||||
const migration = api('src/database/migrations/1790098200000-f6-2-freeze-inspection-context.ts');
|
||||
|
||||
assert.match(migration, /prevent_inspection_context_mutation/);
|
||||
assert.match(migration, /NEW\.operational_area_id IS DISTINCT FROM OLD\.operational_area_id/);
|
||||
assert.match(migration, /NEW\.scope_asset_id IS DISTINCT FROM OLD\.scope_asset_id/);
|
||||
assert.match(migration, /NEW\.operator_company_id IS DISTINCT FROM OLD\.operator_company_id/);
|
||||
assert.match(migration, /BEFORE UPDATE OF operational_area_id, scope_asset_id, operator_company_id/);
|
||||
});
|
||||
|
||||
test('F6.2 preventive candidates are descendants of the frozen Yacimiento only', () => {
|
||||
const service = api('src/inspection-visits/inspection-preventive-candidates.service.ts');
|
||||
const controller = api('src/inspection-visits/inspection-preventive-candidates.controller.ts');
|
||||
|
||||
assert.match(service, /COALESCE\(visit\.scope_asset_id, visit\.operational_area_id\) AS "scopeAssetId"/);
|
||||
assert.match(service, /WITH RECURSIVE scope_tree AS/);
|
||||
assert.match(service, /child\.parent_id/);
|
||||
assert.match(service, /asset\.operational_area_id = \$3::uuid/);
|
||||
assert.match(service, /lower\(asset_type\.code\) IN \('instalacion', 'subinstalacion'\)/);
|
||||
assert.match(service, /NOT EXISTS \([\s\S]*inspection_visit_assets linked/);
|
||||
assert.match(controller, /:id\/preventive-candidates/);
|
||||
});
|
||||
|
||||
test('F6.2 WEB uses the server-scoped preventive selector instead of the mutable Area form', () => {
|
||||
const page = web('src/pages/InspectionVisitEditorF4Page.tsx');
|
||||
const apiClient = web('src/features/inspections/preventiveCandidatesApi.ts');
|
||||
|
||||
assert.match(page, /listInspectionPreventiveCandidates\(id, assetSearch\)/);
|
||||
assert.doesNotMatch(page, /listAssets\(\{[\s\S]{0,220}operationalAreaId: form\.operationalAreaId/);
|
||||
assert.match(page, /Sólo se muestran Instalaciones y Subinstalaciones pertenecientes al Yacimiento/);
|
||||
assert.match(apiClient, /inspection-visits\/\$\{visitId\}\/preventive-candidates/);
|
||||
});
|
||||
@@ -0,0 +1,49 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import { readFileSync } from 'node:fs';
|
||||
import { resolve } from 'node:path';
|
||||
import test from 'node:test';
|
||||
|
||||
function source(path: string) {
|
||||
return readFileSync(resolve(process.cwd(), path), 'utf8');
|
||||
}
|
||||
|
||||
test('F6.3 field types start at the frozen Yacimiento instead of the Area', () => {
|
||||
const structure = source('src/inspection-visits/f3-field-inventory-structure.service.ts');
|
||||
assert.match(structure, /parentId \?\? base\.parent\.id/);
|
||||
assert.doesNotMatch(structure, /parentId \?\? base\.context\.area\.id/);
|
||||
});
|
||||
|
||||
test('F6.3 an Acta can start empty and receive Inventory when Hallazgos are added', () => {
|
||||
const dto = source('src/inspection-acts/dto/create-inspection-act.dto.ts');
|
||||
const service = source('src/inspection-acts/inspection-acts.service.ts');
|
||||
const mobile = source('../android-app/app/src/main/java/com/korexlabs/dhinspeccion/data/MobileActs.kt');
|
||||
|
||||
assert.doesNotMatch(dto, /ArrayMinSize\(1\)/);
|
||||
assert.match(service, /if \(assetIds\.length === 0\) return/);
|
||||
assert.match(mobile, /assetIds = listOfNotNull\(assetId\)/);
|
||||
});
|
||||
|
||||
test('F6.3 every Installation and Subinstallation receives the common field card', () => {
|
||||
const migration = source('src/database/migrations/1790099100000-f6-3-mobile-field-common-attributes.ts');
|
||||
|
||||
for (const label of ['Marca', 'Modelo', 'Capacidad', 'Número de serie', 'Función']) {
|
||||
assert.match(migration, new RegExp(label));
|
||||
}
|
||||
assert.match(migration, /'instalacion','subinstalacion'/);
|
||||
assert.match(migration, /'TEXT'::asset_attribute_data_type/);
|
||||
assert.match(migration, /false, true/);
|
||||
});
|
||||
|
||||
test('F6.3 Android follows Inspección → Acta → Hallazgo → Inventario', () => {
|
||||
const root = source('../android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/F3VisitRoot.kt');
|
||||
const acts = source('../android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/MobileActsScreen.kt');
|
||||
const vm = source('../android-app/app/src/main/java/com/korexlabs/dhinspeccion/MainViewModel.kt');
|
||||
|
||||
assert.match(root, /model\.startVisit\(\); onActs\(\)/);
|
||||
assert.match(root, /Text\("Nuevo Hallazgo"/);
|
||||
assert.match(root, /Buscar instalación o subinstalación/);
|
||||
assert.match(acts, /Text\("\+ Agregar Hallazgo"\)/);
|
||||
assert.match(acts, /model\.createAct\(newActUrgency\)/);
|
||||
assert.match(vm, /fun createAct\(urgency: String = "NON_URGENT"\)/);
|
||||
assert.match(vm, /repository\.fieldInventory\(currentVisit\.id, search, parentId\)/);
|
||||
});
|
||||
@@ -59,11 +59,12 @@ test('F6 field findings resolve by exact technical classification and keep OTROS
|
||||
assert.match(resolver, /label: 'OTROS'/);
|
||||
});
|
||||
|
||||
test('F6 mobile finding gate uses Area ancestry and temporal operator relation instead of copying company ownership onto each object', () => {
|
||||
test('F6.1 mobile finding gate uses Yacimiento scope and temporal Area operator relation instead of Inventory company ownership', () => {
|
||||
const fieldFindings = source('src/inspection-visits/field-findings.service.ts');
|
||||
|
||||
assert.match(fieldFindings, /WITH RECURSIVE ancestors/);
|
||||
assert.match(fieldFindings, /WHERE id=visit\.operational_area_id/);
|
||||
assert.match(fieldFindings, /COALESCE\(visit\.scope_asset_id, visit\.operational_area_id\)/);
|
||||
assert.match(fieldFindings, /AS "insideScope"/);
|
||||
assert.match(fieldFindings, /FROM area_company_relations relation/);
|
||||
assert.match(fieldFindings, /relation\.relation_role='OPERATOR'/);
|
||||
assert.doesNotMatch(fieldFindings, /asset\.operator_company_id=visit\.operator_company_id/);
|
||||
@@ -79,12 +80,15 @@ test('F6 field-created technical Inventory may be provisional only until the sel
|
||||
assert.match(fieldFindings, /FIELD_FINDING_FAMILY_REQUIRED/);
|
||||
});
|
||||
|
||||
test('F6 Android keeps search and reloads scoped to the current physical parent', () => {
|
||||
test('F6.1 Android roots search and reload at the Inspection Yacimiento with legacy Area fallback', () => {
|
||||
const model = source('../android-app/app/src/main/java/com/korexlabs/dhinspeccion/data/DhMobile.kt');
|
||||
const viewModel = source('../android-app/app/src/main/java/com/korexlabs/dhinspeccion/MainViewModel.kt');
|
||||
const screen = source('../android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/F3VisitRoot.kt');
|
||||
|
||||
assert.match(model, /data class VisitDetail[\s\S]*val scopeAsset: AssetSummary\? = null/);
|
||||
assert.match(viewModel, /var inventoryParentId: String\? by mutableStateOf\(null\)/);
|
||||
assert.match(viewModel, /effectiveParentId = parentId \?: inventoryParentId \?: currentVisit\.operationalArea\?\.id/);
|
||||
assert.match(viewModel, /currentVisit\.scopeAsset\?\.id \?: currentVisit\.operationalArea\?\.id/);
|
||||
assert.match(viewModel, /visit\?\.scopeAsset\?\.id \?: visit\?\.operationalArea\?\.id/);
|
||||
assert.match(viewModel, /repository\.fieldInventory\(currentVisit\.id, null, effectiveParentId\)/);
|
||||
assert.match(screen, /model\.loadFieldTypes\(item\.id\)/);
|
||||
});
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import type { DataSource } from 'typeorm';
|
||||
import { FieldBriefingService } from '../../src/act-administration/field-briefing.service';
|
||||
|
||||
test('field briefing convierte el timestamptz de pg a YYYY-MM-DD antes del cast SQL', async () => {
|
||||
const calls: Array<{ sql: string; params: unknown[] }> = [];
|
||||
let queryNumber = 0;
|
||||
|
||||
const dataSource = {
|
||||
query: async (sql: string, params: unknown[]) => {
|
||||
calls.push({ sql, params });
|
||||
queryNumber += 1;
|
||||
|
||||
if (queryNumber === 1) {
|
||||
return [{
|
||||
id: '11111111-1111-4111-8111-111111111111',
|
||||
code: 'INSP-00002-17-09-26',
|
||||
status: 'DRAFT',
|
||||
plannedStartAt: new Date('2026-09-17T23:42:00.000Z'),
|
||||
areaId: '22222222-2222-4222-8222-222222222222',
|
||||
companyId: '33333333-3333-4333-8333-333333333333',
|
||||
areaCode: 'PRES-AREA-TEST',
|
||||
areaName: 'Barrancas',
|
||||
companyCode: 'PRES-ORG-TEST',
|
||||
companyName: 'Petróleos Sudamericanos Energy S.A.',
|
||||
}];
|
||||
}
|
||||
|
||||
return [];
|
||||
},
|
||||
} as unknown as DataSource;
|
||||
|
||||
const result = await new FieldBriefingService(dataSource).forVisit(
|
||||
'11111111-1111-4111-8111-111111111111',
|
||||
);
|
||||
|
||||
assert.equal(calls.length, 2);
|
||||
assert.equal(calls[1]?.params[3], '2026-09-17');
|
||||
assert.equal(result.plannedOn, '2026-09-17');
|
||||
assert.deepEqual(result.summary, {
|
||||
acts: 0,
|
||||
findings: 0,
|
||||
inventoryItems: 0,
|
||||
responseOverdue: 0,
|
||||
commitmentOverdue: 0,
|
||||
verificationPending: 0,
|
||||
});
|
||||
assert.deepEqual(result.acts, []);
|
||||
});
|
||||
@@ -7,6 +7,7 @@ import { ChangeInspectionVisitStatusDto } from '../../src/inspection-visits/dto/
|
||||
import { CreateInspectionVisitDto } from '../../src/inspection-visits/dto/create-inspection-visit.dto';
|
||||
import { ReplaceInspectionVisitAssetsDto } from '../../src/inspection-visits/dto/replace-inspection-visit-assets.dto';
|
||||
import { ReplaceInspectionVisitTeamDto } from '../../src/inspection-visits/dto/replace-inspection-visit-team.dto';
|
||||
import { UpdateInspectionVisitDto } from '../../src/inspection-visits/dto/update-inspection-visit.dto';
|
||||
|
||||
const AREA_ID = '16e54e65-60cf-4739-b0d1-ccdd904fbfd5';
|
||||
const COMPANY_ID = 'ce96211d-ac15-4421-8868-4185323aff61';
|
||||
@@ -25,6 +26,25 @@ test('visit DTO accepts only the minimum planning data required for quick creati
|
||||
assert.equal(dto.leadInspectorUserId, USER_ID);
|
||||
});
|
||||
|
||||
test('visit update DTO keeps Area, Yacimiento and Operadora immutable after creation', async () => {
|
||||
const contextAttempt = plainToInstance(UpdateInspectionVisitDto, {
|
||||
operationalAreaId: AREA_ID,
|
||||
scopeAssetId: AREA_ID,
|
||||
operatorCompanyId: COMPANY_ID,
|
||||
});
|
||||
const errors = await validate(contextAttempt);
|
||||
assert.equal(errors.some((error) => error.property === 'operationalAreaId'), true);
|
||||
assert.equal(errors.some((error) => error.property === 'scopeAssetId'), true);
|
||||
assert.equal(errors.some((error) => error.property === 'operatorCompanyId'), true);
|
||||
|
||||
const ordinaryUpdate = plainToInstance(UpdateInspectionVisitDto, {
|
||||
objective: 'Control preventivo programado',
|
||||
plannedStartAt: '2026-09-17T12:00:00.000Z',
|
||||
instructions: 'Coordinar ingreso con la Operadora.',
|
||||
});
|
||||
assert.deepEqual(await validate(ordinaryUpdate), []);
|
||||
});
|
||||
|
||||
test('asset and team DTOs reject duplicate references', async () => {
|
||||
const assets = Object.assign(new ReplaceInspectionVisitAssetsDto(), {
|
||||
assetIds: [AREA_ID, AREA_ID],
|
||||
|
||||
@@ -1,96 +1,124 @@
|
||||
# Modelo documental de inspecciones
|
||||
|
||||
Este documento fija el modelo funcional validado a partir del Informe Técnico
|
||||
Nº 124/2026, el acta manuscrita adjunta y la planilla de hallazgos entregada.
|
||||
Este documento fija el modelo funcional vigente para Inspecciones, Actas,
|
||||
Hallazgos e Informes. La estructura visual definitiva de los documentos todavía
|
||||
puede cambiar cuando Hidrocarburos entregue las plantillas oficiales; el contrato
|
||||
de datos, la trazabilidad y las reglas de inmutabilidad deben permanecer estables.
|
||||
|
||||
## Canales de operación
|
||||
|
||||
| Función | APK móvil | Dashboard web |
|
||||
|---|---:|---:|
|
||||
| Planificar visita, activos y equipo | Consulta | Administra |
|
||||
| Administrar activos y catálogo de hallazgos | Consulta | Administra |
|
||||
| Iniciar y ejecutar la visita | Inspector | No |
|
||||
| Crear o modificar el acta y sus hallazgos | Inspector | Sólo consulta |
|
||||
| Planificar Inspección, alcance y equipo | Consulta | Administra |
|
||||
| Administrar Inventarios y catálogo de Hallazgos | Consulta | Administra |
|
||||
| Iniciar y ejecutar la Inspección | Inspector | No |
|
||||
| Crear Actas y registrar Hallazgos de campo | Inspector | Sólo consulta |
|
||||
| Incorporar evidencia de campo y GPS | Inspector | Sólo consulta |
|
||||
| Identificar responsable, firmar y cerrar | Inspector | Sólo consulta |
|
||||
| Registrar respuesta empresarial, PDF y próximo control | Consulta | Administra |
|
||||
| Consultar acta, hallazgos e informe sincronizados | Sí | Sí |
|
||||
| Identificar responsable, firmar y sellar Acta | Inspector | Sólo consulta |
|
||||
| Preparar y revisar el INF | Consulta | Administra |
|
||||
| Registrar oficialización GEDO/IF y PDF oficial | Consulta | Administra |
|
||||
| Registrar respuesta empresarial y seguimientos | Consulta | Administra |
|
||||
| Consultar Actas, Hallazgos e Informes sincronizados | Sí | Sí |
|
||||
|
||||
La API aplica esta separación además de la interfaz: las escrituras operativas
|
||||
requieren autenticación bearer de la aplicación móvil y el rol `inspector`.
|
||||
Una sesión web no puede eludir la restricción llamando directamente al endpoint.
|
||||
La API aplica esta separación además de la interfaz. Las escrituras operativas de
|
||||
campo se realizan desde la aplicación móvil con las autorizaciones correspondientes;
|
||||
el dashboard administra planificación, consulta y circuito documental posterior.
|
||||
|
||||
## Cardinalidades
|
||||
## Cardinalidades vigentes
|
||||
|
||||
| Origen | Relación | Destino |
|
||||
|---|---:|---|
|
||||
| Inspección o visita | 1 a 1 | Acta de inspección |
|
||||
| Inspección o visita | 1 a muchos | Actas de inspección |
|
||||
| Acta | 1 a muchos | Hallazgos |
|
||||
| Hallazgo | muchos a 1 | Activo o equipo del Maestro |
|
||||
| Hallazgo | muchos a 1 | Ítem del catálogo configurable |
|
||||
| Hallazgo | 1 a muchos | Evidencias, principalmente fotografías |
|
||||
| Hallazgo | muchos a 1 | Elemento de Inventario |
|
||||
| Hallazgo | muchos a 1 | Ítem del catálogo configurable, o propuesta OTROS |
|
||||
| Hallazgo | 1 a muchos | Evidencias y seguimientos |
|
||||
| Acta | 1 a muchos | Firmas de inspectores |
|
||||
| Acta | 1 a 1 | Firma del responsable que atendió la visita |
|
||||
| Inspección o visita | 1 a 1 | Informe técnico |
|
||||
| Informe técnico | incorpora | Acta, hallazgos y evidencias congelados |
|
||||
| Acta | 0 o 1 | Firma/manifestación del responsable de empresa |
|
||||
| Acta sellada | 0 o 1 | Informe técnico (INF) |
|
||||
| Informe técnico | 1 a 1 | Acta fuente |
|
||||
| Informe técnico | incorpora | Acta, Hallazgos, Inventarios y evidencias congelados |
|
||||
|
||||
Una Inspección puede, por lo tanto, contener varias Actas y generar varios INF,
|
||||
pero cada INF conserva una única Acta fuente. No se mezcla el contenido de dos
|
||||
Actas dentro de un mismo Informe.
|
||||
|
||||
## Acta digital
|
||||
|
||||
El acta debe reunir como mínimo:
|
||||
El Acta debe poder reunir como mínimo:
|
||||
|
||||
- número anual oficial, fecha, hora y ubicación;
|
||||
- empresa, área, yacimiento o instalación inspeccionada;
|
||||
- objeto y resultado de la inspección;
|
||||
- todos los hallazgos de la visita y sus plazos de corrección;
|
||||
- número y año oficial del Acta;
|
||||
- Inspección vinculada, fecha y hora;
|
||||
- Departamento, Área, Yacimiento, Operadora y ubicación de la actuación;
|
||||
- objeto, alcance y descripción de lo actuado;
|
||||
- Instalaciones y Subinstalaciones inspeccionadas;
|
||||
- todos los Hallazgos del Acta, con descripción, Inventario afectado, base legal,
|
||||
reincidencia, gravedad y plazos que correspondan;
|
||||
- inspectores intervinientes;
|
||||
- identidad, DNI, cargo y correo del responsable de la empresa que recibió al
|
||||
equipo;
|
||||
- firmas manuscritas capturadas en pantalla de inspectores y responsable;
|
||||
- versión inmutable, hash, sello de tiempo y token de verificación.
|
||||
equipo, cuando corresponda;
|
||||
- firma de inspectores y manifestación/firma del responsable de empresa, incluida
|
||||
conformidad, disidencia, negativa o ausencia según el flujo aplicable;
|
||||
- versión inmutable, hash, sello de tiempo y mecanismo de verificación documental;
|
||||
- referencias a fotografías/evidencias cuando el formulario oficial determine que
|
||||
deben formar parte del documento.
|
||||
|
||||
Al finalizar la visita, el acta se cierra y ya no admite edición. Se genera el
|
||||
PDF verificable y se envía al correo del responsable de la empresa y a una
|
||||
dirección interna de Hidrocarburos definida por configuración. Cada intento y
|
||||
resultado de entrega debe quedar auditado.
|
||||
|
||||
Si se requiere corregir un acta cerrada, se emitirá una rectificativa vinculada
|
||||
sin reemplazar ni borrar el documento original.
|
||||
Al sellarse, el Acta queda inmutable. Los cambios posteriores pertenecen al
|
||||
seguimiento y no reescriben el contenido constatado. El sistema conserva la
|
||||
instantánea y hashes necesarios para que el PDF se pueda regenerar o sustituir su
|
||||
renderer sin alterar la evidencia fuente.
|
||||
|
||||
## Hallazgos
|
||||
|
||||
La planilla entregada contiene 170 modelos de hallazgo agrupados en 19
|
||||
categorías de equipos, con descripción, normativa y glosario. Se implementará
|
||||
como catálogo administrable, importable y versionado. No se copiarán esas
|
||||
opciones como constantes en la interfaz.
|
||||
El catálogo de Hallazgos es administrable, importable y versionado. Cada Hallazgo
|
||||
operativo conserva una instantánea de su descripción y base legal para que cambios
|
||||
posteriores del catálogo no modifiquen documentos ya emitidos.
|
||||
|
||||
Cada hallazgo operativo conservará una instantánea de su descripción y base
|
||||
legal para que posteriores cambios del catálogo no alteren documentos ya
|
||||
emitidos. También podrá registrar estado, observación específica, activo,
|
||||
ubicación/GPS, plazo y evidencias.
|
||||
Cada Hallazgo nace abierto. Se distinguen el plazo exigido, la respuesta y fecha
|
||||
comprometida por la empresa, la fecha de próximo control y las verificaciones
|
||||
posteriores. La respuesta empresarial no cierra por sí sola un Hallazgo: el cierre
|
||||
surge del flujo de verificación autorizado.
|
||||
|
||||
Cada hallazgo nace abierto. Se distinguen el plazo exigido, la respuesta y
|
||||
fecha comprometida por la empresa, y la fecha de próximo control fijada por el
|
||||
organismo. La respuesta empresarial no cierra el hallazgo: sólo una verificación
|
||||
posterior autorizada puede hacerlo.
|
||||
## Informe técnico (INF)
|
||||
|
||||
## Informe técnico
|
||||
El INF nace desde una Acta sellada y tiene numeración propia. Mientras está en
|
||||
preparación dispone de un Word editable para el desarrollo técnico; modificar ese
|
||||
Word o los campos narrativos no modifica el Acta ni sus Hallazgos fuente.
|
||||
|
||||
El informe se genera después del cierre del acta, con numeración anual global
|
||||
independiente. Siguiendo el modelo entregado, contempla:
|
||||
El contrato proyectado del Informe contempla:
|
||||
|
||||
- título, número, acta referenciada, empresa, área/yacimiento y autores;
|
||||
- objetivos;
|
||||
- antecedentes;
|
||||
- número/año del INF y Acta referenciada;
|
||||
- Inspección, Empresa, Departamento, Área, Yacimiento y autores;
|
||||
- objetivos y antecedentes;
|
||||
- marco legal;
|
||||
- resumen ejecutivo;
|
||||
- descripción de la inspección y de todos los hallazgos;
|
||||
- registro fotográfico;
|
||||
- conclusión;
|
||||
- acta digital completa como anexo final.
|
||||
- descripción y análisis técnico de la inspección;
|
||||
- Inventarios inspeccionados;
|
||||
- detalle de los Hallazgos, reincidencias, gravedad y plazos;
|
||||
- registro fotográfico/evidencias seleccionadas;
|
||||
- conclusiones y recomendaciones;
|
||||
- trazabilidad e integridad de la fuente;
|
||||
- Acta digital completa como anexo final.
|
||||
|
||||
El informe congela las versiones exactas del acta, hallazgos, activos,
|
||||
evidencias y normativa que incorpora.
|
||||
Cuando GEDO devuelve el identificador IF y su PDF oficial, ambos se registran de
|
||||
forma inmutable junto con la fecha de oficialización y el hash del archivo. La
|
||||
carga del IF/PDF oficial no se interpreta por sí sola como notificación a la
|
||||
empresa ni inicia plazos que dependan de una notificación posterior.
|
||||
|
||||
La solicitud de creación del informe corresponde al flujo del inspector en la
|
||||
APK después de cerrar la visita. El backend numera, compone y sella el PDF; el
|
||||
dashboard sólo lo consulta, descarga y administra su seguimiento documental.
|
||||
## Plantillas PDF provisionales
|
||||
|
||||
Hasta recibir los formularios oficiales, la implementación se divide en dos capas:
|
||||
|
||||
1. **Contrato de datos estable.** Define qué información debe estar disponible para
|
||||
Actas e Informes, de dónde proviene, qué versión se congela y qué hashes prueban
|
||||
su integridad.
|
||||
2. **Renderer reemplazable.** Encabezado, logos, tipografías, márgenes, cuadros,
|
||||
orden visual, QR y anexos podrán adaptarse al modelo institucional definitivo
|
||||
sin modificar el dominio ni volver a diseñar el circuito documental.
|
||||
|
||||
El dashboard muestra una sección **PDF preliminar · estructura proyectada** tanto
|
||||
en la ficha del Acta como en la del Informe. Esa sección no pretende reemplazar el
|
||||
formulario oficial: sirve para comprobar ahora que el sistema está capturando toda
|
||||
la información que después deberá volcarse al documento.
|
||||
|
||||
La especificación detallada se mantiene en `docs/PDF_PROVISIONAL_STRUCTURE.md`.
|
||||
|
||||
@@ -0,0 +1,184 @@
|
||||
# Estructura provisional de PDFs · PREVIEW-1
|
||||
|
||||
Estado: **provisional hasta recepción de formularios oficiales**.
|
||||
|
||||
El objetivo de este documento no es fijar todavía la estética institucional. Fija
|
||||
el conjunto de datos que DH Inspección debe ser capaz de colocar en los PDFs de
|
||||
Actas e Informes y separa ese contrato del renderer visual.
|
||||
|
||||
## Principio de implementación
|
||||
|
||||
El dominio documental no debe depender de coordenadas, cuadros o textos impresos
|
||||
de una plantilla determinada. Los datos se congelan primero en snapshots
|
||||
versionados; luego un renderer transforma esa fuente a PDF. Cuando llegue el
|
||||
formulario oficial se reemplaza o adapta el renderer, no la lógica de negocio.
|
||||
|
||||
Se consideran **estables**: identidad del documento, vínculos entre entidades,
|
||||
contenido constatado, Hallazgos, firmas/manifestaciones, fechas, versiones, hashes
|
||||
y trazabilidad. Se consideran **reemplazables**: logo, membrete, encabezado,
|
||||
footer, tipografía, colores, tamaños, posiciones, cantidad de columnas, QR y forma
|
||||
de los anexos.
|
||||
|
||||
## PDF de Acta
|
||||
|
||||
### 1. Cabecera institucional
|
||||
|
||||
Pendiente de modelo oficial. Debe reservar espacio para organismo, dependencia,
|
||||
logo/membrete, denominación del documento y numeración.
|
||||
|
||||
### 2. Identificación
|
||||
|
||||
- número y año del Acta;
|
||||
- código interno;
|
||||
- código de Inspección/visita;
|
||||
- fecha y hora de actuación;
|
||||
- estado documental y versión.
|
||||
|
||||
### 3. Contexto territorial y operativo
|
||||
|
||||
- Departamento;
|
||||
- Área;
|
||||
- Yacimiento;
|
||||
- Empresa/Operadora vigente;
|
||||
- ubicación/GPS cuando corresponda;
|
||||
- Instalación y Subinstalación relacionadas cuando el Acta tenga ese alcance.
|
||||
|
||||
### 4. Personas intervinientes
|
||||
|
||||
- Inspectores actuantes;
|
||||
- responsable de la empresa;
|
||||
- DNI/identificación;
|
||||
- cargo o función;
|
||||
- correo/dato de contacto que exija el formulario.
|
||||
|
||||
### 5. Objeto y descripción de lo actuado
|
||||
|
||||
- objeto o motivo;
|
||||
- resumen/constatación;
|
||||
- observaciones;
|
||||
- Inventarios inspeccionados con código, nombre, tipo y ruta jerárquica.
|
||||
|
||||
### 6. Hallazgos
|
||||
|
||||
Por cada Hallazgo:
|
||||
|
||||
- código;
|
||||
- Inventario asociado;
|
||||
- ítem de catálogo u origen OTROS;
|
||||
- título/denominación;
|
||||
- descripción constatada;
|
||||
- base legal congelada;
|
||||
- reincidencia y referencia al antecedente, si existe;
|
||||
- gravedad cuando aplique;
|
||||
- plazo y tipo de días cuando corresponda;
|
||||
- referencias a evidencia.
|
||||
|
||||
### 7. Firmas y manifestaciones
|
||||
|
||||
- firma de cada Inspector interviniente;
|
||||
- firma/manifestación del responsable de empresa;
|
||||
- conformidad o disidencia;
|
||||
- texto de disidencia;
|
||||
- negativa o ausencia con motivo cuando aplique;
|
||||
- fecha/hora de cada constancia.
|
||||
|
||||
### 8. Integridad
|
||||
|
||||
- hash del contenido bloqueado;
|
||||
- hash final del Acta sellada;
|
||||
- sello de tiempo;
|
||||
- versión del esquema;
|
||||
- espacio para token/QR de verificación si el modelo institucional lo utiliza.
|
||||
|
||||
### 9. Anexo de evidencias
|
||||
|
||||
El sistema debe estar preparado para incorporar fotografías/evidencias, pero su
|
||||
inclusión dentro del PDF principal queda pendiente de la plantilla oficial.
|
||||
|
||||
## Informe técnico · INF
|
||||
|
||||
Cada INF tiene **una sola Acta fuente**. Una Inspección puede contener múltiples
|
||||
Actas y, por lo tanto, múltiples INF independientes.
|
||||
|
||||
### 1. Cabecera e identificación
|
||||
|
||||
- número/año y código del INF;
|
||||
- Acta fuente;
|
||||
- Inspección;
|
||||
- fecha de generación;
|
||||
- autores/Inspector responsable;
|
||||
- Empresa/Operadora;
|
||||
- Departamento, Área y Yacimiento.
|
||||
|
||||
### 2. Objetivos
|
||||
|
||||
Texto editable durante la preparación, si la plantilla oficial lo requiere como
|
||||
campo separado.
|
||||
|
||||
### 3. Antecedentes
|
||||
|
||||
Antecedentes relevantes para comprender la inspección y el contexto técnico.
|
||||
|
||||
### 4. Marco legal
|
||||
|
||||
Normativa aplicable y bases legales congeladas con los Hallazgos del Acta fuente.
|
||||
|
||||
### 5. Resumen ejecutivo
|
||||
|
||||
Campo narrativo editable en estado de preparación.
|
||||
|
||||
### 6. Descripción y análisis técnico
|
||||
|
||||
Desarrollo técnico editable que no modifica el contenido del Acta ni de sus
|
||||
Hallazgos.
|
||||
|
||||
### 7. Inventarios inspeccionados
|
||||
|
||||
Tabla o listado con código, nombre, tipo y ruta territorial/técnica.
|
||||
|
||||
### 8. Hallazgos
|
||||
|
||||
Detalle de los Hallazgos del Acta fuente, con descripción, base legal,
|
||||
reincidencia, gravedad, plazos y vínculo con el Inventario.
|
||||
|
||||
### 9. Registro fotográfico
|
||||
|
||||
Fotografías/evidencias seleccionadas, identificando Hallazgo/Inventario, fecha y
|
||||
metadatos disponibles. La maquetación se definirá con el modelo oficial.
|
||||
|
||||
### 10. Conclusiones y recomendaciones
|
||||
|
||||
Bloque técnico editable durante la preparación del INF.
|
||||
|
||||
### 11. GEDO
|
||||
|
||||
Al oficializar:
|
||||
|
||||
- identificador IF;
|
||||
- fecha/hora de oficialización;
|
||||
- nombre del PDF oficial;
|
||||
- SHA-256 del PDF oficial.
|
||||
|
||||
La oficialización no equivale automáticamente a notificación a la empresa.
|
||||
|
||||
### 12. Integridad y anexo
|
||||
|
||||
- hash del snapshot fuente del INF;
|
||||
- hash del cierre del Acta;
|
||||
- versión de Acta utilizada;
|
||||
- Acta fuente completa como anexo final.
|
||||
|
||||
## Reemplazo por la plantilla oficial
|
||||
|
||||
Cuando se reciba el Acta o Informe oficial en PDF/Word se deberá:
|
||||
|
||||
1. inventariar cada campo del formulario;
|
||||
2. mapearlo contra este contrato;
|
||||
3. identificar únicamente los datos faltantes;
|
||||
4. añadir esos datos al dominio sólo si son información real y no mero diseño;
|
||||
5. construir el renderer definitivo;
|
||||
6. comparar visualmente una muestra contra el original;
|
||||
7. conservar el renderer PREVIEW-1 sólo para pruebas históricas si resultara útil.
|
||||
|
||||
No se deben alterar Actas ya selladas para acomodar una nueva plantilla. Los
|
||||
nuevos renderers deben poder representar snapshots históricos de forma trazable.
|
||||
@@ -0,0 +1,222 @@
|
||||
#!/usr/bin/env bash
|
||||
set -Eeuo pipefail
|
||||
|
||||
cleanup() {
|
||||
docker compose --env-file .env.example --profile tools down -v --remove-orphans >/dev/null 2>&1 || true
|
||||
}
|
||||
trap cleanup EXIT
|
||||
cleanup
|
||||
|
||||
docker compose --env-file .env.example up -d db
|
||||
|
||||
bootstrap_log="$(mktemp)"
|
||||
set +e
|
||||
docker compose --env-file .env.example --profile tools run --build --rm migrate 2>&1 | tee "$bootstrap_log"
|
||||
bootstrap_status=${PIPESTATUS[0]}
|
||||
set -e
|
||||
if [ "$bootstrap_status" -eq 0 ]; then
|
||||
echo 'ERROR: expected historical one-shot reset guard on clean database.' >&2
|
||||
exit 1
|
||||
fi
|
||||
grep -Fq 'Production reset aborted: expected exactly one username admin, found 0' "$bootstrap_log" || {
|
||||
echo 'ERROR: migration chain failed before the expected historical reset guard.' >&2
|
||||
exit 1
|
||||
}
|
||||
rm -f "$bootstrap_log"
|
||||
|
||||
docker compose --env-file .env.example exec -T db \
|
||||
psql -v ON_ERROR_STOP=1 -U dhv2_owner -d dhv2 <<'SQL'
|
||||
INSERT INTO typeorm_migrations ("timestamp", name)
|
||||
SELECT 1788652800000, 'ResetProductionOperationalData1788652800000'
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1 FROM typeorm_migrations
|
||||
WHERE name='ResetProductionOperationalData1788652800000'
|
||||
);
|
||||
SQL
|
||||
|
||||
docker compose --env-file .env.example --profile tools run --rm migrate
|
||||
|
||||
# Prove the presentation preload is a physical tree, not a flattened list.
|
||||
docker compose --env-file .env.example exec -T db \
|
||||
psql -v ON_ERROR_STOP=1 -U dhv2_owner -d dhv2 <<'SQL'
|
||||
DO $$
|
||||
DECLARE invalid_areas integer; invalid_yacimientos integer;
|
||||
BEGIN
|
||||
SELECT COUNT(*) INTO invalid_areas
|
||||
FROM assets area
|
||||
JOIN asset_types type ON type.id=area.asset_type_id
|
||||
LEFT JOIN assets department ON department.id=area.parent_id
|
||||
LEFT JOIN asset_types department_type ON department_type.id=department.asset_type_id
|
||||
WHERE lower(type.code)='area'
|
||||
AND (department.id IS NULL OR lower(department_type.code)<>'departamento');
|
||||
IF invalid_areas <> 0 THEN
|
||||
RAISE EXCEPTION 'Invalid Area→Departamento relations: %', invalid_areas;
|
||||
END IF;
|
||||
|
||||
SELECT COUNT(*) INTO invalid_yacimientos
|
||||
FROM assets yacimiento
|
||||
JOIN asset_types type ON type.id=yacimiento.asset_type_id
|
||||
LEFT JOIN assets area ON area.id=yacimiento.parent_id
|
||||
LEFT JOIN asset_types area_type ON area_type.id=area.asset_type_id
|
||||
WHERE lower(type.code)='yacimiento'
|
||||
AND (area.id IS NULL OR lower(area_type.code)<>'area'
|
||||
OR yacimiento.operational_area_id IS DISTINCT FROM area.id);
|
||||
IF invalid_yacimientos <> 0 THEN
|
||||
RAISE EXCEPTION 'Invalid Yacimiento→Area relations: %', invalid_yacimientos;
|
||||
END IF;
|
||||
END $$;
|
||||
SQL
|
||||
|
||||
export JWT_ACCESS_SECRET='CI_ACCESS_SECRET_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
|
||||
export REFRESH_TOKEN_PEPPER='CI_REFRESH_PEPPER_bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
|
||||
export SMTP_SETTINGS_MASTER_KEY=''
|
||||
docker compose --env-file .env.example build api
|
||||
|
||||
# Disposable CI identities. The real Inspector invariant requires an email.
|
||||
docker compose --env-file .env.example exec -T db \
|
||||
psql -v ON_ERROR_STOP=1 -U dhv2_owner -d dhv2 <<'SQL'
|
||||
INSERT INTO users(id,username,email,password_hash,first_name,last_name,status,must_change_password)
|
||||
VALUES
|
||||
('11111111-1111-4111-8111-111111111111','ci_planner','ci-planner@example.invalid','ci-unused','CI','Planner','ACTIVE',false),
|
||||
('22222222-2222-4222-8222-222222222222','ci_inspector','ci-inspector@example.invalid','ci-unused','CI','Inspector','ACTIVE',false);
|
||||
|
||||
INSERT INTO user_roles(user_id,role_id,assigned_by)
|
||||
SELECT '11111111-1111-4111-8111-111111111111'::uuid, role.id,
|
||||
'11111111-1111-4111-8111-111111111111'::uuid
|
||||
FROM roles role
|
||||
WHERE EXISTS (
|
||||
SELECT 1 FROM role_permissions rp JOIN permissions p ON p.id=rp.permission_id
|
||||
WHERE rp.role_id=role.id AND p.code='inspections.manage'
|
||||
)
|
||||
AND EXISTS (
|
||||
SELECT 1 FROM role_permissions rp JOIN permissions p ON p.id=rp.permission_id
|
||||
WHERE rp.role_id=role.id AND p.code='inspections.assign'
|
||||
)
|
||||
ORDER BY role.is_system DESC,role.code
|
||||
LIMIT 1;
|
||||
|
||||
INSERT INTO user_roles(user_id,role_id,assigned_by)
|
||||
SELECT '22222222-2222-4222-8222-222222222222'::uuid, role.id,
|
||||
'11111111-1111-4111-8111-111111111111'::uuid
|
||||
FROM roles role
|
||||
WHERE EXISTS (
|
||||
SELECT 1 FROM role_permissions rp JOIN permissions p ON p.id=rp.permission_id
|
||||
WHERE rp.role_id=role.id AND p.code='inspections.execute'
|
||||
)
|
||||
ORDER BY (lower(role.code)='inspector') DESC,role.is_system DESC,role.code
|
||||
LIMIT 1;
|
||||
|
||||
DO $$
|
||||
BEGIN
|
||||
IF NOT EXISTS (SELECT 1 FROM user_roles WHERE user_id='11111111-1111-4111-8111-111111111111'::uuid) THEN
|
||||
RAISE EXCEPTION 'CI planner role with manage+assign permissions not found';
|
||||
END IF;
|
||||
IF NOT EXISTS (SELECT 1 FROM user_roles WHERE user_id='22222222-2222-4222-8222-222222222222'::uuid) THEN
|
||||
RAISE EXCEPTION 'CI inspector role with execute permission not found';
|
||||
END IF;
|
||||
END $$;
|
||||
|
||||
INSERT INTO auth_sessions(
|
||||
id,user_id,refresh_token_hash,expires_at,last_used_at,revoked_at,replaced_by_session_id,ip,user_agent,device_label
|
||||
) VALUES (
|
||||
'33333333-3333-4333-8333-333333333333',
|
||||
'11111111-1111-4111-8111-111111111111','ci-unused',
|
||||
CURRENT_TIMESTAMP + INTERVAL '10 minutes',CURRENT_TIMESTAMP,NULL,NULL,NULL,'CI','inspection-planning-smoke'
|
||||
);
|
||||
SQL
|
||||
|
||||
docker compose --env-file .env.example up -d api
|
||||
for _ in $(seq 1 30); do
|
||||
curl -fsS http://127.0.0.1:3101/api/v3/health >/dev/null 2>&1 && break
|
||||
sleep 2
|
||||
done
|
||||
curl -fsS http://127.0.0.1:3101/api/v3/health >/dev/null
|
||||
|
||||
TOKEN="$(docker compose --env-file .env.example exec -T api node - <<'NODE'
|
||||
const jwt = require('jsonwebtoken');
|
||||
process.stdout.write(jwt.sign({
|
||||
sub:'11111111-1111-4111-8111-111111111111',
|
||||
sid:'33333333-3333-4333-8333-333333333333',
|
||||
username:'ci_planner',typ:'access'
|
||||
}, process.env.JWT_ACCESS_SECRET, {
|
||||
algorithm:'HS256',expiresIn:300,issuer:'dhv2-api',audience:'dhv2'
|
||||
}));
|
||||
NODE
|
||||
)"
|
||||
|
||||
CONTEXT="$(docker compose --env-file .env.example exec -T db \
|
||||
psql -At -F '|' -U dhv2_owner -d dhv2 -c "
|
||||
SELECT department.id,area.id,yacimiento.id,relation.company_id
|
||||
FROM assets department
|
||||
JOIN asset_types department_type ON department_type.id=department.asset_type_id
|
||||
JOIN assets area ON area.parent_id=department.id
|
||||
JOIN asset_types area_type ON area_type.id=area.asset_type_id
|
||||
JOIN assets yacimiento ON yacimiento.parent_id=area.id
|
||||
JOIN asset_types yacimiento_type ON yacimiento_type.id=yacimiento.asset_type_id
|
||||
JOIN area_company_relations relation ON relation.area_id=area.id
|
||||
AND relation.relation_role='OPERATOR' AND relation.valid_until IS NULL
|
||||
WHERE lower(department_type.code)='departamento'
|
||||
AND lower(area_type.code)='area'
|
||||
AND lower(yacimiento_type.code)='yacimiento'
|
||||
ORDER BY department.name,area.name,yacimiento.name
|
||||
LIMIT 1;
|
||||
")"
|
||||
IFS='|' read -r DEPARTMENT_ID AREA_ID YACIMIENTO_ID COMPANY_ID <<< "$CONTEXT"
|
||||
test -n "$DEPARTMENT_ID" && test -n "$AREA_ID" && test -n "$YACIMIENTO_ID" && test -n "$COMPANY_ID"
|
||||
|
||||
curl -fsS -H "Authorization: Bearer $TOKEN" \
|
||||
http://127.0.0.1:3101/api/v3/inspection-visits/planning-context/departments \
|
||||
>/tmp/dhv2-departments.json
|
||||
grep -Fq "$DEPARTMENT_ID" /tmp/dhv2-departments.json
|
||||
|
||||
curl -fsS -H "Authorization: Bearer $TOKEN" \
|
||||
"http://127.0.0.1:3101/api/v3/inspection-visits/planning-context/departments/$DEPARTMENT_ID/areas" \
|
||||
>/tmp/dhv2-areas.json
|
||||
grep -Fq "$AREA_ID" /tmp/dhv2-areas.json
|
||||
|
||||
curl -fsS -H "Authorization: Bearer $TOKEN" \
|
||||
"http://127.0.0.1:3101/api/v3/inspection-visits/planning-context/areas/$AREA_ID/yacimientos" \
|
||||
>/tmp/dhv2-yacimientos.json
|
||||
grep -Fq "$YACIMIENTO_ID" /tmp/dhv2-yacimientos.json
|
||||
|
||||
START_AT="$(date -u -d '+1 day' +'%Y-%m-%dT%H:%M:%S.000Z')"
|
||||
HTTP_CODE="$(curl -sS -o /tmp/dhv2-created.json -w '%{http_code}' \
|
||||
-X POST \
|
||||
-H "Authorization: Bearer $TOKEN" \
|
||||
-H 'Content-Type: application/json' \
|
||||
-d "{\"operationalAreaId\":\"$AREA_ID\",\"scopeAssetId\":\"$YACIMIENTO_ID\",\"operatorCompanyId\":\"$COMPANY_ID\",\"plannedStartAt\":\"$START_AT\",\"leadInspectorUserId\":\"22222222-2222-4222-8222-222222222222\"}" \
|
||||
http://127.0.0.1:3101/api/v3/inspection-visits)"
|
||||
if [ "$HTTP_CODE" != 201 ]; then
|
||||
echo "ERROR: real inspection create returned HTTP $HTTP_CODE" >&2
|
||||
cat /tmp/dhv2-created.json >&2
|
||||
docker compose --env-file .env.example logs --no-color api >&2 || true
|
||||
exit 1
|
||||
fi
|
||||
|
||||
VISIT_ID="$(python - <<'PY'
|
||||
import json
|
||||
with open('/tmp/dhv2-created.json',encoding='utf-8') as f:
|
||||
print(json.load(f)['id'])
|
||||
PY
|
||||
)"
|
||||
|
||||
VERIFY="$(docker compose --env-file .env.example exec -T db \
|
||||
psql -At -U dhv2_owner -d dhv2 -c "
|
||||
SELECT COUNT(*)
|
||||
FROM inspection_visits visit
|
||||
JOIN assets yacimiento ON yacimiento.id=visit.scope_asset_id
|
||||
JOIN asset_types yacimiento_type ON yacimiento_type.id=yacimiento.asset_type_id
|
||||
WHERE visit.id='$VISIT_ID'::uuid
|
||||
AND visit.operational_area_id='$AREA_ID'::uuid
|
||||
AND visit.scope_asset_id='$YACIMIENTO_ID'::uuid
|
||||
AND visit.operator_company_id='$COMPANY_ID'::uuid
|
||||
AND yacimiento.parent_id=visit.operational_area_id
|
||||
AND lower(yacimiento_type.code)='yacimiento';
|
||||
")"
|
||||
if [ "$VERIFY" != '1' ]; then
|
||||
echo 'ERROR: created Inspection did not preserve Area/Yacimiento hierarchy.' >&2
|
||||
cat /tmp/dhv2-created.json >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "F6.1 real inspection create smoke: OK ($VISIT_ID)"
|
||||
@@ -21,7 +21,8 @@ import { AssetTypesPage } from '../pages/AssetTypesPage';
|
||||
import { HistoryPage } from '../pages/HistoryPage';
|
||||
import { TemporalAssetsPage } from '../pages/TemporalAssetsPage';
|
||||
import { InspectionVisitsPage } from '../pages/InspectionVisitsPage';
|
||||
import { InspectionVisitEditorF4Page } from '../pages/InspectionVisitEditorF4Page';
|
||||
import { InspectionVisitCreateF61Page } from '../pages/InspectionVisitCreateF61Page';
|
||||
import { InspectionVisitDetailF61Page } from '../pages/InspectionVisitDetailF61Page';
|
||||
import { InspectionActEditorPage } from '../pages/InspectionActEditorPage';
|
||||
import { FindingCatalogPage } from '../pages/FindingCatalogPage';
|
||||
import { FindingDetailPage } from '../pages/FindingDetailPage';
|
||||
@@ -57,10 +58,10 @@ export function App() {
|
||||
<Route path="/planificacion" element={<Navigate to="/inspecciones?status=PLANNED" replace />} />
|
||||
<Route element={<PermissionRoute permission="inspections.read" />}>
|
||||
<Route path="/inspecciones" element={<InspectionVisitsPage />} />
|
||||
<Route path="/inspecciones/:id" element={<InspectionVisitEditorF4Page />} />
|
||||
<Route path="/inspecciones/:id" element={<InspectionVisitDetailF61Page />} />
|
||||
<Route path="/preparacion-campo" element={<FieldBriefingsPage />} />
|
||||
</Route>
|
||||
<Route element={<PermissionRoute permission="inspections.manage" />}><Route path="/inspecciones/nueva" element={<InspectionVisitEditorF4Page />} /></Route>
|
||||
<Route element={<PermissionRoute permission="inspections.manage" />}><Route path="/inspecciones/nueva" element={<InspectionVisitCreateF61Page />} /></Route>
|
||||
<Route element={<PermissionRoute permission="inspection_acts.read" />}>
|
||||
<Route path="/inspecciones/actas/:actId" element={<InspectionActEditorPage />} />
|
||||
<Route path="/inspecciones/actas/nueva" element={<InspectionActEditorPage />} />
|
||||
|
||||
@@ -0,0 +1,109 @@
|
||||
import { Icon } from './Icon';
|
||||
|
||||
type ProjectionKind = 'act' | 'report';
|
||||
|
||||
interface ProjectionSection {
|
||||
title: string;
|
||||
description: string;
|
||||
}
|
||||
|
||||
const actSections: ProjectionSection[] = [
|
||||
{
|
||||
title: 'Identificación y contexto',
|
||||
description: 'Número y año de Acta, Inspección vinculada, fecha y hora, Departamento, Área, Yacimiento, Operadora y ubicación de la actuación.',
|
||||
},
|
||||
{
|
||||
title: 'Intervinientes',
|
||||
description: 'Inspectores actuantes y responsable de la empresa: nombre, DNI, cargo, correo y demás datos de identificación que exija el modelo oficial.',
|
||||
},
|
||||
{
|
||||
title: 'Alcance y constatación',
|
||||
description: 'Objeto de la actuación, descripción de lo actuado, observaciones e Inventarios inspeccionados con su ruta Instalación / Subinstalación.',
|
||||
},
|
||||
{
|
||||
title: 'Hallazgos',
|
||||
description: 'Código, Inventario afectado, descripción, base legal, reincidencia, gravedad y plazos aplicables, conservando la instantánea emitida en campo.',
|
||||
},
|
||||
{
|
||||
title: 'Firmas y manifestaciones',
|
||||
description: 'Firmas de inspectores y responsable de empresa, conformidad o disidencia, manifestación textual, negativa/ausencia si correspondiera y marcas de tiempo.',
|
||||
},
|
||||
{
|
||||
title: 'Integridad y verificación',
|
||||
description: 'Versión sellada, hash SHA-256, sello de tiempo y espacio reservado para token o QR de verificación documental.',
|
||||
},
|
||||
{
|
||||
title: 'Anexos',
|
||||
description: 'Registro fotográfico y evidencias sólo si el formulario oficial exige incorporarlos al Acta; el modelo queda preparado para hacerlo sin alterar el dato fuente.',
|
||||
},
|
||||
];
|
||||
|
||||
const reportSections: ProjectionSection[] = [
|
||||
{
|
||||
title: 'Identificación y contexto',
|
||||
description: 'Número y año del INF, Acta fuente, Inspección, Empresa, Departamento, Área, Yacimiento, fechas y autores/intervinientes.',
|
||||
},
|
||||
{
|
||||
title: 'Objetivos y antecedentes',
|
||||
description: 'Motivo de la inspección, antecedentes relevantes y alcance técnico del Informe.',
|
||||
},
|
||||
{
|
||||
title: 'Marco legal',
|
||||
description: 'Normativa y bases legales aplicables, incluyendo las referencias congeladas de los Hallazgos del Acta fuente.',
|
||||
},
|
||||
{
|
||||
title: 'Resumen ejecutivo y desarrollo técnico',
|
||||
description: 'Resumen ejecutivo, descripción de la inspección, análisis técnico y consideraciones editables durante la preparación del INF.',
|
||||
},
|
||||
{
|
||||
title: 'Inventarios y Hallazgos',
|
||||
description: 'Inventarios inspeccionados y detalle de Hallazgos con descripción, reincidencia, gravedad, plazos y trazabilidad con el Acta.',
|
||||
},
|
||||
{
|
||||
title: 'Registro fotográfico',
|
||||
description: 'Fotografías y evidencias seleccionadas, con referencia al Inventario/Hallazgo, fecha y metadatos disponibles.',
|
||||
},
|
||||
{
|
||||
title: 'Conclusiones',
|
||||
description: 'Conclusión técnica, recomendaciones y texto final sujeto a revisión antes de la oficialización.',
|
||||
},
|
||||
{
|
||||
title: 'GEDO e integridad',
|
||||
description: 'Identificador IF, fecha de oficialización, hash del PDF oficial y hash de la instantánea congelada que originó el Informe.',
|
||||
},
|
||||
{
|
||||
title: 'Anexo final',
|
||||
description: 'Acta fuente completa e inmutable como anexo del Informe, manteniendo la relación exacta INF → Acta.',
|
||||
},
|
||||
];
|
||||
|
||||
export function DocumentPdfProjection({ kind }: { kind: ProjectionKind }) {
|
||||
const isAct = kind === 'act';
|
||||
const sections = isAct ? actSections : reportSections;
|
||||
|
||||
return <section className="panel document-pdf-projection">
|
||||
<div className="panel-heading">
|
||||
<div>
|
||||
<span className="eyebrow">PDF PRELIMINAR · ESTRUCTURA PROYECTADA</span>
|
||||
<h2>{isAct ? 'Contenido previsto del Acta' : 'Contenido previsto del Informe'}</h2>
|
||||
<p className="section-copy">El diseño institucional definitivo todavía no fue recibido. Esta vista fija qué información debe poder alimentar el documento, sin comprometer encabezados, tipografías, logos ni distribución final.</p>
|
||||
</div>
|
||||
<span className="status-badge pending">Plantilla oficial pendiente</span>
|
||||
</div>
|
||||
|
||||
<div className="temporal-notice">
|
||||
<Icon name="clipboard" />
|
||||
<p><strong>Contrato de datos estable, renderer reemplazable.</strong> Cuando llegue el PDF/Word oficial se adapta la composición visual sobre estos mismos datos, sin rehacer el circuito de Inspecciones, Actas, Hallazgos ni trazabilidad.</p>
|
||||
</div>
|
||||
|
||||
<div className="dossier-link-list">
|
||||
{sections.map((section, index) => <div key={section.title}>
|
||||
<div>
|
||||
<strong>{index + 1}. {section.title}</strong>
|
||||
<small>{section.description}</small>
|
||||
</div>
|
||||
<span>Previsto</span>
|
||||
</div>)}
|
||||
</div>
|
||||
</section>;
|
||||
}
|
||||
@@ -10,31 +10,18 @@ interface OperationalContextValue {
|
||||
clearContext: () => void;
|
||||
}
|
||||
|
||||
const STORAGE_KEY = 'dhv2.operational-context';
|
||||
const LEGACY_STORAGE_KEY = 'dhv2.operational-context';
|
||||
const OperationalContext = createContext<OperationalContextValue | null>(null);
|
||||
|
||||
function readStoredContext(): { areaId: string; companyId: string } {
|
||||
try {
|
||||
const raw = window.localStorage.getItem(STORAGE_KEY);
|
||||
if (!raw) return { areaId: '', companyId: '' };
|
||||
const parsed = JSON.parse(raw) as { areaId?: unknown; companyId?: unknown };
|
||||
return {
|
||||
areaId: typeof parsed.areaId === 'string' ? parsed.areaId : '',
|
||||
companyId: typeof parsed.companyId === 'string' ? parsed.companyId : '',
|
||||
};
|
||||
} catch {
|
||||
return { areaId: '', companyId: '' };
|
||||
}
|
||||
}
|
||||
|
||||
export function OperationalContextProvider({ children }: PropsWithChildren) {
|
||||
const initial = useMemo(readStoredContext, []);
|
||||
const [areaId, setAreaState] = useState(initial.areaId);
|
||||
const [companyId, setCompanyState] = useState(initial.companyId);
|
||||
const [areaId, setAreaState] = useState('');
|
||||
const [companyId, setCompanyState] = useState('');
|
||||
|
||||
useEffect(() => {
|
||||
window.localStorage.setItem(STORAGE_KEY, JSON.stringify({ areaId, companyId }));
|
||||
}, [areaId, companyId]);
|
||||
// F6.2 retiró la barra global Área/Operadora. Un contexto persistido sin
|
||||
// controles visibles podía seguir filtrando pantallas de forma inesperada.
|
||||
window.localStorage.removeItem(LEGACY_STORAGE_KEY);
|
||||
}, []);
|
||||
|
||||
const value = useMemo<OperationalContextValue>(() => ({
|
||||
areaId,
|
||||
|
||||
@@ -4,7 +4,7 @@ import { useAuth } from '../../auth/AuthContext';
|
||||
import { Alert, EmptyState, LoadingBlock, errorMessage } from '../../components/Feedback';
|
||||
import { Icon } from '../../components/Icon';
|
||||
import { getAssetLineage } from '../../lib/api';
|
||||
import type { AssetLineageItem } from '../../lib/api';
|
||||
import type { AssetLineageItem, AssetType } from '../../lib/api';
|
||||
import {
|
||||
listInventoryCompanies,
|
||||
listInventoryDepartments,
|
||||
@@ -18,16 +18,61 @@ import type {
|
||||
} from '../../lib/inventoryBrowserApi';
|
||||
import { assetOperationalStatusLabel, assetStatusClass, assetStatusLabel } from './assetPresentation';
|
||||
|
||||
const structuredInventorySections = [
|
||||
{
|
||||
code: 'empresa',
|
||||
label: 'Empresas',
|
||||
description: 'Maestro de empresas operadoras. Se vinculan a una o más Áreas sin formar parte del árbol territorial.',
|
||||
icon: 'users' as const,
|
||||
},
|
||||
{
|
||||
code: 'departamento',
|
||||
label: 'Departamentos',
|
||||
description: 'Primer nivel territorial. Desde cada Departamento se accede a sus Áreas.',
|
||||
icon: 'map' as const,
|
||||
},
|
||||
{
|
||||
code: 'area',
|
||||
label: 'Áreas',
|
||||
description: 'Cada Área pertenece a un Departamento y puede tener una o más Empresas operadoras vinculadas.',
|
||||
icon: 'map' as const,
|
||||
},
|
||||
{
|
||||
code: 'yacimiento',
|
||||
label: 'Yacimientos',
|
||||
description: 'Nivel operativo dentro de un Área. Organiza las Instalaciones que pertenecen a ese Yacimiento.',
|
||||
icon: 'map' as const,
|
||||
},
|
||||
{
|
||||
code: 'instalacion',
|
||||
label: 'Instalaciones',
|
||||
description: 'Elementos técnicos ubicados dentro de un Yacimiento y clasificados por su familia de Inventario.',
|
||||
icon: 'layers' as const,
|
||||
},
|
||||
{
|
||||
code: 'subinstalacion',
|
||||
label: 'Subinstalaciones',
|
||||
description: 'Último nivel estructural. Dependen de una Instalación y conservan su clasificación técnica.',
|
||||
icon: 'layers' as const,
|
||||
},
|
||||
] as const;
|
||||
|
||||
function navigationHref(base: URLSearchParams, parentId?: string) {
|
||||
const params = new URLSearchParams(base);
|
||||
params.delete('view');
|
||||
params.delete('page');
|
||||
params.delete('section');
|
||||
params.delete('companyId');
|
||||
params.delete('typeId');
|
||||
parentId ? params.set('parentId', parentId) : params.delete('parentId');
|
||||
return `/inventarios${params.size ? `?${params}` : ''}`;
|
||||
}
|
||||
|
||||
function inventoryTypeForSection(types: AssetType[], code: string) {
|
||||
if (code === 'empresa') return types.find((type) => type.operationalRole === 'COMPANY') ?? null;
|
||||
return types.find((type) => type.code.toLowerCase() === code) ?? null;
|
||||
}
|
||||
|
||||
function DepartmentCard({ department, href }: { department: InventoryBrowserDepartment; href: string }) {
|
||||
return <Link className="asset-browser-item" to={href}>
|
||||
<span className="asset-browser-item-icon"><Icon name="map" size={17} /></span>
|
||||
@@ -80,7 +125,7 @@ function nextLevelLabel(typeCode: string | undefined) {
|
||||
}
|
||||
}
|
||||
|
||||
export function AssetHierarchyView({ filters }: { filters: InventoryQuery }) {
|
||||
export function AssetHierarchyView({ filters, types }: { filters: InventoryQuery; types: AssetType[] }) {
|
||||
const { hasPermission } = useAuth();
|
||||
const canCreate = hasPermission('assets.create');
|
||||
const [searchParams] = useSearchParams();
|
||||
@@ -123,24 +168,48 @@ export function AssetHierarchyView({ filters }: { filters: InventoryQuery }) {
|
||||
return <div className="asset-browser-panel">
|
||||
{error && <Alert>{error}</Alert>}
|
||||
<div className="asset-browser-section-heading">
|
||||
<div><span className="eyebrow">INVENTARIO COMPLETO</span><h2>Departamentos</h2><p>Entrá por Departamento y navegá Área → Yacimiento → Instalación → Subinstalación hasta llegar a su clasificación y Hallazgos asociados.</p></div>
|
||||
<div>
|
||||
<span className="eyebrow">INVENTARIOS ESTRUCTURADOS</span>
|
||||
<h2>Elegí qué querés administrar</h2>
|
||||
<p>La estructura queda fija y fácil de leer: Empresas como maestro de operadoras y, por separado, Departamento → Área → Yacimiento → Instalación → Subinstalación.</p>
|
||||
</div>
|
||||
<div className="asset-browser-current-actions"><span className="count-pill">{departments.length} Departamentos</span><span className="count-pill">{companies.length} Empresas</span></div>
|
||||
</div>
|
||||
{departments.length === 0
|
||||
? <EmptyState title="Todavía no hay Departamentos" text="Creá el primer registro para comenzar a construir el Inventario manualmente." />
|
||||
: <div className="asset-browser-list">{departments.map((department) => <DepartmentCard key={department.id} department={department} href={navigationHref(searchParams, department.id)} />)}</div>}
|
||||
|
||||
<div className="asset-browser-levels" aria-label="Estructura de Inventarios">
|
||||
<div className="asset-browser-list" aria-label="Secciones estructuradas de Inventarios">
|
||||
{structuredInventorySections.map((section, index) => {
|
||||
const assetType = inventoryTypeForSection(types, section.code);
|
||||
const content = <>
|
||||
<span className="asset-browser-item-icon"><Icon name={section.icon} size={17} /></span>
|
||||
<span className="asset-browser-item-main">
|
||||
<strong>{section.label}</strong>
|
||||
<small>{section.description}</small>
|
||||
</span>
|
||||
<span className="asset-browser-item-status"><small>{section.code === 'empresa' ? 'Maestro independiente' : `Nivel ${index}`}</small></span>
|
||||
{assetType && <Icon name="chevron" size={16} />}
|
||||
</>;
|
||||
return assetType
|
||||
? <Link key={section.code} className="asset-browser-item" to={`/inventarios?view=list&typeId=${assetType.id}`}>{content}</Link>
|
||||
: <div key={section.code} className="asset-browser-item" aria-disabled="true">{content}</div>;
|
||||
})}
|
||||
</div>
|
||||
|
||||
<div className="asset-browser-levels" aria-label="Jerarquía territorial de Inventarios">
|
||||
<div><span>1</span><strong>Departamento</strong><small>raíz territorial</small></div><i>›</i>
|
||||
<div><span>2</span><strong>Área</strong><small>dentro del Departamento</small></div><i>›</i>
|
||||
<div><span>2</span><strong>Área</strong><small>operadoras vinculadas</small></div><i>›</i>
|
||||
<div><span>3</span><strong>Yacimiento</strong><small>dentro del Área</small></div><i>›</i>
|
||||
<div><span>4</span><strong>Instalación</strong><small>clasificación técnica</small></div><i>›</i>
|
||||
<div><span>5</span><strong>Subinstalación</strong><small>clasificación técnica</small></div>
|
||||
</div>
|
||||
|
||||
<section className="asset-browser-group" style={{ marginTop: 20 }}>
|
||||
<div className="asset-browser-group-heading"><div><h3>Empresas</h3><p>Maestro independiente. La Empresa se vincula al Área como operadora sin alterar la estructura física.</p></div><span>{companies.length}</span></div>
|
||||
{companies.length === 0 ? <div className="inline-empty">Todavía no hay Empresas cargadas.</div> : <div className="asset-browser-list">{companies.map((company) => <CompanyCard key={company.id} company={company} />)}</div>}
|
||||
<div className="asset-browser-group-heading">
|
||||
<div><h3>Recorrido por territorio</h3><p>También podés navegar como árbol: entrá por un Departamento y descendé hasta la Instalación o Subinstalación concreta.</p></div>
|
||||
<span>{departments.length}</span>
|
||||
</div>
|
||||
{departments.length === 0
|
||||
? <EmptyState title="Todavía no hay Departamentos" text="Creá el primer registro para comenzar a construir el Inventario manualmente." />
|
||||
: <div className="asset-browser-list">{departments.map((department) => <DepartmentCard key={department.id} department={department} href={navigationHref(searchParams, department.id)} />)}</div>}
|
||||
</section>
|
||||
</div>;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
export interface InspectionPreventiveCandidate {
|
||||
id: string;
|
||||
code: string;
|
||||
name: string;
|
||||
typeName: string;
|
||||
}
|
||||
|
||||
interface PreventiveCandidateResponse {
|
||||
data: InspectionPreventiveCandidate[];
|
||||
}
|
||||
|
||||
export async function listInspectionPreventiveCandidates(
|
||||
visitId: string,
|
||||
search = '',
|
||||
): Promise<InspectionPreventiveCandidate[]> {
|
||||
const query = new URLSearchParams();
|
||||
const term = search.trim();
|
||||
if (term) query.set('search', term);
|
||||
|
||||
const response = await fetch(
|
||||
`/api/v3/inspection-visits/${visitId}/preventive-candidates${query.size ? `?${query}` : ''}`,
|
||||
{
|
||||
method: 'GET',
|
||||
credentials: 'same-origin',
|
||||
headers: { Accept: 'application/json' },
|
||||
},
|
||||
);
|
||||
|
||||
if (!response.ok) {
|
||||
let message = 'No se pudo cargar el Inventario disponible para esta Inspección';
|
||||
try {
|
||||
const payload = await response.json() as { message?: string | string[] };
|
||||
if (Array.isArray(payload.message)) message = payload.message.join('. ');
|
||||
else if (payload.message) message = payload.message;
|
||||
} catch {
|
||||
// Conserva el mensaje funcional cuando la respuesta no sea JSON.
|
||||
}
|
||||
throw new Error(message);
|
||||
}
|
||||
|
||||
const payload = await response.json() as PreventiveCandidateResponse;
|
||||
return payload.data ?? [];
|
||||
}
|
||||
@@ -3,7 +3,6 @@ import { NavLink, Outlet, useNavigate } from 'react-router';
|
||||
import { useAuth } from '../auth/AuthContext';
|
||||
import { APP_PHASE, APP_VERSION } from '../config/version';
|
||||
import { Icon } from '../components/Icon';
|
||||
import { OperationalContextBar } from '../components/OperationalContextBar';
|
||||
import type { IconName } from '../components/Icon';
|
||||
|
||||
interface NavItem {
|
||||
@@ -16,7 +15,6 @@ interface NavItem {
|
||||
const operational: NavItem[] = [
|
||||
{ to: '/', label: 'Inicio', icon: 'home', permission: 'dashboard.read' },
|
||||
{ to: '/inspecciones', label: 'Inspecciones', icon: 'clipboard', permission: 'inspections.read' },
|
||||
{ to: '/preparacion-campo', label: 'Preparación de campo', icon: 'clipboard', permission: 'inspections.read' },
|
||||
];
|
||||
|
||||
const followUp: NavItem[] = [
|
||||
@@ -119,7 +117,6 @@ export function AppLayout() {
|
||||
<strong>DH Inspección</strong>
|
||||
<span className="mobile-version">v{APP_VERSION}</span>
|
||||
</header>
|
||||
<OperationalContextBar />
|
||||
<main className="content"><Outlet /></main>
|
||||
<footer className="app-footer" aria-label="Versión de la aplicación">
|
||||
<span>DH Inspección V2</span><span>·</span><strong>v{APP_VERSION}</strong><span>·</span><span>{APP_PHASE}</span>
|
||||
|
||||
@@ -33,6 +33,40 @@ const quickViews = [
|
||||
{ key: 'out', label: 'Fuera de servicio' },
|
||||
] as const;
|
||||
|
||||
const structuredTypeCopy: Record<string, { title: string; description: string }> = {
|
||||
departamento: {
|
||||
title: 'Departamentos',
|
||||
description: 'Raíz territorial del Inventario. Cada Departamento contiene sus Áreas.',
|
||||
},
|
||||
area: {
|
||||
title: 'Áreas',
|
||||
description: 'Áreas dentro de un Departamento, con sus Empresas operadoras vinculadas.',
|
||||
},
|
||||
yacimiento: {
|
||||
title: 'Yacimientos',
|
||||
description: 'Yacimientos pertenecientes a un Área y utilizados para organizar sus Instalaciones.',
|
||||
},
|
||||
instalacion: {
|
||||
title: 'Instalaciones',
|
||||
description: 'Instalaciones dentro de un Yacimiento, con clasificación técnica y contexto operativo.',
|
||||
},
|
||||
subinstalacion: {
|
||||
title: 'Subinstalaciones',
|
||||
description: 'Subinstalaciones dependientes de una Instalación, último nivel de la estructura.',
|
||||
},
|
||||
};
|
||||
|
||||
function structuredPresentation(type: AssetType | undefined) {
|
||||
if (!type) return null;
|
||||
if (type.operationalRole === 'COMPANY') {
|
||||
return {
|
||||
title: 'Empresas',
|
||||
description: 'Maestro independiente de Empresas operadoras. Se vinculan a una o más Áreas.',
|
||||
};
|
||||
}
|
||||
return structuredTypeCopy[type.code.toLowerCase()] ?? null;
|
||||
}
|
||||
|
||||
export function AssetsPage() {
|
||||
const [urlParams, setUrlParams] = useSearchParams();
|
||||
const operationalContext = useOperationalContext();
|
||||
@@ -58,6 +92,8 @@ export function AssetsPage() {
|
||||
const needsValidation = quick === 'validation' ? true : undefined;
|
||||
const hasGeometry = quick === 'location' ? false : undefined;
|
||||
const effectiveOperationalStatus = quick === 'out' ? 'OUT_OF_SERVICE' as AssetOperationalStatus : operationalStatus;
|
||||
const selectedType = types.find((type) => type.id === typeId);
|
||||
const selectedPresentation = structuredPresentation(selectedType);
|
||||
|
||||
useEffect(() => {
|
||||
listAssetTypes().then((data) => setTypes(data.filter((type) =>
|
||||
@@ -102,15 +138,22 @@ export function AssetsPage() {
|
||||
value > 1 ? next.set('page', String(value)) : next.delete('page'); setUrlParams(next);
|
||||
};
|
||||
const advancedActive = Boolean(typeId || status || rawOperationalStatus);
|
||||
const sectionTitle = view === 'list' && selectedPresentation ? selectedPresentation.title : 'Inventarios';
|
||||
const sectionDescription = view === 'list' && selectedPresentation
|
||||
? selectedPresentation.description
|
||||
: 'Empresas y estructura territorial: Departamento → Área → Yacimiento → Instalación → Subinstalación.';
|
||||
|
||||
return <section>
|
||||
<div className="page-heading asset-center-heading">
|
||||
<div>
|
||||
<span className="eyebrow">INVENTARIOS</span>
|
||||
<h1>Inventarios</h1>
|
||||
<p>Todos los registros: Departamento → Área → Yacimiento → Instalación → Subinstalación, más el maestro independiente de Empresas.</p>
|
||||
<span className="eyebrow">{selectedPresentation && view === 'list' ? 'INVENTARIOS · SECCIÓN' : 'INVENTARIOS'}</span>
|
||||
<h1>{sectionTitle}</h1>
|
||||
<p>{sectionDescription}</p>
|
||||
</div>
|
||||
<div style={{ display: 'flex', gap: 8, flexWrap: 'wrap' }}>
|
||||
{selectedPresentation && view === 'list' && <Link className="button secondary" to="/inventarios"><Icon name="layers" />Ver estructura</Link>}
|
||||
<PermissionGate permission="assets.create"><Link className="button primary" to="/inventarios/nuevo"><Icon name="plus" />Nuevo registro</Link></PermissionGate>
|
||||
</div>
|
||||
<PermissionGate permission="assets.create"><Link className="button primary" to="/inventarios/nuevo"><Icon name="plus" />Nuevo registro</Link></PermissionGate>
|
||||
</div>
|
||||
|
||||
<AssetCenterTabs active={view === 'hierarchy' ? 'navigate' : 'list'} />
|
||||
@@ -126,7 +169,7 @@ export function AssetsPage() {
|
||||
{view === 'list' && <button type="button" className={advancedOpen || advancedActive ? 'advanced active' : 'advanced'} onClick={() => setAdvancedOpen((current) => !current)}>Más filtros</button>}
|
||||
</div>
|
||||
{view === 'list' && (advancedOpen || advancedActive) && <div className="advanced-filter-panel">
|
||||
<label className="field compact-field"><span>Nivel</span><SearchableSelect value={typeId} onChange={(event) => update({ typeId: event.target.value || null })}><option value="">Todos los niveles</option>{types.map((type) => <option key={type.id} value={type.id}>{type.name}</option>)}</SearchableSelect></label>
|
||||
<label className="field compact-field"><span>Sección</span><SearchableSelect value={typeId} onChange={(event) => update({ typeId: event.target.value || null })}><option value="">Todas las secciones</option>{types.map((type) => <option key={type.id} value={type.id}>{type.operationalRole === 'COMPANY' ? 'Empresas' : structuredTypeCopy[type.code.toLowerCase()]?.title ?? type.name}</option>)}</SearchableSelect></label>
|
||||
<label className="field compact-field"><span>Estado del dato</span><SearchableSelect value={status} onChange={(event) => update({ status: event.target.value || null })}><option value="">Todos</option>{ASSET_STATUSES.map((item) => <option key={item.value} value={item.value}>{item.label}</option>)}</SearchableSelect></label>
|
||||
<label className="field compact-field"><span>Estado operativo</span><SearchableSelect value={rawOperationalStatus} onChange={(event) => update({ operationalStatus: event.target.value || null, quick: quick === 'out' ? null : quick === 'all' ? null : quick })}><option value="">Todos</option>{ASSET_OPERATIONAL_STATUSES.map((item) => <option key={item.value} value={item.value}>{item.label}</option>)}</SearchableSelect></label>
|
||||
<button type="button" className="button text filter-clear" onClick={clearFilters}>Limpiar filtros</button>
|
||||
@@ -135,14 +178,14 @@ export function AssetsPage() {
|
||||
|
||||
{error && <Alert>{error}</Alert>}
|
||||
{view === 'hierarchy'
|
||||
? <AssetHierarchyView filters={filters} />
|
||||
? <AssetHierarchyView filters={filters} types={types} />
|
||||
: loading
|
||||
? <LoadingBlock label="Cargando Inventarios…" />
|
||||
: assets.length === 0
|
||||
? <EmptyState title="Todavía no hay registros" text="La base está lista para comenzar la carga manual desde Departamento." />
|
||||
? <EmptyState title="Todavía no hay registros" text={selectedPresentation ? `No hay registros cargados en ${selectedPresentation.title}.` : 'La base está lista para comenzar la carga manual desde Departamento.'} />
|
||||
: <div className="table-panel compact-assets-table">
|
||||
<div className="table-summary"><strong>{meta.total} registro{meta.total === 1 ? '' : 's'}</strong><span>Página {meta.page} de {Math.max(meta.totalPages, 1)}</span></div>
|
||||
<div className="table-scroll"><table><thead><tr><th>Registro</th><th>Nivel</th><th>Ubicación / Operadora</th><th>Estado</th><th>Actualizado</th><th aria-label="Acciones" /></tr></thead><tbody>
|
||||
<div className="table-scroll"><table><thead><tr><th>Registro</th><th>Sección</th><th>Ubicación / Operadora</th><th>Estado</th><th>Actualizado</th><th aria-label="Acciones" /></tr></thead><tbody>
|
||||
{assets.map((asset) => <tr key={asset.id}>
|
||||
<td><div className="asset-cell"><span className="asset-symbol"><Icon name="layers" size={16} /></span><div><Link to={`/inventarios/${asset.id}`} className="table-primary">{asset.name}</Link><small>{asset.code}{asset.parent ? ` · en ${asset.parent.name}` : ''}</small></div></div></td>
|
||||
<td><span className="tag">{asset.type.name}</span></td>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useEffect, useMemo, useState } from 'react';
|
||||
import { Link } from 'react-router';
|
||||
import { Link, useSearchParams } from 'react-router';
|
||||
import { SearchableSelect } from '../components/SearchableSelect';
|
||||
import { Alert, EmptyState, LoadingBlock } from '../components/Feedback';
|
||||
import { formatDate, formatDateOnly } from '../lib/format';
|
||||
@@ -17,6 +17,7 @@ interface VisitOption {
|
||||
code: string;
|
||||
status: string;
|
||||
plannedStartAt: string | null;
|
||||
scopeAsset?: { name: string; typeName?: string } | null;
|
||||
operationalArea: { name: string } | null;
|
||||
operatorCompany: { name: string } | null;
|
||||
}
|
||||
@@ -116,8 +117,10 @@ function findingAction(finding: BriefingFinding, act: BriefingAct, plannedOn: st
|
||||
}
|
||||
|
||||
export function FieldBriefingsPage() {
|
||||
const [searchParams] = useSearchParams();
|
||||
const requestedInspectionId = searchParams.get('inspectionId') ?? '';
|
||||
const [visits, setVisits] = useState<VisitOption[]>([]);
|
||||
const [visitId, setVisitId] = useState('');
|
||||
const [visitId, setVisitId] = useState(requestedInspectionId);
|
||||
const [briefing, setBriefing] = useState<FieldBriefing | null>(null);
|
||||
const [loadingVisits, setLoadingVisits] = useState(true);
|
||||
const [loading, setLoading] = useState(false);
|
||||
@@ -132,12 +135,15 @@ export function FieldBriefingsPage() {
|
||||
const all = [...planned.data, ...drafts.data]
|
||||
.sort((a, b) => String(a.plannedStartAt ?? '').localeCompare(String(b.plannedStartAt ?? '')));
|
||||
setVisits(all);
|
||||
const onlyVisit = all[0];
|
||||
if (all.length === 1 && onlyVisit) setVisitId(onlyVisit.id);
|
||||
if (requestedInspectionId && all.some((visit) => visit.id === requestedInspectionId)) {
|
||||
setVisitId(requestedInspectionId);
|
||||
} else if (all.length === 1 && all[0]) {
|
||||
setVisitId(all[0].id);
|
||||
}
|
||||
}).catch((cause) => {
|
||||
setError(cause instanceof Error ? cause.message : String(cause));
|
||||
}).finally(() => setLoadingVisits(false));
|
||||
}, []);
|
||||
}, [requestedInspectionId]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!visitId) {
|
||||
@@ -158,11 +164,12 @@ export function FieldBriefingsPage() {
|
||||
);
|
||||
|
||||
return <section className="field-briefing-page">
|
||||
<div className="breadcrumb"><Link to="/inspecciones">Inspecciones</Link><span>/</span><span>Preparación para campo</span></div>
|
||||
<div className="page-heading">
|
||||
<div>
|
||||
<span className="eyebrow">ANTES DE SALIR A CAMPO</span>
|
||||
<h1>Preparación de campo</h1>
|
||||
<p>Seleccioná la inspección y revisá los pendientes de Actas anteriores del mismo Área/Yacimiento y Operadora.</p>
|
||||
<span className="eyebrow">ETAPA DE LA INSPECCIÓN</span>
|
||||
<h1>Preparación para campo</h1>
|
||||
<p>Revisá antecedentes y pendientes antes de iniciar la Inspección desde la APK.</p>
|
||||
</div>
|
||||
{briefing && <button className="button secondary no-print" type="button" onClick={() => window.print()}>
|
||||
Imprimir preparación
|
||||
@@ -170,15 +177,15 @@ export function FieldBriefingsPage() {
|
||||
</div>
|
||||
|
||||
<div className="form-card no-print">
|
||||
<label>Inspección planificada</label>
|
||||
<label>Inspección</label>
|
||||
{loadingVisits ? <LoadingBlock label="Cargando inspecciones…" /> : <SearchableSelect
|
||||
value={visitId}
|
||||
onChange={(event) => setVisitId(event.target.value)}
|
||||
searchPlaceholder="Buscar por código, Área u Operadora…"
|
||||
searchPlaceholder="Buscar por código, Yacimiento, Área u Operadora…"
|
||||
>
|
||||
<option value="">Seleccionar inspección…</option>
|
||||
{visits.map((visit) => <option key={visit.id} value={visit.id}>
|
||||
{visit.code} · {visit.operationalArea?.name ?? 'Sin Área'} · {visit.operatorCompany?.name ?? 'Sin Operadora'}
|
||||
{visit.code} · {visit.scopeAsset?.name ?? 'Sin Yacimiento'} · {visit.operationalArea?.name ?? 'Sin Área'} · {visit.operatorCompany?.name ?? 'Sin Operadora'}
|
||||
</option>)}
|
||||
</SearchableSelect>}
|
||||
{selected?.plannedStartAt && <small className="block-muted">Salida prevista: {formatDate(selected.plannedStartAt)}</small>}
|
||||
@@ -189,18 +196,18 @@ export function FieldBriefingsPage() {
|
||||
|
||||
{!loading && !briefing && !error && <EmptyState
|
||||
title="Seleccioná una inspección"
|
||||
text="El sistema reunirá automáticamente los pendientes de inspecciones anteriores del mismo contexto."
|
||||
text="El sistema reunirá automáticamente sus antecedentes y controles pendientes."
|
||||
/>}
|
||||
|
||||
{!loading && briefing && <>
|
||||
<div className="page-heading compact">
|
||||
<div>
|
||||
<span className="eyebrow">{briefing.inspection.code}</span>
|
||||
<h2>{briefing.inspection.area?.name ?? 'Área sin definir'} · {briefing.inspection.operatorCompany?.name ?? 'Operadora sin definir'}</h2>
|
||||
<p>Fecha de referencia: {formatDateOnly(briefing.plannedOn)}</p>
|
||||
<h2>{selected?.scopeAsset?.name ?? 'Yacimiento sin definir'} · {briefing.inspection.area?.name ?? 'Área sin definir'}</h2>
|
||||
<p>{briefing.inspection.operatorCompany?.name ?? 'Operadora sin definir'} · Fecha de referencia: {formatDateOnly(briefing.plannedOn)}</p>
|
||||
</div>
|
||||
<Link className="button secondary no-print" to={`/inspecciones/${briefing.inspection.id}`}>
|
||||
Abrir planificación
|
||||
Volver a la inspección
|
||||
</Link>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { Link, useParams } from 'react-router';
|
||||
import { DocumentPdfProjection } from '../components/DocumentPdfProjection';
|
||||
import { Alert, LoadingBlock, errorMessage } from '../components/Feedback';
|
||||
import { Icon } from '../components/Icon';
|
||||
import {
|
||||
@@ -70,6 +71,7 @@ export function InspectionActEditorPage() {
|
||||
<div className="inspection-act-asset-grid">{act.assets.map((asset) => <div className="inspection-member selected" key={asset.id}><span><strong>{asset.name}</strong><small>{asset.code} · {asset.typeName}</small></span></div>)}</div>
|
||||
</section>}
|
||||
|
||||
{act && <DocumentPdfProjection kind="act" />}
|
||||
{act && <InspectionFindingsPanel act={act} />}
|
||||
{act && <InspectionClosurePanel act={act} />}
|
||||
|
||||
|
||||
@@ -0,0 +1,224 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import type { FormEvent } from 'react';
|
||||
import { Link, useNavigate } from 'react-router';
|
||||
import { Alert, LoadingBlock } from '../components/Feedback';
|
||||
import { Icon } from '../components/Icon';
|
||||
import { SearchableSelect } from '../components/SearchableSelect';
|
||||
import { apiRequest } from '../lib/api';
|
||||
|
||||
interface Option {
|
||||
id: string;
|
||||
code: string;
|
||||
name: string;
|
||||
}
|
||||
|
||||
interface Inspector {
|
||||
id: string;
|
||||
username: string;
|
||||
firstName: string;
|
||||
lastName: string;
|
||||
}
|
||||
|
||||
interface CreatedInspection {
|
||||
id: string;
|
||||
code: string;
|
||||
}
|
||||
|
||||
function inspectorName(person: Inspector): string {
|
||||
return `${person.firstName} ${person.lastName}`.trim() || person.username;
|
||||
}
|
||||
|
||||
function currentLocalDateTime(): string {
|
||||
const now = new Date();
|
||||
const local = new Date(now.getTime() - now.getTimezoneOffset() * 60_000);
|
||||
return local.toISOString().slice(0, 16);
|
||||
}
|
||||
|
||||
export function InspectionVisitCreateF61Page() {
|
||||
const navigate = useNavigate();
|
||||
const [departments, setDepartments] = useState<Option[]>([]);
|
||||
const [areas, setAreas] = useState<Option[]>([]);
|
||||
const [yacimientos, setYacimientos] = useState<Option[]>([]);
|
||||
const [operators, setOperators] = useState<Option[]>([]);
|
||||
const [inspectors, setInspectors] = useState<Inspector[]>([]);
|
||||
const [departmentId, setDepartmentId] = useState('');
|
||||
const [areaId, setAreaId] = useState('');
|
||||
const [yacimientoId, setYacimientoId] = useState('');
|
||||
const [operatorId, setOperatorId] = useState('');
|
||||
const [inspectorId, setInspectorId] = useState('');
|
||||
const [plannedStartAt, setPlannedStartAt] = useState(currentLocalDateTime);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [loadingOperators, setLoadingOperators] = useState(false);
|
||||
const [busy, setBusy] = useState(false);
|
||||
const [error, setError] = useState('');
|
||||
|
||||
useEffect(() => {
|
||||
setLoading(true);
|
||||
Promise.all([
|
||||
apiRequest<{ data: Option[] }>('/inspection-visits/planning-context/departments'),
|
||||
apiRequest<{ data: Inspector[] }>('/inspection-visits/assignees'),
|
||||
]).then(([departmentResponse, inspectorResponse]) => {
|
||||
setDepartments(departmentResponse.data);
|
||||
setInspectors(inspectorResponse.data);
|
||||
}).catch((cause) => {
|
||||
setError(cause instanceof Error ? cause.message : String(cause));
|
||||
}).finally(() => setLoading(false));
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
setAreaId('');
|
||||
setYacimientoId('');
|
||||
setOperatorId('');
|
||||
setAreas([]);
|
||||
setYacimientos([]);
|
||||
setOperators([]);
|
||||
if (!departmentId) return;
|
||||
apiRequest<{ data: Option[] }>(`/inspection-visits/planning-context/departments/${departmentId}/areas`)
|
||||
.then((response) => setAreas(response.data))
|
||||
.catch((cause) => setError(cause instanceof Error ? cause.message : String(cause)));
|
||||
}, [departmentId]);
|
||||
|
||||
useEffect(() => {
|
||||
setYacimientoId('');
|
||||
setOperatorId('');
|
||||
setYacimientos([]);
|
||||
setOperators([]);
|
||||
if (!areaId) return;
|
||||
apiRequest<{ data: Option[] }>(`/inspection-visits/planning-context/areas/${areaId}/yacimientos`)
|
||||
.then((response) => setYacimientos(response.data))
|
||||
.catch((cause) => setError(cause instanceof Error ? cause.message : String(cause)));
|
||||
}, [areaId]);
|
||||
|
||||
useEffect(() => {
|
||||
setOperatorId('');
|
||||
setOperators([]);
|
||||
if (!areaId || !plannedStartAt) return;
|
||||
const parsedStart = new Date(plannedStartAt);
|
||||
if (Number.isNaN(parsedStart.getTime())) return;
|
||||
const at = encodeURIComponent(parsedStart.toISOString());
|
||||
setLoadingOperators(true);
|
||||
apiRequest<{ data: Option[] }>(`/inspection-visits/planning-context/areas/${areaId}/operators?at=${at}`)
|
||||
.then((response) => {
|
||||
setOperators(response.data);
|
||||
if (response.data.length === 1 && response.data[0]) setOperatorId(response.data[0].id);
|
||||
})
|
||||
.catch((cause) => setError(cause instanceof Error ? cause.message : String(cause)))
|
||||
.finally(() => setLoadingOperators(false));
|
||||
}, [areaId, plannedStartAt]);
|
||||
|
||||
const submit = async (event: FormEvent) => {
|
||||
event.preventDefault();
|
||||
setError('');
|
||||
if (!departmentId || !areaId || !yacimientoId || !operatorId || !plannedStartAt || !inspectorId) {
|
||||
setError('Completá Departamento, Área, Yacimiento, Operadora, fecha e Inspector.');
|
||||
return;
|
||||
}
|
||||
const parsedStart = new Date(plannedStartAt);
|
||||
if (Number.isNaN(parsedStart.getTime())) {
|
||||
setError('La fecha y hora de inicio no es válida.');
|
||||
return;
|
||||
}
|
||||
|
||||
setBusy(true);
|
||||
try {
|
||||
const created = await apiRequest<CreatedInspection>('/inspection-visits', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify({
|
||||
operationalAreaId: areaId,
|
||||
scopeAssetId: yacimientoId,
|
||||
operatorCompanyId: operatorId,
|
||||
plannedStartAt: parsedStart.toISOString(),
|
||||
leadInspectorUserId: inspectorId,
|
||||
}),
|
||||
});
|
||||
navigate(`/inspecciones/${created.id}`, { replace: true });
|
||||
} catch (cause) {
|
||||
setError(cause instanceof Error ? cause.message : String(cause));
|
||||
} finally {
|
||||
setBusy(false);
|
||||
}
|
||||
};
|
||||
|
||||
if (loading) return <LoadingBlock label="Cargando estructura territorial…" />;
|
||||
|
||||
return <section className="survey-editor inspection-editor">
|
||||
<div className="breadcrumb"><Link to="/inspecciones">Inspecciones</Link><span>/</span><span>Planificar inspección</span></div>
|
||||
<div className="page-heading survey-editor-heading">
|
||||
<div>
|
||||
<span className="eyebrow">INSPECCIÓN</span>
|
||||
<h1>Planificar inspección</h1>
|
||||
<p>Seleccioná la ubicación respetando la jerarquía Departamento → Área → Yacimiento.</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{error && <Alert>{error}</Alert>}
|
||||
|
||||
<form className="panel form-panel inspection-quick-create" onSubmit={submit}>
|
||||
<div className="panel-heading">
|
||||
<div>
|
||||
<span className="eyebrow">CREACIÓN RÁPIDA</span>
|
||||
<h2>Ubicación, contexto y fecha</h2>
|
||||
<p className="section-copy">La Operadora pertenece al contexto temporal del Área. El Yacimiento define el alcance físico de esta Inspección.</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="form-grid">
|
||||
<label className="field">
|
||||
<span>Departamento</span>
|
||||
<SearchableSelect value={departmentId} onChange={(event) => setDepartmentId(event.target.value)} searchPlaceholder="Buscar Departamento…" required>
|
||||
<option value="">Seleccionar Departamento…</option>
|
||||
{departments.map((department) => <option key={department.id} value={department.id}>{department.name}</option>)}
|
||||
</SearchableSelect>
|
||||
</label>
|
||||
|
||||
<label className="field">
|
||||
<span>Área</span>
|
||||
<SearchableSelect value={areaId} onChange={(event) => setAreaId(event.target.value)} searchPlaceholder="Buscar Área…" required disabled={!departmentId}>
|
||||
<option value="">Seleccionar Área…</option>
|
||||
{areas.map((area) => <option key={area.id} value={area.id}>{area.name}</option>)}
|
||||
</SearchableSelect>
|
||||
</label>
|
||||
|
||||
<label className="field">
|
||||
<span>Yacimiento</span>
|
||||
<SearchableSelect value={yacimientoId} onChange={(event) => setYacimientoId(event.target.value)} searchPlaceholder="Buscar Yacimiento…" required disabled={!areaId}>
|
||||
<option value="">Seleccionar Yacimiento…</option>
|
||||
{yacimientos.map((yacimiento) => <option key={yacimiento.id} value={yacimiento.id}>{yacimiento.name}</option>)}
|
||||
</SearchableSelect>
|
||||
</label>
|
||||
|
||||
<label className="field">
|
||||
<span>Operadora del Área</span>
|
||||
<SearchableSelect value={operatorId} onChange={(event) => setOperatorId(event.target.value)} searchPlaceholder="Buscar Operadora…" required disabled={!areaId || !plannedStartAt || loadingOperators || operators.length === 0}>
|
||||
<option value="">{loadingOperators ? 'Cargando Operadora…' : operators.length === 0 && areaId && plannedStartAt ? 'Sin Operadora vigente para esa fecha' : 'Seleccionar Operadora…'}</option>
|
||||
{operators.map((operator) => <option key={operator.id} value={operator.id}>{operator.name}</option>)}
|
||||
</SearchableSelect>
|
||||
<small className="muted">Se obtiene de la relación vigente del Área para la fecha y hora de inicio.</small>
|
||||
</label>
|
||||
|
||||
<label className="field">
|
||||
<span>Fecha y hora de inicio</span>
|
||||
<input type="datetime-local" value={plannedStartAt} onChange={(event) => setPlannedStartAt(event.target.value)} required />
|
||||
</label>
|
||||
|
||||
<label className="field">
|
||||
<span>Inspector responsable</span>
|
||||
<SearchableSelect value={inspectorId} onChange={(event) => setInspectorId(event.target.value)} searchPlaceholder="Buscar Inspector…" required>
|
||||
<option value="">Seleccionar Inspector…</option>
|
||||
{inspectors.map((inspector) => <option key={inspector.id} value={inspector.id}>{inspectorName(inspector)} · {inspector.username}</option>)}
|
||||
</SearchableSelect>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
{areaId && yacimientos.length === 0 && <Alert>Esta Área no tiene Yacimientos cargados. No se puede planificar una Inspección hasta corregir su jerarquía.</Alert>}
|
||||
{areaId && plannedStartAt && !loadingOperators && operators.length === 0 && <Alert>Esta Área no tiene una Operadora vigente para la fecha seleccionada. Podés consultar el Inventario, pero no planificar una Inspección operativa hasta definir esa relación.</Alert>}
|
||||
|
||||
<div className="form-actions">
|
||||
<Link className="button secondary" to="/inspecciones">Volver</Link>
|
||||
<button className="button primary" disabled={busy || !departmentId || !areaId || !yacimientoId || !operatorId || !plannedStartAt || !inspectorId}>
|
||||
<Icon name="check" />{busy ? 'Creando…' : 'Crear inspección'}
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</section>;
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
import { Link, useParams } from 'react-router';
|
||||
import { Icon } from '../components/Icon';
|
||||
import { InspectionVisitEditorF4Page } from './InspectionVisitEditorF4Page';
|
||||
|
||||
/**
|
||||
* F6.1 keeps Preparación para campo as a stage of the Inspection. The existing
|
||||
* detail remains unchanged underneath; this wrapper makes the relationship
|
||||
* explicit without creating a second operational module.
|
||||
*/
|
||||
export function InspectionVisitDetailF61Page() {
|
||||
const { id } = useParams<{ id: string }>();
|
||||
|
||||
return <>
|
||||
{id && <article className="panel survey-status-actions no-print">
|
||||
<div>
|
||||
<span className="eyebrow">ETAPA PREVIA AL CAMPO</span>
|
||||
<strong>Preparación para campo</strong>
|
||||
<p>Revisá antecedentes, hallazgos pendientes y próximos controles de esta Inspección antes de iniciarla desde la APK.</p>
|
||||
</div>
|
||||
<div className="form-actions">
|
||||
<Link className="button secondary" to={`/preparacion-campo?inspectionId=${id}`}>
|
||||
<Icon name="clipboard" /> Abrir preparación
|
||||
</Link>
|
||||
</div>
|
||||
</article>}
|
||||
<InspectionVisitEditorF4Page />
|
||||
</>;
|
||||
}
|
||||
@@ -11,13 +11,18 @@ import {
|
||||
inspectionStatusClass,
|
||||
inspectionVisitStatusLabel,
|
||||
} from '../features/inspections/inspectionPresentation';
|
||||
import {
|
||||
listInspectionPreventiveCandidates,
|
||||
} from '../features/inspections/preventiveCandidatesApi';
|
||||
import type {
|
||||
InspectionPreventiveCandidate,
|
||||
} from '../features/inspections/preventiveCandidatesApi';
|
||||
import {
|
||||
createInspectionVisit,
|
||||
excludeInspectionVisitAsset,
|
||||
generateInspectionVisitChecklist,
|
||||
getInspectionVisit,
|
||||
includeInspectionVisitAsset,
|
||||
listAssets,
|
||||
listInspectionAssignees,
|
||||
listInspectionPlanningAreas,
|
||||
listInspectionPlanningOperators,
|
||||
@@ -26,7 +31,6 @@ import {
|
||||
updateInspectionVisit,
|
||||
} from '../lib/api';
|
||||
import type {
|
||||
AssetListItem,
|
||||
InspectionPerson,
|
||||
InspectionPlanningContextAsset,
|
||||
InspectionVisit,
|
||||
@@ -100,7 +104,7 @@ export function InspectionVisitEditorF4Page() {
|
||||
const [areas, setAreas] = useState<InspectionPlanningContextAsset[]>([]);
|
||||
const [operators, setOperators] = useState<InspectionPlanningContextAsset[]>([]);
|
||||
const [assignees, setAssignees] = useState<InspectionPerson[]>([]);
|
||||
const [assets, setAssets] = useState<AssetListItem[]>([]);
|
||||
const [assets, setAssets] = useState<InspectionPreventiveCandidate[]>([]);
|
||||
const [assetSearch, setAssetSearch] = useState('');
|
||||
const [newAssetId, setNewAssetId] = useState('');
|
||||
const [leadInspectorId, setLeadInspectorId] = useState('');
|
||||
@@ -109,6 +113,8 @@ export function InspectionVisitEditorF4Page() {
|
||||
const [busy, setBusy] = useState(false);
|
||||
const [error, setError] = useState('');
|
||||
const [success, setSuccess] = useState('');
|
||||
const [showCancelForm, setShowCancelForm] = useState(false);
|
||||
const [cancelReason, setCancelReason] = useState('');
|
||||
|
||||
const applyVisit = (value: InspectionVisit, syncForm = true) => {
|
||||
setVisit(value);
|
||||
@@ -134,9 +140,9 @@ export function InspectionVisitEditorF4Page() {
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
listInspectionPlanningAreas().then(setAreas).catch(() => undefined);
|
||||
if (isNew) listInspectionPlanningAreas().then(setAreas).catch(() => undefined);
|
||||
if (canAssign) listInspectionAssignees().then(setAssignees).catch(() => undefined);
|
||||
}, [canAssign]);
|
||||
}, [canAssign, isNew]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!isNew || form.operationalAreaId || !context.areaId) return;
|
||||
@@ -156,29 +162,27 @@ export function InspectionVisitEditorF4Page() {
|
||||
}, [id]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!form.operationalAreaId) {
|
||||
if (!isNew || !form.operationalAreaId) {
|
||||
setOperators([]);
|
||||
return;
|
||||
}
|
||||
listInspectionPlanningOperators(form.operationalAreaId)
|
||||
.then(setOperators)
|
||||
.catch(() => setOperators([]));
|
||||
}, [form.operationalAreaId]);
|
||||
}, [form.operationalAreaId, isNew]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!form.operationalAreaId || !form.operatorCompanyId) {
|
||||
if (!id || !visit) {
|
||||
setAssets([]);
|
||||
return;
|
||||
}
|
||||
const timer = window.setTimeout(() => {
|
||||
listAssets({
|
||||
pageSize: 100,
|
||||
search: assetSearch.trim(),
|
||||
operationalAreaId: form.operationalAreaId,
|
||||
}).then((response) => setAssets(response.data)).catch(() => undefined);
|
||||
listInspectionPreventiveCandidates(id, assetSearch)
|
||||
.then(setAssets)
|
||||
.catch((requestError) => setError(errorMessage(requestError)));
|
||||
}, 220);
|
||||
return () => window.clearTimeout(timer);
|
||||
}, [assetSearch, form.operationalAreaId, form.operatorCompanyId]);
|
||||
}, [id, assetSearch, visit?.updatedAt]);
|
||||
|
||||
const planningEditable = !visit || visit.status === 'DRAFT' || visit.status === 'PLANNED';
|
||||
const activeAssetIds = useMemo(() => new Set(visit?.assets.map((asset) => asset.id) ?? []), [visit]);
|
||||
@@ -207,12 +211,10 @@ export function InspectionVisitEditorF4Page() {
|
||||
} else if (id) {
|
||||
applyVisit(await updateInspectionVisit(id, {
|
||||
objective: form.objective.trim() || null,
|
||||
operationalAreaId: form.operationalAreaId || null,
|
||||
operatorCompanyId: form.operatorCompanyId || null,
|
||||
plannedStartAt,
|
||||
instructions: form.instructions.trim() || null,
|
||||
}));
|
||||
setSuccess('Planificación actualizada. Regenerá el checklist si cambió contexto o fecha.');
|
||||
setSuccess('Planificación actualizada. Si cambió la fecha, regenerá el checklist.');
|
||||
}
|
||||
} catch (requestError) {
|
||||
setError(errorMessage(requestError));
|
||||
@@ -237,6 +239,7 @@ export function InspectionVisitEditorF4Page() {
|
||||
setBusy(true); setError(''); setSuccess('');
|
||||
try {
|
||||
applyVisit(await replaceInspectionVisitAssets(id, [...activeAssetIds, newAssetId]), false);
|
||||
setAssets((current) => current.filter((asset) => asset.id !== newAssetId));
|
||||
setNewAssetId('');
|
||||
setSuccess('Registro agregado como preventivo.');
|
||||
} catch (requestError) { setError(errorMessage(requestError)); }
|
||||
@@ -286,7 +289,7 @@ export function InspectionVisitEditorF4Page() {
|
||||
finally { setBusy(false); }
|
||||
};
|
||||
|
||||
const lifecycleAction = async (action: 'PLAN' | 'UNPLAN' | 'CANCEL') => {
|
||||
const lifecycleAction = async (action: 'PLAN' | 'UNPLAN') => {
|
||||
if (!id) return;
|
||||
setBusy(true); setError(''); setSuccess('');
|
||||
try {
|
||||
@@ -294,23 +297,38 @@ export function InspectionVisitEditorF4Page() {
|
||||
if (action === 'PLAN') {
|
||||
updated = await planInspectionVisit(id);
|
||||
setSuccess('Inspección planificada. Ya puede iniciarse desde la APK.');
|
||||
} else if (action === 'UNPLAN') {
|
||||
} else {
|
||||
updated = await unplanInspectionVisit(id);
|
||||
setSuccess('La Inspección volvió a borrador para corregir la planificación.');
|
||||
} else {
|
||||
const reason = window.prompt('Indicá el motivo de cancelación (mínimo 10 caracteres):')?.trim() ?? '';
|
||||
if (reason.length < 10) {
|
||||
if (reason) setError('El motivo debe tener al menos 10 caracteres.');
|
||||
return;
|
||||
}
|
||||
updated = await cancelInspectionVisit(id, reason);
|
||||
setSuccess('Inspección cancelada con motivo auditado.');
|
||||
}
|
||||
applyVisit(updated);
|
||||
} catch (requestError) { setError(errorMessage(requestError)); }
|
||||
finally { setBusy(false); }
|
||||
};
|
||||
|
||||
const cancelCurrentVisit = async (event: FormEvent) => {
|
||||
event.preventDefault();
|
||||
if (!id) return;
|
||||
const reason = cancelReason.trim();
|
||||
if (reason.length < 10) {
|
||||
setError('El motivo de cancelación debe tener al menos 10 caracteres.');
|
||||
return;
|
||||
}
|
||||
if (reason.length > 500) {
|
||||
setError('El motivo de cancelación no puede superar los 500 caracteres.');
|
||||
return;
|
||||
}
|
||||
setBusy(true); setError(''); setSuccess('');
|
||||
try {
|
||||
const updated = await cancelInspectionVisit(id, reason);
|
||||
applyVisit(updated);
|
||||
setCancelReason('');
|
||||
setShowCancelForm(false);
|
||||
setSuccess('Inspección cancelada. El motivo quedó registrado y auditado.');
|
||||
} catch (requestError) { setError(errorMessage(requestError)); }
|
||||
finally { setBusy(false); }
|
||||
};
|
||||
|
||||
if (loading) return <LoadingBlock label="Cargando inspección…" />;
|
||||
|
||||
return <section className="survey-editor inspection-editor">
|
||||
@@ -322,11 +340,12 @@ export function InspectionVisitEditorF4Page() {
|
||||
{error && <Alert>{error}</Alert>}{success && <Alert type="success">{success}</Alert>}
|
||||
|
||||
<form className={`panel form-panel ${isNew ? 'inspection-quick-create' : ''}`} onSubmit={saveGeneral}>
|
||||
<div className="panel-heading"><div><span className="eyebrow">{isNew ? 'CREACIÓN RÁPIDA' : 'PLANIFICACIÓN'}</span><h2>Contexto y fecha de inicio</h2><p className="section-copy">No existe título independiente ni fecha de fin planificada. El cierre real se registra al terminar el trabajo de campo.</p></div>{visit && <small className="muted">Actualizado {formatDate(visit.updatedAt)}</small>}</div>
|
||||
<div className="panel-heading"><div><span className="eyebrow">{isNew ? 'CREACIÓN RÁPIDA' : 'PLANIFICACIÓN'}</span><h2>Contexto y fecha de inicio</h2><p className="section-copy">El Área, Yacimiento y Operadora quedan fijados al crear la Inspección. La fecha puede reprogramarse antes del trabajo de campo.</p></div>{visit && <small className="muted">Actualizado {formatDate(visit.updatedAt)}</small>}</div>
|
||||
{visit && <div className="inspection-generated-code"><small>Identificador institucional</small><strong>{visit.code}</strong></div>}
|
||||
<div className="form-grid">
|
||||
<label className="field"><span>Área / Yacimiento</span><SearchableSelect searchPlaceholder="Buscar Área…" value={form.operationalAreaId} onChange={(event) => { context.setAreaId(event.target.value); setForm((current) => ({ ...current, operationalAreaId: event.target.value, operatorCompanyId: '' })); }} required disabled={!canManage || !planningEditable}><option value="">Seleccionar Área…</option>{areas.map((area) => <option key={area.id} value={area.id}>{area.name} · {area.code}</option>)}</SearchableSelect></label>
|
||||
<label className="field"><span>Operadora</span><SearchableSelect searchPlaceholder="Buscar Operadora…" value={form.operatorCompanyId} onChange={(event) => { context.setCompanyId(event.target.value); setForm((current) => ({ ...current, operatorCompanyId: event.target.value })); }} required disabled={!canManage || !planningEditable || !form.operationalAreaId}><option value="">Seleccionar Operadora…</option>{operators.map((operator) => <option key={operator.id} value={operator.id}>{operator.name} · {operator.code}</option>)}</SearchableSelect></label>
|
||||
{isNew ? <label className="field"><span>Área</span><SearchableSelect searchPlaceholder="Buscar Área…" value={form.operationalAreaId} onChange={(event) => { context.setAreaId(event.target.value); setForm((current) => ({ ...current, operationalAreaId: event.target.value, operatorCompanyId: '' })); }} required disabled={!canManage || !planningEditable}><option value="">Seleccionar Área…</option>{areas.map((area) => <option key={area.id} value={area.id}>{area.name} · {area.code}</option>)}</SearchableSelect></label> : <label className="field"><span>Área</span><input value={visit?.operationalArea ? `${visit.operationalArea.name} · ${visit.operationalArea.code}` : 'Sin Área'} readOnly aria-readonly="true" /></label>}
|
||||
{!isNew && <label className="field"><span>Yacimiento</span><input value={visit?.scopeAsset ? `${visit.scopeAsset.name} · ${visit.scopeAsset.code}` : 'Sin Yacimiento'} readOnly aria-readonly="true" /></label>}
|
||||
{isNew ? <label className="field"><span>Operadora</span><SearchableSelect searchPlaceholder="Buscar Operadora…" value={form.operatorCompanyId} onChange={(event) => { context.setCompanyId(event.target.value); setForm((current) => ({ ...current, operatorCompanyId: event.target.value })); }} required disabled={!canManage || !planningEditable || !form.operationalAreaId}><option value="">Seleccionar Operadora…</option>{operators.map((operator) => <option key={operator.id} value={operator.id}>{operator.name} · {operator.code}</option>)}</SearchableSelect></label> : <label className="field"><span>Operadora</span><input value={visit?.operatorCompany ? `${visit.operatorCompany.name} · ${visit.operatorCompany.code}` : 'Sin Operadora'} readOnly aria-readonly="true" /></label>}
|
||||
<label className="field"><span>Fecha y hora de inicio</span><input type="datetime-local" value={form.plannedStartAt} onChange={(event) => setForm((current) => ({ ...current, plannedStartAt: event.target.value }))} required disabled={!canManage || !planningEditable} /></label>
|
||||
{isNew && <label className="field"><span>Inspector responsable</span><SearchableSelect searchPlaceholder="Buscar Inspector…" value={leadInspectorId} onChange={(event) => setLeadInspectorId(event.target.value)} required disabled={!canAssign}><option value="">Seleccionar Inspector…</option>{assignees.map((person) => <option key={person.id} value={person.id}>{personName(person)} · {person.username}</option>)}</SearchableSelect></label>}
|
||||
</div>
|
||||
@@ -335,15 +354,15 @@ export function InspectionVisitEditorF4Page() {
|
||||
</form>
|
||||
|
||||
{visit && <article className="panel inspection-checklist-panel">
|
||||
<div className="panel-heading"><div><span className="eyebrow">CHECKLIST TÉCNICO</span><h2>Antecedentes y controles</h2><p className="section-copy">Se construye por Área, Operadora y fecha. Las respuestas administrativas de empresa no modifican este checklist.</p></div>{canManage && planningEditable && <button type="button" className="button secondary" onClick={() => void regenerateChecklist()} disabled={busy}>Regenerar checklist</button>}</div>
|
||||
{visit.checklist.stale && <Alert>El contexto o la fecha cambió. Regenerá el checklist antes de planificar.</Alert>}
|
||||
<div className="panel-heading"><div><span className="eyebrow">CHECKLIST TÉCNICO</span><h2>Antecedentes y controles</h2><p className="section-copy">Se construye para el Área, Yacimiento y Operadora fijados en la Inspección, tomando la fecha planificada. Las respuestas administrativas de empresa no modifican este checklist.</p></div>{canManage && planningEditable && <button type="button" className="button secondary" onClick={() => void regenerateChecklist()} disabled={busy}>Regenerar checklist</button>}</div>
|
||||
{visit.checklist.stale && <Alert>La fecha cambió. Regenerá el checklist antes de planificar.</Alert>}
|
||||
<div className="inspection-checklist-metrics"><div><strong>{visit.checklist.verificationOverdue}</strong><span>controles vencidos</span></div><div><strong>{visit.checklist.upcomingControls}</strong><span>próximos 30 días</span></div><div><strong>{visit.checklist.antecedents}</strong><span>antecedentes</span></div><div><strong>{visit.checklist.actionableAssets}</strong><span>registros sugeridos</span></div></div>
|
||||
{visit.checklist.items.length === 0 ? <EmptyState title="Sin antecedentes" text="No hay Hallazgos históricos técnicos para este contexto." /> : <div className="table-scroll"><table><thead><tr><th>Tipo</th><th>Hallazgo</th><th>Inventario</th><th>Fecha</th><th>Gravedad</th></tr></thead><tbody>{visit.checklist.items.map((item) => <tr key={item.id}><td><span className={`status-badge ${item.itemKind === 'ANTECEDENT' ? '' : 'warning'}`}>{checklistLabel(item.itemKind)}</span></td><td><Link className="history-asset-link" to={`/hallazgos/${item.findingId}`}><strong>{item.findingTitle}</strong><small>{item.findingCode}</small></Link></td><td><Link className="history-asset-link" to={`/inventarios/${item.asset.id}`}><strong>{item.asset.name}</strong><small>{item.asset.code} · {item.asset.typeName}</small></Link></td><td>{formatDateOnly(item.referenceOn)}</td><td>{item.severity ?? '—'}</td></tr>)}</tbody></table></div>}
|
||||
</article>}
|
||||
|
||||
{visit && visit.verificationFindings.length > 0 && <article className="panel verification-visit-findings"><div className="panel-heading"><div><span className="eyebrow">VERIFICACIÓN</span><h2>Hallazgos a controlar</h2></div><span className="count-pill">{visit.verificationFindings.length}</span></div><div className="dossier-link-list">{visit.verificationFindings.map((finding) => <Link key={finding.id} to={`/hallazgos/${finding.id}`}><div><strong>{finding.title}</strong><small>{finding.code} · {finding.assetName} · objetivo {formatDateOnly(finding.targetControlOn ?? finding.nextControlOn)}</small>{finding.resultNotes && <small>{finding.resultNotes}</small>}</div><span>{finding.outcome === 'RESOLVED' ? 'Solucionado' : finding.outcome === 'NOT_RESOLVED' ? 'No solucionado' : finding.outcome === 'REQUIRES_NEW_DATE' ? 'Reprogramar' : 'Pendiente'}</span><Icon name="chevron" size={16} /></Link>)}</div></article>}
|
||||
|
||||
{visit && planningEditable && canManage && <form className="panel survey-add-target" onSubmit={addPreventiveAsset}><div className="panel-heading"><div><span className="eyebrow">PREVENTIVO</span><h2>Agregar Inventario sin pendiente previo</h2></div></div><label className="field"><span>Buscar Inventario</span><input value={assetSearch} onChange={(event) => setAssetSearch(event.target.value)} placeholder="Código o nombre" /></label><label className="field"><span>Inventario</span><SearchableSelect value={newAssetId} onChange={(event) => setNewAssetId(event.target.value)} required><option value="">Seleccionar…</option>{candidateAssets.map((asset) => <option key={asset.id} value={asset.id}>{asset.code} · {asset.name} · {asset.type.name}</option>)}</SearchableSelect></label><div className="form-actions"><button className="button primary" disabled={busy || !newAssetId}><Icon name="plus" />Agregar preventivo</button></div></form>}
|
||||
{visit && planningEditable && canManage && <form className="panel survey-add-target" onSubmit={addPreventiveAsset}><div className="panel-heading"><div><span className="eyebrow">PREVENTIVO</span><h2>Agregar Inventario sin pendiente previo</h2><p className="section-copy">Sólo se muestran Instalaciones y Subinstalaciones pertenecientes al Yacimiento fijado para esta Inspección.</p></div></div><label className="field"><span>Buscar Inventario</span><input value={assetSearch} onChange={(event) => setAssetSearch(event.target.value)} placeholder="Código o nombre" /></label><label className="field"><span>Inventario</span><SearchableSelect value={newAssetId} onChange={(event) => setNewAssetId(event.target.value)} required><option value="">Seleccionar…</option>{candidateAssets.map((asset) => <option key={asset.id} value={asset.id}>{asset.code} · {asset.name} · {asset.typeName}</option>)}</SearchableSelect></label><div className="form-actions"><button className="button primary" disabled={busy || !newAssetId}><Icon name="plus" />Agregar preventivo</button></div></form>}
|
||||
|
||||
{visit && <article className="table-panel inspection-assets"><div className="table-summary"><strong>{visit.assets.length} incluidos</strong><span>{visit.checklist.excludedAssets} excluidos con trazabilidad</span></div>{visit.planningAssets.length === 0 ? <EmptyState title="Sin Inventarios" text="Generá el checklist o agregá un preventivo." /> : <div className="table-scroll"><table><thead><tr><th>Inventario</th><th>Origen</th><th>Estado</th><th>Motivo</th><th /></tr></thead><tbody>{visit.planningAssets.map((asset) => <tr key={asset.id}><td><Link className="history-asset-link" to={`/inventarios/${asset.id}`}><strong>{asset.name}</strong><small>{asset.code} · {asset.typeName}</small></Link></td><td>{sourceLabel(asset.planningSource)}</td><td>{asset.included ? 'Incluido' : 'Excluido'}</td><td>{asset.exclusionReason ?? '—'}</td><td>{canManage && planningEditable && (asset.included ? <button type="button" className="button danger-outline compact" onClick={() => void excludeAsset(asset.id)}>Excluir</button> : <button type="button" className="button secondary compact" onClick={() => void reincludeAsset(asset.id)}>Reincorporar</button>)}</td></tr>)}</tbody></table></div>}</article>}
|
||||
|
||||
@@ -351,7 +370,9 @@ export function InspectionVisitEditorF4Page() {
|
||||
|
||||
{visit && <InspectionActsPanel visit={visit} />}
|
||||
|
||||
{visit && <article className="panel survey-status-actions"><div><strong>Flujo de la Inspección</strong><p>La oficina planifica. El inicio y cierre operativo se realizan desde la APK. Una Inspección no puede cerrarse hasta que todas sus Actas estén selladas.</p></div><div className="form-actions">{canManage && visit.status === 'DRAFT' && <button type="button" className="button primary" disabled={busy} onClick={() => void lifecycleAction('PLAN')}>Confirmar planificación</button>}{canManage && visit.status === 'PLANNED' && <button type="button" className="button secondary" disabled={busy} onClick={() => void lifecycleAction('UNPLAN')}>Volver a borrador</button>}{canManage && ['DRAFT', 'PLANNED'].includes(visit.status) && <button type="button" className="button danger-outline" disabled={busy} onClick={() => void lifecycleAction('CANCEL')}>Cancelar</button>}</div></article>}
|
||||
{visit && <article className="panel survey-status-actions"><div><strong>Flujo de la Inspección</strong><p>La oficina planifica. El inicio y cierre operativo se realizan desde la APK. Una Inspección no puede cerrarse hasta que todas sus Actas estén selladas.</p></div><div className="form-actions">{canManage && visit.status === 'DRAFT' && <button type="button" className="button primary" disabled={busy} onClick={() => void lifecycleAction('PLAN')}>Confirmar planificación</button>}{canManage && visit.status === 'PLANNED' && <button type="button" className="button secondary" disabled={busy} onClick={() => void lifecycleAction('UNPLAN')}>Volver a borrador</button>}{canManage && ['DRAFT', 'PLANNED', 'IN_PROGRESS'].includes(visit.status) && <button type="button" className="button danger-outline" disabled={busy} onClick={() => { setError(''); setSuccess(''); setShowCancelForm(true); }}>Cancelar inspección</button>}</div></article>}
|
||||
|
||||
{visit && showCancelForm && ['DRAFT', 'PLANNED', 'IN_PROGRESS'].includes(visit.status) && <form className="panel form-panel" onSubmit={cancelCurrentVisit}><div className="panel-heading"><div><span className="eyebrow">CANCELACIÓN</span><h2>Cancelar inspección</h2><p className="section-copy">La cancelación es definitiva y queda auditada. No se permite si la Inspección ya tiene un Acta sellada.</p></div></div><label className="field"><span>Motivo de cancelación</span><textarea value={cancelReason} onChange={(event) => setCancelReason(event.target.value)} minLength={10} maxLength={500} rows={4} placeholder="Explicá el motivo de la cancelación…" required /><small className="muted">{cancelReason.trim().length}/500 · mínimo 10 caracteres</small></label><div className="form-actions"><button type="button" className="button secondary" disabled={busy} onClick={() => { setShowCancelForm(false); setCancelReason(''); }}>Volver</button><button type="submit" className="button danger-outline" disabled={busy || cancelReason.trim().length < 10 || cancelReason.trim().length > 500}>{busy ? 'Cancelando…' : 'Confirmar cancelación'}</button></div></form>}
|
||||
|
||||
{visit?.status === 'PLANNED' && <div className="temporal-notice"><Icon name="clipboard" /><p><strong>Planificación lista.</strong> El Inspector asignado debe iniciar la Inspección desde la APK.</p></div>}
|
||||
{visit?.status === 'IN_PROGRESS' && <div className="temporal-notice"><Icon name="clipboard" /><p><strong>Inspección en curso.</strong> Actas, Hallazgos, firmas y cierre se registran desde la APK.</p></div>}
|
||||
|
||||
@@ -2,6 +2,7 @@ import { useEffect, useState } from 'react';
|
||||
import type { FormEvent } from 'react';
|
||||
import { Link, useParams } from 'react-router';
|
||||
import { useAuth } from '../auth/AuthContext';
|
||||
import { DocumentPdfProjection } from '../components/DocumentPdfProjection';
|
||||
import { Alert, LoadingBlock, errorMessage } from '../components/Feedback';
|
||||
import { Icon } from '../components/Icon';
|
||||
import { SearchableSelect } from '../components/SearchableSelect';
|
||||
@@ -193,7 +194,7 @@ export function ReportDetailPage() {
|
||||
{success && <Alert type="success">{success}</Alert>}
|
||||
|
||||
{report && <>
|
||||
<div className="temporal-notice"><Icon name="clipboard" /><p><strong>Un INF corresponde a una sola Acta.</strong> El Word puede editarse durante la preparación del Informe. El Acta sellada y los Hallazgos que contiene permanecen inmutables.</p></div>
|
||||
<div className="temporal-notice"><Icon name="clipboard" /><p><strong>Un INF corresponde a una sola Acta.</strong> Una Inspección puede contener varias Actas y, por lo tanto, varios INF independientes. El Word puede editarse durante la preparación; el Acta sellada y sus Hallazgos permanecen inmutables.</p></div>
|
||||
|
||||
<section className="panel report-summary-panel">
|
||||
<div className="panel-heading"><div><span className="eyebrow">TRAZABILIDAD DOCUMENTAL</span><h2>{report.code}</h2></div><small className="muted">Versión del Acta: {report.actVersion}</small></div>
|
||||
@@ -210,6 +211,8 @@ export function ReportDetailPage() {
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<DocumentPdfProjection kind="report" />
|
||||
|
||||
<section className="panel">
|
||||
<div className="panel-heading"><div><span className="eyebrow">WORD EDITABLE</span><h2>Preparación del INF</h2><p className="section-copy">El Inspector puede revisar y ajustar el texto del Informe antes de incorporarlo a GEDO. Esta edición no altera el Acta fuente.</p></div>{report.wordStatus === 'READY' && <a className="button secondary" href={inspectionReportWordDownloadUrl(report.id)}>Descargar Word</a>}</div>
|
||||
<form className="form-section" onSubmit={saveNarrative}>
|
||||
|
||||
Reference in New Issue
Block a user