Compare commits

..
Author SHA1 Message Date
admin 03a3a66c51 F3.2 Android: permitir preparar Actas de verificación sin Hallazgos nuevos 2026-09-07 16:50:17 -03:00
admin 2d4e8ae2a7 F3.2 Android: permitir Actas READY paralelas y delegar cierre al servidor 2026-09-07 16:43:24 -03:00
admin 3e5dfb78a2 F3.2 Android: corregir Card clickeable de mensajes 2026-09-07 16:35:37 -03:00
admin ecf6f71c58 F3.2 Android: corregir API de PointerInput en firma 2026-09-07 16:34:33 -03:00
admin bd0f22969c F3.2 API: restaurar manifiesto exacto de producción 2026-09-07 16:26:48 -03:00
admin 5f3987747d F3.2 API: conservar dependencias y cambiar sólo versión 2026-09-07 16:26:32 -03:00
admin a208788488 F3.2: agregar CI de integración multi-Acta 2026-09-07 16:25:23 -03:00
admin 2e5183cc3c F3.2 API: actualizar versión de paquete 2026-09-07 16:24:57 -03:00
admin 80ce9ced0f F3.2 API: versionar integración multi-Acta móvil 2026-09-07 16:24:42 -03:00
admin d49fb81bcf F3.2 Android: activar CI y artefacto 0.12.0 2026-09-07 16:24:31 -03:00
admin 9e50967089 F3.2 Android: versionar APK 0.12.0 2026-09-07 16:24:16 -03:00
admin a1450da51e F3.2 Android: integrar Actas en la navegación de inspección 2026-09-07 16:23:10 -03:00
admin 97a774c264 F3.2 Android: implementar gestión y cierre secuencial de Actas 2026-09-07 16:20:08 -03:00
admin c9f1434462 F3.2 Android: agregar pad manuscrito PNG para firmas 2026-09-07 16:18:28 -03:00
admin d14cf737c0 F3.2 Android: incorporar estado multi-Acta y cierre 2026-09-07 16:16:09 -03:00
admin 9f60e671d2 F3.2 Android: agregar cliente de Actas y cierre 2026-09-07 16:14:43 -03:00
admin 28f6fb3684 F3.2 Android: enviar Acta explícita en Hallazgos 2026-09-07 16:13:52 -03:00
admin d7184ed537 F3.2: fijar contrato multi-Acta móvil y cierre secuencial 2026-09-07 16:13:22 -03:00
admin 203443d9c6 F3.2: resolver Hallazgos contra Acta explícita 2026-09-07 16:12:03 -03:00
admin 45ca6a783e F3.2: recibir Acta explícita en Hallazgos de campo 2026-09-07 16:11:20 -03:00
admin d3bfdeac67 F3.2: permitir Acta explícita al crear Hallazgo de campo 2026-09-07 16:11:05 -03:00
admin 9479ae6d1a F3.2: agregar selección explícita de Acta en Hallazgos de campo 2026-09-07 16:10:49 -03:00
admin 4ca65c6a89 F3.1 hotfix · aislar preflight API del WEB (#19)
Separa el contrato visual F3.1 del test API y agrega a CI el mismo preflight Docker aislado que ejecuta el VPS antes de producción.
2026-09-07 15:53:27 -03:00
admin 3495b33157 CI: replicar preflight API aislado del deploy VPS 2026-09-07 15:48:40 -03:00
admin 115a6a2ed8 F3.1 hotfix: ejecutar contrato visual dentro del job WEB 2026-09-07 15:47:30 -03:00
admin 4796581532 F3.1 hotfix: mover contrato visual a CI WEB 2026-09-07 15:47:16 -03:00
admin 1d3979fda3 F3.1 hotfix: aislar tests API del filesystem WEB 2026-09-07 15:47:02 -03:00
admin 72e75fab2f F3.1 · Inventario estructural, catálogo contextual y conciliación cronológica (#18)
Integra F3.1 con jerarquía estructural de Inventario, familias técnicas/Otro, catálogo contextual, merges append-only, perfil de Inspector, entrega documental al Inspector y APK Android 0.11.0. Todas las barreras API/WEB/DB/Docker/Android quedaron verdes antes del merge.
2026-09-07 15:39:26 -03:00
admin 26ec07864a docs: conservar README 2026-09-05 22:21:47 -03:00
admin 65cb28299d docs: mantener README estable 2026-09-05 22:21:39 -03:00
admin f2f9ccaa72 docs: no-op README 2026-09-05 22:21:34 -03:00
admin c7fd1f8583 docs: estabilizar README 2026-09-05 22:21:28 -03:00
admin c50360e732 docs: simplificar README 2026-09-05 22:21:21 -03:00
admin 387357b96c docs: restaurar README operativo 2026-09-05 22:21:13 -03:00
admin eb47a3d66f docs: registrar política operativa de reset seguro 2026-09-05 22:21:04 -03:00
20 changed files with 1587 additions and 78 deletions
+3 -2
View File
@@ -1,5 +1,5 @@
name: Android APK
# F3.1: este workflow genera la APK debug verificable de la rama antes de promoverla.
# F3.2: genera la APK debug verificable antes de promover la integración multi-Acta.
on:
push:
@@ -8,6 +8,7 @@ on:
- 'feature/f2-3*'
- 'feature/f2-4*'
- 'feature/f3-1*'
- 'feature/f3-2*'
paths:
- 'android-app/**'
- '.github/workflows/android.yml'
@@ -57,7 +58,7 @@ jobs:
- name: Upload APK
uses: actions/upload-artifact@v4
with:
name: DH-Inspeccion-F3.1-0.11.0-debug
name: DH-Inspeccion-F3.2-0.12.0-debug
path: android-app/app/build/outputs/apk/debug/app-debug.apk
if-no-files-found: error
retention-days: 14
+12
View File
@@ -47,6 +47,8 @@ jobs:
cache-dependency-path: web-v2/package-lock.json
- run: npm ci
- run: npm run typecheck
- name: F3.1 WEB contract
run: bash ../scripts/check-f3-1-web-contract.sh
- run: npm run build
contract:
@@ -62,5 +64,15 @@ jobs:
done < <(find scripts -type f -name '*.sh' -print0)
- name: Validate Compose
run: docker compose --env-file .env.example config >/dev/null
- name: VPS-equivalent isolated API preflight
run: |
set -Eeuo pipefail
image="dhv2-api:ci-vps-preflight-${GITHUB_SHA::12}"
docker build --target builder -t "$image" api-v3
docker run --rm \
-v "$PWD/api-v3/test:/app/test:ro" \
-v "$PWD/api-v3/tsconfig.test.json:/app/tsconfig.test.json:ro" \
"$image" npm test
docker image rm "$image" >/dev/null 2>&1 || true
- name: Build production images
run: docker compose --env-file .env.example build api migrate web
+80
View File
@@ -0,0 +1,80 @@
name: F3.2 Multi-Acta CI
on:
push:
branches:
- 'feature/f3-2*'
workflow_dispatch:
permissions:
contents: read
jobs:
api:
name: API · F3.2
runs-on: ubuntu-latest
timeout-minutes: 25
defaults:
run:
working-directory: api-v3
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '24'
cache: npm
cache-dependency-path: api-v3/package-lock.json
- run: npm ci
- name: Typecheck
run: npm run typecheck
- name: Tests
run: npm test
- name: Build
run: npm run build
web:
name: WEB · regression
runs-on: ubuntu-latest
timeout-minutes: 20
defaults:
run:
working-directory: web-v2
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '24'
cache: npm
cache-dependency-path: web-v2/package-lock.json
- run: npm ci
- run: npm run typecheck
- name: F3.1 structural WEB contract
run: bash ../scripts/check-f3-1-web-contract.sh
- run: npm run build
deploy-preflight:
name: VPS-equivalent preflight / Docker
runs-on: ubuntu-latest
timeout-minutes: 30
needs: [api, web]
steps:
- uses: actions/checkout@v4
- name: Validate shell scripts
run: |
while IFS= read -r -d '' script; do
bash -n "$script"
done < <(find scripts -type f -name '*.sh' -print0)
- name: Validate Compose
run: docker compose --env-file .env.example config >/dev/null
- name: VPS-equivalent isolated API tests
run: |
set -Eeuo pipefail
image="dhv2-api:f3-2-preflight-${GITHUB_SHA::12}"
docker build --target builder -t "$image" api-v3
docker run --rm \
-v "$PWD/api-v3/test:/app/test:ro" \
-v "$PWD/api-v3/tsconfig.test.json:/app/tsconfig.test.json:ro" \
"$image" npm test
docker image rm "$image" >/dev/null 2>&1 || true
- name: Build production images
run: docker compose --env-file .env.example build api migrate web
+6 -31
View File
@@ -1,35 +1,10 @@
# DH Inspección V2 · D5.6.2
Hotfix de mantenimiento de Fase D para accesos Android y contrato de regresión de cierre.
# DH Inspección V2
Versión: **0.19.5-1**
Fase: **D5.5.1 · Corrección de staging de planificación**
Repositorio del sistema DH Inspección V2.
D5.5.1 conserva íntegramente D5.5 y corrige únicamente el contrato de pruebas de staging. D5.5 consolida la preparación de visitas desde oficina antes del trabajo de campo. La visita queda anclada explícitamente a Área y Organización operadora, y el sistema genera un checklist auditable con antecedentes, respuestas vencidas, controles vencidos y próximos controles.
## Estructura
## Alcance D5.5
- selección web Área → Organización operadora vigente;
- fecha y equipo inspector dentro del plan;
- checklist automático versionado y append-only;
- respuestas de empresa vencidas y controles de verificación vencidos;
- próximos controles dentro de 30 días de la fecha planificada;
- antecedentes históricos del mismo contexto;
- incorporación automática de registros accionables;
- alta manual de registros preventivos del mismo Área/Operadora;
- exclusiones sólo mediante motivo auditable;
- reincorporación sin borrar la exclusión histórica;
- visitas de verificación integradas al mismo contrato de planificación;
- cambio de contexto o fecha invalida el checklist hasta regeneración explícita;
- inicio de visita exclusivamente desde APK mediante la política móvil ya existente.
## Migración
`1789063200000-phase-d5-5-web-planning-checklist.ts`
`PhaseD55WebPlanningChecklist1789063200000`
## Despliegue
El despliegue debe partir exactamente de API/WEB **0.19.4-1** y ejecutar `scripts/deploy-phase-d5-5.sh`. Antes de modificar producción, el script compila API y web en staging y exige **252 tests** aprobados.
- `api-v3/`: API v3.
- `web-v2/`: aplicación web.
- `scripts/`: utilidades operativas y de despliegue.
- `docs/`: documentación técnica.
+2 -2
View File
@@ -12,8 +12,8 @@ android {
applicationId = "com.korexlabs.dhinspeccion"
minSdk = 26
targetSdk = 36
versionCode = 18
versionName = "0.11.0"
versionCode = 19
versionName = "0.12.0"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
@@ -16,6 +16,11 @@ import com.korexlabs.dhinspeccion.data.FieldFindingOptionsResponse
import com.korexlabs.dhinspeccion.data.FieldFindingsRepository
import com.korexlabs.dhinspeccion.data.FieldInventoryItem
import com.korexlabs.dhinspeccion.data.FieldType
import com.korexlabs.dhinspeccion.data.MobileActClosure
import com.korexlabs.dhinspeccion.data.MobileActDetail
import com.korexlabs.dhinspeccion.data.MobileActSummary
import com.korexlabs.dhinspeccion.data.MobileActsRepository
import com.korexlabs.dhinspeccion.data.MobileResponsibleRequest
import com.korexlabs.dhinspeccion.data.StoredSession
import com.korexlabs.dhinspeccion.data.VisitDetail
import com.korexlabs.dhinspeccion.data.VisitSummary
@@ -26,6 +31,7 @@ import java.time.Instant
class MainViewModel(application: Application) : AndroidViewModel(application) {
private val repository = DhRepository(application)
private val findingsRepository = FieldFindingsRepository(application)
private val actsRepository = MobileActsRepository(application)
var session: StoredSession? by mutableStateOf(repository.currentSession())
private set
@@ -48,6 +54,13 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
var selectedFieldAsset: FieldAssetDetail? by mutableStateOf(null)
private set
var acts: List<MobileActSummary> by mutableStateOf(emptyList())
private set
var selectedAct: MobileActDetail? by mutableStateOf(null)
private set
var actClosure: MobileActClosure? by mutableStateOf(null)
private set
var fieldFindingOptions: FieldFindingOptionsResponse? by mutableStateOf(null)
private set
var lastCreatedFinding: FieldFindingItem? by mutableStateOf(null)
@@ -85,6 +98,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
inventory = emptyList()
fieldTypes = emptyList()
selectedFieldAsset = null
clearActState()
clearFindingState()
}
}
@@ -101,6 +115,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
fieldTypes = emptyList()
selectedFieldAsset = null
clearFindingState()
loadActsInternal(id, selectDraft = true)
}
fun closeVisitView() {
@@ -108,6 +123,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
inventory = emptyList()
fieldTypes = emptyList()
selectedFieldAsset = null
clearActState()
clearFindingState()
loadVisits()
}
@@ -117,10 +133,51 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
launchBusy {
visit = repository.startVisit(id)
notice = "Inspección iniciada."
loadActsInternal(id, selectDraft = true)
loadVisitsInternal()
}
}
fun reloadActs() {
val visitId = visit?.id ?: return
launchBusy { loadActsInternal(visitId, selectDraft = selectedAct == null) }
}
fun selectAct(actId: String) {
launchBusy {
selectedAct = actsRepository.get(actId)
actClosure = actsRepository.closure(actId)
clearFindingState()
}
}
fun createActForSelectedInventory() {
val currentVisit = visit ?: return
val asset = selectedFieldAsset?.asset
if (currentVisit.status != "IN_PROGRESS") {
error = "La inspección debe estar en curso para crear un Acta."
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. Cerrala o cancelala antes de crear la siguiente."
return
}
launchBusy {
val created = actsRepository.create(currentVisit.id, asset.id, currentVisit.code)
selectedAct = created
actClosure = actsRepository.closure(created.id)
loadActsInternal(currentVisit.id, selectDraft = false)
notice = "${created.code} creada. Los Hallazgos nuevos quedarán vinculados explícitamente a esta Acta."
if (selectedFieldAsset?.capture?.readyForFinding == true) {
loadFindingOptionsInternal(currentVisit.id, asset.id, created.id)
}
}
}
fun searchInventory(search: String, parentId: String? = null) {
val id = visit?.id ?: return
launchBusy {
@@ -141,8 +198,13 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
selectedFieldAsset = repository.selectFieldAsset(visitId, item.id)
notice = "Inventario agregado a la inspección."
inventory = repository.fieldInventory(visitId, null, null).data
if (selectedFieldAsset?.capture?.readyForFinding == true) {
loadFindingOptionsInternal(visitId, item.id)
val draft = selectedDraftAct()
if (selectedFieldAsset?.capture?.readyForFinding == true && draft != null) {
selectedAct = actsRepository.ensureAsset(draft.id, item.id)
loadActsInternal(visitId, selectDraft = false)
loadFindingOptionsInternal(visitId, item.id, draft.id)
} else if (selectedFieldAsset?.capture?.readyForFinding == true) {
notice = "Inventario listo. Creá o seleccioná un Acta antes de registrar Hallazgos."
}
}
}
@@ -207,8 +269,11 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
selectedFieldAsset = repository.selectFieldAsset(visitId, result.canonical.id)
notice = "Fusión registrada. Se conserva ${result.canonical.code} y la historia de ${result.source.code} permanece trazable."
inventory = repository.fieldInventory(visitId, null, null).data
if (selectedFieldAsset?.capture?.readyForFinding == true) {
loadFindingOptionsInternal(visitId, result.canonical.id)
val draft = selectedDraftAct()
if (selectedFieldAsset?.capture?.readyForFinding == true && draft != null) {
selectedAct = actsRepository.ensureAsset(draft.id, result.canonical.id)
loadActsInternal(visitId, selectDraft = false)
loadFindingOptionsInternal(visitId, result.canonical.id, draft.id)
}
}
}
@@ -237,8 +302,13 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
"Fotografía registrada."
}
inventory = repository.fieldInventory(visitId, null, null).data
if (response.capture.readyForFinding) {
loadFindingOptionsInternal(visitId, asset.id)
val draft = selectedDraftAct()
if (response.capture.readyForFinding && draft != null) {
selectedAct = actsRepository.ensureAsset(draft.id, asset.id)
loadActsInternal(visitId, selectDraft = false)
loadFindingOptionsInternal(visitId, asset.id, draft.id)
} else if (response.capture.readyForFinding) {
notice = "Inventario listo. Creá o seleccioná un Acta antes de registrar Hallazgos."
}
}
}
@@ -246,7 +316,16 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
fun openFindingForSelected() {
val visitId = visit?.id ?: return
val assetId = selectedFieldAsset?.asset?.id ?: return
launchBusy { loadFindingOptionsInternal(visitId, assetId) }
val draft = selectedDraftAct()
if (draft == null) {
error = "Creá o seleccioná el Acta en borrador antes de registrar Hallazgos."
return
}
launchBusy {
selectedAct = actsRepository.ensureAsset(draft.id, assetId)
loadActsInternal(visitId, selectDraft = false)
loadFindingOptionsInternal(visitId, assetId, draft.id)
}
}
fun createFieldFinding(
@@ -259,6 +338,11 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
) {
val visitId = visit?.id ?: return
val assetId = selectedFieldAsset?.asset?.id ?: return
val actId = selectedDraftAct()?.id
if (actId == null) {
error = "No hay un Acta en borrador seleccionada."
return
}
if (description.isBlank()) {
error = "Describí el Hallazgo antes de guardarlo."
return
@@ -272,10 +356,12 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
return
}
launchBusy {
selectedAct = actsRepository.ensureAsset(actId, assetId)
val response = findingsRepository.create(
visitId,
assetId,
CreateFieldFindingRequest(
actId = actId,
catalogItemId = catalogItemId,
customTitle = customTitle?.trim()?.takeIf { it.isNotBlank() },
customLegalBasis = customLegalBasis?.trim()?.takeIf { it.isNotBlank() },
@@ -285,8 +371,9 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
),
)
lastCreatedFinding = response.finding
notice = "Hallazgo ${response.finding.code} registrado. Podés agregar evidencia fotográfica."
loadFindingOptionsInternal(visitId, assetId, keepLastCreated = true)
notice = "Hallazgo ${response.finding.code} registrado en ${response.act.code}. Podés agregar evidencia fotográfica."
loadFindingOptionsInternal(visitId, assetId, actId, keepLastCreated = true)
loadActsInternal(visitId, selectDraft = false)
}
}
@@ -318,6 +405,139 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
launchBusy { loadEvidenceInternal(findingId) }
}
fun setCompanyResponsiblePresent(
fullName: String,
documentType: String,
documentNumber: String,
position: String,
email: String?,
phone: String?,
) {
val actId = selectedAct?.id ?: return
if (fullName.isBlank() || documentNumber.isBlank() || position.isBlank()) {
error = "Completá nombre, documento y cargo del responsable de la empresa."
return
}
launchBusy {
actClosure = actsRepository.setResponsible(
actId,
MobileResponsibleRequest(
attendanceStatus = "PRESENT",
fullName = fullName.trim(),
documentType = documentType,
documentNumber = documentNumber.trim(),
position = position.trim(),
email = email?.trim()?.takeIf { it.isNotBlank() },
phone = phone?.trim()?.takeIf { it.isNotBlank() },
),
)
notice = "Responsable de empresa registrado para el Acta."
}
}
fun setCompanyResponsibleAbsent(reason: String) {
val actId = selectedAct?.id ?: return
if (reason.trim().length < 10) {
error = "Indicá un motivo de ausencia de al menos 10 caracteres."
return
}
launchBusy {
actClosure = actsRepository.setResponsible(
actId,
MobileResponsibleRequest(
attendanceStatus = "ABSENT",
absenceReason = reason.trim(),
),
)
notice = "Ausencia del responsable registrada."
}
}
fun prepareSelectedAct() {
val actId = selectedAct?.id ?: return
launchBusy {
actClosure = actsRepository.prepare(actId)
refreshSelectedActInternal(actId)
notice = "Acta preparada. Su contenido quedó congelado para las firmas."
}
}
fun reopenSelectedAct() {
val actId = selectedAct?.id ?: return
launchBusy {
actClosure = actsRepository.reopen(actId)
refreshSelectedActInternal(actId)
notice = "Acta reabierta. Podés corregirla antes de volver a preparar."
}
}
fun signSelectedActAsInspector(
png: File,
latitude: Double?,
longitude: Double?,
accuracyM: Double?,
) {
val actId = selectedAct?.id ?: return
launchBusy {
actClosure = actsRepository.signInspector(actId, png, latitude, longitude, accuracyM)
notice = "Firma del inspector incorporada al Acta."
}
}
fun signSelectedActAsCompany(
png: File,
latitude: Double?,
longitude: Double?,
accuracyM: Double?,
manifestation: String,
statement: String?,
) {
val actId = selectedAct?.id ?: return
launchBusy {
actClosure = actsRepository.signCompany(
actId, png, latitude, longitude, accuracyM, manifestation, statement,
)
notice = if (manifestation == "DISSENT") {
"Firma de empresa registrada con disidencia."
} else {
"Firma de empresa registrada."
}
}
}
fun recordCompanyOutcome(status: String, reason: String) {
val actId = selectedAct?.id ?: return
if (reason.trim().length < 10) {
error = "Indicá un motivo de al menos 10 caracteres."
return
}
launchBusy {
actClosure = actsRepository.companyOutcome(actId, status, reason)
notice = if (status == "ABSENT") "Ausencia de empresa asentada." else "Negativa a firmar asentada."
}
}
fun closeSelectedAct() {
val currentVisit = visit ?: return
val actId = selectedAct?.id ?: return
launchBusy {
actClosure = actsRepository.closeAct(actId)
refreshSelectedActInternal(actId)
loadActsInternal(currentVisit.id, selectDraft = false)
clearFindingState()
notice = "${selectedAct?.code ?: "Acta"} cerrada e inmutable. Podés crear otra Acta o finalizar la inspección."
}
}
fun closeInspection() {
val visitId = visit?.id ?: return
launchBusy {
visit = actsRepository.closeVisit(visitId)
loadVisitsInternal()
notice = "Inspección cerrada. Las Actas y documentos quedan disponibles para oficina."
}
}
fun clearFindingFlow() {
fieldFindingOptions = null
lastCreatedFinding = null
@@ -330,12 +550,43 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
clearFindingState()
}
private fun selectedDraftAct(): MobileActDetail? =
selectedAct?.takeIf { it.status == "DRAFT" }
?: acts.firstOrNull { it.status == "DRAFT" }?.let { summary ->
selectedAct?.takeIf { it.id == summary.id && it.status == "DRAFT" }
}
private suspend fun loadActsInternal(visitId: String, selectDraft: Boolean) {
acts = actsRepository.list(visitId).data
val currentId = selectedAct?.id
val current = currentId?.let { id -> acts.firstOrNull { it.id == id } }
val target = when {
current != null -> current.id
selectDraft -> acts.firstOrNull { it.status == "DRAFT" }?.id
else -> null
}
if (target != null) {
selectedAct = actsRepository.get(target)
actClosure = actsRepository.closure(target)
} else if (current == null) {
selectedAct = null
actClosure = null
}
}
private suspend fun refreshSelectedActInternal(actId: String) {
selectedAct = actsRepository.get(actId)
actClosure = actsRepository.closure(actId)
visit?.id?.let { loadActsInternal(it, selectDraft = false) }
}
private suspend fun loadFindingOptionsInternal(
visitId: String,
assetId: String,
actId: String,
keepLastCreated: Boolean = false,
) {
val options = findingsRepository.options(visitId, assetId)
val options = findingsRepository.options(visitId, assetId, actId)
fieldFindingOptions = options
if (!keepLastCreated) lastCreatedFinding = null
val loaded = linkedMapOf<String, List<FieldFindingEvidence>>()
@@ -351,6 +602,12 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
)
}
private fun clearActState() {
acts = emptyList()
selectedAct = null
actClosure = null
}
private fun clearFindingState() {
fieldFindingOptions = null
lastCreatedFinding = null
@@ -22,6 +22,7 @@ import retrofit2.http.Multipart
import retrofit2.http.POST
import retrofit2.http.Part
import retrofit2.http.Path
import retrofit2.http.Query
import java.io.File
import java.time.Instant
@@ -100,12 +101,15 @@ data class FieldFindingEvidenceListResponse(
data class FieldFindingOptionsResponse(
val act: FieldFindingAct,
val capture: CaptureStatus = CaptureStatus(),
val assetIncludedInAct: Boolean = true,
val catalog: FieldFindingCatalog,
val findings: List<FieldFindingItem> = emptyList(),
val canAddAnother: Boolean = true,
val actSelectionMode: String = "EXPLICIT",
)
data class CreateFieldFindingRequest(
val actId: String,
val catalogItemId: String? = null,
val customTitle: String? = null,
val customLegalBasis: String? = null,
@@ -119,6 +123,7 @@ data class FieldFindingCreateResponse(
val capture: CaptureStatus = CaptureStatus(),
val finding: FieldFindingItem,
val canAddAnother: Boolean = true,
val actSelectionMode: String = "EXPLICIT",
)
private interface FieldFindingsApi {
@@ -127,6 +132,7 @@ private interface FieldFindingsApi {
@Header("Authorization") authorization: String,
@Path("visitId") visitId: String,
@Path("assetId") assetId: String,
@Query("actId") actId: String,
): FieldFindingOptionsResponse
@POST("inspection-visits/{visitId}/field-findings/{assetId}")
@@ -166,7 +172,7 @@ private interface FieldFindingsApi {
/**
* Cliente de campo para Hallazgos y sus evidencias append-only.
* Comparte el almacén cifrado de sesión y nunca persiste la contraseña.
* F3.2 exige que la APK identifique explícitamente el Acta activa.
*/
class FieldFindingsRepository(context: Context) {
private val store = SecureSessionStore(context.applicationContext)
@@ -179,9 +185,9 @@ class FieldFindingsRepository(context: Context) {
.build()
.create(FieldFindingsApi::class.java)
suspend fun options(visitId: String, assetId: String): FieldFindingOptionsResponse =
suspend fun options(visitId: String, assetId: String, actId: String): FieldFindingOptionsResponse =
authorized { session ->
api.options("Bearer ${session.accessToken}", visitId, assetId)
api.options("Bearer ${session.accessToken}", visitId, assetId, actId)
}
suspend fun create(
@@ -0,0 +1,447 @@
package com.korexlabs.dhinspeccion.data
import android.content.Context
import com.korexlabs.dhinspeccion.BuildConfig
import com.squareup.moshi.Moshi
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import okhttp3.MediaType.Companion.toMediaType
import okhttp3.MultipartBody
import okhttp3.OkHttpClient
import okhttp3.RequestBody
import okhttp3.RequestBody.Companion.asRequestBody
import okhttp3.RequestBody.Companion.toRequestBody
import retrofit2.HttpException
import retrofit2.Retrofit
import retrofit2.converter.moshi.MoshiConverterFactory
import retrofit2.http.Body
import retrofit2.http.GET
import retrofit2.http.Header
import retrofit2.http.Multipart
import retrofit2.http.PATCH
import retrofit2.http.POST
import retrofit2.http.PUT
import retrofit2.http.Part
import retrofit2.http.Path
import retrofit2.http.Query
import java.io.File
import java.time.Instant
data class MobileActSummary(
val id: String,
val visitId: String,
val code: String,
val status: String,
val occurredAt: String,
val title: String,
val summary: String,
val observations: String? = null,
val currentVersion: Int = 0,
val closedAt: String? = null,
val closureSha256: String? = null,
val assetCount: Int = 0,
val findingCount: Int = 0,
)
data class MobileActDetail(
val id: String,
val visitId: String,
val code: String,
val status: String,
val occurredAt: String,
val title: String,
val summary: String,
val observations: String? = null,
val currentVersion: Int = 0,
val closedAt: String? = null,
val closureSha256: String? = null,
val assetCount: Int = 0,
val findingCount: Int = 0,
val assets: List<AssetSummary> = emptyList(),
)
data class MobileActListMeta(
val page: Int = 1,
val pageSize: Int = 100,
val total: Int = 0,
val totalPages: Int = 0,
)
data class MobileActListResponse(
val data: List<MobileActSummary> = emptyList(),
val meta: MobileActListMeta = MobileActListMeta(),
)
data class CreateMobileActRequest(
val occurredAt: String,
val title: String,
val summary: String,
val observations: String? = null,
val assetIds: List<String>,
)
data class UpdateMobileActRequest(
val assetIds: List<String>,
)
data class MobileResponsibleRequest(
val attendanceStatus: String,
val fullName: String? = null,
val documentType: String? = null,
val documentNumber: String? = null,
val position: String? = null,
val email: String? = null,
val phone: String? = null,
val absenceReason: String? = null,
)
data class MobileResponsible(
val actId: String,
val attendanceStatus: String,
val fullName: String? = null,
val documentType: String? = null,
val documentNumber: String? = null,
val position: String? = null,
val email: String? = null,
val phone: String? = null,
val absenceReason: String? = null,
)
data class MobileActClosureHeader(
val id: String,
val code: String,
val status: String,
val visitId: String,
val currentVersion: Int = 0,
val closedAt: String? = null,
val closureSha256: String? = null,
)
data class MobileVisitClosureHeader(
val id: String,
val code: String,
val status: String,
val actualClosedAt: String? = null,
)
data class MobileSignature(
val id: String,
val signerType: String,
val signerUserId: String? = null,
val signerName: String,
val status: String,
val reason: String? = null,
val companyManifestation: String? = null,
val companyStatement: String? = null,
val signedAt: String? = null,
val imageSha256: String? = null,
)
data class MobileClosureRecord(
val schemaVersion: String,
val preparedSha256: String,
val preparedAt: String,
val finalSha256: String? = null,
val deviceClosedAt: String? = null,
val serverClosedAt: String? = null,
val uploadMode: String? = null,
val isCurrent: Boolean = true,
)
data class MobileClosureConsents(
val version: String = "",
val inspector: String = "",
val company: String = "",
)
data class MobileActClosure(
val act: MobileActClosureHeader,
val visit: MobileVisitClosureHeader,
val responsible: MobileResponsible? = null,
val closure: MobileClosureRecord? = null,
val signatures: List<MobileSignature> = emptyList(),
val consents: MobileClosureConsents = MobileClosureConsents(),
)
data class MobileCompanyOutcomeRequest(
val status: String,
val reason: String,
)
data class MobileCloseActRequest(
val clientClosedAt: String = Instant.now().toString(),
val uploadMode: String = "ONLINE",
)
data class MobileCloseVisitRequest(
val clientClosedAt: String = Instant.now().toString(),
)
private interface MobileActsApi {
@GET("inspection-visits/{visitId}/acts")
suspend fun listActs(
@Header("Authorization") authorization: String,
@Path("visitId") visitId: String,
@Query("pageSize") pageSize: Int = 100,
): MobileActListResponse
@GET("inspection-acts/{actId}")
suspend fun act(
@Header("Authorization") authorization: String,
@Path("actId") actId: String,
): MobileActDetail
@POST("inspection-visits/{visitId}/acts")
suspend fun createAct(
@Header("Authorization") authorization: String,
@Path("visitId") visitId: String,
@Body request: CreateMobileActRequest,
): MobileActDetail
@PATCH("inspection-acts/{actId}")
suspend fun updateAct(
@Header("Authorization") authorization: String,
@Path("actId") actId: String,
@Body request: UpdateMobileActRequest,
): MobileActDetail
@GET("inspection-acts/{actId}/closure")
suspend fun closure(
@Header("Authorization") authorization: String,
@Path("actId") actId: String,
): MobileActClosure
@PUT("inspection-acts/{actId}/responsible")
suspend fun responsible(
@Header("Authorization") authorization: String,
@Path("actId") actId: String,
@Body request: MobileResponsibleRequest,
): MobileActClosure
@POST("inspection-acts/{actId}/ready")
suspend fun ready(
@Header("Authorization") authorization: String,
@Path("actId") actId: String,
): MobileActClosure
@POST("inspection-acts/{actId}/reopen")
suspend fun reopen(
@Header("Authorization") authorization: String,
@Path("actId") actId: String,
): MobileActClosure
@Multipart
@POST("inspection-acts/{actId}/signatures/inspector")
suspend fun signInspector(
@Header("Authorization") authorization: String,
@Path("actId") actId: String,
@Part file: MultipartBody.Part,
@Part("consentAccepted") consentAccepted: RequestBody,
@Part("clientSignedAt") clientSignedAt: RequestBody,
@Part("latitude") latitude: RequestBody?,
@Part("longitude") longitude: RequestBody?,
@Part("accuracyM") accuracyM: RequestBody?,
@Part("deviceLabel") deviceLabel: RequestBody,
): MobileActClosure
@Multipart
@POST("inspection-acts/{actId}/signatures/company")
suspend fun signCompany(
@Header("Authorization") authorization: String,
@Path("actId") actId: String,
@Part file: MultipartBody.Part,
@Part("consentAccepted") consentAccepted: RequestBody,
@Part("clientSignedAt") clientSignedAt: RequestBody,
@Part("latitude") latitude: RequestBody?,
@Part("longitude") longitude: RequestBody?,
@Part("accuracyM") accuracyM: RequestBody?,
@Part("deviceLabel") deviceLabel: RequestBody,
@Part("manifestation") manifestation: RequestBody?,
@Part("statement") statement: RequestBody?,
): MobileActClosure
@POST("inspection-acts/{actId}/company-outcome")
suspend fun companyOutcome(
@Header("Authorization") authorization: String,
@Path("actId") actId: String,
@Body request: MobileCompanyOutcomeRequest,
): MobileActClosure
@POST("inspection-acts/{actId}/close")
suspend fun closeAct(
@Header("Authorization") authorization: String,
@Path("actId") actId: String,
@Body request: MobileCloseActRequest,
): MobileActClosure
@POST("inspection-visits/{visitId}/close")
suspend fun closeVisit(
@Header("Authorization") authorization: String,
@Path("visitId") visitId: String,
@Body request: MobileCloseVisitRequest,
): VisitDetail
@POST("auth/mobile/refresh")
suspend fun refresh(@Body request: RefreshRequest): MobileSessionResponse
}
class MobileActsRepository(context: Context) {
private val store = SecureSessionStore(context.applicationContext)
private val refreshMutex = Mutex()
private val moshi = Moshi.Builder().addLast(KotlinJsonAdapterFactory()).build()
private val api: MobileActsApi = Retrofit.Builder()
.baseUrl(BuildConfig.API_BASE_URL)
.client(OkHttpClient.Builder().build())
.addConverterFactory(MoshiConverterFactory.create(moshi))
.build()
.create(MobileActsApi::class.java)
suspend fun list(visitId: String): MobileActListResponse = authorized { session ->
api.listActs("Bearer ${session.accessToken}", visitId)
}
suspend fun get(actId: String): MobileActDetail = authorized { session ->
api.act("Bearer ${session.accessToken}", actId)
}
suspend fun create(visitId: String, assetId: String, visitCode: String): MobileActDetail = authorized { session ->
api.createAct(
"Bearer ${session.accessToken}",
visitId,
CreateMobileActRequest(
occurredAt = Instant.now().toString(),
title = "Acta de inspección $visitCode",
summary = "Acta de inspección en curso. Los Hallazgos y observaciones se incorporan de forma trazable durante la visita.",
assetIds = listOf(assetId),
),
)
}
suspend fun ensureAsset(actId: String, assetId: String): MobileActDetail {
val detail = get(actId)
if (detail.assets.any { it.id == assetId }) return detail
val ids = (detail.assets.map { it.id } + assetId).distinct()
return authorized { session ->
api.updateAct("Bearer ${session.accessToken}", actId, UpdateMobileActRequest(ids))
}
}
suspend fun closure(actId: String): MobileActClosure = authorized { session ->
api.closure("Bearer ${session.accessToken}", actId)
}
suspend fun setResponsible(actId: String, request: MobileResponsibleRequest): MobileActClosure = authorized { session ->
api.responsible("Bearer ${session.accessToken}", actId, request)
}
suspend fun prepare(actId: String): MobileActClosure = authorized { session ->
api.ready("Bearer ${session.accessToken}", actId)
}
suspend fun reopen(actId: String): MobileActClosure = authorized { session ->
api.reopen("Bearer ${session.accessToken}", actId)
}
suspend fun signInspector(
actId: String,
png: File,
latitude: Double?,
longitude: Double?,
accuracyM: Double?,
): MobileActClosure = signature(actId, png, latitude, longitude, accuracyM, company = false)
suspend fun signCompany(
actId: String,
png: File,
latitude: Double?,
longitude: Double?,
accuracyM: Double?,
manifestation: String = "CONFORMITY",
statement: String? = null,
): MobileActClosure = signature(
actId = actId,
png = png,
latitude = latitude,
longitude = longitude,
accuracyM = accuracyM,
company = true,
manifestation = manifestation,
statement = statement,
)
suspend fun companyOutcome(actId: String, status: String, reason: String): MobileActClosure = authorized { session ->
api.companyOutcome(
"Bearer ${session.accessToken}",
actId,
MobileCompanyOutcomeRequest(status, reason.trim()),
)
}
suspend fun closeAct(actId: String): MobileActClosure = authorized { session ->
api.closeAct("Bearer ${session.accessToken}", actId, MobileCloseActRequest())
}
suspend fun closeVisit(visitId: String): VisitDetail = authorized { session ->
api.closeVisit("Bearer ${session.accessToken}", visitId, MobileCloseVisitRequest())
}
private suspend fun signature(
actId: String,
png: File,
latitude: Double?,
longitude: Double?,
accuracyM: Double?,
company: Boolean,
manifestation: String? = null,
statement: String? = null,
): MobileActClosure = authorized { session ->
val text = "text/plain".toMediaType()
val file = MultipartBody.Part.createFormData(
"file",
png.name,
png.asRequestBody("image/png".toMediaType()),
)
val consent = "true".toRequestBody(text)
val signedAt = Instant.now().toString().toRequestBody(text)
val device = "DH Android".toRequestBody(text)
val lat = latitude?.toString()?.toRequestBody(text)
val lon = longitude?.toString()?.toRequestBody(text)
val accuracy = accuracyM?.toString()?.toRequestBody(text)
if (company) {
api.signCompany(
"Bearer ${session.accessToken}", actId, file, consent, signedAt,
lat, lon, accuracy, device,
manifestation?.toRequestBody(text),
statement?.trim()?.takeIf { it.isNotBlank() }?.toRequestBody(text),
)
} else {
api.signInspector(
"Bearer ${session.accessToken}", actId, file, consent, signedAt,
lat, lon, accuracy, device,
)
}
}
private suspend fun <T> authorized(block: suspend (StoredSession) -> T): T {
var session = store.load() ?: throw IllegalStateException("Sesión no iniciada")
try {
return block(session)
} catch (error: HttpException) {
if (error.code() != 401) throw error
}
session = refresh(session.refreshToken)
return block(session)
}
private suspend fun refresh(previousRefreshToken: String): StoredSession = refreshMutex.withLock {
val latest = store.load() ?: throw IllegalStateException("Sesión no iniciada")
if (latest.refreshToken != previousRefreshToken) return@withLock latest
try {
store.save(api.refresh(RefreshRequest(previousRefreshToken)))
} catch (error: Throwable) {
store.clear()
throw error
}
}
}
@@ -76,15 +76,31 @@ private data class F3GeoSnapshot(
@Composable
fun F3VisitRoot(model: MainViewModel) {
var inventoryMode by rememberSaveable(model.visit?.id) { mutableStateOf(false) }
if (inventoryMode) {
F3FieldInventoryScreen(model, onBack = { inventoryMode = false })
} else {
F3VisitOverview(model, onInventory = { inventoryMode = true })
var actsMode by rememberSaveable(model.visit?.id) { mutableStateOf(false) }
when {
actsMode -> MobileActsScreen(
model = model,
onBack = { actsMode = false },
onGoInventory = {
actsMode = false
inventoryMode = true
},
)
inventoryMode -> F3FieldInventoryScreen(model, onBack = { inventoryMode = false })
else -> F3VisitOverview(
model = model,
onInventory = { inventoryMode = true },
onActs = { actsMode = true },
)
}
}
@Composable
private fun F3VisitOverview(model: MainViewModel, onInventory: () -> Unit) {
private fun F3VisitOverview(
model: MainViewModel,
onInventory: () -> Unit,
onActs: () -> Unit,
) {
val visit = model.visit ?: return
Column(
Modifier
@@ -137,9 +153,17 @@ private fun F3VisitOverview(model: MainViewModel, onInventory: () -> Unit) {
Button(onClick = onInventory, modifier = Modifier.fillMaxWidth()) {
Text("Abrir Inventario de campo")
}
OutlinedButton(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 ""}")
}
} else if (visit.status == "CLOSED") {
OutlinedButton(onClick = onActs, modifier = Modifier.fillMaxWidth()) {
Text("Ver Actas · ${model.acts.size}")
}
} else if (visit.status == "PLANNED") {
Text(
"Primero iniciá la inspección para habilitar altas, fotografías y Hallazgos.",
"Primero iniciá la inspección para habilitar altas, fotografías, Actas y Hallazgos.",
style = MaterialTheme.typography.bodySmall,
)
}
@@ -0,0 +1,425 @@
package com.korexlabs.dhinspeccion.ui
import android.Manifest
import android.content.Context
import android.content.pm.PackageManager
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.AssistChip
import androidx.compose.material3.Button
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import androidx.core.content.ContextCompat
import com.google.android.gms.location.LocationServices
import com.google.android.gms.location.Priority
import com.google.android.gms.tasks.CancellationTokenSource
import com.korexlabs.dhinspeccion.MainViewModel
import kotlinx.coroutines.launch
import kotlinx.coroutines.suspendCancellableCoroutine
import java.io.File
import kotlin.coroutines.resume
import kotlin.coroutines.resumeWithException
private data class ActSignatureGeo(
val latitude: Double,
val longitude: Double,
val accuracyM: Double?,
)
@Composable
fun MobileActsScreen(
model: MainViewModel,
onBack: () -> Unit,
onGoInventory: () -> Unit,
) {
val visit = model.visit ?: return
val selected = model.selectedAct
val closure = model.actClosure
val context = LocalContext.current
val scope = rememberCoroutineScope()
var attendance by rememberSaveable(selected?.id) {
mutableStateOf(closure?.responsible?.attendanceStatus ?: "PRESENT")
}
var fullName by rememberSaveable(selected?.id) {
mutableStateOf(closure?.responsible?.fullName.orEmpty())
}
var documentType by rememberSaveable(selected?.id) {
mutableStateOf(closure?.responsible?.documentType ?: "DNI")
}
var documentNumber by rememberSaveable(selected?.id) {
mutableStateOf(closure?.responsible?.documentNumber.orEmpty())
}
var position by rememberSaveable(selected?.id) {
mutableStateOf(closure?.responsible?.position.orEmpty())
}
var email by rememberSaveable(selected?.id) {
mutableStateOf(closure?.responsible?.email.orEmpty())
}
var phone by rememberSaveable(selected?.id) {
mutableStateOf(closure?.responsible?.phone.orEmpty())
}
var absenceReason by rememberSaveable(selected?.id) {
mutableStateOf(closure?.responsible?.absenceReason.orEmpty())
}
var refusalReason by rememberSaveable(selected?.id) { mutableStateOf("") }
var manifestation by rememberSaveable(selected?.id) { mutableStateOf("CONFORMITY") }
var dissentStatement by rememberSaveable(selected?.id) { mutableStateOf("") }
LaunchedEffect(visit.id) { model.reloadActs() }
fun signWithGeo(file: File, company: Boolean) {
scope.launch {
val geo = runCatching { currentActSignatureGeo(context) }.getOrNull()
if (company) {
model.signSelectedActAsCompany(
png = file,
latitude = geo?.latitude,
longitude = geo?.longitude,
accuracyM = geo?.accuracyM,
manifestation = manifestation,
statement = dissentStatement.takeIf { manifestation == "DISSENT" },
)
} else {
model.signSelectedActAsInspector(
png = file,
latitude = geo?.latitude,
longitude = geo?.longitude,
accuracyM = geo?.accuracyM,
)
}
}
}
Column(
Modifier
.fillMaxSize()
.verticalScroll(rememberScrollState())
.padding(top = 28.dp, start = 16.dp, end = 16.dp, bottom = 36.dp),
verticalArrangement = Arrangement.spacedBy(12.dp),
) {
Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
OutlinedButton(onClick = onBack, enabled = !model.busy) { Text("Volver") }
Text("Actas", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
}
Text("${visit.code} · ${visit.operatorCompany?.name.orEmpty()}")
F32ActMessage(model)
Card(Modifier.fillMaxWidth()) {
Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
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.")
}
model.acts.forEach { act ->
val active = selected?.id == act.id
OutlinedButton(
onClick = { model.selectAct(act.id) },
modifier = Modifier.fillMaxWidth(),
) {
Text(
(if (active) "" else "") +
"${act.code} · ${actStatusLabel(act.status)} · ${act.findingCount} Hallazgo${if (act.findingCount == 1) "" else "s"}",
)
}
}
}
}
val hasDraftAct = model.acts.any { it.status == "DRAFT" }
if (visit.status == "IN_PROGRESS" && !hasDraftAct) {
Card(
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)
if (model.acts.any { it.status == "READY" }) {
Text(
"Puede existir una nueva Acta en borrador aunque haya Actas preparadas pendientes de firma de empresa. Sólo se permite un borrador a la vez.",
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() },
enabled = !model.busy,
modifier = Modifier.fillMaxWidth(),
) { Text("Crear nueva Acta") }
}
}
}
}
if (selected != null) {
HorizontalDivider()
Card(Modifier.fillMaxWidth()) {
Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
Text(selected.code, style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
Text(actStatusLabel(selected.status))
Text("${selected.findingCount} Hallazgo${if (selected.findingCount == 1) "" else "s"} · ${selected.assetCount} elemento${if (selected.assetCount == 1) "" else "s"} de Inventario")
Text(selected.summary, style = MaterialTheme.typography.bodySmall)
selected.closureSha256?.let { Text("Hash final: $it", style = MaterialTheme.typography.bodySmall) }
}
}
when (selected.status) {
"DRAFT" -> {
Text("1. 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") })
}
if (attendance == "PRESENT") {
OutlinedTextField(fullName, { fullName = it }, label = { Text("Nombre y apellido *") }, modifier = Modifier.fillMaxWidth())
Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(6.dp)) {
listOf("DNI", "CUIL", "PASSPORT", "OTHER").forEach { kind ->
AssistChip(onClick = { documentType = kind }, label = { Text(if (documentType == kind) "$kind" else kind) })
}
}
OutlinedTextField(documentNumber, { documentNumber = it }, label = { Text("Documento *") }, modifier = Modifier.fillMaxWidth())
OutlinedTextField(position, { position = it }, label = { Text("Cargo *") }, modifier = Modifier.fillMaxWidth())
OutlinedTextField(email, { email = it }, label = { Text("Email") }, modifier = Modifier.fillMaxWidth())
OutlinedTextField(phone, { phone = it }, label = { Text("Teléfono") }, modifier = Modifier.fillMaxWidth())
Button(
onClick = {
model.setCompanyResponsiblePresent(fullName, documentType, documentNumber, position, email, phone)
},
enabled = !model.busy && fullName.isNotBlank() && documentNumber.isNotBlank() && position.isNotBlank(),
modifier = Modifier.fillMaxWidth(),
) { Text("Guardar responsable") }
} else {
OutlinedTextField(
absenceReason,
{ absenceReason = it },
label = { Text("Motivo de ausencia *") },
minLines = 2,
modifier = Modifier.fillMaxWidth(),
)
Button(
onClick = { model.setCompanyResponsibleAbsent(absenceReason) },
enabled = !model.busy && absenceReason.trim().length >= 10,
modifier = Modifier.fillMaxWidth(),
) { Text("Guardar ausencia") }
}
HorizontalDivider()
Text("2. Hallazgos / verificaciones", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
Text("Los Hallazgos se cargan desde Inventario y quedan vinculados a ${selected.code} de forma explícita. Un Acta de verificación puede prepararse sin Hallazgos nuevos si la verificación ya fue registrada.")
Button(onClick = onGoInventory, modifier = Modifier.fillMaxWidth()) { Text("Ir a Inventario / Hallazgos") }
HorizontalDivider()
Text("3. Preparar Acta", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
Text("Al preparar, el contenido se congela y se calcula su hash. El servidor exige al menos un Hallazgo o una verificación registrada.")
Button(
onClick = { model.prepareSelectedAct() },
enabled = !model.busy && closure?.responsible != null,
modifier = Modifier.fillMaxWidth(),
) { Text("Preparar Acta para firmas") }
}
"READY" -> {
val signatures = closure?.signatures.orEmpty()
val inspectorSigned = signatures.any { it.signerType == "INSPECTOR" && it.status == "SIGNED" }
val companyOutcome = signatures.firstOrNull { it.signerType == "COMPANY_RESPONSIBLE" }
Text("Acta preparada", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
closure?.closure?.preparedSha256?.let { Text("Hash preparado: $it", style = MaterialTheme.typography.bodySmall) }
if (signatures.isEmpty()) {
OutlinedButton(onClick = { model.reopenSelectedAct() }, enabled = !model.busy, modifier = Modifier.fillMaxWidth()) {
Text("Volver a borrador")
}
}
HorizontalDivider()
Text("Firma del inspector", fontWeight = FontWeight.Bold)
if (inspectorSigned) {
Text("✓ Firma del inspector registrada", color = MaterialTheme.colorScheme.primary)
} else {
Text(closure?.consents?.inspector.orEmpty(), style = MaterialTheme.typography.bodySmall)
SignaturePad(
label = "Firmá como inspector/a",
enabled = !model.busy,
onCaptured = { file -> signWithGeo(file, company = false) },
)
}
HorizontalDivider()
Text("Recepción de la empresa", fontWeight = FontWeight.Bold)
if (companyOutcome != null) {
val detail = when (companyOutcome.status) {
"SIGNED" -> if (companyOutcome.companyManifestation == "DISSENT") "Firma en disidencia" else "Firma registrada"
"REFUSED" -> "Negativa a firmar"
"ABSENT" -> "Responsable ausente"
else -> companyOutcome.status
}
Text("$detail", color = MaterialTheme.colorScheme.primary)
companyOutcome.reason?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
companyOutcome.companyStatement?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
} else if (closure?.responsible?.attendanceStatus == "ABSENT") {
Text("El responsable fue registrado como ausente.")
Button(
onClick = {
model.recordCompanyOutcome(
"ABSENT",
closure.responsible.absenceReason ?: "Responsable de empresa ausente durante la inspección",
)
},
enabled = !model.busy && inspectorSigned,
modifier = Modifier.fillMaxWidth(),
) { Text("Asentar ausencia en el Acta") }
} else {
Text(closure?.consents?.company.orEmpty(), style = MaterialTheme.typography.bodySmall)
Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
AssistChip(onClick = { manifestation = "CONFORMITY" }, label = { Text(if (manifestation == "CONFORMITY") "✓ Conforme" else "Conforme") })
AssistChip(onClick = { manifestation = "DISSENT" }, label = { Text(if (manifestation == "DISSENT") "✓ En disidencia" else "En disidencia") })
}
if (manifestation == "DISSENT") {
OutlinedTextField(
dissentStatement,
{ dissentStatement = it },
label = { Text("Manifestación de disidencia *") },
minLines = 2,
modifier = Modifier.fillMaxWidth(),
)
}
SignaturePad(
label = "Firma del responsable de empresa",
enabled = !model.busy && inspectorSigned && (manifestation != "DISSENT" || dissentStatement.trim().length >= 10),
onCaptured = { file -> signWithGeo(file, company = true) },
)
Text("Si la persona presente se niega a firmar, asentá el motivo en lugar de dibujar una firma.", style = MaterialTheme.typography.bodySmall)
OutlinedTextField(
refusalReason,
{ refusalReason = it },
label = { Text("Motivo de negativa") },
minLines = 2,
modifier = Modifier.fillMaxWidth(),
)
OutlinedButton(
onClick = { model.recordCompanyOutcome("REFUSED", refusalReason) },
enabled = !model.busy && inspectorSigned && refusalReason.trim().length >= 10,
modifier = Modifier.fillMaxWidth(),
) { Text("Registrar negativa a firmar") }
}
HorizontalDivider()
if (inspectorSigned && companyOutcome != null) {
Button(
onClick = { model.closeSelectedAct() },
enabled = !model.busy,
modifier = Modifier.fillMaxWidth(),
) { Text("Cerrar Acta definitivamente") }
} else if (inspectorSigned) {
Text(
"La inspección puede finalizar con la firma de empresa pendiente; el Acta permanecerá preparada hasta registrar firma, negativa o ausencia.",
style = MaterialTheme.typography.bodySmall,
)
}
}
"CLOSED" -> {
Card(
Modifier.fillMaxWidth(),
colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer),
) {
Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
Text("Acta cerrada e inmutable", fontWeight = FontWeight.Bold)
Text("El PDF, informe Word y entregas documentales se generan desde este cierre.")
closure?.closure?.finalSha256?.let { Text("SHA-256: $it", style = MaterialTheme.typography.bodySmall) }
}
}
}
"CANCELLED" -> Text("Esta Acta fue cancelada y permanece sólo como antecedente.")
}
}
if (visit.status == "IN_PROGRESS" && model.acts.isNotEmpty()) {
HorizontalDivider()
val drafts = model.acts.count { it.status == "DRAFT" }
Text("Finalizar inspección", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
Text(
"No puede quedar ninguna Acta en borrador. Al cerrar, el servidor verifica que cada Acta preparada tenga firma de inspector; si falta alguna, indicará cuál debe completarse.",
)
Button(
onClick = { model.closeInspection() },
enabled = !model.busy && drafts == 0,
modifier = Modifier.fillMaxWidth(),
) { Text("Cerrar inspección y salir de la empresa") }
}
}
}
@Composable
private fun F32ActMessage(model: MainViewModel) {
val text = model.error ?: model.notice ?: return
Card(
modifier = Modifier.fillMaxWidth(),
colors = CardDefaults.cardColors(
containerColor = if (model.error != null) MaterialTheme.colorScheme.errorContainer
else MaterialTheme.colorScheme.secondaryContainer,
),
onClick = { model.clearMessages() },
) {
Text(text, Modifier.padding(12.dp))
}
}
private fun actStatusLabel(status: String): String = when (status) {
"DRAFT" -> "Borrador"
"READY" -> "Preparada para firmas"
"CLOSED" -> "Cerrada"
"CANCELLED" -> "Cancelada"
else -> status
}
private fun hasActLocation(context: Context): Boolean =
ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED ||
ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED
private suspend fun currentActSignatureGeo(context: Context): ActSignatureGeo = suspendCancellableCoroutine { continuation ->
if (!hasActLocation(context)) {
continuation.resumeWithException(SecurityException("Ubicación no autorizada"))
return@suspendCancellableCoroutine
}
val source = CancellationTokenSource()
LocationServices.getFusedLocationProviderClient(context)
.getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
.addOnSuccessListener { location ->
if (!continuation.isActive) return@addOnSuccessListener
if (location == null) continuation.resumeWithException(IllegalStateException("Ubicación no disponible"))
else continuation.resume(ActSignatureGeo(location.latitude, location.longitude, location.accuracy.toDouble()))
}
.addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
continuation.invokeOnCancellation { source.cancel() }
}
@@ -0,0 +1,137 @@
package com.korexlabs.dhinspeccion.ui
import android.graphics.Bitmap
import android.graphics.Canvas as AndroidCanvas
import android.graphics.Color as AndroidColor
import android.graphics.Paint
import androidx.compose.foundation.Canvas
import androidx.compose.foundation.background
import androidx.compose.foundation.gestures.detectDragGestures
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Button
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateListOf
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.StrokeCap
import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.layout.onSizeChanged
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.unit.IntSize
import androidx.compose.ui.unit.dp
import java.io.File
import java.io.FileOutputStream
@Composable
fun SignaturePad(
label: String,
enabled: Boolean = true,
onCaptured: (File) -> Unit,
) {
val context = LocalContext.current
val strokes = remember { mutableStateListOf<List<Offset>>() }
var currentStroke by remember { mutableStateOf<List<Offset>>(emptyList()) }
var canvasSize by remember { mutableStateOf(IntSize.Zero) }
Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
Text(label, fontWeight = androidx.compose.ui.text.font.FontWeight.SemiBold)
Text(
"Firmá dentro del recuadro. La imagen se guarda como PNG y se incorpora al hash del Acta.",
style = MaterialTheme.typography.bodySmall,
)
Canvas(
modifier = Modifier
.fillMaxWidth()
.height(190.dp)
.background(Color.White)
.onSizeChanged { canvasSize = it }
.pointerInput(enabled) {
if (!enabled) return@pointerInput
detectDragGestures(
onDragStart = { position -> currentStroke = listOf(position) },
onDrag = { change, _ ->
change.consume()
currentStroke = currentStroke + change.position
},
onDragEnd = {
if (currentStroke.size > 1) strokes.add(currentStroke)
currentStroke = emptyList()
},
onDragCancel = { currentStroke = emptyList() },
)
},
) {
val all = strokes + listOf(currentStroke)
all.forEach { stroke ->
stroke.zipWithNext().forEach { (start, end) ->
drawLine(
color = Color.Black,
start = start,
end = end,
strokeWidth = 4.dp.toPx(),
cap = StrokeCap.Round,
)
}
}
}
Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
OutlinedButton(
onClick = { strokes.clear(); currentStroke = emptyList() },
enabled = enabled && (strokes.isNotEmpty() || currentStroke.isNotEmpty()),
modifier = Modifier.weight(1f),
) { Text("Limpiar") }
Button(
onClick = {
val width = canvasSize.width.coerceAtLeast(1)
val height = canvasSize.height.coerceAtLeast(1)
val targetWidth = 1000
val targetHeight = 400
val scaleX = targetWidth.toFloat() / width.toFloat()
val scaleY = targetHeight.toFloat() / height.toFloat()
val bitmap = Bitmap.createBitmap(targetWidth, targetHeight, Bitmap.Config.ARGB_8888)
val native = AndroidCanvas(bitmap)
native.drawColor(AndroidColor.WHITE)
val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
color = AndroidColor.BLACK
strokeWidth = 7f
strokeCap = Paint.Cap.ROUND
strokeJoin = Paint.Join.ROUND
style = Paint.Style.STROKE
}
strokes.forEach { stroke ->
stroke.zipWithNext().forEach { (start, end) ->
native.drawLine(
start.x * scaleX,
start.y * scaleY,
end.x * scaleX,
end.y * scaleY,
paint,
)
}
}
val file = File.createTempFile("DH_FIRMA_", ".png", context.cacheDir)
FileOutputStream(file).use { stream ->
check(bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream))
}
bitmap.recycle()
onCaptured(file)
},
enabled = enabled && strokes.isNotEmpty(),
modifier = Modifier.weight(1f),
) { Text("Usar firma") }
}
}
}
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "dhv2-api",
"version": "0.24.0-1",
"version": "0.25.0-1",
"private": true,
"license": "UNLICENSED",
"scripts": {
@@ -18,8 +18,13 @@ const optionalText = ({ value }: { value: unknown }) =>
/**
* Hallazgo capturado desde la APK sobre un Inventario ya seleccionado.
* El assetId se toma de la URL para evitar inconsistencias entre pantalla y payload.
* `actId` queda opcional sólo para compatibilidad con Android 0.11.0; F3.2 siempre lo envía.
*/
export class CreateFieldFindingDto {
@IsOptional()
@IsUUID('4')
actId?: string;
@IsOptional()
@Transform(optionalText)
@IsUUID('4')
@@ -0,0 +1,12 @@
import { IsOptional, IsUUID } from 'class-validator';
/**
* Selección explícita del Acta activa desde la APK.
* `actId` queda opcional sólo durante la transición desde Android 0.11.0;
* F3.2 móvil siempre lo informa.
*/
export class FieldFindingActQueryDto {
@IsOptional()
@IsUUID('4')
actId?: string;
}
@@ -5,12 +5,14 @@ import {
Param,
ParseUUIDPipe,
Post,
Query,
Req,
} from '@nestjs/common';
import { CurrentAuth } from '../auth/decorators/current-auth.decorator';
import { RequirePermissions } from '../authorization/decorators/require-permissions.decorator';
import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
import { CreateFieldFindingDto } from './dto/create-field-finding.dto';
import { FieldFindingActQueryDto } from './dto/field-finding-act-query.dto';
import { FieldFindingsService } from './field-findings.service';
@Controller('inspection-visits/:visitId/field-findings')
@@ -22,9 +24,10 @@ export class FieldFindingsController {
options(
@Param('visitId', new ParseUUIDPipe({ version: '4' })) visitId: string,
@Param('assetId', new ParseUUIDPipe({ version: '4' })) assetId: string,
@Query() query: FieldFindingActQueryDto,
@CurrentAuth() principal: AuthPrincipal,
): Promise<unknown> {
return this.fieldFindings.options(visitId, assetId, principal);
return this.fieldFindings.options(visitId, assetId, query.actId, principal);
}
@Get(':assetId')
@@ -32,9 +35,10 @@ export class FieldFindingsController {
list(
@Param('visitId', new ParseUUIDPipe({ version: '4' })) visitId: string,
@Param('assetId', new ParseUUIDPipe({ version: '4' })) assetId: string,
@Query() query: FieldFindingActQueryDto,
@CurrentAuth() principal: AuthPrincipal,
): Promise<unknown> {
return this.fieldFindings.list(visitId, assetId, principal);
return this.fieldFindings.list(visitId, assetId, query.actId, principal);
}
@Post(':assetId')
@@ -36,9 +36,15 @@ export class FieldFindingsService {
private readonly findings: InspectionFindingsService,
) {}
async options(visitId: string, assetId: string, principal: AuthPrincipal) {
async options(
visitId: string,
assetId: string,
actId: string | undefined,
principal: AuthPrincipal,
) {
const gate = await this.requireGate(visitId, assetId, principal);
const act = await this.requireDraftAct(visitId);
const act = await this.requireDraftAct(visitId, actId);
const assetIncludedInAct = await this.actContainsAsset(act.id, assetId);
const [catalog, findings] = await Promise.all([
this.catalog.listApplicableForAsset(assetId, {}),
this.findings.listForAct(act.id),
@@ -48,21 +54,30 @@ export class FieldFindingsService {
context: gate.context,
act,
capture: gate.capture,
assetIncludedInAct,
catalog,
findings: findings.data.filter((finding) => finding.assetId === assetId),
canAddAnother: true,
canAddAnother: assetIncludedInAct,
actSelectionMode: actId ? 'EXPLICIT' : 'LEGACY_SINGLE_DRAFT',
};
}
async list(visitId: string, assetId: string, principal: AuthPrincipal) {
async list(
visitId: string,
assetId: string,
actId: string | undefined,
principal: AuthPrincipal,
) {
const gate = await this.requireGate(visitId, assetId, principal);
const act = await this.requireDraftAct(visitId);
const act = await this.requireDraftAct(visitId, actId);
const findings = await this.findings.listForAct(act.id);
return {
context: gate.context,
act,
capture: gate.capture,
assetIncludedInAct: await this.actContainsAsset(act.id, assetId),
data: findings.data.filter((finding) => finding.assetId === assetId),
actSelectionMode: actId ? 'EXPLICIT' : 'LEGACY_SINGLE_DRAFT',
};
}
@@ -74,7 +89,15 @@ export class FieldFindingsService {
request: RequestWithContext,
) {
const gate = await this.requireGate(visitId, assetId, principal);
const act = await this.requireDraftAct(visitId);
const act = await this.requireDraftAct(visitId, dto.actId);
if (!await this.actContainsAsset(act.id, assetId)) {
throw new ConflictException({
code: 'FIELD_FINDING_ASSET_NOT_IN_ACT',
message: 'Agregá este Inventario al Acta seleccionada antes de registrar el Hallazgo',
actId: act.id,
assetId,
});
}
const payload: CreateInspectionFindingDto = {
assetId,
catalogItemId: dto.catalogItemId ?? null,
@@ -91,6 +114,7 @@ export class FieldFindingsService {
capture: gate.capture,
finding,
canAddAnother: true,
actSelectionMode: dto.actId ? 'EXPLICIT' : 'LEGACY_SINGLE_DRAFT',
};
}
@@ -268,7 +292,40 @@ export class FieldFindingsService {
};
}
private async requireDraftAct(visitId: string): Promise<DraftActRow> {
private async actContainsAsset(actId: string, assetId: string): Promise<boolean> {
const [row] = await this.dataSource.query(`
SELECT EXISTS (
SELECT 1 FROM inspection_act_assets
WHERE act_id=$1::uuid AND asset_id=$2::uuid AND included=true
) AS included
`, [actId, assetId]) as Array<{ included: boolean }>;
return Boolean(row?.included);
}
private async requireDraftAct(visitId: string, requestedActId?: string): Promise<DraftActRow> {
if (requestedActId) {
const [act] = await this.dataSource.query(`
SELECT id,code,status
FROM inspection_acts
WHERE id=$1::uuid AND visit_id=$2::uuid
`, [requestedActId, visitId]) as DraftActRow[];
if (!act) {
throw new NotFoundException({
code: 'FIELD_FINDING_ACT_NOT_FOUND',
message: 'El Acta seleccionada no pertenece a esta inspección',
});
}
if (act.status !== 'DRAFT') {
throw new ConflictException({
code: 'FIELD_FINDING_ACT_NOT_DRAFT',
message: 'Los Hallazgos nuevos sólo pueden agregarse a un Acta en borrador',
actId: act.id,
actStatus: act.status,
});
}
return act;
}
const rows = await this.dataSource.query(`
SELECT id, code, status
FROM inspection_acts
+2 -2
View File
@@ -1,2 +1,2 @@
export const API_VERSION = '0.24.0-1';
export const API_PHASE = 'F3.1';
export const API_VERSION = '0.25.0-1';
export const API_PHASE = 'F3.2';
@@ -52,15 +52,3 @@ test('F3.1 fuerza Área → Yacimiento → Instalación → Subinstalación en s
assert.match(service, /SUBINSTALACION: 'instalacion'/);
assert.match(service, /INVENTORY_SUBINSTALLATION_FAMILY_PARENT_INVALID/);
});
test('F3.1 retira Relevamientos del dashboard y usa alta guiada de cuatro niveles', () => {
const layout = readFileSync('../web-v2/src/layout/AppLayout.tsx', 'utf8');
const app = readFileSync('../web-v2/src/app/App.tsx', 'utf8');
const page = readFileSync('../web-v2/src/pages/InventoryCreatePage.tsx', 'utf8');
assert.doesNotMatch(layout, /label: 'Relevamientos'/);
assert.match(app, /path="\/relevamiento\/\*" element={<Navigate to="\/inventarios" replace \/>}/);
assert.match(app, /path="\/inventarios\/nuevo" element={<InventoryCreatePage \/>}/);
for (const kind of ['AREA', 'YACIMIENTO', 'INSTALACION', 'SUBINSTALACION']) assert.match(page, new RegExp(`kind: '${kind}'`));
assert.doesNotMatch(page, /kind: 'EQUIPO'/);
assert.match(page, /getInventoryFamilyFindings/);
});
@@ -0,0 +1,42 @@
import assert from 'node:assert/strict';
import { readFileSync } from 'node:fs';
import test from 'node:test';
const read = (path: string) => readFileSync(path, 'utf8');
test('F3.2 mantiene múltiples Actas con un solo borrador simultáneo por inspección', () => {
const migration = read('src/database/migrations/1789495200000-phase-f1-1-multi-act-inspections.ts');
assert.match(migration, /DROP CONSTRAINT IF EXISTS uq_inspection_acts_visit/);
assert.match(migration, /CREATE UNIQUE INDEX uq_inspection_acts_one_draft_per_visit/);
assert.match(migration, /WHERE status = 'DRAFT'/);
});
test('F3.2 permite seleccionar el Acta explícitamente al trabajar Hallazgos desde la APK', () => {
const controller = read('src/inspection-visits/field-findings.controller.ts');
const service = read('src/inspection-visits/field-findings.service.ts');
const dto = read('src/inspection-visits/dto/create-field-finding.dto.ts');
assert.match(controller, /FieldFindingActQueryDto/);
assert.match(controller, /query\.actId/);
assert.match(dto, /actId\?: string/);
assert.match(service, /actSelectionMode: actId \? 'EXPLICIT' : 'LEGACY_SINGLE_DRAFT'/);
assert.match(service, /WHERE id=\$1::uuid AND visit_id=\$2::uuid/);
assert.match(service, /FIELD_FINDING_ACT_NOT_DRAFT/);
assert.match(service, /FIELD_FINDING_ASSET_NOT_IN_ACT/);
});
test('F3.2 conserva el cierre documental inmutable de cada Acta', () => {
const closing = read('src/inspection-closing/inspection-closing.service.ts');
assert.match(closing, /INSPECTION_ACT_INSPECTOR_SIGNATURE_REQUIRED/);
assert.match(closing, /INSPECTION_ACT_COMPANY_OUTCOME_REQUIRED/);
assert.match(closing, /finalSha256 = sha256CanonicalJson\(finalSnapshot\)/);
assert.match(closing, /status = 'CLOSED'/);
assert.match(closing, /ensureFrozenReport/);
assert.match(closing, /ensureWordForAct/);
});
test('F3.2 cierra la inspección sólo cuando no quedan borradores ni Actas sin firma de inspector', () => {
const visits = read('src/inspection-visits/inspection-visits.service.ts');
assert.match(visits, /INSPECTION_VISIT_DRAFT_ACTS_PENDING/);
assert.match(visits, /INSPECTION_VISIT_INSPECTOR_SIGNATURE_PENDING/);
assert.match(visits, /actsMayCompleteCompanySignatureLater: true/);
});
+37
View File
@@ -0,0 +1,37 @@
#!/usr/bin/env bash
set -Eeuo pipefail
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
LAYOUT="$ROOT/web-v2/src/layout/AppLayout.tsx"
APP="$ROOT/web-v2/src/app/App.tsx"
PAGE="$ROOT/web-v2/src/pages/InventoryCreatePage.tsx"
for file in "$LAYOUT" "$APP" "$PAGE"; do
test -f "$file" || {
echo "F3.1 WEB contract: falta $file"
exit 1
}
done
if grep -Fq "label: 'Relevamientos'" "$LAYOUT"; then
echo "F3.1 WEB contract: Relevamientos no debe volver al menú principal"
exit 1
fi
grep -Fq 'path="/relevamiento/*"' "$APP"
grep -Fq 'Navigate to="/inventarios" replace' "$APP"
grep -Fq 'path="/inventarios/nuevo"' "$APP"
grep -Fq 'InventoryCreatePage' "$APP"
for kind in AREA YACIMIENTO INSTALACION SUBINSTALACION; do
grep -Fq "kind: '$kind'" "$PAGE"
done
if grep -Fq "kind: 'EQUIPO'" "$PAGE"; then
echo "F3.1 WEB contract: el alta guiada no debe restaurar EQUIPO como quinto nivel estructural"
exit 1
fi
grep -Fq 'getInventoryFamilyFindings' "$PAGE"
echo 'F3.1 WEB contract: OK'