Compare commits
15
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
38a508553d | ||
|
|
a2e838cd01 | ||
|
|
b47c929a56 | ||
|
|
2ff00a077d | ||
|
|
b6b2ad0a9b | ||
|
|
7ed834935d | ||
|
|
3c5845bf6b | ||
|
|
21790ca250 | ||
|
|
2c7ef3f7af | ||
|
|
c7f9f7fe4b | ||
|
|
c172724f28 | ||
|
|
f05cecd947 | ||
|
|
f1db43f207 | ||
|
|
143ae01b57 | ||
|
|
2cf3f041be |
@@ -48,7 +48,7 @@ jobs:
|
|||||||
run: sdkmanager 'platforms;android-36' 'build-tools;36.0.0'
|
run: sdkmanager 'platforms;android-36' 'build-tools;36.0.0'
|
||||||
|
|
||||||
- name: Gradle 8.13
|
- name: Gradle 8.13
|
||||||
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
|
uses: gradle/actions/setup-gradle@v4
|
||||||
with:
|
with:
|
||||||
gradle-version: '8.13'
|
gradle-version: '8.13'
|
||||||
|
|
||||||
|
|||||||
+26
-106
@@ -116,10 +116,9 @@ jobs:
|
|||||||
|
|
||||||
docker compose --env-file .env.example --profile tools run --rm migrate
|
docker compose --env-file .env.example --profile tools run --rm migrate
|
||||||
|
|
||||||
# The completed chain must end in the exact authoritative SQL model:
|
# F5.1 performs the historical clean start. F6.1 then seeds only the
|
||||||
# 7 Departamentos, 64 Áreas, 230 Yacimientos, 13 Empresas, 2 Tipos de
|
# presentation territory approved by DH: 7 Departamentos, 64 Áreas,
|
||||||
# concesión, 14/109 technical families, 181 Hallazgos and their exact
|
# 230 Yacimientos and 12 real Empresas.
|
||||||
# 48 + 880 contextual mappings.
|
|
||||||
docker compose --env-file .env.example exec -T db \
|
docker compose --env-file .env.example exec -T db \
|
||||||
psql -v ON_ERROR_STOP=1 -U dhv2_owner -d dhv2 <<'SQL'
|
psql -v ON_ERROR_STOP=1 -U dhv2_owner -d dhv2 <<'SQL'
|
||||||
DO $$
|
DO $$
|
||||||
@@ -128,23 +127,13 @@ jobs:
|
|||||||
domain_assets integer;
|
domain_assets integer;
|
||||||
audits integer;
|
audits integer;
|
||||||
applicability integer;
|
applicability integer;
|
||||||
legacy_territory_sources integer;
|
territory_sources integer;
|
||||||
legacy_presentation_sources integer;
|
presentation_sources integer;
|
||||||
authoritative_sources integer;
|
|
||||||
source_installations integer;
|
source_installations integer;
|
||||||
source_subinstallations integer;
|
source_subinstallations integer;
|
||||||
source_findings integer;
|
source_findings integer;
|
||||||
concession_types integer;
|
|
||||||
departments integer;
|
|
||||||
areas integer;
|
|
||||||
yacimientos integer;
|
|
||||||
companies integer;
|
|
||||||
invalid_yacimientos integer;
|
|
||||||
department_types integer;
|
department_types integer;
|
||||||
area_department_rules integer;
|
area_department_rules integer;
|
||||||
yacimiento_area_rules integer;
|
|
||||||
installation_yacimiento_rules integer;
|
|
||||||
subinstallation_installation_rules integer;
|
|
||||||
BEGIN
|
BEGIN
|
||||||
SELECT COUNT(*) INTO f5_migrations
|
SELECT COUNT(*) INTO f5_migrations
|
||||||
FROM typeorm_migrations
|
FROM typeorm_migrations
|
||||||
@@ -161,86 +150,49 @@ jobs:
|
|||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
SELECT COUNT(*) INTO domain_assets FROM assets;
|
SELECT COUNT(*) INTO domain_assets FROM assets;
|
||||||
IF domain_assets <> 314 THEN
|
IF domain_assets <> 313 THEN
|
||||||
RAISE EXCEPTION 'Authoritative model must contain 314 Assets, got %', domain_assets;
|
RAISE EXCEPTION 'F6.1 presentation preload must contain 313 Assets, got %', domain_assets;
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
SELECT COUNT(*) INTO audits FROM audit_events;
|
SELECT COUNT(*) INTO audits FROM audit_events;
|
||||||
IF audits <> 0 THEN
|
IF audits <> 0 THEN
|
||||||
RAISE EXCEPTION 'Clean authoritative rehearsal must start with 0 audit events, got %', audits;
|
RAISE EXCEPTION 'F6.1 presentation preload must start with 0 audit events, got %', audits;
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
SELECT COUNT(*) INTO applicability FROM finding_catalog_item_inventory_families;
|
SELECT COUNT(*) INTO applicability FROM finding_catalog_item_inventory_families;
|
||||||
IF applicability <> 928 THEN
|
IF applicability <> 0 THEN
|
||||||
RAISE EXCEPTION 'Authoritative model must contain 928 finding applicability links, got %', applicability;
|
RAISE EXCEPTION 'Clean migration rehearsal must contain 0 finding applicability links, got %', applicability;
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
SELECT COUNT(*) INTO legacy_territory_sources
|
SELECT COUNT(*) INTO territory_sources
|
||||||
FROM source_documents
|
FROM source_documents
|
||||||
WHERE document_number='DH-F5-TERRITORY';
|
WHERE document_number='DH-F5-TERRITORY';
|
||||||
IF legacy_territory_sources <> 0 THEN
|
IF territory_sources <> 0 THEN
|
||||||
RAISE EXCEPTION 'Authoritative model must remove the old F5 territory source, got % rows', legacy_territory_sources;
|
RAISE EXCEPTION 'F5.1 must remove the old territory source preload, got % rows', territory_sources;
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
SELECT COUNT(*) INTO legacy_presentation_sources
|
SELECT COUNT(*) INTO presentation_sources
|
||||||
FROM source_documents
|
FROM source_documents
|
||||||
WHERE document_number='DH-F6.1-PRESENTATION-TERRITORY-20260909';
|
WHERE document_number='DH-F6.1-PRESENTATION-TERRITORY-20260909';
|
||||||
IF legacy_presentation_sources <> 0 THEN
|
IF presentation_sources <> 1 THEN
|
||||||
RAISE EXCEPTION 'Authoritative model must remove the F6.1 presentation source, got % rows', legacy_presentation_sources;
|
RAISE EXCEPTION 'F6.1 must contain exactly one presentation territory source, got %', presentation_sources;
|
||||||
END IF;
|
|
||||||
|
|
||||||
SELECT COUNT(*) INTO authoritative_sources
|
|
||||||
FROM source_documents
|
|
||||||
WHERE document_number IN ('DH-AUTH-TERRITORY-20260911','DH-AUTH-INVENTORY-20260911');
|
|
||||||
IF authoritative_sources <> 2 THEN
|
|
||||||
RAISE EXCEPTION 'Authoritative model must contain its two SQL source documents, got %', authoritative_sources;
|
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
SELECT COUNT(*) FILTER (WHERE level='INSTALLATION'),
|
SELECT COUNT(*) FILTER (WHERE level='INSTALLATION'),
|
||||||
COUNT(*) FILTER (WHERE level='SUBINSTALLATION')
|
COUNT(*) FILTER (WHERE level='SUBINSTALLATION')
|
||||||
INTO source_installations,source_subinstallations
|
INTO source_installations,source_subinstallations
|
||||||
FROM inventory_families
|
FROM inventory_families
|
||||||
WHERE is_active=true AND source_reference LIKE 'modelo_relacional:%';
|
WHERE is_active=true AND source_reference LIKE 'F5:final_modelov2.xlsx%';
|
||||||
IF source_installations <> 14 OR source_subinstallations <> 109 THEN
|
IF source_installations <> 14 OR source_subinstallations <> 109 THEN
|
||||||
RAISE EXCEPTION 'Authoritative technical families must be 14 installations and 109 subinstallations, got % and %', source_installations,source_subinstallations;
|
RAISE EXCEPTION 'F6.1 must preserve technical family masters: installations %, subinstallations %', source_installations,source_subinstallations;
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
SELECT COUNT(*) INTO source_findings
|
SELECT COUNT(*) INTO source_findings
|
||||||
FROM finding_catalog_items item
|
FROM finding_catalog_items item
|
||||||
JOIN finding_categories category ON category.id=item.category_id
|
JOIN finding_categories category ON category.id=item.category_id
|
||||||
WHERE lower(category.code)='authmodel' AND item.is_active=true;
|
WHERE lower(category.code)='f5model' AND item.is_active=true;
|
||||||
IF source_findings <> 181 THEN
|
IF source_findings <> 177 THEN
|
||||||
RAISE EXCEPTION 'Authoritative finding catalog must contain 181 items, got %', source_findings;
|
RAISE EXCEPTION 'F6.1 must preserve finding master catalog, got %', source_findings;
|
||||||
END IF;
|
|
||||||
|
|
||||||
SELECT COUNT(*) INTO concession_types FROM concession_types WHERE is_active=true;
|
|
||||||
IF concession_types <> 2 THEN
|
|
||||||
RAISE EXCEPTION 'Authoritative model must contain 2 concession types, got %', concession_types;
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
SELECT COUNT(*) FILTER (WHERE lower(type.code)='departamento'),
|
|
||||||
COUNT(*) FILTER (WHERE lower(type.code)='area'),
|
|
||||||
COUNT(*) FILTER (WHERE lower(type.code)='yacimiento'),
|
|
||||||
COUNT(*) FILTER (WHERE type.operational_role='COMPANY')
|
|
||||||
INTO departments,areas,yacimientos,companies
|
|
||||||
FROM assets asset
|
|
||||||
JOIN asset_types type ON type.id=asset.asset_type_id;
|
|
||||||
IF departments <> 7 OR areas <> 64 OR yacimientos <> 230 OR companies <> 13 THEN
|
|
||||||
RAISE EXCEPTION 'Authoritative territory mismatch: departments %, areas %, yacimientos %, companies %', departments,areas,yacimientos,companies;
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
SELECT COUNT(*) INTO invalid_yacimientos
|
|
||||||
FROM assets yacimiento
|
|
||||||
JOIN asset_types type ON type.id=yacimiento.asset_type_id
|
|
||||||
JOIN assets area ON area.id=yacimiento.parent_id
|
|
||||||
WHERE lower(type.code)='yacimiento'
|
|
||||||
AND (
|
|
||||||
yacimiento.operational_area_id IS DISTINCT FROM area.id
|
|
||||||
OR yacimiento.operator_company_id IS NULL
|
|
||||||
OR yacimiento.concession_type_id IS NULL
|
|
||||||
);
|
|
||||||
IF invalid_yacimientos <> 0 THEN
|
|
||||||
RAISE EXCEPTION 'Authoritative model contains % invalid Yacimiento relationships', invalid_yacimientos;
|
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
SELECT COUNT(*) INTO department_types
|
SELECT COUNT(*) INTO department_types
|
||||||
@@ -258,43 +210,16 @@ jobs:
|
|||||||
IF area_department_rules <> 1 THEN
|
IF area_department_rules <> 1 THEN
|
||||||
RAISE EXCEPTION 'Expected Area → Departamento canonical rule, got %', area_department_rules;
|
RAISE EXCEPTION 'Expected Area → Departamento canonical rule, got %', area_department_rules;
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
SELECT COUNT(*) INTO yacimiento_area_rules
|
|
||||||
FROM asset_type_parent_rules rule
|
|
||||||
JOIN asset_types child ON child.id=rule.child_type_id
|
|
||||||
JOIN asset_types parent ON parent.id=rule.parent_type_id
|
|
||||||
WHERE lower(child.code)='yacimiento' AND lower(parent.code)='area';
|
|
||||||
IF yacimiento_area_rules <> 1 THEN
|
|
||||||
RAISE EXCEPTION 'Expected Yacimiento → Área canonical rule, got %', yacimiento_area_rules;
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
SELECT COUNT(*) INTO installation_yacimiento_rules
|
|
||||||
FROM asset_type_parent_rules rule
|
|
||||||
JOIN asset_types child ON child.id=rule.child_type_id
|
|
||||||
JOIN asset_types parent ON parent.id=rule.parent_type_id
|
|
||||||
WHERE lower(child.code)='instalacion' AND lower(parent.code)='yacimiento';
|
|
||||||
IF installation_yacimiento_rules <> 1 THEN
|
|
||||||
RAISE EXCEPTION 'Expected Instalación → Yacimiento canonical rule, got %', installation_yacimiento_rules;
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
SELECT COUNT(*) INTO subinstallation_installation_rules
|
|
||||||
FROM asset_type_parent_rules rule
|
|
||||||
JOIN asset_types child ON child.id=rule.child_type_id
|
|
||||||
JOIN asset_types parent ON parent.id=rule.parent_type_id
|
|
||||||
WHERE lower(child.code)='subinstalacion' AND lower(parent.code)='instalacion';
|
|
||||||
IF subinstallation_installation_rules <> 1 THEN
|
|
||||||
RAISE EXCEPTION 'Expected Subinstalación → Instalación canonical rule, got %', subinstallation_installation_rules;
|
|
||||||
END IF;
|
|
||||||
END $$;
|
END $$;
|
||||||
SQL
|
SQL
|
||||||
|
|
||||||
# Destructive cuts are intentionally one-way: production rollback is
|
# Both destructive cuts are intentionally one-way: production rollback is
|
||||||
# the PRE database backup, not migration:revert. Prove the completed
|
# the PRE database backup, not migration:revert. Prove the completed chain
|
||||||
# chain is idempotent and has no pending migration on a second run.
|
# is idempotent and has no pending migration on a second run.
|
||||||
rerun_log="$(mktemp)"
|
rerun_log="$(mktemp)"
|
||||||
docker compose --env-file .env.example --profile tools run --rm migrate 2>&1 | tee "$rerun_log"
|
docker compose --env-file .env.example --profile tools run --rm migrate 2>&1 | tee "$rerun_log"
|
||||||
grep -Eq 'No pending migrations|Applied migrations: 0' "$rerun_log" || {
|
grep -Eq 'No pending migrations|Applied migrations: 0' "$rerun_log" || {
|
||||||
echo "ERROR: authoritative migration chain is not idempotent." >&2
|
echo "ERROR: F6.1 migration chain is not idempotent." >&2
|
||||||
cat "$rerun_log" >&2
|
cat "$rerun_log" >&2
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
@@ -309,14 +234,9 @@ jobs:
|
|||||||
docker compose --env-file .env.example build api
|
docker compose --env-file .env.example build api
|
||||||
docker compose --env-file .env.example up -d api
|
docker compose --env-file .env.example up -d api
|
||||||
|
|
||||||
# In containerized runners (Gitea DinD), 127.0.0.1 of the job
|
|
||||||
# is not the Docker daemon host. Probe the production API from
|
|
||||||
# inside its own container so this barrier works on GitHub and Gitea.
|
|
||||||
api_ready=0
|
api_ready=0
|
||||||
for _ in $(seq 1 30); do
|
for _ in $(seq 1 30); do
|
||||||
if docker compose --env-file .env.example exec -T api \
|
if curl -fsS http://127.0.0.1:3101/api/v3/health >/tmp/dhv2-health.json 2>/dev/null; then
|
||||||
node -e 'fetch(`http://127.0.0.1:${process.env.API_PORT}/api/v3/health`).then(async r => { const t = await r.text(); process.stdout.write(t); if (!r.ok) process.exit(1); }).catch(() => process.exit(1))' \
|
|
||||||
>/tmp/dhv2-health.json 2>/dev/null; then
|
|
||||||
api_ready=1
|
api_ready=1
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
# F6.4 · Android Campo Moderno
|
|
||||||
|
|
||||||
Criterios de aceptación:
|
|
||||||
|
|
||||||
- el buscador de Instalación padre consulta mientras se escribe y cada resultado se puede seleccionar directamente;
|
|
||||||
- la selección de Instalación abre la clasificación compatible de Subinstalación;
|
|
||||||
- Actas utiliza un read-model móvil desacoplado del módulo documental de oficina;
|
|
||||||
- la APK conserva GPS + foto antes de habilitar Hallazgos sobre Inventario nacido en campo;
|
|
||||||
- el lifecycle Acta DRAFT → LOCKED → SEALED no cambia;
|
|
||||||
- la interfaz de campo usa el tema DH moderno y mantiene acceso claro a Actas, Inventario y Hallazgos;
|
|
||||||
- Android lint/tests/debug/release, API tests/build, WEB build y Docker contract deben quedar verdes.
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
# Checklist final Android 0.19.0
|
|
||||||
|
|
||||||
La candidata sólo se promueve si el mismo SHA cumple:
|
|
||||||
|
|
||||||
- iniciar Inspección;
|
|
||||||
- crear/abrir Acta;
|
|
||||||
- seleccionar o crear Instalación/Subinstalación;
|
|
||||||
- exigir GPS + fotografía para Inventario nacido en campo antes de Hallazgos;
|
|
||||||
- registrar Hallazgos sobre el elemento seleccionado;
|
|
||||||
- cerrar contenido del Acta y mostrar **Pendiente de firma**;
|
|
||||||
- completar firma del Inspector y manifestación/firma o negativa de la empresa;
|
|
||||||
- mostrar el Acta como **Firmada y cerrada**;
|
|
||||||
- permitir cerrar la Inspección sólo con todas las Actas activas firmadas y cerradas;
|
|
||||||
- no exponer estados internos en inglés en la interfaz de campo;
|
|
||||||
- Android CI / RC, DH V2 CI y auditoría de dependencias en verde.
|
|
||||||
+17
-66
@@ -1,88 +1,39 @@
|
|||||||
# DH Inspección Android · release final de campo 0.19.0
|
# DH Inspección Android · release F6.1
|
||||||
|
|
||||||
## Candidata vigente
|
## Candidata vigente
|
||||||
|
|
||||||
- Fase funcional: **Flujo final de campo · Inspección → Acta → Hallazgos → Firma**.
|
- Fase funcional: **F6.1**.
|
||||||
- `versionName`: **0.19.0**.
|
- `versionName`: **0.15.1**.
|
||||||
- `versionCode`: **28**.
|
- `versionCode`: **23**.
|
||||||
- Application ID release: `com.korexlabs.dhinspeccion`.
|
- Application ID release: `com.korexlabs.dhinspeccion`.
|
||||||
- Application ID debug/QA: `com.korexlabs.dhinspeccion.debug`.
|
- Application ID debug/QA: `com.korexlabs.dhinspeccion.debug`.
|
||||||
- API: `https://dhv2.korexlabs.com/api/v3/`.
|
- API: `https://dhv2.korexlabs.com/api/v3/`.
|
||||||
|
- Launcher de presentación: adaptación vectorial local inspirada en el escudo institucional publicado por Gobierno de Mendoza en `mendoza.gov.ar`, para reemplazar el ícono genérico del sistema.
|
||||||
|
|
||||||
La variante debug es independiente de la app productiva y puede instalarse para QA/presentación sin sobrescribir una instalación release histórica.
|
La variante debug es independiente de la app productiva y puede instalarse para QA/presentación sin sobrescribir una instalación release histórica.
|
||||||
|
|
||||||
## Procedimiento operativo validado
|
|
||||||
|
|
||||||
La APK 0.19.0 fija como recorrido principal de campo:
|
|
||||||
|
|
||||||
1. **Iniciar Inspección**. Al iniciarla se habilitan Actas, Hallazgos e Inventario de campo.
|
|
||||||
2. **Crear o abrir un Acta**. Puede haber varias Actas dentro de una misma Inspección, pero sólo una puede permanecer en elaboración al mismo tiempo.
|
|
||||||
3. **Agregar Hallazgos** sobre una Instalación o Subinstalación seleccionada.
|
|
||||||
4. Si el elemento ya existe, se lo selecciona desde el Inventario del Área/Yacimiento de la Inspección.
|
|
||||||
5. Si no existe, se da de alta desde campo sin abandonar el Acta.
|
|
||||||
6. Un elemento nuevo debe completar **GPS + fotografía** antes de poder recibir Hallazgos.
|
|
||||||
7. Al terminar el contenido del Acta se usa **Cerrar Acta y dejar pendiente de firma**. Desde ese momento el contenido queda inmutable y el estado visible es **Pendiente de firma**.
|
|
||||||
8. La firma del Inspector y la manifestación/firma o negativa de la empresa completan el Acta, que pasa a **Firmada y cerrada**.
|
|
||||||
9. La Inspección sólo puede cerrarse cuando todas sus Actas no canceladas están firmadas y cerradas.
|
|
||||||
|
|
||||||
La nomenclatura técnica interna de API (`DRAFT`, `LOCKED`, `SEALED`, etc.) no se muestra al inspector: la interfaz usa textos operativos en castellano.
|
|
||||||
|
|
||||||
## Alta de Instalaciones y Subinstalaciones
|
|
||||||
|
|
||||||
El alta móvil queda alineada con el Dashboard y con las validaciones del servidor.
|
|
||||||
|
|
||||||
### Instalación
|
|
||||||
|
|
||||||
- contexto territorial: Yacimiento/Área de la Inspección;
|
|
||||||
- clasificación técnica compatible;
|
|
||||||
- **Nombre técnico** obligatorio;
|
|
||||||
- Nombre habitual opcional;
|
|
||||||
- Descripción opcional;
|
|
||||||
- atributos técnicos definidos por el tipo; sólo los marcados como obligatorios bloquean el guardado;
|
|
||||||
- código DH generado por el sistema cuando corresponde;
|
|
||||||
- GPS de la tablet;
|
|
||||||
- fotografía obligatoria antes de crear Hallazgos.
|
|
||||||
|
|
||||||
### Subinstalación
|
|
||||||
|
|
||||||
Además de lo anterior requiere elegir primero la **Instalación padre**. El buscador consulta mientras se escribe y cada resultado es seleccionable tocando la tarjeta.
|
|
||||||
|
|
||||||
La clasificación y los atributos se obtienen dinámicamente desde el mismo catálogo administrado por el Dashboard; la APK no mantiene listas técnicas paralelas.
|
|
||||||
|
|
||||||
## Actas y firma
|
|
||||||
|
|
||||||
La terminología visible se simplifica:
|
|
||||||
|
|
||||||
- `DRAFT` → **En elaboración**;
|
|
||||||
- `LOCKED` → **Pendiente de firma**;
|
|
||||||
- `SEALED` → **Firmada y cerrada**.
|
|
||||||
|
|
||||||
Cerrar el contenido no cierra automáticamente la Inspección y tampoco obliga a terminar la firma en ese instante: puede continuarse con otra Acta. Una vez cerrado el contenido, el Acta es inmutable.
|
|
||||||
|
|
||||||
Después de la firma/cierre definitivo se mantiene el circuito documental existente: PDF del Acta e informe INF editable (DOCX) para oficina.
|
|
||||||
|
|
||||||
## Castellano e identidad visual
|
|
||||||
|
|
||||||
Se revisaron las pantallas activas de campo para evitar exponer estados y opciones internas en inglés. Entre otros cambios: Pasaporte/Otro en documentos, estados de Inspección/Acta/Hallazgo en castellano, Correo electrónico, Huella de integridad y terminología de cierre orientada al usuario.
|
|
||||||
|
|
||||||
La pantalla de ingreso y el desbloqueo biométrico utilizan la identidad visual de Mendoza ya incorporada al proyecto.
|
|
||||||
|
|
||||||
## Barrera obligatoria
|
## Barrera obligatoria
|
||||||
|
|
||||||
Todo cambio Android o de API que pueda afectar al cliente móvil debe pasar `Android CI / RC`:
|
Todo cambio Android o de API que pueda afectar al cliente móvil debe pasar `Android CI / RC`:
|
||||||
|
|
||||||
1. validación de identidad, HTTPS y políticas básicas del manifest;
|
1. validación de identidad, HTTPS y políticas básicas del manifest;
|
||||||
2. Android lint;
|
2. Android lint;
|
||||||
3. pruebas unitarias Android reales, con verificación de que exista al menos una prueba ejecutada;
|
3. unit tests Android reales, con verificación de que exista al menos una prueba ejecutada;
|
||||||
4. `assembleDebug`;
|
4. `assembleDebug`;
|
||||||
5. `assembleRelease` para comprobar que la variante productiva compile;
|
5. `assembleRelease` para comprobar que la variante productiva compile;
|
||||||
6. empaquetado del APK debug con SHA-256 y metadata de commit/versionado.
|
6. empaquetado del APK debug con SHA-256 y metadata de commit/versionado.
|
||||||
|
|
||||||
Además, `DH V2 CI` debe mantener verdes API, WEB y contrato Docker/migraciones antes de promover cambios que afecten al servidor.
|
La barrera de lint exige además manejo explícito de la revocación de permisos de ubicación durante una captura GPS y declara la cámara como capacidad de hardware opcional, sin relajar permisos ni desactivar reglas globalmente.
|
||||||
|
|
||||||
|
El artefacto de CI contiene:
|
||||||
|
|
||||||
|
- APK debug;
|
||||||
|
- archivo `.sha256`;
|
||||||
|
- `release-metadata.txt` con fase, versión, versionCode, commit, applicationId, API base y canal.
|
||||||
|
|
||||||
## Firma release
|
## Firma release
|
||||||
|
|
||||||
La clave histórica de firma **no se versiona ni se reemplaza**. La CI compila la variante release para detectar roturas, pero una APK productiva que deba actualizar `com.korexlabs.dhinspeccion` tiene que firmarse con la clave histórica.
|
La clave histórica de firma **no se versiona ni se reemplaza**. La CI compila la variante release para detectar roturas, pero la APK productiva final debe firmarse con la clave histórica antes de instalarse como actualización de `com.korexlabs.dhinspeccion`.
|
||||||
|
|
||||||
No se debe crear una clave nueva para resolver una falta de acceso: eso rompería la continuidad de actualización de tablets que ya tengan una versión firmada con la clave anterior.
|
No se debe crear una clave nueva para resolver una falta de acceso: eso rompería la continuidad de actualización de tablets que ya tengan una versión firmada con la clave anterior.
|
||||||
|
|
||||||
@@ -91,7 +42,7 @@ No se debe crear una clave nueva para resolver una falta de acceso: eso romperí
|
|||||||
Antes de distribuir una APK productiva:
|
Antes de distribuir una APK productiva:
|
||||||
|
|
||||||
- todas las barreras de CI del SHA exacto deben estar verdes;
|
- todas las barreras de CI del SHA exacto deben estar verdes;
|
||||||
- comprobar certificado/huella de firma contra la versión histórica si se distribuirá como actualización productiva;
|
- comprobar certificado/huella de firma contra la versión histórica;
|
||||||
- realizar actualización sobre al menos una tablet con la versión productiva anterior cuando corresponda;
|
- realizar actualización sobre al menos una tablet con la versión productiva anterior;
|
||||||
- ejecutar smoke funcional: ingreso, iniciar Inspección, crear Acta, seleccionar/crear Instalación o Subinstalación, GPS/foto, Hallazgo, cerrar Acta → Pendiente de firma, firma/manifestación, cierre de Acta y cierre de Inspección;
|
- ejecutar smoke funcional contra el entorno objetivo: login, lista de inspecciones, inicio, inventario, alta de campo, foto/GPS, Acta, Hallazgo y cierre;
|
||||||
- registrar el SHA Git y SHA-256 de la APK distribuida.
|
- registrar el SHA Git y SHA-256 de la APK distribuida.
|
||||||
|
|||||||
@@ -12,8 +12,8 @@ android {
|
|||||||
applicationId = "com.korexlabs.dhinspeccion"
|
applicationId = "com.korexlabs.dhinspeccion"
|
||||||
minSdk = 26
|
minSdk = 26
|
||||||
targetSdk = 36
|
targetSdk = 36
|
||||||
versionCode = 28
|
versionCode = 25
|
||||||
versionName = "0.19.0"
|
versionName = "0.16.0"
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
vectorDrawables.useSupportLibrary = true
|
vectorDrawables.useSupportLibrary = true
|
||||||
|
|||||||
@@ -169,7 +169,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (acts.any { it.status == "DRAFT" }) {
|
if (acts.any { it.status == "DRAFT" }) {
|
||||||
error = "Ya existe un Acta en elaboración. Cerrala o cancelala antes de crear la siguiente."
|
error = "Ya existe un Acta en borrador. Bloqueala o cancelala antes de crear la siguiente."
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
launchBusy {
|
launchBusy {
|
||||||
@@ -241,7 +241,6 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
|||||||
latitude: Double,
|
latitude: Double,
|
||||||
longitude: Double,
|
longitude: Double,
|
||||||
accuracyM: Double?,
|
accuracyM: Double?,
|
||||||
description: String? = null,
|
|
||||||
) {
|
) {
|
||||||
val visitId = visit?.id ?: return
|
val visitId = visit?.id ?: return
|
||||||
if (visit?.status != "IN_PROGRESS") {
|
if (visit?.status != "IN_PROGRESS") {
|
||||||
@@ -259,7 +258,6 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
|||||||
familyId = familyId,
|
familyId = familyId,
|
||||||
name = name.trim(),
|
name = name.trim(),
|
||||||
commonName = commonName?.trim()?.takeIf { it.isNotBlank() },
|
commonName = commonName?.trim()?.takeIf { it.isNotBlank() },
|
||||||
description = description?.trim()?.takeIf { it.isNotBlank() },
|
|
||||||
attributes = attributes,
|
attributes = attributes,
|
||||||
deviceLatitude = latitude,
|
deviceLatitude = latitude,
|
||||||
deviceLongitude = longitude,
|
deviceLongitude = longitude,
|
||||||
@@ -342,7 +340,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
|||||||
val assetId = selectedFieldAsset?.asset?.id ?: return
|
val assetId = selectedFieldAsset?.asset?.id ?: return
|
||||||
val draft = selectedDraftAct()
|
val draft = selectedDraftAct()
|
||||||
if (draft == null) {
|
if (draft == null) {
|
||||||
error = "Creá o seleccioná el Acta en elaboración antes de registrar Hallazgos."
|
error = "Creá o seleccioná el Acta en borrador antes de registrar Hallazgos."
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
launchBusy {
|
launchBusy {
|
||||||
@@ -364,7 +362,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
|||||||
val assetId = selectedFieldAsset?.asset?.id ?: return
|
val assetId = selectedFieldAsset?.asset?.id ?: return
|
||||||
val actId = selectedDraftAct()?.id
|
val actId = selectedDraftAct()?.id
|
||||||
if (actId == null) {
|
if (actId == null) {
|
||||||
error = "No hay un Acta en elaboración seleccionada."
|
error = "No hay un Acta en borrador seleccionada."
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (description.isBlank()) {
|
if (description.isBlank()) {
|
||||||
@@ -473,7 +471,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
|||||||
absenceReason = reason.trim(),
|
absenceReason = reason.trim(),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
notice = "Ausencia del responsable registrada. La manifestación de empresa quedará pendiente y deberá resolverse antes de firmar y cerrar el Acta."
|
notice = "Ausencia del responsable registrada. La manifestación de empresa quedará pendiente y deberá resolverse antes de sellar el Acta."
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -482,12 +480,12 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
|||||||
launchBusy {
|
launchBusy {
|
||||||
actClosure = actsRepository.lock(actId)
|
actClosure = actsRepository.lock(actId)
|
||||||
refreshSelectedActInternal(actId)
|
refreshSelectedActInternal(actId)
|
||||||
notice = "Acta cerrada y pendiente de firma. Su contenido quedó inmutable; las firmas y manifestaciones pueden completarse a continuación."
|
notice = "Acta bloqueada. Su contenido quedó inmutable; ahora deben resolverse las firmas y manifestaciones."
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun reopenSelectedAct() {
|
fun reopenSelectedAct() {
|
||||||
error = "Un Acta pendiente de firma es inmutable y no puede volver a edición."
|
error = "Un Acta bloqueada es inmutable y no puede volver a borrador."
|
||||||
}
|
}
|
||||||
|
|
||||||
fun signSelectedActAsInspector(
|
fun signSelectedActAsInspector(
|
||||||
@@ -548,7 +546,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
|||||||
refreshSelectedActInternal(actId)
|
refreshSelectedActInternal(actId)
|
||||||
loadActsInternal(currentVisit.id, selectDraft = false)
|
loadActsInternal(currentVisit.id, selectDraft = false)
|
||||||
clearFindingState()
|
clearFindingState()
|
||||||
notice = "${selectedAct?.code ?: "Acta"} firmada y cerrada. Podés crear otra Acta o continuar hacia el cierre de la Inspección."
|
notice = "${selectedAct?.code ?: "Acta"} SELLADA e inmutable. Podés crear otra Acta o continuar hacia el cierre de la Inspección."
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -557,7 +555,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
|
|||||||
launchBusy {
|
launchBusy {
|
||||||
visit = actsRepository.closeVisit(visitId)
|
visit = actsRepository.closeVisit(visitId)
|
||||||
loadVisitsInternal()
|
loadVisitsInternal()
|
||||||
notice = "Inspección cerrada. Todas sus Actas quedaron firmadas y disponibles para el circuito de oficina."
|
notice = "Inspección cerrada. Todas sus Actas quedaron SELLADAS y disponibles para el circuito de oficina."
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -207,7 +207,7 @@ data class MobileCloseVisitRequest(
|
|||||||
)
|
)
|
||||||
|
|
||||||
private interface MobileActsApi {
|
private interface MobileActsApi {
|
||||||
@GET("inspection-visits/{visitId}/acts/mobile")
|
@GET("inspection-visits/{visitId}/acts")
|
||||||
suspend fun listActs(
|
suspend fun listActs(
|
||||||
@Header("Authorization") authorization: String,
|
@Header("Authorization") authorization: String,
|
||||||
@Path("visitId") visitId: String,
|
@Path("visitId") visitId: String,
|
||||||
|
|||||||
@@ -1,73 +0,0 @@
|
|||||||
package com.korexlabs.dhinspeccion.ui
|
|
||||||
|
|
||||||
import androidx.compose.foundation.isSystemInDarkTheme
|
|
||||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
|
||||||
import androidx.compose.material3.MaterialTheme
|
|
||||||
import androidx.compose.material3.darkColorScheme
|
|
||||||
import androidx.compose.material3.lightColorScheme
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.compose.ui.graphics.Color
|
|
||||||
import androidx.compose.ui.unit.dp
|
|
||||||
|
|
||||||
private val DhLightColors = lightColorScheme(
|
|
||||||
primary = Color(0xFF075E63),
|
|
||||||
onPrimary = Color(0xFFFFFFFF),
|
|
||||||
primaryContainer = Color(0xFFD6F0F0),
|
|
||||||
onPrimaryContainer = Color(0xFF073F43),
|
|
||||||
secondary = Color(0xFF445E74),
|
|
||||||
onSecondary = Color(0xFFFFFFFF),
|
|
||||||
secondaryContainer = Color(0xFFDCE7F1),
|
|
||||||
onSecondaryContainer = Color(0xFF243F54),
|
|
||||||
tertiary = Color(0xFF6A5A42),
|
|
||||||
background = Color(0xFFF6F8FA),
|
|
||||||
onBackground = Color(0xFF182025),
|
|
||||||
surface = Color(0xFFFFFFFF),
|
|
||||||
onSurface = Color(0xFF182025),
|
|
||||||
surfaceVariant = Color(0xFFEDF1F4),
|
|
||||||
onSurfaceVariant = Color(0xFF455158),
|
|
||||||
outline = Color(0xFF77848B),
|
|
||||||
outlineVariant = Color(0xFFD7DEE2),
|
|
||||||
error = Color(0xFFB3261E),
|
|
||||||
onError = Color(0xFFFFFFFF),
|
|
||||||
errorContainer = Color(0xFFF9DEDC),
|
|
||||||
onErrorContainer = Color(0xFF6F1713),
|
|
||||||
)
|
|
||||||
|
|
||||||
private val DhDarkColors = darkColorScheme(
|
|
||||||
primary = Color(0xFF88D4D7),
|
|
||||||
onPrimary = Color(0xFF00373A),
|
|
||||||
primaryContainer = Color(0xFF074F53),
|
|
||||||
onPrimaryContainer = Color(0xFFB7EBED),
|
|
||||||
secondary = Color(0xFFB6CBE0),
|
|
||||||
onSecondary = Color(0xFF203646),
|
|
||||||
secondaryContainer = Color(0xFF344C60),
|
|
||||||
onSecondaryContainer = Color(0xFFDCE7F1),
|
|
||||||
background = Color(0xFF101416),
|
|
||||||
onBackground = Color(0xFFE0E4E6),
|
|
||||||
surface = Color(0xFF171C1F),
|
|
||||||
onSurface = Color(0xFFE0E4E6),
|
|
||||||
surfaceVariant = Color(0xFF263035),
|
|
||||||
onSurfaceVariant = Color(0xFFC3CDD2),
|
|
||||||
outline = Color(0xFF8C989E),
|
|
||||||
error = Color(0xFFFFB4AB),
|
|
||||||
onError = Color(0xFF690005),
|
|
||||||
errorContainer = Color(0xFF93000A),
|
|
||||||
onErrorContainer = Color(0xFFFFDAD6),
|
|
||||||
)
|
|
||||||
|
|
||||||
private val DhShapes = androidx.compose.material3.Shapes(
|
|
||||||
extraSmall = RoundedCornerShape(8.dp),
|
|
||||||
small = RoundedCornerShape(12.dp),
|
|
||||||
medium = RoundedCornerShape(16.dp),
|
|
||||||
large = RoundedCornerShape(22.dp),
|
|
||||||
extraLarge = RoundedCornerShape(28.dp),
|
|
||||||
)
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun DhTheme(content: @Composable () -> Unit) {
|
|
||||||
MaterialTheme(
|
|
||||||
colorScheme = if (isSystemInDarkTheme()) DhDarkColors else DhLightColors,
|
|
||||||
shapes = DhShapes,
|
|
||||||
content = content,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,972 +0,0 @@
|
|||||||
package com.korexlabs.dhinspeccion.ui
|
|
||||||
|
|
||||||
import android.Manifest
|
|
||||||
import android.content.Context
|
|
||||||
import android.content.pm.PackageManager
|
|
||||||
import android.net.Uri
|
|
||||||
import android.os.Environment
|
|
||||||
import androidx.activity.compose.rememberLauncherForActivityResult
|
|
||||||
import androidx.activity.result.contract.ActivityResultContracts
|
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
|
||||||
import androidx.compose.foundation.layout.Box
|
|
||||||
import androidx.compose.foundation.layout.Column
|
|
||||||
import androidx.compose.foundation.layout.Row
|
|
||||||
import androidx.compose.foundation.layout.Spacer
|
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
|
||||||
import androidx.compose.foundation.layout.height
|
|
||||||
import androidx.compose.foundation.layout.padding
|
|
||||||
import androidx.compose.foundation.layout.width
|
|
||||||
import androidx.compose.foundation.lazy.LazyColumn
|
|
||||||
import androidx.compose.foundation.lazy.items
|
|
||||||
import androidx.compose.foundation.rememberScrollState
|
|
||||||
import androidx.compose.foundation.text.KeyboardOptions
|
|
||||||
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.mutableStateMapOf
|
|
||||||
import androidx.compose.runtime.mutableStateOf
|
|
||||||
import androidx.compose.runtime.remember
|
|
||||||
import androidx.compose.runtime.rememberCoroutineScope
|
|
||||||
import androidx.compose.runtime.saveable.rememberSaveable
|
|
||||||
import androidx.compose.runtime.setValue
|
|
||||||
import androidx.compose.ui.Alignment
|
|
||||||
import androidx.compose.ui.Modifier
|
|
||||||
import androidx.compose.ui.platform.LocalContext
|
|
||||||
import androidx.compose.ui.text.font.FontWeight
|
|
||||||
import androidx.compose.ui.text.input.KeyboardType
|
|
||||||
import androidx.compose.ui.unit.dp
|
|
||||||
import androidx.core.content.ContextCompat
|
|
||||||
import androidx.core.content.FileProvider
|
|
||||||
import androidx.exifinterface.media.ExifInterface
|
|
||||||
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 com.korexlabs.dhinspeccion.data.FieldAttributeDefinition
|
|
||||||
import com.korexlabs.dhinspeccion.data.FieldInventoryItem
|
|
||||||
import com.korexlabs.dhinspeccion.data.FieldType
|
|
||||||
import com.korexlabs.dhinspeccion.data.VisitDetail
|
|
||||||
import kotlinx.coroutines.launch
|
|
||||||
import kotlinx.coroutines.suspendCancellableCoroutine
|
|
||||||
import java.io.File
|
|
||||||
import java.time.Instant
|
|
||||||
import java.time.ZoneId
|
|
||||||
import java.time.format.DateTimeFormatter
|
|
||||||
import kotlin.coroutines.resume
|
|
||||||
import kotlin.coroutines.resumeWithException
|
|
||||||
|
|
||||||
private data class DynamicGeoSnapshot(
|
|
||||||
val latitude: Double,
|
|
||||||
val longitude: Double,
|
|
||||||
val accuracyM: Double?,
|
|
||||||
)
|
|
||||||
|
|
||||||
private enum class DynamicInventoryMode {
|
|
||||||
BROWSE,
|
|
||||||
PICK_PARENT,
|
|
||||||
CREATE_INSTALLATION,
|
|
||||||
CREATE_SUBINSTALLATION,
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun DynamicVisitRoot(model: MainViewModel) {
|
|
||||||
var inventoryMode by rememberSaveable(model.visit?.id) { mutableStateOf(false) }
|
|
||||||
var actsMode by rememberSaveable(model.visit?.id) { mutableStateOf(false) }
|
|
||||||
|
|
||||||
when {
|
|
||||||
actsMode -> MobileActsScreen(
|
|
||||||
model = model,
|
|
||||||
onBack = { actsMode = false },
|
|
||||||
onGoInventory = {
|
|
||||||
actsMode = false
|
|
||||||
inventoryMode = true
|
|
||||||
},
|
|
||||||
)
|
|
||||||
inventoryMode -> DynamicFieldInventoryScreen(
|
|
||||||
model = model,
|
|
||||||
onBack = {
|
|
||||||
inventoryMode = false
|
|
||||||
actsMode = true
|
|
||||||
},
|
|
||||||
)
|
|
||||||
else -> DynamicVisitOverview(
|
|
||||||
model = model,
|
|
||||||
onInventory = { inventoryMode = true },
|
|
||||||
onActs = { actsMode = true },
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
private fun DynamicVisitOverview(
|
|
||||||
model: MainViewModel,
|
|
||||||
onInventory: () -> Unit,
|
|
||||||
onActs: () -> Unit,
|
|
||||||
) {
|
|
||||||
val visit = model.visit ?: return
|
|
||||||
Column(
|
|
||||||
Modifier
|
|
||||||
.fillMaxSize()
|
|
||||||
.verticalScroll(rememberScrollState())
|
|
||||||
.padding(top = 28.dp, start = 16.dp, end = 16.dp, bottom = 30.dp),
|
|
||||||
verticalArrangement = Arrangement.spacedBy(12.dp),
|
|
||||||
) {
|
|
||||||
Row(
|
|
||||||
Modifier.fillMaxWidth(),
|
|
||||||
horizontalArrangement = Arrangement.SpaceBetween,
|
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
|
||||||
) {
|
|
||||||
OutlinedButton(onClick = { model.closeVisitView() }) { Text("Volver") }
|
|
||||||
Text(dynamicStatusLabel(visit.status), fontWeight = FontWeight.Bold)
|
|
||||||
}
|
|
||||||
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: ${dynamicShortDate(it)}", style = MaterialTheme.typography.bodySmall)
|
|
||||||
}
|
|
||||||
visit.instructions?.takeIf { it.isNotBlank() }?.let {
|
|
||||||
Card(Modifier.fillMaxWidth()) {
|
|
||||||
Column(Modifier.padding(12.dp)) {
|
|
||||||
Text("Instrucciones", fontWeight = FontWeight.Bold)
|
|
||||||
Text(it)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
DynamicMessageStrip(model)
|
|
||||||
|
|
||||||
if (visit.status == "PLANNED") {
|
|
||||||
Card(
|
|
||||||
Modifier.fillMaxWidth(),
|
|
||||||
colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer),
|
|
||||||
) {
|
|
||||||
Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
|
|
||||||
Text("Todo listo para comenzar", fontWeight = FontWeight.Bold)
|
|
||||||
Text("Al iniciar se habilitan Actas, Hallazgos y altas rápidas de campo.")
|
|
||||||
Button(
|
|
||||||
onClick = { model.startVisit(); onActs() },
|
|
||||||
enabled = !model.busy,
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
) { Text(if (model.busy) "Iniciando…" else "Iniciar inspección") }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (visit.status == "IN_PROGRESS") {
|
|
||||||
Card(
|
|
||||||
Modifier.fillMaxWidth(),
|
|
||||||
colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.secondaryContainer),
|
|
||||||
) {
|
|
||||||
Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
|
|
||||||
Text("Modo campo rápido", fontWeight = FontWeight.Bold)
|
|
||||||
Text(
|
|
||||||
"Desde Inventario podés cargar una Subinstalación en tres pasos: elegir Instalación, identificarla y capturar GPS + foto.",
|
|
||||||
style = MaterialTheme.typography.bodySmall,
|
|
||||||
)
|
|
||||||
Button(onClick = onInventory, modifier = Modifier.fillMaxWidth()) {
|
|
||||||
Text("+ Nueva subinstalación / inventario")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Button(onClick = onActs, modifier = Modifier.fillMaxWidth()) {
|
|
||||||
val open = model.acts.count { it.status == "DRAFT" || it.status == "READY" }
|
|
||||||
Text("Abrir Actas · ${model.acts.size}${if (open > 0) " · $open abiertas" else ""}")
|
|
||||||
}
|
|
||||||
OutlinedButton(onClick = onInventory, modifier = Modifier.fillMaxWidth()) {
|
|
||||||
Text("Buscar Inventario / Hallazgos")
|
|
||||||
}
|
|
||||||
} else if (visit.status == "CLOSED") {
|
|
||||||
OutlinedButton(onClick = onActs, modifier = Modifier.fillMaxWidth()) {
|
|
||||||
Text("Ver Actas · ${model.acts.size}")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
DynamicChecklistCard(visit)
|
|
||||||
|
|
||||||
Text("Inventario planificado", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
|
|
||||||
if (visit.planningAssets.none { it.included }) {
|
|
||||||
Text("Sin elementos planificados.")
|
|
||||||
}
|
|
||||||
visit.planningAssets.filter { it.included }.forEach { asset ->
|
|
||||||
Card(Modifier.fillMaxWidth()) {
|
|
||||||
Column(Modifier.padding(10.dp)) {
|
|
||||||
Text(asset.name, fontWeight = FontWeight.SemiBold)
|
|
||||||
Text("${asset.code} · ${asset.typeName.orEmpty()}", style = MaterialTheme.typography.bodySmall)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
private fun DynamicChecklistCard(visit: VisitDetail) {
|
|
||||||
val checklist = visit.checklist
|
|
||||||
Card(Modifier.fillMaxWidth()) {
|
|
||||||
Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
|
|
||||||
Text("Antecedentes antes de salir", fontWeight = FontWeight.Bold)
|
|
||||||
Text("Vencidos empresa: ${checklist.companyOverdue} · Verificaciones vencidas: ${checklist.verificationOverdue}")
|
|
||||||
Text("Antecedentes: ${checklist.antecedents} · Próximos controles: ${checklist.upcomingControls}")
|
|
||||||
if (checklist.stale) {
|
|
||||||
Text("El checklist requiere revisión/actualización.", color = MaterialTheme.colorScheme.error)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
private fun DynamicFieldInventoryScreen(model: MainViewModel, onBack: () -> Unit) {
|
|
||||||
val context = LocalContext.current
|
|
||||||
val scope = rememberCoroutineScope()
|
|
||||||
val visit = model.visit ?: return
|
|
||||||
|
|
||||||
var modeName by rememberSaveable(visit.id) { mutableStateOf(DynamicInventoryMode.BROWSE.name) }
|
|
||||||
val mode = runCatching { DynamicInventoryMode.valueOf(modeName) }.getOrDefault(DynamicInventoryMode.BROWSE)
|
|
||||||
var search by rememberSaveable(visit.id) { mutableStateOf("") }
|
|
||||||
var parentSearch by rememberSaveable(visit.id) { mutableStateOf("") }
|
|
||||||
var parentId by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
|
|
||||||
var parentLabel by rememberSaveable(visit.id) { mutableStateOf("") }
|
|
||||||
var name by rememberSaveable(visit.id) { mutableStateOf("") }
|
|
||||||
var commonName by rememberSaveable(visit.id) { mutableStateOf("") }
|
|
||||||
var selectedTypeId by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
|
|
||||||
var selectedFamilyId by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
|
|
||||||
var familySearch by rememberSaveable(visit.id) { mutableStateOf("") }
|
|
||||||
val attributeValues = remember { mutableStateMapOf<String, String>() }
|
|
||||||
var pendingAutoPhoto by rememberSaveable(visit.id) { mutableStateOf(false) }
|
|
||||||
var localError by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
|
|
||||||
var permissionAction by rememberSaveable(visit.id) { mutableStateOf("PHOTO") }
|
|
||||||
|
|
||||||
var mergeSearch by rememberSaveable(visit.id) { mutableStateOf("") }
|
|
||||||
var mergeCandidateId by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
|
|
||||||
var mergeReason by rememberSaveable(visit.id) { mutableStateOf("") }
|
|
||||||
|
|
||||||
fun resetForm() {
|
|
||||||
name = ""
|
|
||||||
commonName = ""
|
|
||||||
selectedTypeId = null
|
|
||||||
selectedFamilyId = null
|
|
||||||
familySearch = ""
|
|
||||||
attributeValues.clear()
|
|
||||||
localError = null
|
|
||||||
}
|
|
||||||
|
|
||||||
fun backToBrowse() {
|
|
||||||
modeName = DynamicInventoryMode.BROWSE.name
|
|
||||||
parentId = null
|
|
||||||
parentLabel = ""
|
|
||||||
parentSearch = ""
|
|
||||||
resetForm()
|
|
||||||
model.loadFieldTypes(null)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun startInstallation() {
|
|
||||||
model.clearSelectedFieldAsset()
|
|
||||||
modeName = DynamicInventoryMode.CREATE_INSTALLATION.name
|
|
||||||
parentId = null
|
|
||||||
parentLabel = visit.scopeAsset?.name ?: "Yacimiento de la inspección"
|
|
||||||
resetForm()
|
|
||||||
model.loadFieldTypes(null)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun startSubinstallation() {
|
|
||||||
model.clearSelectedFieldAsset()
|
|
||||||
modeName = DynamicInventoryMode.PICK_PARENT.name
|
|
||||||
parentId = null
|
|
||||||
parentLabel = ""
|
|
||||||
parentSearch = ""
|
|
||||||
resetForm()
|
|
||||||
model.searchInventory("", visit.scopeAsset?.id)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun chooseParent(item: FieldInventoryItem) {
|
|
||||||
parentId = item.id
|
|
||||||
parentLabel = "${item.name} (${item.code})"
|
|
||||||
modeName = DynamicInventoryMode.CREATE_SUBINSTALLATION.name
|
|
||||||
resetForm()
|
|
||||||
model.loadFieldTypes(item.id)
|
|
||||||
}
|
|
||||||
|
|
||||||
LaunchedEffect(visit.id) {
|
|
||||||
model.searchInventory("", visit.scopeAsset?.id)
|
|
||||||
}
|
|
||||||
|
|
||||||
LaunchedEffect(model.fieldTypes, modeName) {
|
|
||||||
if (mode == DynamicInventoryMode.CREATE_INSTALLATION || mode == DynamicInventoryMode.CREATE_SUBINSTALLATION) {
|
|
||||||
val preferred = model.fieldTypes.firstOrNull { type ->
|
|
||||||
val normalized = dynamicNormalize(type.structuralKind ?: type.code.ifBlank { type.name })
|
|
||||||
when (mode) {
|
|
||||||
DynamicInventoryMode.CREATE_INSTALLATION -> normalized.contains("instalacion") && !normalized.contains("subinstalacion")
|
|
||||||
DynamicInventoryMode.CREATE_SUBINSTALLATION -> normalized.contains("subinstalacion")
|
|
||||||
else -> false
|
|
||||||
}
|
|
||||||
} ?: model.fieldTypes.firstOrNull()
|
|
||||||
if (model.fieldTypes.none { it.id == selectedTypeId }) {
|
|
||||||
selectedTypeId = preferred?.id
|
|
||||||
selectedFamilyId = null
|
|
||||||
familySearch = ""
|
|
||||||
attributeValues.clear()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
val selectedType = model.fieldTypes.firstOrNull { it.id == selectedTypeId }
|
|
||||||
val selectedFamily = selectedType?.families?.firstOrNull { it.id == selectedFamilyId }
|
|
||||||
val filteredFamilies = remember(selectedType, familySearch) {
|
|
||||||
val needle = dynamicNormalize(familySearch)
|
|
||||||
selectedType?.families.orEmpty().filter { family ->
|
|
||||||
needle.isBlank() || dynamicNormalize("${family.code} ${family.name}").contains(needle)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var pendingPhotoFile by remember { mutableStateOf<File?>(null) }
|
|
||||||
var pendingPhotoGeo by remember { mutableStateOf<DynamicGeoSnapshot?>(null) }
|
|
||||||
|
|
||||||
val takePicture = rememberLauncherForActivityResult(ActivityResultContracts.TakePicture()) { success ->
|
|
||||||
val file = pendingPhotoFile
|
|
||||||
val geo = pendingPhotoGeo
|
|
||||||
if (success && file != null && geo != null) {
|
|
||||||
runCatching { writeDynamicExif(file, geo) }
|
|
||||||
model.uploadFieldPhoto(file, geo.latitude, geo.longitude, geo.accuracyM)
|
|
||||||
} else if (!success) {
|
|
||||||
localError = "La foto quedó pendiente. Podés tomarla cuando estés listo."
|
|
||||||
}
|
|
||||||
pendingPhotoFile = null
|
|
||||||
pendingPhotoGeo = null
|
|
||||||
}
|
|
||||||
|
|
||||||
val beginPhoto: () -> Unit = {
|
|
||||||
scope.launch {
|
|
||||||
runCatching { currentDynamicGeo(context) }
|
|
||||||
.onSuccess { geo ->
|
|
||||||
val (file, uri) = newDynamicPhoto(context)
|
|
||||||
pendingPhotoFile = file
|
|
||||||
pendingPhotoGeo = geo
|
|
||||||
takePicture.launch(uri)
|
|
||||||
}
|
|
||||||
.onFailure { localError = it.message ?: "No se pudo obtener el GPS para la fotografía." }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun createWithLocation() {
|
|
||||||
val type = selectedType ?: return
|
|
||||||
val effectiveParent = when (mode) {
|
|
||||||
DynamicInventoryMode.CREATE_SUBINSTALLATION -> parentId
|
|
||||||
else -> null
|
|
||||||
}
|
|
||||||
scope.launch {
|
|
||||||
runCatching { currentDynamicGeo(context) }
|
|
||||||
.onSuccess { geo ->
|
|
||||||
pendingAutoPhoto = true
|
|
||||||
model.createFieldAsset(
|
|
||||||
type = type,
|
|
||||||
parentId = effectiveParent,
|
|
||||||
familyId = selectedFamilyId,
|
|
||||||
name = name,
|
|
||||||
commonName = commonName,
|
|
||||||
attributes = buildDynamicAttributes(type, attributeValues),
|
|
||||||
latitude = geo.latitude,
|
|
||||||
longitude = geo.longitude,
|
|
||||||
accuracyM = geo.accuracyM,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
.onFailure { localError = it.message ?: "No se pudo capturar la ubicación GPS." }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
val permissionsLauncher = rememberLauncherForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { result ->
|
|
||||||
val cameraAllowed = result[Manifest.permission.CAMERA] == true || dynamicHasPermission(context, Manifest.permission.CAMERA)
|
|
||||||
val locationAllowed = result[Manifest.permission.ACCESS_FINE_LOCATION] == true ||
|
|
||||||
result[Manifest.permission.ACCESS_COARSE_LOCATION] == true || dynamicHasLocation(context)
|
|
||||||
when (permissionAction) {
|
|
||||||
"CREATE" -> {
|
|
||||||
if (cameraAllowed && locationAllowed) createWithLocation()
|
|
||||||
else localError = "Para el alta rápida se necesitan cámara y ubicación."
|
|
||||||
}
|
|
||||||
else -> {
|
|
||||||
if (cameraAllowed && locationAllowed) beginPhoto()
|
|
||||||
else localError = "Para completar el alta se necesitan cámara y ubicación."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun requestCreate() {
|
|
||||||
permissionAction = "CREATE"
|
|
||||||
if (dynamicHasPermission(context, Manifest.permission.CAMERA) && dynamicHasLocation(context)) {
|
|
||||||
createWithLocation()
|
|
||||||
} else {
|
|
||||||
permissionsLauncher.launch(
|
|
||||||
arrayOf(
|
|
||||||
Manifest.permission.CAMERA,
|
|
||||||
Manifest.permission.ACCESS_FINE_LOCATION,
|
|
||||||
Manifest.permission.ACCESS_COARSE_LOCATION,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun requestPhoto() {
|
|
||||||
permissionAction = "PHOTO"
|
|
||||||
if (dynamicHasPermission(context, Manifest.permission.CAMERA) && dynamicHasLocation(context)) {
|
|
||||||
beginPhoto()
|
|
||||||
} else {
|
|
||||||
permissionsLauncher.launch(
|
|
||||||
arrayOf(
|
|
||||||
Manifest.permission.CAMERA,
|
|
||||||
Manifest.permission.ACCESS_FINE_LOCATION,
|
|
||||||
Manifest.permission.ACCESS_COARSE_LOCATION,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
val selectedCapture = model.selectedFieldAsset
|
|
||||||
LaunchedEffect(selectedCapture?.asset?.id, pendingAutoPhoto) {
|
|
||||||
val capture = selectedCapture?.capture
|
|
||||||
if (pendingAutoPhoto && capture?.captureRequired == true && capture.creationGpsCaptured && capture.fieldPhotoCount == 0) {
|
|
||||||
pendingAutoPhoto = false
|
|
||||||
requestPhoto()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
val mergeSource = selectedCapture?.takeIf {
|
|
||||||
it.capture.captureRequired && dynamicItemTypeCode(it.asset) in setOf("instalacion", "subinstalacion")
|
|
||||||
}
|
|
||||||
val mergeCandidates = remember(model.inventory, mergeSource) {
|
|
||||||
if (mergeSource == null) emptyList() else model.inventory.filter { candidate ->
|
|
||||||
candidate.id != mergeSource.asset.id &&
|
|
||||||
candidate.informationStatus != "INACTIVE" &&
|
|
||||||
candidate.type?.id == mergeSource.asset.type?.id &&
|
|
||||||
candidate.parent?.id == mergeSource.asset.parent?.id &&
|
|
||||||
!candidate.captureRequired
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Column(Modifier.fillMaxSize().padding(top = 28.dp)) {
|
|
||||||
Row(
|
|
||||||
Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp),
|
|
||||||
horizontalArrangement = Arrangement.SpaceBetween,
|
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
|
||||||
) {
|
|
||||||
OutlinedButton(onClick = { if (mode == DynamicInventoryMode.BROWSE) onBack() else backToBrowse() }) {
|
|
||||||
Text(if (mode == DynamicInventoryMode.BROWSE) "Acta" else "Atrás")
|
|
||||||
}
|
|
||||||
Column(horizontalAlignment = Alignment.End) {
|
|
||||||
Text(
|
|
||||||
when (mode) {
|
|
||||||
DynamicInventoryMode.PICK_PARENT -> "Elegir Instalación"
|
|
||||||
DynamicInventoryMode.CREATE_INSTALLATION -> "Nueva Instalación"
|
|
||||||
DynamicInventoryMode.CREATE_SUBINSTALLATION -> "Nueva Subinstalación"
|
|
||||||
else -> "Inventario de campo"
|
|
||||||
},
|
|
||||||
style = MaterialTheme.typography.titleLarge,
|
|
||||||
fontWeight = FontWeight.Bold,
|
|
||||||
)
|
|
||||||
Text(visit.scopeAsset?.name ?: visit.code, style = MaterialTheme.typography.bodySmall)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Column(Modifier.padding(horizontal = 16.dp)) {
|
|
||||||
DynamicMessageStrip(model)
|
|
||||||
localError?.let {
|
|
||||||
Card(
|
|
||||||
modifier = Modifier.fillMaxWidth().padding(bottom = 8.dp),
|
|
||||||
colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.errorContainer),
|
|
||||||
onClick = { localError = null },
|
|
||||||
) { Text(it, Modifier.padding(12.dp)) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (selectedCapture != null) {
|
|
||||||
DynamicCaptureCard(
|
|
||||||
item = selectedCapture.asset,
|
|
||||||
gps = selectedCapture.capture.creationGpsCaptured,
|
|
||||||
photos = selectedCapture.capture.fieldPhotoCount,
|
|
||||||
ready = selectedCapture.capture.readyForFinding,
|
|
||||||
onPhoto = { requestPhoto() },
|
|
||||||
onClose = { model.clearSelectedFieldAsset() },
|
|
||||||
onCreateAnother = {
|
|
||||||
if (dynamicItemTypeCode(selectedCapture.asset) == "subinstalacion" && selectedCapture.asset.parent != null) {
|
|
||||||
chooseParent(
|
|
||||||
FieldInventoryItem(
|
|
||||||
id = selectedCapture.asset.parent.id,
|
|
||||||
code = selectedCapture.asset.parent.code,
|
|
||||||
name = selectedCapture.asset.parent.name,
|
|
||||||
type = null,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
startSubinstallation()
|
|
||||||
}
|
|
||||||
},
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (mergeSource != null && !mergeSource.capture.readyForFinding) {
|
|
||||||
Card(
|
|
||||||
Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 4.dp),
|
|
||||||
colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.secondaryContainer),
|
|
||||||
) {
|
|
||||||
Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
|
|
||||||
Text("¿Ya existía?", fontWeight = FontWeight.Bold)
|
|
||||||
Text("Antes de seguir, podés fusionar el alta con un registro existente compatible.", style = MaterialTheme.typography.bodySmall)
|
|
||||||
OutlinedTextField(
|
|
||||||
value = mergeSearch,
|
|
||||||
onValueChange = { mergeSearch = it },
|
|
||||||
label = { Text("Buscar posible duplicado") },
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
singleLine = true,
|
|
||||||
)
|
|
||||||
OutlinedButton(
|
|
||||||
onClick = {
|
|
||||||
mergeCandidateId = null
|
|
||||||
model.searchInventory(mergeSearch, mergeSource.asset.parent?.id)
|
|
||||||
},
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
) { Text("Buscar coincidencias") }
|
|
||||||
mergeCandidates.take(6).forEach { candidate ->
|
|
||||||
AssistChip(
|
|
||||||
onClick = { mergeCandidateId = candidate.id },
|
|
||||||
label = {
|
|
||||||
Text(if (mergeCandidateId == candidate.id) "✓ ${candidate.code} · ${candidate.name}" else "${candidate.code} · ${candidate.name}")
|
|
||||||
},
|
|
||||||
)
|
|
||||||
}
|
|
||||||
if (mergeCandidateId != null) {
|
|
||||||
OutlinedTextField(
|
|
||||||
value = mergeReason,
|
|
||||||
onValueChange = { mergeReason = it },
|
|
||||||
label = { Text("Motivo de la fusión") },
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
minLines = 2,
|
|
||||||
)
|
|
||||||
Button(
|
|
||||||
onClick = { model.mergeCreatedFieldAsset(mergeCandidateId!!, mergeReason) },
|
|
||||||
enabled = mergeReason.trim().length >= 8 && !model.busy,
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
) { Text("Fusionar con el existente") }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
when (mode) {
|
|
||||||
DynamicInventoryMode.BROWSE -> {
|
|
||||||
Column(
|
|
||||||
Modifier.fillMaxWidth().padding(horizontal = 16.dp),
|
|
||||||
verticalArrangement = Arrangement.spacedBy(8.dp),
|
|
||||||
) {
|
|
||||||
Card(
|
|
||||||
Modifier.fillMaxWidth(),
|
|
||||||
colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer),
|
|
||||||
) {
|
|
||||||
Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
|
|
||||||
Text("Alta rápida en campo", fontWeight = FontWeight.Bold)
|
|
||||||
Text("La Subinstalación se carga guiada, sin navegar por formularios largos.", style = MaterialTheme.typography.bodySmall)
|
|
||||||
Button(onClick = { startSubinstallation() }, modifier = Modifier.fillMaxWidth(), enabled = visit.status == "IN_PROGRESS") {
|
|
||||||
Text("+ Nueva Subinstalación")
|
|
||||||
}
|
|
||||||
OutlinedButton(onClick = { startInstallation() }, modifier = Modifier.fillMaxWidth(), enabled = visit.status == "IN_PROGRESS") {
|
|
||||||
Text("+ Nueva Instalación")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
OutlinedTextField(
|
|
||||||
value = search,
|
|
||||||
onValueChange = { search = it },
|
|
||||||
label = { Text("Buscar instalación, subinstalación o código") },
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
singleLine = true,
|
|
||||||
)
|
|
||||||
Button(
|
|
||||||
onClick = { model.searchInventory(search) },
|
|
||||||
enabled = !model.busy,
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
) { Text("Buscar") }
|
|
||||||
}
|
|
||||||
|
|
||||||
Text("Inventario disponible", 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.filter { dynamicItemTypeCode(it) in setOf("instalacion", "subinstalacion") },
|
|
||||||
key = { it.id },
|
|
||||||
) { item ->
|
|
||||||
DynamicInventoryCard(
|
|
||||||
item = item,
|
|
||||||
onInspect = { model.selectExisting(item) },
|
|
||||||
onAddChild = { chooseParent(item) },
|
|
||||||
)
|
|
||||||
}
|
|
||||||
item { Spacer(Modifier.height(30.dp)) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
DynamicInventoryMode.PICK_PARENT -> {
|
|
||||||
Column(
|
|
||||||
Modifier.fillMaxWidth().padding(horizontal = 16.dp),
|
|
||||||
verticalArrangement = Arrangement.spacedBy(8.dp),
|
|
||||||
) {
|
|
||||||
DynamicStepHeader(1, "Elegí la Instalación padre")
|
|
||||||
Text("Solo se muestran Instalaciones del Yacimiento de esta inspección.", style = MaterialTheme.typography.bodySmall)
|
|
||||||
OutlinedTextField(
|
|
||||||
value = parentSearch,
|
|
||||||
onValueChange = { parentSearch = it },
|
|
||||||
label = { Text("Buscar Instalación por nombre o código") },
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
singleLine = true,
|
|
||||||
)
|
|
||||||
Button(
|
|
||||||
onClick = { model.searchInventory(parentSearch, visit.scopeAsset?.id) },
|
|
||||||
enabled = !model.busy,
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
) { Text("Buscar Instalación") }
|
|
||||||
}
|
|
||||||
LazyColumn(
|
|
||||||
Modifier.fillMaxSize().padding(horizontal = 16.dp, vertical = 8.dp),
|
|
||||||
verticalArrangement = Arrangement.spacedBy(8.dp),
|
|
||||||
) {
|
|
||||||
items(
|
|
||||||
model.inventory.filter { dynamicItemTypeCode(it) == "instalacion" },
|
|
||||||
key = { it.id },
|
|
||||||
) { item ->
|
|
||||||
Card(onClick = { chooseParent(item) }, modifier = Modifier.fillMaxWidth()) {
|
|
||||||
Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) {
|
|
||||||
Text(item.name, fontWeight = FontWeight.Bold)
|
|
||||||
Text(item.code, style = MaterialTheme.typography.bodySmall)
|
|
||||||
Text("Tocar para agregar una Subinstalación", color = MaterialTheme.colorScheme.primary, style = MaterialTheme.typography.bodySmall)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
item { Spacer(Modifier.height(24.dp)) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
DynamicInventoryMode.CREATE_INSTALLATION,
|
|
||||||
DynamicInventoryMode.CREATE_SUBINSTALLATION -> {
|
|
||||||
val isSubinstallation = mode == DynamicInventoryMode.CREATE_SUBINSTALLATION
|
|
||||||
Column(
|
|
||||||
Modifier
|
|
||||||
.fillMaxSize()
|
|
||||||
.padding(horizontal = 16.dp)
|
|
||||||
.verticalScroll(rememberScrollState()),
|
|
||||||
verticalArrangement = Arrangement.spacedBy(10.dp),
|
|
||||||
) {
|
|
||||||
DynamicStepHeader(if (isSubinstallation) 2 else 1, if (isSubinstallation) "Identificá la Subinstalación" else "Identificá la Instalación")
|
|
||||||
Text("Ubicación: $parentLabel", style = MaterialTheme.typography.bodySmall, fontWeight = FontWeight.SemiBold)
|
|
||||||
if (isSubinstallation) {
|
|
||||||
OutlinedButton(onClick = { startSubinstallation() }, modifier = Modifier.fillMaxWidth()) {
|
|
||||||
Text("Cambiar Instalación padre")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (model.fieldTypes.isEmpty()) {
|
|
||||||
Text("No hay un tipo habilitado para esta ubicación.", color = MaterialTheme.colorScheme.error)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (model.fieldTypes.size > 1) {
|
|
||||||
Text("Nivel de Inventario", fontWeight = FontWeight.Bold)
|
|
||||||
model.fieldTypes.forEach { type ->
|
|
||||||
AssistChip(
|
|
||||||
onClick = {
|
|
||||||
selectedTypeId = type.id
|
|
||||||
selectedFamilyId = null
|
|
||||||
attributeValues.clear()
|
|
||||||
},
|
|
||||||
label = { Text(if (selectedTypeId == type.id) "✓ ${type.name}" else type.name) },
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (selectedType?.familyRequired == true) {
|
|
||||||
Text("Clasificación técnica *", fontWeight = FontWeight.Bold)
|
|
||||||
OutlinedTextField(
|
|
||||||
value = familySearch,
|
|
||||||
onValueChange = { familySearch = it },
|
|
||||||
label = { Text("Buscar clasificación") },
|
|
||||||
supportingText = { Text("${filteredFamilies.size} opciones compatibles") },
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
singleLine = true,
|
|
||||||
)
|
|
||||||
filteredFamilies.take(12).forEach { family ->
|
|
||||||
AssistChip(
|
|
||||||
onClick = { selectedFamilyId = family.id },
|
|
||||||
label = {
|
|
||||||
val prefix = when {
|
|
||||||
selectedFamilyId == family.id -> "✓ "
|
|
||||||
family.isOther -> "+ "
|
|
||||||
else -> ""
|
|
||||||
}
|
|
||||||
Text(prefix + family.name)
|
|
||||||
},
|
|
||||||
)
|
|
||||||
}
|
|
||||||
if (filteredFamilies.size > 12) {
|
|
||||||
Text("Escribí parte del nombre para reducir la lista.", style = MaterialTheme.typography.bodySmall)
|
|
||||||
}
|
|
||||||
selectedFamily?.let { family ->
|
|
||||||
if (family.isOther) {
|
|
||||||
Text("Quedará marcado como no catalogado para revisión en oficina.", color = MaterialTheme.colorScheme.secondary)
|
|
||||||
}
|
|
||||||
if (family.informationLabels.isNotEmpty()) {
|
|
||||||
Text("Datos esperados: ${family.informationLabels.joinToString(" · ")}", style = MaterialTheme.typography.bodySmall)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
OutlinedTextField(
|
|
||||||
value = name,
|
|
||||||
onValueChange = { name = it },
|
|
||||||
label = { Text("Nombre o código visible *") },
|
|
||||||
supportingText = { Text("Usá lo que ve el inspector en la placa o en campo.") },
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
singleLine = true,
|
|
||||||
)
|
|
||||||
OutlinedTextField(
|
|
||||||
value = commonName,
|
|
||||||
onValueChange = { commonName = it },
|
|
||||||
label = { Text("Nombre habitual") },
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
singleLine = true,
|
|
||||||
)
|
|
||||||
|
|
||||||
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(),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
HorizontalDivider()
|
|
||||||
DynamicStepHeader(if (isSubinstallation) 3 else 2, "GPS + foto en un solo paso")
|
|
||||||
Text(
|
|
||||||
"Al guardar se captura la ubicación actual y la cámara se abre automáticamente. La foto sigue siendo obligatoria antes de crear Hallazgos.",
|
|
||||||
style = MaterialTheme.typography.bodySmall,
|
|
||||||
)
|
|
||||||
|
|
||||||
val attributesReady = selectedType?.attributes
|
|
||||||
?.filter { it.isRequired }
|
|
||||||
?.all { attributeValues[it.code].orEmpty().isNotBlank() }
|
|
||||||
?: false
|
|
||||||
val familyReady = selectedType?.familyRequired != true || selectedFamilyId != null
|
|
||||||
Button(
|
|
||||||
onClick = { requestCreate() },
|
|
||||||
enabled = selectedType != null && name.isNotBlank() && attributesReady && familyReady && !model.busy,
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
) { Text(if (model.busy) "Guardando…" else "Guardar y tomar foto") }
|
|
||||||
Spacer(Modifier.height(30.dp))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
private fun DynamicStepHeader(step: Int, title: String) {
|
|
||||||
Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
|
|
||||||
Card(colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer)) {
|
|
||||||
Text(step.toString(), Modifier.padding(horizontal = 10.dp, vertical = 6.dp), fontWeight = FontWeight.Bold)
|
|
||||||
}
|
|
||||||
Spacer(Modifier.width(8.dp))
|
|
||||||
Text(title, style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
private fun DynamicCaptureCard(
|
|
||||||
item: FieldInventoryItem,
|
|
||||||
gps: Boolean,
|
|
||||||
photos: Int,
|
|
||||||
ready: Boolean,
|
|
||||||
onPhoto: () -> Unit,
|
|
||||||
onClose: () -> Unit,
|
|
||||||
onCreateAnother: () -> Unit,
|
|
||||||
) {
|
|
||||||
Card(
|
|
||||||
Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 6.dp),
|
|
||||||
colors = CardDefaults.cardColors(
|
|
||||||
containerColor = if (ready) MaterialTheme.colorScheme.primaryContainer else MaterialTheme.colorScheme.surfaceVariant,
|
|
||||||
),
|
|
||||||
) {
|
|
||||||
Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(7.dp)) {
|
|
||||||
Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
|
|
||||||
Column(Modifier.weight(1f)) {
|
|
||||||
Text(item.name, fontWeight = FontWeight.Bold)
|
|
||||||
Text(item.code, style = MaterialTheme.typography.bodySmall)
|
|
||||||
}
|
|
||||||
OutlinedButton(onClick = onClose) { Text("Cerrar") }
|
|
||||||
}
|
|
||||||
Text("GPS: ${if (gps) "OK" else "pendiente"} · Fotos: $photos")
|
|
||||||
if (!ready) {
|
|
||||||
Text("Falta la fotografía obligatoria.", color = MaterialTheme.colorScheme.error)
|
|
||||||
Button(onClick = onPhoto, modifier = Modifier.fillMaxWidth()) { Text("Tomar foto ahora") }
|
|
||||||
} else {
|
|
||||||
Text("Alta completa · lista para Hallazgos", color = MaterialTheme.colorScheme.primary, fontWeight = FontWeight.Bold)
|
|
||||||
OutlinedButton(onClick = onCreateAnother, modifier = Modifier.fillMaxWidth()) {
|
|
||||||
Text("+ Crear otra Subinstalación")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
private fun DynamicInventoryCard(
|
|
||||||
item: FieldInventoryItem,
|
|
||||||
onInspect: () -> Unit,
|
|
||||||
onAddChild: () -> Unit,
|
|
||||||
) {
|
|
||||||
val typeCode = dynamicItemTypeCode(item)
|
|
||||||
Card(Modifier.fillMaxWidth()) {
|
|
||||||
Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
|
|
||||||
Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
|
|
||||||
Text(item.name, fontWeight = FontWeight.SemiBold)
|
|
||||||
Text(if (typeCode == "subinstalacion") "Subinstalación" else "Instalación", style = MaterialTheme.typography.bodySmall)
|
|
||||||
}
|
|
||||||
Text(item.code, style = MaterialTheme.typography.bodySmall)
|
|
||||||
item.commonName?.takeIf { it.isNotBlank() }?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
|
|
||||||
Text(
|
|
||||||
if (item.readyForFinding) "Disponible" else "GPS/foto pendiente",
|
|
||||||
color = if (item.readyForFinding) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error,
|
|
||||||
style = MaterialTheme.typography.bodySmall,
|
|
||||||
)
|
|
||||||
Button(onClick = onInspect, modifier = Modifier.fillMaxWidth()) {
|
|
||||||
Text(if (item.selectedInInspection) "Abrir para Hallazgo" else "Usar para Hallazgo")
|
|
||||||
}
|
|
||||||
if (typeCode == "instalacion") {
|
|
||||||
OutlinedButton(onClick = onAddChild, modifier = Modifier.fillMaxWidth()) {
|
|
||||||
Text("+ Agregar Subinstalación")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
private fun DynamicMessageStrip(model: MainViewModel) {
|
|
||||||
val error = model.error
|
|
||||||
val notice = model.notice
|
|
||||||
if (error != null || notice != null) {
|
|
||||||
Card(
|
|
||||||
modifier = Modifier.fillMaxWidth().padding(bottom = 10.dp),
|
|
||||||
colors = CardDefaults.cardColors(
|
|
||||||
containerColor = if (error != null) MaterialTheme.colorScheme.errorContainer else MaterialTheme.colorScheme.secondaryContainer,
|
|
||||||
),
|
|
||||||
onClick = { model.clearMessages() },
|
|
||||||
) {
|
|
||||||
Text(error ?: notice.orEmpty(), Modifier.padding(12.dp))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun dynamicItemTypeCode(item: FieldInventoryItem): String {
|
|
||||||
val type = item.type ?: return ""
|
|
||||||
return dynamicNormalize(type.typeName ?: type.name)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun dynamicNormalize(value: String): String = value.trim().lowercase()
|
|
||||||
.replace('ó', 'o')
|
|
||||||
.replace('í', 'i')
|
|
||||||
.replace('á', 'a')
|
|
||||||
.replace('é', 'e')
|
|
||||||
.replace('ú', 'u')
|
|
||||||
.replace("_", "")
|
|
||||||
.replace("-", "")
|
|
||||||
.replace(" ", "")
|
|
||||||
|
|
||||||
private fun dynamicStatusLabel(status: String): String = when (status) {
|
|
||||||
"PLANNED" -> "Planificada"
|
|
||||||
"IN_PROGRESS" -> "En curso"
|
|
||||||
"CLOSED" -> "Cerrada"
|
|
||||||
"CANCELLED" -> "Cancelada"
|
|
||||||
else -> status
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun buildDynamicAttributes(type: FieldType, values: Map<String, String>): Map<String, Any?> =
|
|
||||||
type.attributes.mapNotNull { definition ->
|
|
||||||
val raw = values[definition.code]?.trim().orEmpty()
|
|
||||||
if (raw.isBlank()) return@mapNotNull null
|
|
||||||
definition.code to coerceDynamicAttribute(definition, raw)
|
|
||||||
}.toMap()
|
|
||||||
|
|
||||||
private fun coerceDynamicAttribute(definition: FieldAttributeDefinition, raw: String): Any = when (definition.dataType.uppercase()) {
|
|
||||||
"INTEGER", "INT" -> raw.toLongOrNull() ?: raw
|
|
||||||
"NUMBER", "DECIMAL", "FLOAT", "DOUBLE" -> raw.replace(',', '.').toDoubleOrNull() ?: raw
|
|
||||||
"BOOLEAN", "BOOL" -> raw.lowercase() in setOf("true", "1", "si", "sí", "yes")
|
|
||||||
else -> raw
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun dynamicHasPermission(context: Context, permission: String): Boolean =
|
|
||||||
ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED
|
|
||||||
|
|
||||||
private fun dynamicHasLocation(context: Context): Boolean =
|
|
||||||
dynamicHasPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) ||
|
|
||||||
dynamicHasPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION)
|
|
||||||
|
|
||||||
private suspend fun currentDynamicGeo(context: Context): DynamicGeoSnapshot = suspendCancellableCoroutine { continuation ->
|
|
||||||
if (!dynamicHasLocation(context)) {
|
|
||||||
continuation.resumeWithException(SecurityException("Se necesita permiso de ubicación."))
|
|
||||||
return@suspendCancellableCoroutine
|
|
||||||
}
|
|
||||||
val source = CancellationTokenSource()
|
|
||||||
val client = LocationServices.getFusedLocationProviderClient(context)
|
|
||||||
try {
|
|
||||||
client.getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
|
|
||||||
.addOnSuccessListener { location ->
|
|
||||||
if (!continuation.isActive) return@addOnSuccessListener
|
|
||||||
if (location == null) {
|
|
||||||
continuation.resumeWithException(IllegalStateException("No se pudo obtener una ubicación GPS actual."))
|
|
||||||
} else {
|
|
||||||
continuation.resume(DynamicGeoSnapshot(location.latitude, location.longitude, location.accuracy.toDouble()))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
|
|
||||||
} catch (error: SecurityException) {
|
|
||||||
if (continuation.isActive) continuation.resumeWithException(error)
|
|
||||||
}
|
|
||||||
continuation.invokeOnCancellation { source.cancel() }
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun newDynamicPhoto(context: Context): Pair<File, Uri> {
|
|
||||||
val directory = context.getExternalFilesDir(Environment.DIRECTORY_PICTURES)
|
|
||||||
?: throw IllegalStateException("No se pudo acceder al almacenamiento de fotografías.")
|
|
||||||
directory.mkdirs()
|
|
||||||
val file = File.createTempFile("DH_FAST_${System.currentTimeMillis()}_", ".jpg", directory)
|
|
||||||
val uri = FileProvider.getUriForFile(context, "${context.packageName}.files", file)
|
|
||||||
return file to uri
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun writeDynamicExif(file: File, geo: DynamicGeoSnapshot) {
|
|
||||||
val now = Instant.now()
|
|
||||||
val exif = ExifInterface(file)
|
|
||||||
exif.setLatLong(geo.latitude, geo.longitude)
|
|
||||||
val formatter = DateTimeFormatter.ofPattern("yyyy:MM:dd HH:mm:ss").withZone(ZoneId.systemDefault())
|
|
||||||
exif.setAttribute(ExifInterface.TAG_DATETIME_ORIGINAL, formatter.format(now))
|
|
||||||
exif.setAttribute(ExifInterface.TAG_DATETIME_DIGITIZED, formatter.format(now))
|
|
||||||
exif.saveAttributes()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun dynamicShortDate(value: String): String = value.replace('T', ' ').take(16)
|
|
||||||
@@ -185,7 +185,7 @@ fun FieldFindingScreen(model: MainViewModel) {
|
|||||||
Text(asset.name, fontWeight = FontWeight.Bold)
|
Text(asset.name, fontWeight = FontWeight.Bold)
|
||||||
Text("${asset.code} · Acta ${options.act.code}", style = MaterialTheme.typography.bodySmall)
|
Text("${asset.code} · Acta ${options.act.code}", style = MaterialTheme.typography.bodySmall)
|
||||||
Text(
|
Text(
|
||||||
"GPS + foto del Inventario: ${if (options.capture.readyForFinding) "completo" else "pendiente"}",
|
"GPS + foto del Inventario: ${if (options.capture.readyForFinding) "OK" else "pendiente"}",
|
||||||
color = if (options.capture.readyForFinding) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error,
|
color = if (options.capture.readyForFinding) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error,
|
||||||
style = MaterialTheme.typography.bodySmall,
|
style = MaterialTheme.typography.bodySmall,
|
||||||
)
|
)
|
||||||
@@ -210,7 +210,7 @@ fun FieldFindingScreen(model: MainViewModel) {
|
|||||||
Card(Modifier.fillMaxWidth()) {
|
Card(Modifier.fillMaxWidth()) {
|
||||||
Column(Modifier.padding(10.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
|
Column(Modifier.padding(10.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
|
||||||
Text("${finding.code} · ${finding.title}", fontWeight = FontWeight.SemiBold)
|
Text("${finding.code} · ${finding.title}", fontWeight = FontWeight.SemiBold)
|
||||||
Text("Gravedad: ${finding.severity ?: "s/d"} · ${findingStatusLabelEs(finding.status)}", style = MaterialTheme.typography.bodySmall)
|
Text("Gravedad: ${finding.severity ?: "s/d"} · ${finding.status}", style = MaterialTheme.typography.bodySmall)
|
||||||
Text(
|
Text(
|
||||||
"Evidencias: ${evidence.size} · Fotos: ${evidence.count { it.kind == "PHOTO" }}",
|
"Evidencias: ${evidence.size} · Fotos: ${evidence.count { it.kind == "PHOTO" }}",
|
||||||
style = MaterialTheme.typography.bodySmall,
|
style = MaterialTheme.typography.bodySmall,
|
||||||
|
|||||||
@@ -3,13 +3,11 @@ package com.korexlabs.dhinspeccion.ui
|
|||||||
import android.content.Context
|
import android.content.Context
|
||||||
import androidx.biometric.BiometricManager
|
import androidx.biometric.BiometricManager
|
||||||
import androidx.biometric.BiometricPrompt
|
import androidx.biometric.BiometricPrompt
|
||||||
import androidx.compose.foundation.Image
|
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
import androidx.compose.foundation.layout.Box
|
import androidx.compose.foundation.layout.Box
|
||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
import androidx.compose.foundation.layout.height
|
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.filled.Visibility
|
import androidx.compose.material.icons.filled.Visibility
|
||||||
@@ -31,9 +29,7 @@ import androidx.compose.runtime.saveable.rememberSaveable
|
|||||||
import androidx.compose.runtime.setValue
|
import androidx.compose.runtime.setValue
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.layout.ContentScale
|
|
||||||
import androidx.compose.ui.platform.LocalContext
|
import androidx.compose.ui.platform.LocalContext
|
||||||
import androidx.compose.ui.res.painterResource
|
|
||||||
import androidx.compose.ui.text.font.FontWeight
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
import androidx.compose.ui.text.input.PasswordVisualTransformation
|
import androidx.compose.ui.text.input.PasswordVisualTransformation
|
||||||
import androidx.compose.ui.text.input.VisualTransformation
|
import androidx.compose.ui.text.input.VisualTransformation
|
||||||
@@ -41,7 +37,6 @@ import androidx.compose.ui.unit.dp
|
|||||||
import androidx.core.content.ContextCompat
|
import androidx.core.content.ContextCompat
|
||||||
import androidx.fragment.app.FragmentActivity
|
import androidx.fragment.app.FragmentActivity
|
||||||
import com.korexlabs.dhinspeccion.MainViewModel
|
import com.korexlabs.dhinspeccion.MainViewModel
|
||||||
import com.korexlabs.dhinspeccion.R
|
|
||||||
|
|
||||||
private const val BIOMETRIC_PREFS = "dh_v2_biometric"
|
private const val BIOMETRIC_PREFS = "dh_v2_biometric"
|
||||||
private const val BIOMETRIC_ENABLED = "enabled"
|
private const val BIOMETRIC_ENABLED = "enabled"
|
||||||
@@ -79,7 +74,7 @@ fun DhRoot(model: MainViewModel, activity: FragmentActivity) {
|
|||||||
if (model.session == null) unlocked = false
|
if (model.session == null) unlocked = false
|
||||||
}
|
}
|
||||||
|
|
||||||
DhTheme {
|
MaterialTheme {
|
||||||
Surface(Modifier.fillMaxSize()) {
|
Surface(Modifier.fillMaxSize()) {
|
||||||
when {
|
when {
|
||||||
model.session == null -> EnhancedLoginScreen(model) {
|
model.session == null -> EnhancedLoginScreen(model) {
|
||||||
@@ -96,7 +91,7 @@ fun DhRoot(model: MainViewModel, activity: FragmentActivity) {
|
|||||||
},
|
},
|
||||||
)
|
)
|
||||||
model.fieldFindingOptions != null -> FieldFindingScreen(model)
|
model.fieldFindingOptions != null -> FieldFindingScreen(model)
|
||||||
model.visit != null -> ModernVisitRoot(model)
|
model.visit != null -> F3VisitRoot(model)
|
||||||
else -> MobileHomeScreen(model)
|
else -> MobileHomeScreen(model)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -110,13 +105,7 @@ private fun EnhancedLoginScreen(model: MainViewModel, onPasswordLogin: () -> Uni
|
|||||||
var passwordVisible by rememberSaveable { mutableStateOf(false) }
|
var passwordVisible by rememberSaveable { mutableStateOf(false) }
|
||||||
|
|
||||||
Box(Modifier.fillMaxSize().padding(24.dp), contentAlignment = Alignment.Center) {
|
Box(Modifier.fillMaxSize().padding(24.dp), contentAlignment = Alignment.Center) {
|
||||||
Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(14.dp), horizontalAlignment = Alignment.CenterHorizontally) {
|
Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(14.dp)) {
|
||||||
Image(
|
|
||||||
painter = painterResource(R.drawable.ic_mendoza_launcher_exact),
|
|
||||||
contentDescription = "Gobierno de Mendoza",
|
|
||||||
modifier = Modifier.fillMaxWidth().height(170.dp),
|
|
||||||
contentScale = ContentScale.Fit,
|
|
||||||
)
|
|
||||||
Text("DH Inspección", style = MaterialTheme.typography.headlineMedium, fontWeight = FontWeight.Bold)
|
Text("DH Inspección", style = MaterialTheme.typography.headlineMedium, fontWeight = FontWeight.Bold)
|
||||||
Text("Aplicación de campo · Dirección de Hidrocarburos")
|
Text("Aplicación de campo · Dirección de Hidrocarburos")
|
||||||
model.error?.let { Text(it, color = MaterialTheme.colorScheme.error) }
|
model.error?.let { Text(it, color = MaterialTheme.colorScheme.error) }
|
||||||
@@ -124,7 +113,7 @@ private fun EnhancedLoginScreen(model: MainViewModel, onPasswordLogin: () -> Uni
|
|||||||
OutlinedTextField(
|
OutlinedTextField(
|
||||||
value = identifier,
|
value = identifier,
|
||||||
onValueChange = { identifier = it },
|
onValueChange = { identifier = it },
|
||||||
label = { Text("Usuario o correo electrónico") },
|
label = { Text("Usuario o email") },
|
||||||
modifier = Modifier.fillMaxWidth(),
|
modifier = Modifier.fillMaxWidth(),
|
||||||
singleLine = true,
|
singleLine = true,
|
||||||
)
|
)
|
||||||
@@ -209,12 +198,6 @@ private fun BiometricUnlockScreen(
|
|||||||
verticalArrangement = Arrangement.spacedBy(14.dp),
|
verticalArrangement = Arrangement.spacedBy(14.dp),
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
horizontalAlignment = Alignment.CenterHorizontally,
|
||||||
) {
|
) {
|
||||||
Image(
|
|
||||||
painter = painterResource(R.drawable.ic_mendoza_launcher_exact),
|
|
||||||
contentDescription = "Gobierno de Mendoza",
|
|
||||||
modifier = Modifier.fillMaxWidth().height(140.dp),
|
|
||||||
contentScale = ContentScale.Fit,
|
|
||||||
)
|
|
||||||
Text("DH Inspección", style = MaterialTheme.typography.headlineMedium, fontWeight = FontWeight.Bold)
|
Text("DH Inspección", style = MaterialTheme.typography.headlineMedium, fontWeight = FontWeight.Bold)
|
||||||
Text("Ingresá con tu huella")
|
Text("Ingresá con tu huella")
|
||||||
error?.let { Text(it, color = MaterialTheme.colorScheme.error) }
|
error?.let { Text(it, color = MaterialTheme.colorScheme.error) }
|
||||||
|
|||||||
@@ -215,7 +215,7 @@ private fun MobileVisitCard(visit: VisitSummary, onOpen: () -> Unit) {
|
|||||||
Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
|
Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
|
||||||
Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
|
Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
|
||||||
Text(visit.code, fontWeight = FontWeight.Bold)
|
Text(visit.code, fontWeight = FontWeight.Bold)
|
||||||
Text(visitStatusLabelEs(visit.status))
|
Text(visit.status)
|
||||||
}
|
}
|
||||||
Text(visit.operatorCompany?.name ?: "Operadora sin definir")
|
Text(visit.operatorCompany?.name ?: "Operadora sin definir")
|
||||||
Text(visit.operationalArea?.name ?: "Área sin definir", style = MaterialTheme.typography.bodySmall)
|
Text(visit.operationalArea?.name ?: "Área sin definir", style = MaterialTheme.typography.bodySmall)
|
||||||
|
|||||||
-559
@@ -1,559 +0,0 @@
|
|||||||
package com.korexlabs.dhinspeccion.ui
|
|
||||||
|
|
||||||
import android.Manifest
|
|
||||||
import android.content.Context
|
|
||||||
import android.content.pm.PackageManager
|
|
||||||
import androidx.compose.foundation.BorderStroke
|
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
|
||||||
import androidx.compose.foundation.layout.Column
|
|
||||||
import androidx.compose.foundation.layout.Row
|
|
||||||
import androidx.compose.foundation.layout.Spacer
|
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
|
||||||
import androidx.compose.foundation.layout.height
|
|
||||||
import androidx.compose.foundation.layout.padding
|
|
||||||
import androidx.compose.foundation.layout.width
|
|
||||||
import androidx.compose.foundation.rememberScrollState
|
|
||||||
import androidx.compose.foundation.verticalScroll
|
|
||||||
import androidx.compose.material.icons.Icons
|
|
||||||
import androidx.compose.material.icons.filled.Add
|
|
||||||
import androidx.compose.material.icons.filled.Assignment
|
|
||||||
import androidx.compose.material.icons.filled.CheckCircle
|
|
||||||
import androidx.compose.material.icons.filled.EditNote
|
|
||||||
import androidx.compose.material.icons.filled.ErrorOutline
|
|
||||||
import androidx.compose.material.icons.filled.Lock
|
|
||||||
import androidx.compose.material.icons.filled.Person
|
|
||||||
import androidx.compose.material3.Button
|
|
||||||
import androidx.compose.material3.ElevatedCard
|
|
||||||
import androidx.compose.material3.FilterChip
|
|
||||||
import androidx.compose.material3.HorizontalDivider
|
|
||||||
import androidx.compose.material3.Icon
|
|
||||||
import androidx.compose.material3.MaterialTheme
|
|
||||||
import androidx.compose.material3.OutlinedButton
|
|
||||||
import androidx.compose.material3.OutlinedTextField
|
|
||||||
import androidx.compose.material3.Surface
|
|
||||||
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.Alignment
|
|
||||||
import androidx.compose.ui.Modifier
|
|
||||||
import androidx.compose.ui.platform.LocalContext
|
|
||||||
import androidx.compose.ui.text.font.FontWeight
|
|
||||||
import androidx.compose.ui.text.style.TextOverflow
|
|
||||||
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 ModernActSignatureGeo(
|
|
||||||
val latitude: Double,
|
|
||||||
val longitude: Double,
|
|
||||||
val accuracyM: Double?,
|
|
||||||
)
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun ModernMobileActsScreen(
|
|
||||||
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 newActUrgency by rememberSaveable(visit.id) { mutableStateOf("NON_URGENT") }
|
|
||||||
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 { currentModernActSignatureGeo(context) }.getOrNull()
|
|
||||||
if (company) {
|
|
||||||
model.signSelectedActAsCompany(
|
|
||||||
png = file,
|
|
||||||
latitude = geo?.latitude,
|
|
||||||
longitude = geo?.longitude,
|
|
||||||
accuracyM = geo?.accuracyM,
|
|
||||||
manifestation = manifestation,
|
|
||||||
statement = dissentStatement.takeIf { manifestation == "DISSENT" },
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
model.signSelectedActAsInspector(
|
|
||||||
png = file,
|
|
||||||
latitude = geo?.latitude,
|
|
||||||
longitude = geo?.longitude,
|
|
||||||
accuracyM = geo?.accuracyM,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Column(
|
|
||||||
Modifier
|
|
||||||
.fillMaxSize()
|
|
||||||
.verticalScroll(rememberScrollState())
|
|
||||||
.padding(horizontal = 18.dp, vertical = 16.dp),
|
|
||||||
verticalArrangement = Arrangement.spacedBy(14.dp),
|
|
||||||
) {
|
|
||||||
ModernHeader(title = "Actas", subtitle = visit.code, onBack = onBack)
|
|
||||||
|
|
||||||
Surface(
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
shape = MaterialTheme.shapes.large,
|
|
||||||
tonalElevation = 1.dp,
|
|
||||||
) {
|
|
||||||
Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
|
|
||||||
Text(
|
|
||||||
visit.scopeAsset?.name ?: "Yacimiento",
|
|
||||||
style = MaterialTheme.typography.titleMedium,
|
|
||||||
fontWeight = FontWeight.Bold,
|
|
||||||
)
|
|
||||||
visit.operatorCompany?.name?.takeIf { it.isNotBlank() }?.let {
|
|
||||||
Text(
|
|
||||||
it,
|
|
||||||
style = MaterialTheme.typography.bodyMedium,
|
|
||||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
|
||||||
maxLines = 2,
|
|
||||||
overflow = TextOverflow.Ellipsis,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ModernMessage(model)
|
|
||||||
|
|
||||||
if (model.acts.isEmpty()) {
|
|
||||||
ElevatedCard(Modifier.fillMaxWidth()) {
|
|
||||||
Column(
|
|
||||||
Modifier.padding(20.dp),
|
|
||||||
verticalArrangement = Arrangement.spacedBy(8.dp),
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
) {
|
|
||||||
Icon(Icons.Filled.Assignment, contentDescription = null, tint = MaterialTheme.colorScheme.secondary)
|
|
||||||
Text("Todavía no hay Actas", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
|
|
||||||
Text(
|
|
||||||
"Creá la primera Acta y después incorporá Hallazgos seleccionando el Inventario.",
|
|
||||||
style = MaterialTheme.typography.bodyMedium,
|
|
||||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
Text("Actas de esta inspección", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
|
|
||||||
model.acts.forEach { act ->
|
|
||||||
val active = selected?.id == act.id
|
|
||||||
Surface(
|
|
||||||
onClick = { model.selectAct(act.id) },
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
shape = MaterialTheme.shapes.large,
|
|
||||||
color = if (active) MaterialTheme.colorScheme.primaryContainer else MaterialTheme.colorScheme.surface,
|
|
||||||
tonalElevation = if (active) 1.dp else 0.dp,
|
|
||||||
border = BorderStroke(
|
|
||||||
if (active) 2.dp else 1.dp,
|
|
||||||
if (active) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.outlineVariant,
|
|
||||||
),
|
|
||||||
) {
|
|
||||||
Row(
|
|
||||||
Modifier.padding(15.dp),
|
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
|
||||||
horizontalArrangement = Arrangement.spacedBy(12.dp),
|
|
||||||
) {
|
|
||||||
Icon(
|
|
||||||
when (act.status) {
|
|
||||||
"LOCKED" -> Icons.Filled.Lock
|
|
||||||
"SEALED" -> Icons.Filled.CheckCircle
|
|
||||||
else -> Icons.Filled.EditNote
|
|
||||||
},
|
|
||||||
contentDescription = null,
|
|
||||||
tint = if (active) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.secondary,
|
|
||||||
)
|
|
||||||
Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(3.dp)) {
|
|
||||||
Text(act.code, fontWeight = FontWeight.Bold)
|
|
||||||
Text(
|
|
||||||
"${modernActStatusLabel(act.status)} · ${if (act.urgency == "URGENT") "Urgente" else "No urgente"}",
|
|
||||||
style = MaterialTheme.typography.bodySmall,
|
|
||||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
|
||||||
)
|
|
||||||
Text(
|
|
||||||
"${act.findingCount} Hallazgo${if (act.findingCount == 1) "" else "s"} · ${act.assetCount} elemento${if (act.assetCount == 1) "" else "s"}",
|
|
||||||
style = MaterialTheme.typography.bodySmall,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
if (active) Icon(Icons.Filled.CheckCircle, "Seleccionada", tint = MaterialTheme.colorScheme.primary)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
val hasDraftAct = model.acts.any { it.status == "DRAFT" }
|
|
||||||
if (visit.status == "IN_PROGRESS" && !hasDraftAct) {
|
|
||||||
ElevatedCard(Modifier.fillMaxWidth()) {
|
|
||||||
Column(Modifier.padding(18.dp), verticalArrangement = Arrangement.spacedBy(12.dp)) {
|
|
||||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
|
||||||
Surface(shape = MaterialTheme.shapes.medium, color = MaterialTheme.colorScheme.primaryContainer) {
|
|
||||||
Icon(Icons.Filled.Add, null, Modifier.padding(10.dp), tint = MaterialTheme.colorScheme.primary)
|
|
||||||
}
|
|
||||||
Spacer(Modifier.width(10.dp))
|
|
||||||
Column {
|
|
||||||
Text("Nueva Acta", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
|
|
||||||
Text("Un solo borrador activo por vez", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Text("Urgencia", fontWeight = FontWeight.SemiBold)
|
|
||||||
Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
|
||||||
FilterChip(
|
|
||||||
selected = newActUrgency == "NON_URGENT",
|
|
||||||
onClick = { newActUrgency = "NON_URGENT" },
|
|
||||||
label = { Text("No urgente") },
|
|
||||||
)
|
|
||||||
FilterChip(
|
|
||||||
selected = newActUrgency == "URGENT",
|
|
||||||
onClick = { newActUrgency = "URGENT" },
|
|
||||||
label = { Text("Urgente") },
|
|
||||||
)
|
|
||||||
}
|
|
||||||
Surface(
|
|
||||||
Modifier.fillMaxWidth(),
|
|
||||||
shape = MaterialTheme.shapes.medium,
|
|
||||||
color = MaterialTheme.colorScheme.surfaceVariant,
|
|
||||||
) {
|
|
||||||
Text(
|
|
||||||
if (newActUrgency == "URGENT") {
|
|
||||||
"El plazo urgente se computará desde el Acta conforme a la política institucional vigente al cerrar su contenido."
|
|
||||||
} else {
|
|
||||||
"El plazo no urgente comienza con la oficialización GEDO, no al crear el Acta."
|
|
||||||
},
|
|
||||||
Modifier.padding(12.dp),
|
|
||||||
style = MaterialTheme.typography.bodySmall,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
Button(
|
|
||||||
onClick = { model.createAct(newActUrgency) },
|
|
||||||
enabled = !model.busy,
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
) {
|
|
||||||
Icon(Icons.Filled.Add, null)
|
|
||||||
Spacer(Modifier.width(7.dp))
|
|
||||||
Text(if (model.busy) "Creando…" else "Crear nueva Acta")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (selected != null) {
|
|
||||||
HorizontalDivider()
|
|
||||||
Surface(
|
|
||||||
Modifier.fillMaxWidth(),
|
|
||||||
shape = MaterialTheme.shapes.large,
|
|
||||||
color = MaterialTheme.colorScheme.surfaceVariant,
|
|
||||||
) {
|
|
||||||
Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
|
|
||||||
Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) {
|
|
||||||
Text(selected.code, style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
|
|
||||||
StatusPill(modernActStatusLabel(selected.status))
|
|
||||||
}
|
|
||||||
Text(if (selected.urgency == "URGENT") "Urgente" else "No urgente", color = MaterialTheme.colorScheme.onSurfaceVariant)
|
|
||||||
Text("${selected.findingCount} Hallazgos · ${selected.assetCount} elementos de Inventario", style = MaterialTheme.typography.bodySmall)
|
|
||||||
selected.deadlineAt?.let { Text("Vencimiento · $it", style = MaterialTheme.typography.bodySmall) }
|
|
||||||
if (selected.deadlineAt == null && selected.deadlineBasis == "GEDO_DATE") {
|
|
||||||
Text("Vencimiento pendiente de fecha GEDO", style = MaterialTheme.typography.bodySmall)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
when (selected.status) {
|
|
||||||
"DRAFT" -> {
|
|
||||||
ElevatedCard(Modifier.fillMaxWidth()) {
|
|
||||||
Column(Modifier.padding(18.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) {
|
|
||||||
Text("Hallazgos", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
|
|
||||||
Text(
|
|
||||||
"Elegí una Instalación o Subinstalación existente, o creala en campo si todavía no está registrada.",
|
|
||||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
|
||||||
)
|
|
||||||
Button(onClick = onGoInventory, modifier = Modifier.fillMaxWidth()) {
|
|
||||||
Icon(Icons.Filled.Add, null)
|
|
||||||
Spacer(Modifier.width(6.dp))
|
|
||||||
Text("Agregar Hallazgo")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ElevatedCard(Modifier.fillMaxWidth()) {
|
|
||||||
Column(Modifier.padding(18.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) {
|
|
||||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
|
||||||
Icon(Icons.Filled.Person, null, tint = MaterialTheme.colorScheme.primary)
|
|
||||||
Spacer(Modifier.width(8.dp))
|
|
||||||
Text("Responsable de la empresa", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
|
|
||||||
}
|
|
||||||
Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
|
||||||
FilterChip(selected = attendance == "PRESENT", onClick = { attendance = "PRESENT" }, label = { Text("Presente") })
|
|
||||||
FilterChip(selected = attendance == "ABSENT", onClick = { attendance = "ABSENT" }, label = { Text("Ausente") })
|
|
||||||
}
|
|
||||||
if (attendance == "PRESENT") {
|
|
||||||
OutlinedTextField(fullName, { fullName = it }, label = { Text("Nombre y apellido *") }, modifier = Modifier.fillMaxWidth(), singleLine = true)
|
|
||||||
Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(6.dp)) {
|
|
||||||
listOf("DNI", "CUIL", "PASSPORT", "OTHER").forEach { kind ->
|
|
||||||
FilterChip(selected = documentType == kind, onClick = { documentType = kind }, label = { Text(documentTypeLabelEs(kind)) })
|
|
||||||
}
|
|
||||||
}
|
|
||||||
OutlinedTextField(documentNumber, { documentNumber = it }, label = { Text("Documento *") }, modifier = Modifier.fillMaxWidth(), singleLine = true)
|
|
||||||
OutlinedTextField(position, { position = it }, label = { Text("Cargo *") }, modifier = Modifier.fillMaxWidth(), singleLine = true)
|
|
||||||
OutlinedTextField(email, { email = it }, label = { Text("Correo electrónico") }, modifier = Modifier.fillMaxWidth(), singleLine = true)
|
|
||||||
OutlinedTextField(phone, { phone = it }, label = { Text("Teléfono") }, modifier = Modifier.fillMaxWidth(), singleLine = true)
|
|
||||||
Button(
|
|
||||||
onClick = { model.setCompanyResponsiblePresent(fullName, documentType, documentNumber, position, email, phone) },
|
|
||||||
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") }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ElevatedCard(Modifier.fillMaxWidth()) {
|
|
||||||
Column(Modifier.padding(18.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) {
|
|
||||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
|
||||||
Icon(Icons.Filled.Lock, null, tint = MaterialTheme.colorScheme.error)
|
|
||||||
Spacer(Modifier.width(8.dp))
|
|
||||||
Text("Cerrar Acta", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
|
|
||||||
}
|
|
||||||
Text(
|
|
||||||
"Al cerrar el contenido, el Acta queda inmutable y pasa a Pendiente de firma. Podés firmarla ahora o continuar con otra Acta.",
|
|
||||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
|
||||||
)
|
|
||||||
Button(
|
|
||||||
onClick = { model.prepareSelectedAct() },
|
|
||||||
enabled = !model.busy && closure?.responsible != null,
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
) { Text("Cerrar Acta y dejar pendiente de firma") }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
"LOCKED" -> {
|
|
||||||
val signatures = closure?.signatures.orEmpty()
|
|
||||||
val inspectorSigned = signatures.any { it.signerType == "INSPECTOR" && it.status == "SIGNED" }
|
|
||||||
val companyOutcome = signatures.firstOrNull { it.signerType == "COMPANY_RESPONSIBLE" }
|
|
||||||
val companyResolved = companyOutcome?.status == "SIGNED" || companyOutcome?.status == "REFUSED"
|
|
||||||
|
|
||||||
ElevatedCard(Modifier.fillMaxWidth()) {
|
|
||||||
Column(Modifier.padding(18.dp), verticalArrangement = Arrangement.spacedBy(12.dp)) {
|
|
||||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
|
||||||
Icon(Icons.Filled.Lock, null, tint = MaterialTheme.colorScheme.secondary)
|
|
||||||
Spacer(Modifier.width(8.dp))
|
|
||||||
Text("Acta pendiente de firma", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
|
|
||||||
}
|
|
||||||
Text("El contenido ya está cerrado e inmutable. Completá la firma del inspector y la manifestación de la empresa cuando corresponda.")
|
|
||||||
closure?.closure?.preparedSha256?.let { Text("Huella de integridad · $it", style = MaterialTheme.typography.bodySmall) }
|
|
||||||
|
|
||||||
HorizontalDivider()
|
|
||||||
Text("Firma del inspector", fontWeight = FontWeight.Bold)
|
|
||||||
if (inspectorSigned) {
|
|
||||||
SuccessLine("Firma del inspector registrada")
|
|
||||||
} else {
|
|
||||||
Text(closure?.consents?.inspector.orEmpty(), style = MaterialTheme.typography.bodySmall)
|
|
||||||
SignaturePad(
|
|
||||||
label = "Firmá como inspector/a",
|
|
||||||
enabled = !model.busy,
|
|
||||||
onCaptured = { file -> signWithGeo(file, company = false) },
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
HorizontalDivider()
|
|
||||||
Text("Manifestación de la empresa", fontWeight = FontWeight.Bold)
|
|
||||||
if (companyOutcome != null && companyResolved) {
|
|
||||||
val detail = when (companyOutcome.status) {
|
|
||||||
"SIGNED" -> if (companyOutcome.companyManifestation == "DISSENT") "Firma en disidencia" else "Firma en conformidad"
|
|
||||||
"REFUSED" -> "Negativa a firmar"
|
|
||||||
else -> humanBackendLabelEs(companyOutcome.status)
|
|
||||||
}
|
|
||||||
SuccessLine(detail)
|
|
||||||
companyOutcome.reason?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
|
|
||||||
companyOutcome.companyStatement?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
|
|
||||||
} else if (closure?.responsible?.attendanceStatus == "ABSENT") {
|
|
||||||
Surface(Modifier.fillMaxWidth(), shape = MaterialTheme.shapes.medium, color = MaterialTheme.colorScheme.errorContainer) {
|
|
||||||
Row(Modifier.padding(12.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
|
||||||
Icon(Icons.Filled.ErrorOutline, null, tint = MaterialTheme.colorScheme.error)
|
|
||||||
Text(
|
|
||||||
"La ausencia no resuelve la manifestación. Debe registrarse firma o negativa antes de firmar y cerrar el Acta.",
|
|
||||||
Modifier.weight(1f),
|
|
||||||
style = MaterialTheme.typography.bodySmall,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
Text(closure?.consents?.company.orEmpty(), style = MaterialTheme.typography.bodySmall)
|
|
||||||
Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
|
||||||
FilterChip(selected = manifestation == "CONFORMITY", onClick = { manifestation = "CONFORMITY" }, label = { Text("Conforme") })
|
|
||||||
FilterChip(selected = manifestation == "DISSENT", onClick = { manifestation = "DISSENT" }, label = { Text("En 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 se niega a firmar, registrá el motivo.", 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") }
|
|
||||||
}
|
|
||||||
|
|
||||||
if (inspectorSigned && companyResolved) {
|
|
||||||
Button(
|
|
||||||
onClick = { model.closeSelectedAct() },
|
|
||||||
enabled = !model.busy,
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
) {
|
|
||||||
Icon(Icons.Filled.CheckCircle, null)
|
|
||||||
Spacer(Modifier.width(6.dp))
|
|
||||||
Text("Firmar y cerrar Acta")
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
Text(
|
|
||||||
"La Inspección no puede cerrarse hasta completar las manifestaciones de esta Acta.",
|
|
||||||
style = MaterialTheme.typography.bodySmall,
|
|
||||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
"SEALED" -> {
|
|
||||||
ElevatedCard(Modifier.fillMaxWidth()) {
|
|
||||||
Row(Modifier.padding(18.dp), horizontalArrangement = Arrangement.spacedBy(10.dp), verticalAlignment = Alignment.Top) {
|
|
||||||
Icon(Icons.Filled.CheckCircle, null, tint = MaterialTheme.colorScheme.primary)
|
|
||||||
Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(5.dp)) {
|
|
||||||
Text("Acta firmada y cerrada", fontWeight = FontWeight.Bold)
|
|
||||||
Text("Desde este cierre se genera el PDF del Acta y el informe INF editable (DOCX) para el Inspector.")
|
|
||||||
closure?.closure?.finalSha256?.let { Text("SHA-256 · $it", style = MaterialTheme.typography.bodySmall) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
"CANCELLED" -> {
|
|
||||||
Surface(Modifier.fillMaxWidth(), shape = MaterialTheme.shapes.medium, color = MaterialTheme.colorScheme.surfaceVariant) {
|
|
||||||
Text("Esta Acta fue cancelada y permanece como antecedente.", Modifier.padding(14.dp))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (visit.status == "IN_PROGRESS" && model.acts.isNotEmpty()) {
|
|
||||||
val activeActs = model.acts.filter { it.status != "CANCELLED" }
|
|
||||||
val pendingActs = activeActs.filter { it.status != "SEALED" }
|
|
||||||
ElevatedCard(Modifier.fillMaxWidth()) {
|
|
||||||
Column(Modifier.padding(18.dp), verticalArrangement = Arrangement.spacedBy(9.dp)) {
|
|
||||||
Text("Finalizar Inspección", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
|
|
||||||
if (pendingActs.isEmpty()) {
|
|
||||||
SuccessLine("Todas las Actas están firmadas y cerradas")
|
|
||||||
} else {
|
|
||||||
Text(
|
|
||||||
"Falta firmar y cerrar: ${pendingActs.joinToString { it.code }}",
|
|
||||||
style = MaterialTheme.typography.bodySmall,
|
|
||||||
color = MaterialTheme.colorScheme.error,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
Button(
|
|
||||||
onClick = { model.closeInspection() },
|
|
||||||
enabled = !model.busy && activeActs.isNotEmpty() && pendingActs.isEmpty(),
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
) { Text("Cerrar Inspección y salir") }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Spacer(Modifier.height(32.dp))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
private fun SuccessLine(text: String) {
|
|
||||||
Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(7.dp)) {
|
|
||||||
Icon(Icons.Filled.CheckCircle, null, tint = MaterialTheme.colorScheme.primary)
|
|
||||||
Text(text, color = MaterialTheme.colorScheme.primary, fontWeight = FontWeight.SemiBold)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun modernActStatusLabel(status: String): String = actStatusLabelEs(status)
|
|
||||||
|
|
||||||
private fun hasModernActLocation(context: Context): Boolean =
|
|
||||||
ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED ||
|
|
||||||
ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED
|
|
||||||
|
|
||||||
private suspend fun currentModernActSignatureGeo(context: Context): ModernActSignatureGeo = suspendCancellableCoroutine { continuation ->
|
|
||||||
if (!hasModernActLocation(context)) {
|
|
||||||
continuation.resumeWithException(SecurityException("Ubicación no autorizada"))
|
|
||||||
return@suspendCancellableCoroutine
|
|
||||||
}
|
|
||||||
val source = CancellationTokenSource()
|
|
||||||
try {
|
|
||||||
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(ModernActSignatureGeo(location.latitude, location.longitude, location.accuracy.toDouble()))
|
|
||||||
}
|
|
||||||
.addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
|
|
||||||
} catch (error: SecurityException) {
|
|
||||||
if (continuation.isActive) continuation.resumeWithException(error)
|
|
||||||
}
|
|
||||||
continuation.invokeOnCancellation { source.cancel() }
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -49,7 +49,7 @@ fun SignaturePad(
|
|||||||
Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
|
Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||||
Text(label, fontWeight = androidx.compose.ui.text.font.FontWeight.SemiBold)
|
Text(label, fontWeight = androidx.compose.ui.text.font.FontWeight.SemiBold)
|
||||||
Text(
|
Text(
|
||||||
"Firmá dentro del recuadro. La imagen se guarda como PNG y se incorpora a la huella de integridad del Acta.",
|
"Firmá dentro del recuadro. La imagen se guarda como PNG y se incorpora al hash del Acta.",
|
||||||
style = MaterialTheme.typography.bodySmall,
|
style = MaterialTheme.typography.bodySmall,
|
||||||
)
|
)
|
||||||
Canvas(
|
Canvas(
|
||||||
|
|||||||
@@ -1,50 +0,0 @@
|
|||||||
package com.korexlabs.dhinspeccion.ui
|
|
||||||
|
|
||||||
import java.util.Locale
|
|
||||||
|
|
||||||
internal fun visitStatusLabelEs(status: String?): String = when (status?.uppercase(Locale.ROOT)) {
|
|
||||||
"PLANNED" -> "Planificada"
|
|
||||||
"IN_PROGRESS" -> "En curso"
|
|
||||||
"CLOSED" -> "Cerrada"
|
|
||||||
"CANCELLED" -> "Cancelada"
|
|
||||||
null, "" -> "Sin estado"
|
|
||||||
else -> humanBackendLabelEs(status)
|
|
||||||
}
|
|
||||||
|
|
||||||
internal fun actStatusLabelEs(status: String?): String = when (status?.uppercase(Locale.ROOT)) {
|
|
||||||
"DRAFT" -> "En elaboración"
|
|
||||||
"LOCKED" -> "Pendiente de firma"
|
|
||||||
"SEALED" -> "Firmada y cerrada"
|
|
||||||
"CLOSED" -> "Cerrada"
|
|
||||||
"RECTIFIED" -> "Rectificada"
|
|
||||||
"CANCELLED" -> "Cancelada"
|
|
||||||
null, "" -> "Sin estado"
|
|
||||||
else -> humanBackendLabelEs(status)
|
|
||||||
}
|
|
||||||
|
|
||||||
internal fun findingStatusLabelEs(status: String?): String = when (status?.uppercase(Locale.ROOT)) {
|
|
||||||
"OPEN" -> "Abierto"
|
|
||||||
"PENDING" -> "Pendiente"
|
|
||||||
"COMPANY_RESPONSE_PENDING" -> "Pendiente de respuesta de la empresa"
|
|
||||||
"COMPANY_RESPONDED" -> "Respondido por la empresa"
|
|
||||||
"VERIFICATION_PENDING" -> "Pendiente de verificación"
|
|
||||||
"VERIFICATION_SCHEDULED" -> "Verificación programada"
|
|
||||||
"READY_TO_CLOSE" -> "Listo para cierre"
|
|
||||||
"CLOSED" -> "Cerrado"
|
|
||||||
"CANCELLED" -> "Cancelado"
|
|
||||||
null, "" -> "Sin estado"
|
|
||||||
else -> humanBackendLabelEs(status)
|
|
||||||
}
|
|
||||||
|
|
||||||
internal fun documentTypeLabelEs(type: String): String = when (type.uppercase(Locale.ROOT)) {
|
|
||||||
"DNI" -> "DNI"
|
|
||||||
"CUIL" -> "CUIL"
|
|
||||||
"PASSPORT" -> "Pasaporte"
|
|
||||||
"OTHER" -> "Otro"
|
|
||||||
else -> humanBackendLabelEs(type)
|
|
||||||
}
|
|
||||||
|
|
||||||
internal fun humanBackendLabelEs(value: String): String {
|
|
||||||
val clean = value.trim().replace('_', ' ').replace('-', ' ').lowercase(Locale("es", "AR"))
|
|
||||||
return clean.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale("es", "AR")) else it.toString() }
|
|
||||||
}
|
|
||||||
-26
@@ -1,26 +0,0 @@
|
|||||||
package com.korexlabs.dhinspeccion
|
|
||||||
|
|
||||||
import java.io.File
|
|
||||||
import org.junit.Assert.assertTrue
|
|
||||||
import org.junit.Test
|
|
||||||
|
|
||||||
class DynamicFieldFlowContractTest {
|
|
||||||
private val source = File("src/main/java/com/korexlabs/dhinspeccion/ui/DynamicVisitRoot.kt").readText()
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun fastSubinstallationFlowKeepsParentClassificationAndCaptureSteps() {
|
|
||||||
assertTrue(source.contains("Elegí la Instalación padre"))
|
|
||||||
assertTrue(source.contains("Clasificación técnica *"))
|
|
||||||
assertTrue(source.contains("Guardar y tomar foto"))
|
|
||||||
assertTrue(source.contains("model.loadFieldTypes(item.id)"))
|
|
||||||
assertTrue(source.contains("parentId = item.id"))
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun fieldCaptureStillRequiresGpsAndPhotoBeforeFindings() {
|
|
||||||
assertTrue(source.contains("La foto sigue siendo obligatoria antes de crear Hallazgos"))
|
|
||||||
assertTrue(source.contains("creationGpsCaptured"))
|
|
||||||
assertTrue(source.contains("fieldPhotoCount == 0"))
|
|
||||||
assertTrue(source.contains("model.uploadFieldPhoto"))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-57
@@ -1,57 +0,0 @@
|
|||||||
package com.korexlabs.dhinspeccion
|
|
||||||
|
|
||||||
import java.io.File
|
|
||||||
import org.junit.Assert.assertFalse
|
|
||||||
import org.junit.Assert.assertTrue
|
|
||||||
import org.junit.Test
|
|
||||||
|
|
||||||
class FinalFieldFlowContractTest {
|
|
||||||
private val visit = File("src/main/java/com/korexlabs/dhinspeccion/ui/ModernVisitRoot.kt").readText()
|
|
||||||
private val acts = File("src/main/java/com/korexlabs/dhinspeccion/ui/ModernMobileActsScreen.kt").readText()
|
|
||||||
private val findings = File("src/main/java/com/korexlabs/dhinspeccion/ui/FieldFindingScreen.kt").readText()
|
|
||||||
private val home = File("src/main/java/com/korexlabs/dhinspeccion/ui/MobileHomeScreen.kt").readText()
|
|
||||||
private val labels = File("src/main/java/com/korexlabs/dhinspeccion/ui/UiSpanishLabels.kt").readText()
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun inspectionActFindingFlowMatchesFieldProcedure() {
|
|
||||||
assertTrue(visit.contains("Iniciar inspección"))
|
|
||||||
assertTrue(acts.contains("Crear nueva Acta"))
|
|
||||||
assertTrue(acts.contains("Agregar Hallazgo"))
|
|
||||||
assertTrue(visit.contains("Instalación"))
|
|
||||||
assertTrue(visit.contains("Subinstalación"))
|
|
||||||
assertTrue(visit.contains("Guardar y tomar foto"))
|
|
||||||
assertTrue(acts.contains("Cerrar Acta y dejar pendiente de firma"))
|
|
||||||
assertTrue(labels.contains("\"LOCKED\" -> \"Pendiente de firma\""))
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun fieldCreateKeepsDashboardEquivalentMinimumAndCaptureBarrier() {
|
|
||||||
assertTrue(visit.contains("Nombre técnico *"))
|
|
||||||
assertTrue(visit.contains("Nombre habitual (opcional)"))
|
|
||||||
assertTrue(visit.contains("Descripción (opcional)"))
|
|
||||||
assertTrue(visit.contains("familyReady"))
|
|
||||||
assertTrue(visit.contains("attributesReady"))
|
|
||||||
assertTrue(visit.contains("GPS + foto"))
|
|
||||||
assertTrue(visit.contains("La foto es obligatoria antes de registrar Hallazgos"))
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun structuralSelectionUsesTheServerTypeCode() {
|
|
||||||
assertTrue(visit.contains("type.code.ifBlank { type.typeName ?: type.name }"))
|
|
||||||
assertTrue(visit.contains("modernItemTypeCode(it) in setOf(\"instalacion\", \"subinstalacion\")"))
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun currentFieldUiDoesNotExposeBackendEnglishStates() {
|
|
||||||
assertTrue(home.contains("visitStatusLabelEs(visit.status)"))
|
|
||||||
assertTrue(findings.contains("findingStatusLabelEs(finding.status)"))
|
|
||||||
assertTrue(acts.contains("documentTypeLabelEs(kind)"))
|
|
||||||
assertTrue(labels.contains("\"PASSPORT\" -> \"Pasaporte\""))
|
|
||||||
assertTrue(labels.contains("\"OTHER\" -> \"Otro\""))
|
|
||||||
assertFalse(acts.contains("Finalizar y BLOQUEAR Acta"))
|
|
||||||
assertFalse(acts.contains("Acta BLOQUEADA"))
|
|
||||||
assertFalse(acts.contains("SELLAR Acta"))
|
|
||||||
assertFalse(acts.contains("Acta SELLADA"))
|
|
||||||
assertFalse(acts.contains("Text(\"Email\")"))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -8,8 +8,8 @@ class ReleaseMetadataTest {
|
|||||||
@Test
|
@Test
|
||||||
fun debugBuildKeepsSeparateApplicationIdentity() {
|
fun debugBuildKeepsSeparateApplicationIdentity() {
|
||||||
assertEquals("com.korexlabs.dhinspeccion.debug", BuildConfig.APPLICATION_ID)
|
assertEquals("com.korexlabs.dhinspeccion.debug", BuildConfig.APPLICATION_ID)
|
||||||
assertEquals(28, BuildConfig.VERSION_CODE)
|
assertEquals(25, BuildConfig.VERSION_CODE)
|
||||||
assertEquals("0.19.0-debug", BuildConfig.VERSION_NAME)
|
assertEquals("0.16.0-debug", BuildConfig.VERSION_NAME)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
@@ -1,407 +0,0 @@
|
|||||||
import { Injectable, Logger, NotFoundException } from '@nestjs/common';
|
|
||||||
import { DataSource } from 'typeorm';
|
|
||||||
|
|
||||||
type DossierRecord = Record<string, any>;
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
export class ActivityDossierService {
|
|
||||||
private readonly logger = new Logger(ActivityDossierService.name);
|
|
||||||
|
|
||||||
constructor(private readonly dataSource: DataSource) {}
|
|
||||||
|
|
||||||
async dossier(id: string): Promise<Record<string, unknown>> {
|
|
||||||
const assetRows = (await this.dataSource.query(
|
|
||||||
`SELECT id, code, name, common_name AS "commonName", created_at AS "createdAt"
|
|
||||||
FROM assets
|
|
||||||
WHERE id = $1`,
|
|
||||||
[id],
|
|
||||||
)) as Array<{ id: string; code: string; name: string; commonName: string | null; createdAt: Date }>;
|
|
||||||
const asset = assetRows[0];
|
|
||||||
if (!asset) {
|
|
||||||
throw new NotFoundException({
|
|
||||||
code: 'ASSET_NOT_FOUND',
|
|
||||||
message: 'Activo no encontrado',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const failedFacets: string[] = [];
|
|
||||||
const safeQuery = async (facet: string, sql: string): Promise<DossierRecord[]> => {
|
|
||||||
try {
|
|
||||||
return (await this.dataSource.query(sql, [id])) as DossierRecord[];
|
|
||||||
} catch (error) {
|
|
||||||
failedFacets.push(facet);
|
|
||||||
const message = error instanceof Error ? error.message : String(error);
|
|
||||||
this.logger.error(`No se pudo cargar la faceta ${facet} del expediente ${id}: ${message}`);
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const [
|
|
||||||
visits,
|
|
||||||
acts,
|
|
||||||
findings,
|
|
||||||
evidence,
|
|
||||||
communications,
|
|
||||||
verificationResults,
|
|
||||||
documents,
|
|
||||||
inspectionReports,
|
|
||||||
media,
|
|
||||||
versions,
|
|
||||||
] = await Promise.all([
|
|
||||||
safeQuery('visits', `
|
|
||||||
SELECT visit.id, visit.code, visit.status,
|
|
||||||
visit.planned_start_at AS "plannedStartAt",
|
|
||||||
visit.actual_started_at AS "actualStartedAt",
|
|
||||||
visit.actual_closed_at AS "actualClosedAt",
|
|
||||||
visit.created_at AS "createdAt"
|
|
||||||
FROM inspection_visits visit
|
|
||||||
WHERE visit.scope_asset_id = $1
|
|
||||||
OR EXISTS (
|
|
||||||
SELECT 1
|
|
||||||
FROM inspection_visit_assets visit_asset
|
|
||||||
WHERE visit_asset.visit_id = visit.id
|
|
||||||
AND visit_asset.asset_id = $1
|
|
||||||
AND visit_asset.included = true
|
|
||||||
)
|
|
||||||
OR EXISTS (
|
|
||||||
SELECT 1
|
|
||||||
FROM inspection_acts act
|
|
||||||
JOIN inspection_act_assets act_asset
|
|
||||||
ON act_asset.act_id = act.id AND act_asset.included = true
|
|
||||||
WHERE act.visit_id = visit.id
|
|
||||||
AND act_asset.asset_id = $1
|
|
||||||
)
|
|
||||||
OR EXISTS (
|
|
||||||
SELECT 1
|
|
||||||
FROM inspection_acts act
|
|
||||||
JOIN inspection_findings finding ON finding.act_id = act.id
|
|
||||||
WHERE act.visit_id = visit.id
|
|
||||||
AND finding.asset_id = $1
|
|
||||||
)
|
|
||||||
ORDER BY COALESCE(visit.actual_started_at, visit.planned_start_at, visit.created_at) DESC
|
|
||||||
LIMIT 200
|
|
||||||
`),
|
|
||||||
safeQuery('acts', `
|
|
||||||
SELECT act.id, act.visit_id AS "visitId", act.code, act.status,
|
|
||||||
act.occurred_at AS "occurredAt", act.title, act.summary,
|
|
||||||
act.closed_at AS "closedAt", act.current_version AS "currentVersion",
|
|
||||||
visit.code AS "visitCode"
|
|
||||||
FROM inspection_acts act
|
|
||||||
JOIN inspection_visits visit ON visit.id = act.visit_id
|
|
||||||
WHERE EXISTS (
|
|
||||||
SELECT 1
|
|
||||||
FROM inspection_act_assets act_asset
|
|
||||||
WHERE act_asset.act_id = act.id
|
|
||||||
AND act_asset.asset_id = $1
|
|
||||||
AND act_asset.included = true
|
|
||||||
)
|
|
||||||
OR EXISTS (
|
|
||||||
SELECT 1
|
|
||||||
FROM inspection_findings finding
|
|
||||||
WHERE finding.act_id = act.id
|
|
||||||
AND finding.asset_id = $1
|
|
||||||
)
|
|
||||||
ORDER BY act.occurred_at DESC
|
|
||||||
LIMIT 200
|
|
||||||
`),
|
|
||||||
safeQuery('findings', `
|
|
||||||
SELECT finding.id, finding.act_id AS "actId", finding.code, finding.status,
|
|
||||||
finding.title, finding.description,
|
|
||||||
finding.correction_due_on AS "correctionDueOn",
|
|
||||||
finding.company_response_received_on AS "companyResponseReceivedOn",
|
|
||||||
finding.next_control_on AS "nextControlOn",
|
|
||||||
finding.closed_at AS "closedAt", finding.closure_notes AS "closureNotes",
|
|
||||||
finding.created_at AS "createdAt", finding.updated_at AS "updatedAt",
|
|
||||||
act.code AS "actCode", act.occurred_at AS "actOccurredAt",
|
|
||||||
visit.id AS "visitId", visit.code AS "visitCode"
|
|
||||||
FROM inspection_findings finding
|
|
||||||
JOIN inspection_acts act ON act.id = finding.act_id
|
|
||||||
JOIN inspection_visits visit ON visit.id = act.visit_id
|
|
||||||
WHERE finding.asset_id = $1
|
|
||||||
ORDER BY finding.created_at DESC
|
|
||||||
LIMIT 500
|
|
||||||
`),
|
|
||||||
safeQuery('evidence', `
|
|
||||||
SELECT evidence.id, evidence.finding_id AS "findingId", evidence.communication_id AS "communicationId",
|
|
||||||
evidence.kind, evidence.purpose, evidence.original_name AS "originalName",
|
|
||||||
evidence.title, evidence.description, evidence.captured_at AS "capturedAt",
|
|
||||||
evidence.created_at AS "createdAt", finding.code AS "findingCode",
|
|
||||||
finding.title AS "findingTitle"
|
|
||||||
FROM inspection_finding_evidence evidence
|
|
||||||
JOIN inspection_findings finding ON finding.id = evidence.finding_id
|
|
||||||
WHERE finding.asset_id = $1
|
|
||||||
ORDER BY COALESCE(evidence.captured_at, evidence.created_at) DESC
|
|
||||||
LIMIT 500
|
|
||||||
`),
|
|
||||||
safeQuery('communications', `
|
|
||||||
SELECT communication.id, communication.finding_id AS "findingId",
|
|
||||||
communication.direction, communication.channel, communication.type,
|
|
||||||
communication.occurred_at AS "occurredAt", communication.subject,
|
|
||||||
communication.details, communication.contact_name AS "contactName",
|
|
||||||
communication.created_at AS "createdAt", finding.code AS "findingCode",
|
|
||||||
finding.title AS "findingTitle"
|
|
||||||
FROM inspection_finding_communications communication
|
|
||||||
JOIN inspection_findings finding ON finding.id = communication.finding_id
|
|
||||||
WHERE finding.asset_id = $1
|
|
||||||
ORDER BY communication.occurred_at DESC
|
|
||||||
LIMIT 500
|
|
||||||
`),
|
|
||||||
safeQuery('verificationResults', `
|
|
||||||
SELECT verification_link.id,
|
|
||||||
verification_link.finding_id AS "findingId",
|
|
||||||
verification_link.visit_id AS "visitId",
|
|
||||||
verification_link.target_control_on AS "targetControlOn",
|
|
||||||
verification_link.outcome,
|
|
||||||
verification_link.result_notes AS "resultNotes",
|
|
||||||
verification_link.verified_at AS "verifiedAt",
|
|
||||||
verification_link.result_recorded_at AS "resultRecordedAt",
|
|
||||||
verification_link.rescheduled_control_on AS "rescheduledControlOn",
|
|
||||||
finding.code AS "findingCode", finding.title AS "findingTitle",
|
|
||||||
visit.code AS "visitCode", visit.status AS "visitStatus",
|
|
||||||
(SELECT COUNT(*)::integer
|
|
||||||
FROM inspection_finding_evidence verification_evidence
|
|
||||||
WHERE verification_evidence.finding_id = finding.id
|
|
||||||
AND verification_evidence.verification_visit_id = visit.id
|
|
||||||
AND verification_evidence.purpose = 'VERIFICATION') AS "evidenceCount"
|
|
||||||
FROM inspection_finding_verification_visits verification_link
|
|
||||||
JOIN inspection_findings finding ON finding.id = verification_link.finding_id
|
|
||||||
JOIN inspection_visits visit ON visit.id = verification_link.visit_id
|
|
||||||
WHERE finding.asset_id = $1 AND verification_link.outcome IS NOT NULL
|
|
||||||
ORDER BY verification_link.verified_at DESC NULLS LAST, verification_link.result_recorded_at DESC
|
|
||||||
LIMIT 500
|
|
||||||
`),
|
|
||||||
safeQuery('documents', `
|
|
||||||
SELECT document.id, document.document_type AS "documentType",
|
|
||||||
document.document_number AS "documentNumber", document.title,
|
|
||||||
document.issuer, document.document_date AS "documentDate",
|
|
||||||
document.external_reference AS "externalReference",
|
|
||||||
link.relation_type AS "relationType", link.notes,
|
|
||||||
link.created_at AS "linkedAt"
|
|
||||||
FROM asset_source_documents link
|
|
||||||
JOIN source_documents document ON document.id = link.document_id
|
|
||||||
WHERE link.asset_id = $1
|
|
||||||
ORDER BY COALESCE(document.document_date::timestamptz, link.created_at) DESC
|
|
||||||
LIMIT 300
|
|
||||||
`),
|
|
||||||
safeQuery('inspectionReports', `
|
|
||||||
SELECT report.id, report.code, report.status,
|
|
||||||
report.pdf_status AS "pdfStatus", report.title,
|
|
||||||
report.generated_at AS "generatedAt", report.frozen_sha256 AS "frozenSha256",
|
|
||||||
act.id AS "actId", act.code AS "actCode",
|
|
||||||
visit.id AS "visitId", visit.code AS "visitCode"
|
|
||||||
FROM inspection_reports report
|
|
||||||
JOIN inspection_acts act ON act.id = report.act_id
|
|
||||||
JOIN inspection_visits visit ON visit.id = report.visit_id
|
|
||||||
WHERE visit.scope_asset_id = $1
|
|
||||||
OR EXISTS (
|
|
||||||
SELECT 1
|
|
||||||
FROM inspection_act_assets act_asset
|
|
||||||
WHERE act_asset.act_id = act.id
|
|
||||||
AND act_asset.asset_id = $1
|
|
||||||
AND act_asset.included = true
|
|
||||||
)
|
|
||||||
OR EXISTS (
|
|
||||||
SELECT 1
|
|
||||||
FROM inspection_findings finding
|
|
||||||
WHERE finding.act_id = act.id
|
|
||||||
AND finding.asset_id = $1
|
|
||||||
)
|
|
||||||
ORDER BY report.generated_at DESC
|
|
||||||
LIMIT 200
|
|
||||||
`),
|
|
||||||
safeQuery('media', `
|
|
||||||
SELECT media.id, media.kind, media.original_name AS "originalName",
|
|
||||||
media.title, media.description, media.captured_at AS "capturedAt",
|
|
||||||
media.created_at AS "createdAt", media.source
|
|
||||||
FROM asset_media media
|
|
||||||
WHERE media.asset_id = $1 AND media.deleted_at IS NULL
|
|
||||||
ORDER BY COALESCE(media.captured_at, media.created_at) DESC
|
|
||||||
LIMIT 500
|
|
||||||
`),
|
|
||||||
safeQuery('versions', `
|
|
||||||
SELECT version.id, version.version_number AS "versionNumber",
|
|
||||||
version.change_type AS "changeType", version.changed_fields AS "changedFields",
|
|
||||||
version.occurred_at AS "occurredAt", version.actor_username AS "actorUsername",
|
|
||||||
version.source
|
|
||||||
FROM asset_versions version
|
|
||||||
WHERE version.asset_id = $1
|
|
||||||
ORDER BY version.occurred_at DESC
|
|
||||||
LIMIT 500
|
|
||||||
`),
|
|
||||||
]);
|
|
||||||
|
|
||||||
const timeline: DossierRecord[] = [];
|
|
||||||
const push = (event: DossierRecord) => timeline.push(event);
|
|
||||||
|
|
||||||
versions.forEach((version) => push({
|
|
||||||
id: `version:${String(version.id)}`,
|
|
||||||
kind: 'INVENTORY_CHANGE',
|
|
||||||
occurredAt: version.occurredAt,
|
|
||||||
title: version.changeType === 'CREATED' || version.changeType === 'BASELINE'
|
|
||||||
? 'Registro incorporado al inventario'
|
|
||||||
: 'Inventario actualizado',
|
|
||||||
description: Array.isArray(version.changedFields) && version.changedFields.length > 0
|
|
||||||
? `Campos: ${(version.changedFields as string[]).join(', ')}`
|
|
||||||
: null,
|
|
||||||
meta: {
|
|
||||||
versionNumber: version.versionNumber,
|
|
||||||
changeType: version.changeType,
|
|
||||||
actorUsername: version.actorUsername,
|
|
||||||
source: version.source,
|
|
||||||
},
|
|
||||||
}));
|
|
||||||
visits.forEach((visit) => push({
|
|
||||||
id: `visit:${String(visit.id)}`,
|
|
||||||
kind: 'INSPECTION',
|
|
||||||
occurredAt: visit.actualStartedAt ?? visit.plannedStartAt ?? visit.createdAt,
|
|
||||||
title: `Inspección ${String(visit.code)}`,
|
|
||||||
description: null,
|
|
||||||
href: `/inspecciones/${String(visit.id)}`,
|
|
||||||
meta: { status: visit.status },
|
|
||||||
}));
|
|
||||||
acts.forEach((act) => push({
|
|
||||||
id: `act:${String(act.id)}`,
|
|
||||||
kind: 'ACT',
|
|
||||||
occurredAt: act.occurredAt,
|
|
||||||
title: `Acta ${String(act.code)}`,
|
|
||||||
description: act.title,
|
|
||||||
href: `/inspecciones/actas/${String(act.id)}`,
|
|
||||||
meta: { status: act.status, visitCode: act.visitCode },
|
|
||||||
}));
|
|
||||||
findings.forEach((finding) => {
|
|
||||||
push({
|
|
||||||
id: `finding:${String(finding.id)}`,
|
|
||||||
kind: 'FINDING',
|
|
||||||
occurredAt: finding.createdAt,
|
|
||||||
title: `Hallazgo ${String(finding.code)}`,
|
|
||||||
description: finding.title,
|
|
||||||
href: `/hallazgos/${String(finding.id)}`,
|
|
||||||
meta: { status: finding.status, actCode: finding.actCode },
|
|
||||||
});
|
|
||||||
if (finding.closedAt) {
|
|
||||||
push({
|
|
||||||
id: `finding-close:${String(finding.id)}`,
|
|
||||||
kind: 'FINDING_CLOSED',
|
|
||||||
occurredAt: finding.closedAt,
|
|
||||||
title: `Hallazgo ${String(finding.code)} cerrado`,
|
|
||||||
description: finding.closureNotes,
|
|
||||||
href: `/hallazgos/${String(finding.id)}`,
|
|
||||||
meta: { status: finding.status },
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
verificationResults.forEach((verification) => push({
|
|
||||||
id: `verification:${String(verification.id)}`,
|
|
||||||
kind: 'VERIFICATION',
|
|
||||||
occurredAt: verification.verifiedAt ?? verification.resultRecordedAt,
|
|
||||||
title: verification.outcome === 'RESOLVED'
|
|
||||||
? `Verificación conforme · ${String(verification.findingCode)}`
|
|
||||||
: verification.outcome === 'NOT_RESOLVED'
|
|
||||||
? `Verificación no conforme · ${String(verification.findingCode)}`
|
|
||||||
: `Verificación reprogramada · ${String(verification.findingCode)}`,
|
|
||||||
description: verification.resultNotes,
|
|
||||||
href: `/hallazgos/${String(verification.findingId)}`,
|
|
||||||
meta: {
|
|
||||||
outcome: verification.outcome,
|
|
||||||
visitCode: verification.visitCode,
|
|
||||||
targetControlOn: verification.targetControlOn,
|
|
||||||
rescheduledControlOn: verification.rescheduledControlOn,
|
|
||||||
evidenceCount: verification.evidenceCount,
|
|
||||||
},
|
|
||||||
}));
|
|
||||||
communications.forEach((communication) => push({
|
|
||||||
id: `communication:${String(communication.id)}`,
|
|
||||||
kind: 'COMMUNICATION',
|
|
||||||
occurredAt: communication.occurredAt,
|
|
||||||
title: communication.type === 'COMPANY_RESPONSE'
|
|
||||||
? 'Respuesta de la empresa'
|
|
||||||
: String(communication.subject),
|
|
||||||
description: communication.details,
|
|
||||||
href: `/hallazgos/${String(communication.findingId)}`,
|
|
||||||
meta: {
|
|
||||||
findingCode: communication.findingCode,
|
|
||||||
direction: communication.direction,
|
|
||||||
channel: communication.channel,
|
|
||||||
},
|
|
||||||
}));
|
|
||||||
evidence.forEach((item) => push({
|
|
||||||
id: `evidence:${String(item.id)}`,
|
|
||||||
kind: item.kind === 'PHOTO' ? 'PHOTO' : 'DOCUMENT',
|
|
||||||
occurredAt: item.capturedAt ?? item.createdAt,
|
|
||||||
title: item.kind === 'PHOTO' ? 'Fotografía / evidencia' : 'Documento incorporado',
|
|
||||||
description: item.title ?? item.originalName,
|
|
||||||
href: `/hallazgos/${String(item.findingId)}`,
|
|
||||||
meta: { findingCode: item.findingCode, purpose: item.purpose },
|
|
||||||
}));
|
|
||||||
inspectionReports.forEach((report) => push({
|
|
||||||
id: `inspection-report:${String(report.id)}`,
|
|
||||||
kind: 'REPORT',
|
|
||||||
occurredAt: report.generatedAt,
|
|
||||||
title: `Informe ${String(report.code)}`,
|
|
||||||
description: report.title,
|
|
||||||
href: `/informes/${String(report.id)}`,
|
|
||||||
meta: { status: report.status, pdfStatus: report.pdfStatus, actCode: report.actCode },
|
|
||||||
}));
|
|
||||||
documents.forEach((document) => push({
|
|
||||||
id: `source-document:${String(document.id)}`,
|
|
||||||
kind: document.documentType === 'TECHNICAL_REPORT' ? 'REPORT' : 'SOURCE_DOCUMENT',
|
|
||||||
occurredAt: document.documentDate ?? document.linkedAt,
|
|
||||||
title: String(document.title),
|
|
||||||
description: document.documentNumber
|
|
||||||
? `Documento ${String(document.documentNumber)}`
|
|
||||||
: 'Documento vinculado al inventario',
|
|
||||||
meta: { documentType: document.documentType, relationType: document.relationType },
|
|
||||||
}));
|
|
||||||
media.forEach((item) => push({
|
|
||||||
id: `asset-media:${String(item.id)}`,
|
|
||||||
kind: item.kind === 'PHOTO' ? 'PHOTO' : 'DOCUMENT',
|
|
||||||
occurredAt: item.capturedAt ?? item.createdAt,
|
|
||||||
title: item.kind === 'PHOTO' ? 'Fotografía del inventario' : 'Archivo del inventario',
|
|
||||||
description: item.title ?? item.originalName,
|
|
||||||
meta: { source: item.source },
|
|
||||||
}));
|
|
||||||
|
|
||||||
timeline.sort(
|
|
||||||
(a, b) => new Date(String(b.occurredAt ?? 0)).getTime() - new Date(String(a.occurredAt ?? 0)).getTime(),
|
|
||||||
);
|
|
||||||
|
|
||||||
const openFindings = findings.filter((finding) => finding.status === 'OPEN').length;
|
|
||||||
const closedFindings = findings.filter((finding) => finding.status === 'CLOSED').length;
|
|
||||||
const reports = documents.filter((document) => document.documentType === 'TECHNICAL_REPORT');
|
|
||||||
|
|
||||||
return {
|
|
||||||
asset: {
|
|
||||||
id: asset.id,
|
|
||||||
code: asset.code,
|
|
||||||
name: asset.name,
|
|
||||||
commonName: asset.commonName,
|
|
||||||
},
|
|
||||||
counters: {
|
|
||||||
inspections: visits.length,
|
|
||||||
acts: acts.length,
|
|
||||||
findings: findings.length,
|
|
||||||
verifications: verificationResults.length,
|
|
||||||
openFindings,
|
|
||||||
closedFindings,
|
|
||||||
evidence: evidence.length,
|
|
||||||
documents: documents.length + media.filter((item) => item.kind === 'DOCUMENT').length,
|
|
||||||
photos: evidence.filter((item) => item.kind === 'PHOTO').length
|
|
||||||
+ media.filter((item) => item.kind === 'PHOTO').length,
|
|
||||||
reports: reports.length + inspectionReports.length,
|
|
||||||
},
|
|
||||||
visits,
|
|
||||||
acts,
|
|
||||||
findings,
|
|
||||||
evidence,
|
|
||||||
communications,
|
|
||||||
verificationResults,
|
|
||||||
documents,
|
|
||||||
inspectionReports,
|
|
||||||
reports,
|
|
||||||
media,
|
|
||||||
versions,
|
|
||||||
timeline: timeline.slice(0, 500),
|
|
||||||
warnings: failedFacets,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -24,7 +24,6 @@ import { AssetRegistryService } from './asset-registry.service';
|
|||||||
import { FieldDiscoveryInspectionLinkService } from '../inspection-operations/field-discovery-inspection-link.service';
|
import { FieldDiscoveryInspectionLinkService } from '../inspection-operations/field-discovery-inspection-link.service';
|
||||||
import { InventoryStructureController } from './inventory-structure.controller';
|
import { InventoryStructureController } from './inventory-structure.controller';
|
||||||
import { InventoryStructureService } from './inventory-structure.service';
|
import { InventoryStructureService } from './inventory-structure.service';
|
||||||
import { SimpleInventoryStructureService } from './simple-inventory-structure.service';
|
|
||||||
import { InventoryFamilyCatalogController } from './inventory-family-catalog.controller';
|
import { InventoryFamilyCatalogController } from './inventory-family-catalog.controller';
|
||||||
import { InventoryFamilyCatalogService } from './inventory-family-catalog.service';
|
import { InventoryFamilyCatalogService } from './inventory-family-catalog.service';
|
||||||
import { InventoryTechnicalValuesController } from './inventory-technical-values.controller';
|
import { InventoryTechnicalValuesController } from './inventory-technical-values.controller';
|
||||||
@@ -32,7 +31,6 @@ import { InventoryTechnicalValuesService } from './inventory-technical-values.se
|
|||||||
import { InventoryFunctionService } from './inventory-function.service';
|
import { InventoryFunctionService } from './inventory-function.service';
|
||||||
import { FieldInventoryMergeController, InventoryMergeController } from './inventory-merge.controller';
|
import { FieldInventoryMergeController, InventoryMergeController } from './inventory-merge.controller';
|
||||||
import { InventoryMergeService } from './inventory-merge.service';
|
import { InventoryMergeService } from './inventory-merge.service';
|
||||||
import { ActivityDossierService } from './activity-dossier.service';
|
|
||||||
import { MergedInventoryDossierService } from './merged-inventory-dossier.service';
|
import { MergedInventoryDossierService } from './merged-inventory-dossier.service';
|
||||||
import { InventoryBrowserController } from './inventory-browser.controller';
|
import { InventoryBrowserController } from './inventory-browser.controller';
|
||||||
import { InventoryBrowserService } from './inventory-browser.service';
|
import { InventoryBrowserService } from './inventory-browser.service';
|
||||||
@@ -61,13 +59,11 @@ import { InventoryBrowserService } from './inventory-browser.service';
|
|||||||
AssetTypesService,
|
AssetTypesService,
|
||||||
AssetsService,
|
AssetsService,
|
||||||
InventoryStructureService,
|
InventoryStructureService,
|
||||||
SimpleInventoryStructureService,
|
|
||||||
InventoryFamilyCatalogService,
|
InventoryFamilyCatalogService,
|
||||||
InventoryTechnicalValuesService,
|
InventoryTechnicalValuesService,
|
||||||
InventoryFunctionService,
|
InventoryFunctionService,
|
||||||
InventoryBrowserService,
|
InventoryBrowserService,
|
||||||
InventoryMergeService,
|
InventoryMergeService,
|
||||||
ActivityDossierService,
|
|
||||||
MergedInventoryDossierService,
|
MergedInventoryDossierService,
|
||||||
AssetGeometriesService,
|
AssetGeometriesService,
|
||||||
AssetHistoryService,
|
AssetHistoryService,
|
||||||
|
|||||||
@@ -142,8 +142,27 @@ export class AssetOperationalRelationsService {
|
|||||||
if (!document) throw new BadRequestException({ code: 'SOURCE_DOCUMENT_NOT_FOUND', message: 'El documento fuente no existe' });
|
if (!document) throw new BadRequestException({ code: 'SOURCE_DOCUMENT_NOT_FOUND', message: 'El documento fuente no existe' });
|
||||||
}
|
}
|
||||||
|
|
||||||
// F7: un Área puede estar explotada por varias Empresas simultáneamente.
|
if (dto.relationRole === AreaOrganizationRole.OPERATOR) {
|
||||||
// La unicidad válida es Área + Empresa + rol activo; no existe una única Operadora por Área.
|
const [currentOperator] = (await manager.query(`
|
||||||
|
SELECT relation.id,company.name AS "companyName"
|
||||||
|
FROM area_company_relations relation
|
||||||
|
JOIN assets company ON company.id=relation.company_id
|
||||||
|
WHERE relation.area_id=$1
|
||||||
|
AND relation.relation_role='OPERATOR'
|
||||||
|
AND relation.valid_until IS NULL
|
||||||
|
AND relation.company_id<>$2
|
||||||
|
ORDER BY relation.valid_from DESC
|
||||||
|
LIMIT 1
|
||||||
|
FOR UPDATE OF relation
|
||||||
|
`,[dto.areaId,dto.companyId])) as Array<{id:string;companyName:string}>;
|
||||||
|
if (currentOperator) {
|
||||||
|
throw new ConflictException({
|
||||||
|
code:'AREA_ACTIVE_OPERATOR_MUST_END_FIRST',
|
||||||
|
message:`El Área ya tiene una Operadora vigente (${currentOperator.companyName}). Finalizá esa relación antes de registrar la nueva Operadora.`,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const [row] = (await manager.query(`
|
const [row] = (await manager.query(`
|
||||||
INSERT INTO area_company_relations (
|
INSERT INTO area_company_relations (
|
||||||
area_id, company_id, relation_role, participation_percent, legal_instrument, source_document_id, start_reason, created_by
|
area_id, company_id, relation_role, participation_percent, legal_instrument, source_document_id, start_reason, created_by
|
||||||
@@ -151,6 +170,9 @@ export class AssetOperationalRelationsService {
|
|||||||
RETURNING id
|
RETURNING id
|
||||||
`, [dto.areaId, dto.companyId, dto.relationRole, dto.participationPercent ?? null, dto.legalInstrument ?? null, dto.sourceDocumentId ?? null, dto.reason, principal.userId])) as Array<{ id: string }>;
|
`, [dto.areaId, dto.companyId, dto.relationRole, dto.participationPercent ?? null, dto.legalInstrument ?? null, dto.sourceDocumentId ?? null, dto.reason, principal.userId])) as Array<{ id: string }>;
|
||||||
|
|
||||||
|
// F5/F6: changing the Area operator is a temporal relation event only.
|
||||||
|
// Existing Inventory keeps its creation/historical operator snapshot and
|
||||||
|
// physical hierarchy unchanged. Runtime ownership must resolve this row.
|
||||||
const created = await this.loadRelation(manager, row.id);
|
const created = await this.loadRelation(manager, row.id);
|
||||||
await this.audit.record({
|
await this.audit.record({
|
||||||
...administrationAuditContext(principal, request),
|
...administrationAuditContext(principal, request),
|
||||||
@@ -159,7 +181,7 @@ export class AssetOperationalRelationsService {
|
|||||||
entityId: row.id,
|
entityId: row.id,
|
||||||
afterData: this.auditView(created),
|
afterData: this.auditView(created),
|
||||||
metadata: dto.relationRole === AreaOrganizationRole.OPERATOR
|
metadata: dto.relationRole === AreaOrganizationRole.OPERATOR
|
||||||
? { inventoryHierarchyChanged:false, multipleAreaOperatorsAllowed:true }
|
? { inventoryHierarchyChanged:false, operatorSnapshotPreserved:true }
|
||||||
: undefined,
|
: undefined,
|
||||||
}, manager);
|
}, manager);
|
||||||
return created;
|
return created;
|
||||||
@@ -190,6 +212,7 @@ export class AssetOperationalRelationsService {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// F5/F6: physical Inventory belongs to Area/Yacimiento hierarchy, not to Company.
|
||||||
// Ending an operator relation never moves, rewrites or blocks existing Inventory.
|
// Ending an operator relation never moves, rewrites or blocks existing Inventory.
|
||||||
await manager.query(`
|
await manager.query(`
|
||||||
UPDATE area_company_relations
|
UPDATE area_company_relations
|
||||||
@@ -209,7 +232,6 @@ export class AssetOperationalRelationsService {
|
|||||||
afterData: this.auditView(updated),
|
afterData: this.auditView(updated),
|
||||||
metadata: {
|
metadata: {
|
||||||
inventoryHierarchyChanged:false,
|
inventoryHierarchyChanged:false,
|
||||||
operatorSnapshotPreserved:true,
|
|
||||||
retainedCompatibilitySnapshotCount: before.assignedAssetCount,
|
retainedCompatibilitySnapshotCount: before.assignedAssetCount,
|
||||||
},
|
},
|
||||||
}, manager);
|
}, manager);
|
||||||
|
|||||||
@@ -54,10 +54,6 @@ export class CreateAssetDto {
|
|||||||
@IsUUID('4')
|
@IsUUID('4')
|
||||||
operatorCompanyId?: string | null;
|
operatorCompanyId?: string | null;
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsUUID('4')
|
|
||||||
concessionTypeId?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@Transform(({ value }) =>
|
@Transform(({ value }) =>
|
||||||
typeof value === 'string' && value.trim() ? value.trim() : null,
|
typeof value === 'string' && value.trim() ? value.trim() : null,
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ import {
|
|||||||
|
|
||||||
// Invariante de dominio: Empresa es un maestro independiente. La jerarquía física
|
// Invariante de dominio: Empresa es un maestro independiente. La jerarquía física
|
||||||
// se expresa sólo como Departamento → Área → Yacimiento → Instalación → Subinstalación.
|
// se expresa sólo como Departamento → Área → Yacimiento → Instalación → Subinstalación.
|
||||||
// La Empresa y el Tipo de concesión se relacionan directamente con el Yacimiento.
|
|
||||||
export const INVENTORY_STRUCTURE_KINDS = [
|
export const INVENTORY_STRUCTURE_KINDS = [
|
||||||
'EMPRESA',
|
'EMPRESA',
|
||||||
'DEPARTAMENTO',
|
'DEPARTAMENTO',
|
||||||
@@ -53,14 +52,6 @@ export class CreateInventoryStructureDto {
|
|||||||
@IsUUID('4')
|
@IsUUID('4')
|
||||||
familyId?: string | null;
|
familyId?: string | null;
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsUUID('4')
|
|
||||||
operatorCompanyId?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsUUID('4')
|
|
||||||
concessionTypeId?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim() : null)
|
@Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim() : null)
|
||||||
@IsString()
|
@IsString()
|
||||||
|
|||||||
@@ -48,14 +48,14 @@ export class UpdateAssetDto {
|
|||||||
@IsUUID('4')
|
@IsUUID('4')
|
||||||
operationalAreaId?: string | null;
|
operationalAreaId?: string | null;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Snapshot histórico/de compatibilidad. La Operadora vigente pertenece a la
|
||||||
|
* relación temporal Área↔Empresa y no puede editarse como propiedad física.
|
||||||
|
*/
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsEmpty({ message: 'La Empresa relacionada se administra en el Yacimiento, no desde la edición genérica del Inventario' })
|
@IsEmpty({ message: 'La Operadora se administra en la relación temporal del Área, no en el Inventario' })
|
||||||
operatorCompanyId?: string | null;
|
operatorCompanyId?: string | null;
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsEmpty({ message: 'El Tipo de concesión se administra en el Yacimiento, no desde la edición genérica del Inventario' })
|
|
||||||
concessionTypeId?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@Transform(({ value }) =>
|
@Transform(({ value }) =>
|
||||||
typeof value === 'string' && value.trim() ? value.trim() : null,
|
typeof value === 'string' && value.trim() ? value.trim() : null,
|
||||||
|
|||||||
@@ -4,14 +4,10 @@ import { RequirePermissions } from '../authorization/decorators/require-permissi
|
|||||||
import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
|
import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
|
||||||
import { CreateInventoryStructureDto } from './dto/create-inventory-structure.dto';
|
import { CreateInventoryStructureDto } from './dto/create-inventory-structure.dto';
|
||||||
import { InventoryStructureService } from './inventory-structure.service';
|
import { InventoryStructureService } from './inventory-structure.service';
|
||||||
import { SimpleInventoryStructureService } from './simple-inventory-structure.service';
|
|
||||||
|
|
||||||
@Controller('inventory-structure')
|
@Controller('inventory-structure')
|
||||||
export class InventoryStructureController {
|
export class InventoryStructureController {
|
||||||
constructor(
|
constructor(private readonly inventoryStructure: InventoryStructureService) {}
|
||||||
private readonly inventoryStructure: InventoryStructureService,
|
|
||||||
private readonly simpleInventoryStructure: SimpleInventoryStructureService,
|
|
||||||
) {}
|
|
||||||
|
|
||||||
@Get()
|
@Get()
|
||||||
@RequirePermissions('assets.read')
|
@RequirePermissions('assets.read')
|
||||||
@@ -28,17 +24,6 @@ export class InventoryStructureController {
|
|||||||
return this.inventoryStructure.parents(kind, search);
|
return this.inventoryStructure.parents(kind, search);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post('simple')
|
|
||||||
@RequirePermissions('assets.create')
|
|
||||||
createSimple(
|
|
||||||
@Body() dto: CreateInventoryStructureDto,
|
|
||||||
@CurrentAuth() principal: AuthPrincipal,
|
|
||||||
@Req() request: RequestWithContext,
|
|
||||||
) {
|
|
||||||
return this.simpleInventoryStructure.create(dto, principal, request);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Compatibilidad temporal con el alta anterior. La WEB F7 utiliza /simple.
|
|
||||||
@Post()
|
@Post()
|
||||||
@RequirePermissions('assets.create')
|
@RequirePermissions('assets.create')
|
||||||
create(
|
create(
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ import type { CreateInventoryStructureDto, InventoryStructureKind } from './dto/
|
|||||||
import { AssetHistoryService } from './asset-history.service';
|
import { AssetHistoryService } from './asset-history.service';
|
||||||
|
|
||||||
type StructureTypeRow = { id: string; code: string; name: string };
|
type StructureTypeRow = { id: string; code: string; name: string };
|
||||||
type SimpleOptionRow = { id: string; code: string; name: string };
|
|
||||||
type FamilyParent = { id: string; code: string; name: string };
|
type FamilyParent = { id: string; code: string; name: string };
|
||||||
type FamilyRow = {
|
type FamilyRow = {
|
||||||
id: string;
|
id: string;
|
||||||
@@ -38,17 +37,9 @@ type ParentRow = {
|
|||||||
name: string;
|
name: string;
|
||||||
typeCode: string;
|
typeCode: string;
|
||||||
inventoryFamilyId: string | null;
|
inventoryFamilyId: string | null;
|
||||||
operationalAreaId: string | null;
|
|
||||||
operatorCompanyId: string | null;
|
|
||||||
};
|
};
|
||||||
type IdRow = { id: string };
|
type IdRow = { id: string };
|
||||||
|
|
||||||
type YacimientoContext = {
|
|
||||||
companyId: string;
|
|
||||||
concessionTypeId: string;
|
|
||||||
concessionName: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
const TYPE_CODE_BY_KIND: Record<Exclude<InventoryStructureKind, 'EMPRESA'>, string> = {
|
const TYPE_CODE_BY_KIND: Record<Exclude<InventoryStructureKind, 'EMPRESA'>, string> = {
|
||||||
DEPARTAMENTO: 'departamento',
|
DEPARTAMENTO: 'departamento',
|
||||||
AREA: 'area',
|
AREA: 'area',
|
||||||
@@ -123,21 +114,6 @@ export class InventoryStructureService {
|
|||||||
ORDER BY family.level,family.name,family.code
|
ORDER BY family.level,family.name,family.code
|
||||||
`)) as FamilyRow[];
|
`)) as FamilyRow[];
|
||||||
|
|
||||||
const companies = (await this.dataSource.query(`
|
|
||||||
SELECT asset.id,asset.code,COALESCE(profile.legal_name,asset.name) AS name
|
|
||||||
FROM assets asset
|
|
||||||
JOIN asset_types type ON type.id=asset.asset_type_id AND type.operational_role='COMPANY' AND type.is_active=true
|
|
||||||
LEFT JOIN organization_profiles profile ON profile.asset_id=asset.id
|
|
||||||
WHERE asset.information_status<>'INACTIVE'
|
|
||||||
ORDER BY COALESCE(profile.legal_name,asset.name),asset.code
|
|
||||||
`)) as SimpleOptionRow[];
|
|
||||||
const concessionTypes = (await this.dataSource.query(`
|
|
||||||
SELECT id,code,name
|
|
||||||
FROM concession_types
|
|
||||||
WHERE is_active=true
|
|
||||||
ORDER BY CASE lower(name) WHEN 'explotación' THEN 1 WHEN 'exploración' THEN 2 ELSE 9 END,name,code
|
|
||||||
`)) as SimpleOptionRow[];
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
independentMasters: [
|
independentMasters: [
|
||||||
{ kind: 'EMPRESA', label: 'Empresa', type: company, parentKind: null, requiresFamily: false },
|
{ kind: 'EMPRESA', label: 'Empresa', type: company, parentKind: null, requiresFamily: false },
|
||||||
@@ -149,8 +125,6 @@ export class InventoryStructureService {
|
|||||||
{ kind: 'INSTALACION', label: 'Instalación', type: instalacion, parentKind: 'YACIMIENTO', requiresFamily: true },
|
{ kind: 'INSTALACION', label: 'Instalación', type: instalacion, parentKind: 'YACIMIENTO', requiresFamily: true },
|
||||||
{ kind: 'SUBINSTALACION', label: 'Subinstalación', type: subinstalacion, parentKind: 'INSTALACION', requiresFamily: true },
|
{ kind: 'SUBINSTALACION', label: 'Subinstalación', type: subinstalacion, parentKind: 'INSTALACION', requiresFamily: true },
|
||||||
],
|
],
|
||||||
companies,
|
|
||||||
concessionTypes,
|
|
||||||
installationFamilies: families.filter((item) => item.level==='INSTALLATION'),
|
installationFamilies: families.filter((item) => item.level==='INSTALLATION'),
|
||||||
subinstallationFamilies: families.filter((item) => item.level==='SUBINSTALLATION'),
|
subinstallationFamilies: families.filter((item) => item.level==='SUBINSTALLATION'),
|
||||||
};
|
};
|
||||||
@@ -205,43 +179,25 @@ export class InventoryStructureService {
|
|||||||
const type = await this.requireStructureType(manager, dto.kind);
|
const type = await this.requireStructureType(manager, dto.kind);
|
||||||
const parent = await this.requireParent(manager, dto.kind, dto.parentId ?? null);
|
const parent = await this.requireParent(manager, dto.kind, dto.parentId ?? null);
|
||||||
const family = await this.requireFamily(manager, dto.kind, dto.familyId ?? null, parent);
|
const family = await this.requireFamily(manager, dto.kind, dto.familyId ?? null, parent);
|
||||||
const yacimientoContext = await this.requireYacimientoContext(manager, dto);
|
|
||||||
const generatedCode = dto.code?.trim().toUpperCase() || this.generatedCode(dto.kind, dto.name);
|
const generatedCode = dto.code?.trim().toUpperCase() || this.generatedCode(dto.kind, dto.name);
|
||||||
const operationalAreaId = parent && ['YACIMIENTO','INSTALACION','SUBINSTALACION'].includes(dto.kind)
|
const operationalAreaId = parent && ['YACIMIENTO','INSTALACION','SUBINSTALACION'].includes(dto.kind)
|
||||||
? await this.resolveAreaId(manager, parent)
|
? await this.resolveAreaId(manager, parent)
|
||||||
: null;
|
: null;
|
||||||
const operatorCompanyId = dto.kind === 'YACIMIENTO'
|
|
||||||
? yacimientoContext?.companyId ?? null
|
|
||||||
: dto.kind === 'INSTALACION' || dto.kind === 'SUBINSTALACION'
|
|
||||||
? parent?.operatorCompanyId ?? null
|
|
||||||
: null;
|
|
||||||
const concessionTypeId = dto.kind === 'YACIMIENTO'
|
|
||||||
? yacimientoContext?.concessionTypeId ?? null
|
|
||||||
: null;
|
|
||||||
|
|
||||||
if ((dto.kind === 'INSTALACION' || dto.kind === 'SUBINSTALACION') && !operatorCompanyId) {
|
|
||||||
throw new ConflictException({
|
|
||||||
code: 'INVENTORY_YACIMIENTO_COMPANY_MISSING',
|
|
||||||
message: 'El Yacimiento de origen no tiene una Empresa relacionada válida',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const inserted = (await manager.query(`
|
const inserted = (await manager.query(`
|
||||||
INSERT INTO assets (
|
INSERT INTO assets (
|
||||||
asset_type_id,parent_id,operational_area_id,operator_company_id,concession_type_id,inventory_family_id,
|
asset_type_id,parent_id,operational_area_id,operator_company_id,inventory_family_id,
|
||||||
code,name,common_name,description,information_status,operational_status,
|
code,name,common_name,description,information_status,operational_status,
|
||||||
data_origin,source_name,source_reference,source_notes,created_by,updated_by,provenance_updated_by
|
data_origin,source_name,source_reference,source_notes,created_by,updated_by,provenance_updated_by
|
||||||
) VALUES (
|
) VALUES (
|
||||||
$1::uuid,$2::uuid,$3::uuid,$4::uuid,$5::uuid,$6::uuid,
|
$1::uuid,$2::uuid,$3::uuid,NULL,$4::uuid,
|
||||||
$7::varchar,$8::varchar,$9::varchar,$10::text,$11::asset_information_status,$12::asset_operational_status,
|
$5::varchar,$6::varchar,$7::varchar,$8::text,$9::asset_information_status,$10::asset_operational_status,
|
||||||
$13::varchar,$14::varchar,$15::varchar,$16::text,$17::uuid,$17::uuid,$17::uuid
|
$11::varchar,$12::varchar,$13::varchar,$14::text,$15::uuid,$15::uuid,$15::uuid
|
||||||
) RETURNING id
|
) RETURNING id
|
||||||
`, [
|
`, [
|
||||||
type.id,
|
type.id,
|
||||||
parent?.id ?? null,
|
parent?.id ?? null,
|
||||||
operationalAreaId,
|
operationalAreaId,
|
||||||
operatorCompanyId,
|
|
||||||
concessionTypeId,
|
|
||||||
family?.id ?? null,
|
family?.id ?? null,
|
||||||
generatedCode,
|
generatedCode,
|
||||||
dto.name,
|
dto.name,
|
||||||
@@ -250,13 +206,9 @@ export class InventoryStructureService {
|
|||||||
AssetInformationStatus.DRAFT,
|
AssetInformationStatus.DRAFT,
|
||||||
AssetOperationalStatus.UNKNOWN,
|
AssetOperationalStatus.UNKNOWN,
|
||||||
AssetDataOrigin.MANUAL,
|
AssetDataOrigin.MANUAL,
|
||||||
dto.kind === 'EMPRESA' ? 'Maestro manual de Empresas' : 'Estructura manual de Inventario',
|
dto.kind === 'EMPRESA' ? 'Maestro manual de Empresas F6' : 'Estructura manual de Inventario F6',
|
||||||
dto.kind === 'EMPRESA' ? 'inventory-master:empresa' : `inventory-structure:${dto.kind.toLowerCase()}`,
|
dto.kind === 'EMPRESA' ? 'inventory-master:empresa' : `inventory-structure:${dto.kind.toLowerCase()}`,
|
||||||
family
|
family ? `Clasificación técnica: ${family.code} · ${family.name}` : null,
|
||||||
? `Clasificación técnica: ${family.code} · ${family.name}`
|
|
||||||
: yacimientoContext
|
|
||||||
? `Tipo de concesión: ${yacimientoContext.concessionName}`
|
|
||||||
: null,
|
|
||||||
principal.userId,
|
principal.userId,
|
||||||
])) as Array<{ id: string }>;
|
])) as Array<{ id: string }>;
|
||||||
const id = inserted[0]?.id;
|
const id = inserted[0]?.id;
|
||||||
@@ -269,15 +221,6 @@ export class InventoryStructureService {
|
|||||||
ON CONFLICT (asset_id) DO UPDATE SET legal_name=EXCLUDED.legal_name,updated_by=EXCLUDED.updated_by,updated_at=CURRENT_TIMESTAMP
|
ON CONFLICT (asset_id) DO UPDATE SET legal_name=EXCLUDED.legal_name,updated_by=EXCLUDED.updated_by,updated_at=CURRENT_TIMESTAMP
|
||||||
`,[id,dto.name,principal.userId]);
|
`,[id,dto.name,principal.userId]);
|
||||||
}
|
}
|
||||||
if (dto.kind === 'YACIMIENTO' && operationalAreaId && operatorCompanyId && concessionTypeId) {
|
|
||||||
await this.ensureCompatibilityProjection(
|
|
||||||
manager,
|
|
||||||
operationalAreaId,
|
|
||||||
operatorCompanyId,
|
|
||||||
concessionTypeId,
|
|
||||||
yacimientoContext?.concessionName ?? 'Concesión',
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const versionNumber = await this.history.capture(
|
const versionNumber = await this.history.capture(
|
||||||
manager,id,AssetVersionChangeType.CREATED,principal,request,
|
manager,id,AssetVersionChangeType.CREATED,principal,request,
|
||||||
@@ -286,14 +229,10 @@ export class InventoryStructureService {
|
|||||||
INSERT INTO asset_context_history (
|
INSERT INTO asset_context_history (
|
||||||
asset_id,parent_id,operational_area_id,operator_company_id,valid_from,
|
asset_id,parent_id,operational_area_id,operator_company_id,valid_from,
|
||||||
change_reason,asset_version_number,source,request_id,created_by
|
change_reason,asset_version_number,source,request_id,created_by
|
||||||
) VALUES ($1,$2,$3,$4,CURRENT_TIMESTAMP,$5,$6,'WEB',$7,$8)
|
) VALUES ($1,$2,$3,NULL,CURRENT_TIMESTAMP,$4,$5,'WEB',$6,$7)
|
||||||
`, [
|
`, [
|
||||||
id,parent?.id ?? null,operationalAreaId,operatorCompanyId,
|
id,parent?.id ?? null,operationalAreaId,
|
||||||
dto.kind === 'YACIMIENTO'
|
dto.kind === 'EMPRESA' ? 'Alta manual de Empresa independiente F6' : 'Alta manual de estructura de Inventario F6',
|
||||||
? 'Alta manual de Yacimiento con Área, Empresa y Tipo de concesión'
|
|
||||||
: dto.kind === 'EMPRESA'
|
|
||||||
? 'Alta manual de Empresa independiente'
|
|
||||||
: 'Alta manual de estructura de Inventario',
|
|
||||||
versionNumber,request.requestId,principal.userId,
|
versionNumber,request.requestId,principal.userId,
|
||||||
]);
|
]);
|
||||||
const created = await this.loadView(manager, id);
|
const created = await this.loadView(manager, id);
|
||||||
@@ -305,8 +244,7 @@ export class InventoryStructureService {
|
|||||||
metadata: {
|
metadata: {
|
||||||
versionNumber,inventoryStructureKind: dto.kind,
|
versionNumber,inventoryStructureKind: dto.kind,
|
||||||
inventoryFamilyId: family?.id ?? null,inventoryFamilyCode: family?.code ?? null,
|
inventoryFamilyId: family?.id ?? null,inventoryFamilyCode: family?.code ?? null,
|
||||||
operatorCompanyId,
|
operatorOwnership: false,
|
||||||
concessionTypeId,
|
|
||||||
},
|
},
|
||||||
}, manager);
|
}, manager);
|
||||||
return created;
|
return created;
|
||||||
@@ -352,9 +290,7 @@ export class InventoryStructureService {
|
|||||||
});
|
});
|
||||||
const rows = (await manager.query(`
|
const rows = (await manager.query(`
|
||||||
SELECT asset.id,asset.code,asset.name,type.code AS "typeCode",
|
SELECT asset.id,asset.code,asset.name,type.code AS "typeCode",
|
||||||
asset.inventory_family_id AS "inventoryFamilyId",
|
asset.inventory_family_id AS "inventoryFamilyId"
|
||||||
asset.operational_area_id AS "operationalAreaId",
|
|
||||||
asset.operator_company_id AS "operatorCompanyId"
|
|
||||||
FROM assets asset
|
FROM assets asset
|
||||||
JOIN asset_types type ON type.id=asset.asset_type_id
|
JOIN asset_types type ON type.id=asset.asset_type_id
|
||||||
WHERE asset.id=$1::uuid AND asset.information_status<>'INACTIVE'
|
WHERE asset.id=$1::uuid AND asset.information_status<>'INACTIVE'
|
||||||
@@ -369,65 +305,8 @@ export class InventoryStructureService {
|
|||||||
return parent;
|
return parent;
|
||||||
}
|
}
|
||||||
|
|
||||||
private async requireYacimientoContext(
|
|
||||||
manager: EntityManager,
|
|
||||||
dto: CreateInventoryStructureDto,
|
|
||||||
): Promise<YacimientoContext | null> {
|
|
||||||
if (dto.kind !== 'YACIMIENTO') {
|
|
||||||
if (dto.operatorCompanyId || dto.concessionTypeId) {
|
|
||||||
throw new BadRequestException({
|
|
||||||
code: 'INVENTORY_YACIMIENTO_CONTEXT_NOT_ALLOWED',
|
|
||||||
message: 'Empresa relacionada y Tipo de concesión sólo corresponden al Yacimiento',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
if (!dto.operatorCompanyId) {
|
|
||||||
throw new BadRequestException({
|
|
||||||
code: 'INVENTORY_YACIMIENTO_COMPANY_REQUIRED',
|
|
||||||
message: 'Seleccioná la Empresa relacionada del Yacimiento',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
if (!dto.concessionTypeId) {
|
|
||||||
throw new BadRequestException({
|
|
||||||
code: 'INVENTORY_YACIMIENTO_CONCESSION_REQUIRED',
|
|
||||||
message: 'Seleccioná el Tipo de concesión del Yacimiento',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
const companyRows = (await manager.query(`
|
|
||||||
SELECT asset.id
|
|
||||||
FROM assets asset
|
|
||||||
JOIN asset_types type ON type.id=asset.asset_type_id
|
|
||||||
WHERE asset.id=$1::uuid
|
|
||||||
AND type.operational_role='COMPANY'
|
|
||||||
AND type.is_active=true
|
|
||||||
AND asset.information_status<>'INACTIVE'
|
|
||||||
FOR KEY SHARE
|
|
||||||
`,[dto.operatorCompanyId])) as IdRow[];
|
|
||||||
if (!companyRows[0]) throw new BadRequestException({
|
|
||||||
code: 'INVENTORY_YACIMIENTO_COMPANY_INVALID',
|
|
||||||
message: 'La Empresa relacionada seleccionada no es válida',
|
|
||||||
});
|
|
||||||
const concessionRows = (await manager.query(`
|
|
||||||
SELECT id,name
|
|
||||||
FROM concession_types
|
|
||||||
WHERE id=$1::uuid AND is_active=true
|
|
||||||
FOR KEY SHARE
|
|
||||||
`,[dto.concessionTypeId])) as Array<{id:string;name:string}>;
|
|
||||||
if (!concessionRows[0]) throw new BadRequestException({
|
|
||||||
code: 'INVENTORY_YACIMIENTO_CONCESSION_INVALID',
|
|
||||||
message: 'El Tipo de concesión seleccionado no es válido',
|
|
||||||
});
|
|
||||||
return {
|
|
||||||
companyId: dto.operatorCompanyId,
|
|
||||||
concessionTypeId: dto.concessionTypeId,
|
|
||||||
concessionName: concessionRows[0].name,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
private async resolveAreaId(manager: EntityManager,parent: ParentRow):Promise<string> {
|
private async resolveAreaId(manager: EntityManager,parent: ParentRow):Promise<string> {
|
||||||
if (parent.typeCode.toLowerCase()==='area') return parent.id;
|
if (parent.typeCode.toLowerCase()==='area') return parent.id;
|
||||||
if (parent.operationalAreaId) return parent.operationalAreaId;
|
|
||||||
const rows = (await manager.query(`
|
const rows = (await manager.query(`
|
||||||
WITH RECURSIVE lineage AS (
|
WITH RECURSIVE lineage AS (
|
||||||
SELECT asset.id,asset.parent_id,asset.asset_type_id FROM assets asset WHERE asset.id=$1::uuid
|
SELECT asset.id,asset.parent_id,asset.asset_type_id FROM assets asset WHERE asset.id=$1::uuid
|
||||||
@@ -502,40 +381,6 @@ export class InventoryStructureService {
|
|||||||
return family;
|
return family;
|
||||||
}
|
}
|
||||||
|
|
||||||
private async ensureCompatibilityProjection(
|
|
||||||
manager: EntityManager,
|
|
||||||
areaId: string,
|
|
||||||
companyId: string,
|
|
||||||
concessionTypeId: string,
|
|
||||||
concessionName: string,
|
|
||||||
): Promise<void> {
|
|
||||||
const companyProjection = await manager.query(`
|
|
||||||
SELECT id FROM area_company_relations
|
|
||||||
WHERE area_id=$1::uuid AND company_id=$2::uuid AND relation_role='OPERATOR' AND valid_to IS NULL
|
|
||||||
LIMIT 1
|
|
||||||
`,[areaId,companyId]);
|
|
||||||
if (!companyProjection[0]) {
|
|
||||||
await manager.query(`
|
|
||||||
INSERT INTO area_company_relations(area_id,company_id,relation_role,valid_from,start_reason)
|
|
||||||
VALUES($1::uuid,$2::uuid,'OPERATOR',CURRENT_TIMESTAMP,'Proyección derivada de Yacimiento')
|
|
||||||
`,[areaId,companyId]);
|
|
||||||
}
|
|
||||||
const rightType = concessionName.toLocaleLowerCase('es-AR').includes('explor')
|
|
||||||
? 'EXPLORATION_PERMIT'
|
|
||||||
: 'EXPLOITATION_CONCESSION';
|
|
||||||
const rightProjection = await manager.query(`
|
|
||||||
SELECT id FROM area_legal_rights
|
|
||||||
WHERE area_id=$1::uuid AND right_type=$2::area_legal_right_type AND status='ACTIVE'
|
|
||||||
LIMIT 1
|
|
||||||
`,[areaId,rightType]);
|
|
||||||
if (!rightProjection[0]) {
|
|
||||||
await manager.query(`
|
|
||||||
INSERT INTO area_legal_rights(area_id,right_type,name,status,notes)
|
|
||||||
VALUES($1::uuid,$2::area_legal_right_type,$3,'ACTIVE',$4)
|
|
||||||
`,[areaId,rightType,`${concessionName} · proyección de Yacimiento`,`Tipo de concesión canónico: ${concessionTypeId}`]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private generatedCode(kind: InventoryStructureKind, name: string): string {
|
private generatedCode(kind: InventoryStructureKind, name: string): string {
|
||||||
const prefix = kind === 'EMPRESA' ? 'EMP'
|
const prefix = kind === 'EMPRESA' ? 'EMP'
|
||||||
: kind === 'DEPARTAMENTO' ? 'DEP'
|
: kind === 'DEPARTAMENTO' ? 'DEP'
|
||||||
@@ -555,8 +400,6 @@ export class InventoryStructureService {
|
|||||||
JSONB_BUILD_OBJECT('id',type.id,'code',type.code,'name',type.name) AS type,
|
JSONB_BUILD_OBJECT('id',type.id,'code',type.code,'name',type.name) AS type,
|
||||||
CASE WHEN parent.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',parent.id,'code',parent.code,'name',parent.name) END AS parent,
|
CASE WHEN parent.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',parent.id,'code',parent.code,'name',parent.name) END AS parent,
|
||||||
CASE WHEN area.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',area.id,'code',area.code,'name',area.name) END AS "operationalArea",
|
CASE WHEN area.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',area.id,'code',area.code,'name',area.name) END AS "operationalArea",
|
||||||
CASE WHEN company.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',company.id,'code',company.code,'name',COALESCE(profile.legal_name,company.name)) END AS "operatorCompany",
|
|
||||||
CASE WHEN concession.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',concession.id,'code',concession.code,'name',concession.name) END AS "concessionType",
|
|
||||||
CASE WHEN family.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
|
CASE WHEN family.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
|
||||||
'id',family.id,'code',family.code,'name',family.name,'level',family.level,
|
'id',family.id,'code',family.code,'name',family.name,'level',family.level,
|
||||||
'informationLabels',family.information_labels
|
'informationLabels',family.information_labels
|
||||||
@@ -566,9 +409,6 @@ export class InventoryStructureService {
|
|||||||
JOIN asset_types type ON type.id=asset.asset_type_id
|
JOIN asset_types type ON type.id=asset.asset_type_id
|
||||||
LEFT JOIN assets parent ON parent.id=asset.parent_id
|
LEFT JOIN assets parent ON parent.id=asset.parent_id
|
||||||
LEFT JOIN assets area ON area.id=asset.operational_area_id
|
LEFT JOIN assets area ON area.id=asset.operational_area_id
|
||||||
LEFT JOIN assets company ON company.id=asset.operator_company_id
|
|
||||||
LEFT JOIN organization_profiles profile ON profile.asset_id=company.id
|
|
||||||
LEFT JOIN concession_types concession ON concession.id=asset.concession_type_id
|
|
||||||
LEFT JOIN inventory_families family ON family.id=asset.inventory_family_id
|
LEFT JOIN inventory_families family ON family.id=asset.inventory_family_id
|
||||||
WHERE asset.id=$1::uuid
|
WHERE asset.id=$1::uuid
|
||||||
`, [id]);
|
`, [id]);
|
||||||
|
|||||||
@@ -1,13 +1,10 @@
|
|||||||
import { Injectable } from '@nestjs/common';
|
import { Injectable } from '@nestjs/common';
|
||||||
import { ActivityDossierService } from './activity-dossier.service';
|
|
||||||
import { AssetsService } from './assets.service';
|
import { AssetsService } from './assets.service';
|
||||||
import { InventoryFunctionService } from './inventory-function.service';
|
import { InventoryFunctionService } from './inventory-function.service';
|
||||||
import { InventoryMergeService } from './inventory-merge.service';
|
import { InventoryMergeService } from './inventory-merge.service';
|
||||||
|
|
||||||
type LooseRecord = Record<string, any>;
|
type LooseRecord = Record<string, any>;
|
||||||
|
|
||||||
const MERGEABLE_DOSSIER_TYPES = new Set(['instalacion', 'subinstalacion']);
|
|
||||||
|
|
||||||
function dedupeById<T extends LooseRecord>(items: T[]): T[] {
|
function dedupeById<T extends LooseRecord>(items: T[]): T[] {
|
||||||
const seen = new Set<string>();
|
const seen = new Set<string>();
|
||||||
const result: T[] = [];
|
const result: T[] = [];
|
||||||
@@ -32,22 +29,11 @@ function sortDesc(items: LooseRecord[], fieldCandidates: string[]): LooseRecord[
|
|||||||
export class MergedInventoryDossierService {
|
export class MergedInventoryDossierService {
|
||||||
constructor(
|
constructor(
|
||||||
private readonly assets: AssetsService,
|
private readonly assets: AssetsService,
|
||||||
private readonly activity: ActivityDossierService,
|
|
||||||
private readonly merges: InventoryMergeService,
|
private readonly merges: InventoryMergeService,
|
||||||
private readonly functions: InventoryFunctionService,
|
private readonly functions: InventoryFunctionService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async dossier(requestedAssetId: string): Promise<Record<string, unknown>> {
|
async dossier(requestedAssetId: string): Promise<Record<string, unknown>> {
|
||||||
const requestedAsset = await this.assets.getById(requestedAssetId);
|
|
||||||
const requestedTypeCode = requestedAsset.type.code.trim().toLowerCase();
|
|
||||||
|
|
||||||
// La conciliación/fusión existe sólo para Instalaciones y Subinstalaciones.
|
|
||||||
// Los registros territoriales (Departamento, Área, Yacimiento) deben poder
|
|
||||||
// abrir su Actividad sin depender del subsistema de merge.
|
|
||||||
if (!MERGEABLE_DOSSIER_TYPES.has(requestedTypeCode)) {
|
|
||||||
return await this.activity.dossier(requestedAssetId);
|
|
||||||
}
|
|
||||||
|
|
||||||
const mergeStatus = await this.merges.status(requestedAssetId) as LooseRecord;
|
const mergeStatus = await this.merges.status(requestedAssetId) as LooseRecord;
|
||||||
const canonical = mergeStatus.canonical as LooseRecord;
|
const canonical = mergeStatus.canonical as LooseRecord;
|
||||||
const requested = mergeStatus.requested as LooseRecord;
|
const requested = mergeStatus.requested as LooseRecord;
|
||||||
@@ -58,7 +44,7 @@ export class MergedInventoryDossierService {
|
|||||||
.filter((value, index, all) => all.indexOf(value) === index);
|
.filter((value, index, all) => all.indexOf(value) === index);
|
||||||
|
|
||||||
const dossiers = await Promise.all(inventoryIds.map(async (assetId) => {
|
const dossiers = await Promise.all(inventoryIds.map(async (assetId) => {
|
||||||
const dossier = await this.activity.dossier(assetId) as LooseRecord;
|
const dossier = await this.assets.dossier(assetId) as LooseRecord;
|
||||||
const identity = dossier.asset as LooseRecord;
|
const identity = dossier.asset as LooseRecord;
|
||||||
const functionDossier = await this.functions.getForAsset(assetId).catch(() => null) as LooseRecord | null;
|
const functionDossier = await this.functions.getForAsset(assetId).catch(() => null) as LooseRecord | null;
|
||||||
return { assetId, identity, dossier, functionDossier };
|
return { assetId, identity, dossier, functionDossier };
|
||||||
@@ -159,9 +145,6 @@ export class MergedInventoryDossierService {
|
|||||||
const reports = documents.filter((document) => document.documentType === 'TECHNICAL_REPORT');
|
const reports = documents.filter((document) => document.documentType === 'TECHNICAL_REPORT');
|
||||||
const openFindings = findings.filter((finding) => finding.status === 'OPEN').length;
|
const openFindings = findings.filter((finding) => finding.status === 'OPEN').length;
|
||||||
const closedFindings = findings.filter((finding) => finding.status === 'CLOSED').length;
|
const closedFindings = findings.filter((finding) => finding.status === 'CLOSED').length;
|
||||||
const warnings = dossiers.flatMap(({ assetId, dossier }) =>
|
|
||||||
((dossier.warnings ?? []) as string[]).map((facet) => `${assetId}:${facet}`),
|
|
||||||
);
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
asset: {
|
asset: {
|
||||||
@@ -211,7 +194,6 @@ export class MergedInventoryDossierService {
|
|||||||
media,
|
media,
|
||||||
versions,
|
versions,
|
||||||
timeline: timeline.slice(0, 1000),
|
timeline: timeline.slice(0, 1000),
|
||||||
warnings,
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,323 +0,0 @@
|
|||||||
import { randomUUID } from 'node:crypto';
|
|
||||||
import {
|
|
||||||
BadRequestException,
|
|
||||||
ConflictException,
|
|
||||||
Injectable,
|
|
||||||
NotFoundException,
|
|
||||||
} from '@nestjs/common';
|
|
||||||
import { DataSource, EntityManager } 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 {
|
|
||||||
AssetDataOrigin,
|
|
||||||
AssetInformationStatus,
|
|
||||||
AssetOperationalStatus,
|
|
||||||
AssetVersionChangeType,
|
|
||||||
AuditAction,
|
|
||||||
} from '../database/entities';
|
|
||||||
import type { CreateInventoryStructureDto, InventoryStructureKind } from './dto/create-inventory-structure.dto';
|
|
||||||
import { AssetHistoryService } from './asset-history.service';
|
|
||||||
|
|
||||||
type StructureTypeRow = { id: string; code: string; name: string };
|
|
||||||
type ParentRow = {
|
|
||||||
id: string;
|
|
||||||
code: string;
|
|
||||||
name: string;
|
|
||||||
typeCode: string;
|
|
||||||
inventoryFamilyId: string | null;
|
|
||||||
operationalAreaId: string | null;
|
|
||||||
operatorCompanyId: string | null;
|
|
||||||
};
|
|
||||||
type FamilyRow = {
|
|
||||||
id: string;
|
|
||||||
code: string;
|
|
||||||
name: string;
|
|
||||||
level: 'INSTALLATION' | 'SUBINSTALLATION';
|
|
||||||
};
|
|
||||||
|
|
||||||
const TYPE_CODE_BY_KIND: Record<Exclude<InventoryStructureKind, 'EMPRESA'>, string> = {
|
|
||||||
DEPARTAMENTO: 'departamento',
|
|
||||||
AREA: 'area',
|
|
||||||
YACIMIENTO: 'yacimiento',
|
|
||||||
INSTALACION: 'instalacion',
|
|
||||||
SUBINSTALACION: 'subinstalacion',
|
|
||||||
};
|
|
||||||
|
|
||||||
const PARENT_TYPE_BY_KIND: Record<InventoryStructureKind, string | null> = {
|
|
||||||
EMPRESA: null,
|
|
||||||
DEPARTAMENTO: null,
|
|
||||||
AREA: 'departamento',
|
|
||||||
YACIMIENTO: 'area',
|
|
||||||
INSTALACION: 'yacimiento',
|
|
||||||
SUBINSTALACION: 'instalacion',
|
|
||||||
};
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
export class SimpleInventoryStructureService {
|
|
||||||
constructor(
|
|
||||||
private readonly dataSource: DataSource,
|
|
||||||
private readonly audit: AuditService,
|
|
||||||
private readonly history: AssetHistoryService,
|
|
||||||
) {}
|
|
||||||
|
|
||||||
async create(
|
|
||||||
dto: CreateInventoryStructureDto,
|
|
||||||
principal: AuthPrincipal,
|
|
||||||
request: RequestWithContext,
|
|
||||||
) {
|
|
||||||
try {
|
|
||||||
return await this.dataSource.transaction(async (manager) => {
|
|
||||||
const type = await this.requireStructureType(manager, dto.kind);
|
|
||||||
const parent = await this.requireParent(manager, dto.kind, dto.parentId ?? null);
|
|
||||||
const family = await this.requireFamily(manager, dto.kind, dto.familyId ?? null, parent);
|
|
||||||
|
|
||||||
let operationalAreaId: string | null = null;
|
|
||||||
let operatorCompanyId: string | null = null;
|
|
||||||
|
|
||||||
if (dto.kind === 'YACIMIENTO') {
|
|
||||||
if (!parent) throw new BadRequestException({ code: 'INVENTORY_YACIMIENTO_AREA_REQUIRED', message: 'Seleccioná el Área del Yacimiento' });
|
|
||||||
if (!dto.operatorCompanyId) throw new BadRequestException({ code: 'INVENTORY_YACIMIENTO_COMPANY_REQUIRED', message: 'Seleccioná la Empresa operadora del Yacimiento' });
|
|
||||||
await this.requireAreaCompanyRelation(manager, parent.id, dto.operatorCompanyId);
|
|
||||||
operationalAreaId = parent.id;
|
|
||||||
operatorCompanyId = dto.operatorCompanyId;
|
|
||||||
} else if (dto.kind === 'INSTALACION' || dto.kind === 'SUBINSTALACION') {
|
|
||||||
operationalAreaId = parent?.operationalAreaId ?? null;
|
|
||||||
operatorCompanyId = parent?.operatorCompanyId ?? null;
|
|
||||||
if (!operationalAreaId || !operatorCompanyId) {
|
|
||||||
throw new ConflictException({
|
|
||||||
code: 'INVENTORY_YACIMIENTO_CONTEXT_MISSING',
|
|
||||||
message: 'El Yacimiento de origen debe tener Área y Empresa operadora válidas',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
} else if (dto.operatorCompanyId || dto.concessionTypeId) {
|
|
||||||
throw new BadRequestException({
|
|
||||||
code: 'INVENTORY_SIMPLE_CONTEXT_NOT_ALLOWED',
|
|
||||||
message: 'Empresa operadora sólo corresponde al Yacimiento',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const generatedCode = dto.code?.trim().toUpperCase() || this.generatedCode(dto.kind, dto.name);
|
|
||||||
const rows = (await manager.query(`
|
|
||||||
INSERT INTO assets (
|
|
||||||
asset_type_id,parent_id,operational_area_id,operator_company_id,concession_type_id,inventory_family_id,
|
|
||||||
code,name,common_name,description,information_status,operational_status,
|
|
||||||
data_origin,source_name,source_reference,source_notes,created_by,updated_by,provenance_updated_by
|
|
||||||
) VALUES (
|
|
||||||
$1::uuid,$2::uuid,$3::uuid,$4::uuid,NULL,$5::uuid,
|
|
||||||
$6::varchar,$7::varchar,NULL,NULL,$8::asset_information_status,$9::asset_operational_status,
|
|
||||||
$10::varchar,$11::varchar,$12::varchar,$13::text,$14::uuid,$14::uuid,$14::uuid
|
|
||||||
) RETURNING id
|
|
||||||
`, [
|
|
||||||
type.id,
|
|
||||||
parent?.id ?? null,
|
|
||||||
operationalAreaId,
|
|
||||||
operatorCompanyId,
|
|
||||||
family?.id ?? null,
|
|
||||||
generatedCode,
|
|
||||||
dto.name,
|
|
||||||
AssetInformationStatus.DRAFT,
|
|
||||||
AssetOperationalStatus.UNKNOWN,
|
|
||||||
AssetDataOrigin.MANUAL,
|
|
||||||
dto.kind === 'EMPRESA' ? 'Maestro manual de Empresas' : 'Alta simple de Inventario',
|
|
||||||
`inventory-simple:${dto.kind.toLowerCase()}`,
|
|
||||||
family ? `Tipo: ${family.name}` : null,
|
|
||||||
principal.userId,
|
|
||||||
])) as Array<{ id: string }>;
|
|
||||||
const id = rows[0]?.id;
|
|
||||||
if (!id) throw new Error('No se pudo crear el registro');
|
|
||||||
|
|
||||||
if (dto.kind === 'EMPRESA') {
|
|
||||||
await manager.query(`
|
|
||||||
INSERT INTO organization_profiles(asset_id,organization_kind,legal_name,updated_by)
|
|
||||||
VALUES ($1::uuid,'COMPANY',$2,$3::uuid)
|
|
||||||
ON CONFLICT (asset_id) DO UPDATE
|
|
||||||
SET legal_name=EXCLUDED.legal_name,updated_by=EXCLUDED.updated_by,updated_at=CURRENT_TIMESTAMP
|
|
||||||
`, [id, dto.name, principal.userId]);
|
|
||||||
}
|
|
||||||
|
|
||||||
const versionNumber = await this.history.capture(
|
|
||||||
manager,
|
|
||||||
id,
|
|
||||||
AssetVersionChangeType.CREATED,
|
|
||||||
principal,
|
|
||||||
request,
|
|
||||||
);
|
|
||||||
|
|
||||||
await manager.query(`
|
|
||||||
INSERT INTO asset_context_history (
|
|
||||||
asset_id,parent_id,operational_area_id,operator_company_id,valid_from,
|
|
||||||
change_reason,asset_version_number,source,request_id,created_by
|
|
||||||
) VALUES ($1,$2,$3,$4,CURRENT_TIMESTAMP,$5,$6,'WEB',$7,$8)
|
|
||||||
`, [
|
|
||||||
id,
|
|
||||||
parent?.id ?? null,
|
|
||||||
operationalAreaId,
|
|
||||||
operatorCompanyId,
|
|
||||||
dto.kind === 'YACIMIENTO'
|
|
||||||
? 'Alta de Yacimiento con Empresa operadora vinculada al Área'
|
|
||||||
: 'Alta simple de Inventario',
|
|
||||||
versionNumber,
|
|
||||||
request.requestId,
|
|
||||||
principal.userId,
|
|
||||||
]);
|
|
||||||
|
|
||||||
const created = await this.loadView(manager, id);
|
|
||||||
await this.audit.record({
|
|
||||||
...administrationAuditContext(principal, request),
|
|
||||||
action: AuditAction.ASSET_CREATED,
|
|
||||||
entityType: 'asset',
|
|
||||||
entityId: id,
|
|
||||||
afterData: created as Record<string, unknown>,
|
|
||||||
metadata: {
|
|
||||||
versionNumber,
|
|
||||||
inventoryStructureKind: dto.kind,
|
|
||||||
inventoryFamilyId: family?.id ?? null,
|
|
||||||
inventoryFamilyCode: family?.code ?? null,
|
|
||||||
operatorCompanyId,
|
|
||||||
simpleInventoryFlow: true,
|
|
||||||
},
|
|
||||||
}, manager);
|
|
||||||
return created;
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
if (isUniqueViolation(error)) {
|
|
||||||
throw new ConflictException({ code: 'ASSET_CODE_ALREADY_EXISTS', message: 'Ya existe un registro con ese código' });
|
|
||||||
}
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async requireStructureType(manager: EntityManager, kind: InventoryStructureKind): Promise<StructureTypeRow> {
|
|
||||||
const sql = kind === 'EMPRESA'
|
|
||||||
? `SELECT id,code,name FROM asset_types WHERE operational_role='COMPANY' AND is_active=true ORDER BY (lower(code)='empresa') DESC,created_at LIMIT 1`
|
|
||||||
: `SELECT id,code,name FROM asset_types WHERE lower(code)=lower($1::text) AND is_active=true LIMIT 1`;
|
|
||||||
const params = kind === 'EMPRESA' ? [] : [TYPE_CODE_BY_KIND[kind as Exclude<InventoryStructureKind, 'EMPRESA'>]];
|
|
||||||
const rows = (await manager.query(sql, params)) as StructureTypeRow[];
|
|
||||||
if (!rows[0]) throw new ConflictException({ code: 'INVENTORY_STRUCTURE_TYPE_NOT_CONFIGURED', message: `El nivel ${kind} no está configurado` });
|
|
||||||
return rows[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
private async requireParent(
|
|
||||||
manager: EntityManager,
|
|
||||||
kind: InventoryStructureKind,
|
|
||||||
parentId: string | null,
|
|
||||||
): Promise<ParentRow | null> {
|
|
||||||
const expectedType = PARENT_TYPE_BY_KIND[kind];
|
|
||||||
if (!expectedType) {
|
|
||||||
if (parentId) throw new BadRequestException({ code: 'INVENTORY_ROOT_MUST_NOT_HAVE_PARENT', message: `${kind === 'EMPRESA' ? 'Empresa' : 'Departamento'} no admite padre` });
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
if (!parentId) throw new BadRequestException({ code: 'INVENTORY_PARENT_REQUIRED', message: `Seleccioná el nivel superior para crear ${kind.toLowerCase()}` });
|
|
||||||
|
|
||||||
const rows = (await manager.query(`
|
|
||||||
SELECT asset.id,asset.code,asset.name,lower(type.code) AS "typeCode",
|
|
||||||
asset.inventory_family_id AS "inventoryFamilyId",
|
|
||||||
CASE WHEN lower(type.code)='area' THEN asset.id ELSE asset.operational_area_id END AS "operationalAreaId",
|
|
||||||
asset.operator_company_id AS "operatorCompanyId"
|
|
||||||
FROM assets asset
|
|
||||||
JOIN asset_types type ON type.id=asset.asset_type_id
|
|
||||||
WHERE asset.id=$1::uuid AND asset.information_status<>'INACTIVE'
|
|
||||||
FOR KEY SHARE OF asset
|
|
||||||
`, [parentId])) as ParentRow[];
|
|
||||||
const parent = rows[0];
|
|
||||||
if (!parent || parent.typeCode !== expectedType) {
|
|
||||||
throw new BadRequestException({ code: 'INVENTORY_PARENT_INVALID', message: `El registro padre debe ser ${expectedType}` });
|
|
||||||
}
|
|
||||||
return parent;
|
|
||||||
}
|
|
||||||
|
|
||||||
private async requireAreaCompanyRelation(manager: EntityManager, areaId: string, companyId: string): Promise<void> {
|
|
||||||
const rows = await manager.query(`
|
|
||||||
SELECT 1
|
|
||||||
FROM area_company_relations relation
|
|
||||||
JOIN assets company ON company.id=relation.company_id
|
|
||||||
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_until IS NULL
|
|
||||||
AND company.information_status<>'INACTIVE'
|
|
||||||
AND company_type.operational_role='COMPANY'
|
|
||||||
AND company_type.is_active=true
|
|
||||||
LIMIT 1
|
|
||||||
FOR KEY SHARE OF relation
|
|
||||||
`, [areaId, companyId]);
|
|
||||||
if (!rows[0]) {
|
|
||||||
throw new BadRequestException({
|
|
||||||
code: 'INVENTORY_YACIMIENTO_COMPANY_NOT_IN_AREA',
|
|
||||||
message: 'La Empresa seleccionada no está vinculada como explotadora del Área',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async requireFamily(
|
|
||||||
manager: EntityManager,
|
|
||||||
kind: InventoryStructureKind,
|
|
||||||
familyId: string | null,
|
|
||||||
parent: ParentRow | null,
|
|
||||||
): Promise<FamilyRow | null> {
|
|
||||||
if (kind !== 'INSTALACION' && kind !== 'SUBINSTALACION') {
|
|
||||||
if (familyId) throw new BadRequestException({ code: 'INVENTORY_FAMILY_NOT_ALLOWED', message: 'Este nivel no usa Tipo de Instalación/Subinstalación' });
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
if (!familyId) throw new BadRequestException({ code: 'INVENTORY_FAMILY_REQUIRED', message: `Seleccioná el tipo de ${kind === 'INSTALACION' ? 'Instalación' : 'Subinstalación'}` });
|
|
||||||
|
|
||||||
const rows = (await manager.query(`
|
|
||||||
SELECT id,code,name,level::text AS level
|
|
||||||
FROM inventory_families
|
|
||||||
WHERE id=$1::uuid AND is_active=true
|
|
||||||
LIMIT 1
|
|
||||||
FOR KEY SHARE
|
|
||||||
`, [familyId])) as FamilyRow[];
|
|
||||||
const family = rows[0];
|
|
||||||
if (!family) throw new NotFoundException({ code: 'INVENTORY_FAMILY_NOT_FOUND', message: 'El tipo seleccionado no existe o está oculto' });
|
|
||||||
const expected = kind === 'INSTALACION' ? 'INSTALLATION' : 'SUBINSTALLATION';
|
|
||||||
if (family.level !== expected) throw new BadRequestException({ code: 'INVENTORY_FAMILY_LEVEL_INVALID', message: 'El tipo seleccionado no corresponde a este nivel' });
|
|
||||||
|
|
||||||
if (kind === 'SUBINSTALACION') {
|
|
||||||
if (!parent?.inventoryFamilyId) throw new BadRequestException({ code: 'INVENTORY_PARENT_FAMILY_REQUIRED', message: 'La Instalación debe tener un tipo configurado' });
|
|
||||||
const compatible = await manager.query(`
|
|
||||||
SELECT 1 FROM inventory_family_parent_rules
|
|
||||||
WHERE child_family_id=$1::uuid AND parent_family_id=$2::uuid
|
|
||||||
LIMIT 1
|
|
||||||
`, [family.id, parent.inventoryFamilyId]);
|
|
||||||
if (!compatible[0]) throw new BadRequestException({ code: 'INVENTORY_SUBINSTALLATION_FAMILY_PARENT_INVALID', message: 'Ese tipo de Subinstalación no está habilitado dentro de la Instalación seleccionada' });
|
|
||||||
}
|
|
||||||
return family;
|
|
||||||
}
|
|
||||||
|
|
||||||
private generatedCode(kind: InventoryStructureKind, name: string): string {
|
|
||||||
const prefix = kind === 'EMPRESA' ? 'EMP'
|
|
||||||
: kind === 'DEPARTAMENTO' ? 'DEP'
|
|
||||||
: kind === 'AREA' ? 'AREA'
|
|
||||||
: kind === 'YACIMIENTO' ? 'YAC'
|
|
||||||
: kind === 'INSTALACION' ? 'INST'
|
|
||||||
: 'SUB';
|
|
||||||
const readable = name.normalize('NFD').replace(/[\u0300-\u036f]/g, '').toUpperCase()
|
|
||||||
.replace(/[^A-Z0-9]+/g, '-').replace(/^-+|-+$/g, '').slice(0, 48) || 'REGISTRO';
|
|
||||||
return `${prefix}-${readable}-${randomUUID().slice(0, 8).toUpperCase()}`.slice(0, 120);
|
|
||||||
}
|
|
||||||
|
|
||||||
private async loadView(manager: EntityManager, id: string) {
|
|
||||||
const rows = await manager.query(`
|
|
||||||
SELECT asset.id,asset.code,asset.name,asset.common_name AS "commonName",asset.description,
|
|
||||||
asset.information_status AS "informationStatus",asset.operational_status AS "operationalStatus",
|
|
||||||
JSONB_BUILD_OBJECT('id',type.id,'code',type.code,'name',type.name) AS type,
|
|
||||||
CASE WHEN parent.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',parent.id,'code',parent.code,'name',parent.name) END AS parent,
|
|
||||||
CASE WHEN area.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',area.id,'code',area.code,'name',area.name) END AS "operationalArea",
|
|
||||||
CASE WHEN company.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',company.id,'code',company.code,'name',COALESCE(profile.legal_name,company.name)) END AS "operatorCompany",
|
|
||||||
CASE WHEN family.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',family.id,'code',family.code,'name',family.name,'level',family.level) END AS "inventoryFamily",
|
|
||||||
asset.created_at AS "createdAt",asset.updated_at AS "updatedAt"
|
|
||||||
FROM assets asset
|
|
||||||
JOIN asset_types type ON type.id=asset.asset_type_id
|
|
||||||
LEFT JOIN assets parent ON parent.id=asset.parent_id
|
|
||||||
LEFT JOIN assets area ON area.id=asset.operational_area_id
|
|
||||||
LEFT JOIN assets company ON company.id=asset.operator_company_id
|
|
||||||
LEFT JOIN organization_profiles profile ON profile.asset_id=company.id
|
|
||||||
LEFT JOIN inventory_families family ON family.id=asset.inventory_family_id
|
|
||||||
WHERE asset.id=$1::uuid
|
|
||||||
`, [id]);
|
|
||||||
return rows[0];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -33,7 +33,6 @@ export enum AssetDataOrigin {
|
|||||||
@Index('idx_assets_parent_id', ['parentId'])
|
@Index('idx_assets_parent_id', ['parentId'])
|
||||||
@Index('idx_assets_operational_area_id', ['operationalAreaId'])
|
@Index('idx_assets_operational_area_id', ['operationalAreaId'])
|
||||||
@Index('idx_assets_operator_company_id', ['operatorCompanyId'])
|
@Index('idx_assets_operator_company_id', ['operatorCompanyId'])
|
||||||
@Index('idx_assets_concession_type_id', ['concessionTypeId'])
|
|
||||||
@Index('idx_assets_inventory_family_id', ['inventoryFamilyId'])
|
@Index('idx_assets_inventory_family_id', ['inventoryFamilyId'])
|
||||||
@Index('idx_assets_information_status', ['informationStatus'])
|
@Index('idx_assets_information_status', ['informationStatus'])
|
||||||
@Index('idx_assets_operational_status', ['operationalStatus'])
|
@Index('idx_assets_operational_status', ['operationalStatus'])
|
||||||
@@ -55,9 +54,6 @@ export class Asset extends TimestampedEntity {
|
|||||||
@Column({ name: 'operator_company_id', type: 'uuid', nullable: true })
|
@Column({ name: 'operator_company_id', type: 'uuid', nullable: true })
|
||||||
operatorCompanyId!: string | null;
|
operatorCompanyId!: string | null;
|
||||||
|
|
||||||
@Column({ name: 'concession_type_id', type: 'uuid', nullable: true })
|
|
||||||
concessionTypeId!: string | null;
|
|
||||||
|
|
||||||
@Column({ name: 'inventory_family_id', type: 'uuid', nullable: true })
|
@Column({ name: 'inventory_family_id', type: 'uuid', nullable: true })
|
||||||
inventoryFamilyId!: string | null;
|
inventoryFamilyId!: string | null;
|
||||||
|
|
||||||
|
|||||||
@@ -1,240 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,173 +0,0 @@
|
|||||||
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.',
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-380
@@ -1,380 +0,0 @@
|
|||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
import { AUTHORITATIVE_INVENTORY_MODEL as SOURCE } from '../../reference-data/authoritative-inventory-model';
|
|
||||||
|
|
||||||
type IdRow = { id: string };
|
|
||||||
|
|
||||||
const TERRITORY_DOC = 'DH-AUTH-TERRITORY-20260911';
|
|
||||||
const INVENTORY_DOC = 'DH-AUTH-INVENTORY-20260911';
|
|
||||||
const FINDING_CATEGORY_CODE = 'AUTHMODEL';
|
|
||||||
|
|
||||||
function sourceCode(prefix: string, id: number): string {
|
|
||||||
return `${prefix}-${String(id).padStart(4, '0')}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class AuthoritativeInventoryRelationships1790106600000 implements MigrationInterface {
|
|
||||||
name = 'AuthoritativeInventoryRelationships1790106600000';
|
|
||||||
|
|
||||||
public async up(q: QueryRunner): Promise<void> {
|
|
||||||
this.assertSource();
|
|
||||||
|
|
||||||
const companyType = await this.type(q, `SELECT id FROM asset_types WHERE operational_role='COMPANY' AND is_active=true ORDER BY (lower(code)='empresa') DESC, created_at LIMIT 1`);
|
|
||||||
const departmentType = await this.type(q, `SELECT id FROM asset_types WHERE lower(code)='departamento' AND is_active=true LIMIT 1`);
|
|
||||||
const areaType = await this.type(q, `SELECT id FROM asset_types WHERE lower(code)='area' AND operational_role='AREA' AND is_active=true LIMIT 1`);
|
|
||||||
const fieldType = await this.type(q, `SELECT id FROM asset_types WHERE lower(code)='yacimiento' AND is_active=true LIMIT 1`);
|
|
||||||
const installationType = await this.type(q, `SELECT id FROM asset_types WHERE lower(code)='instalacion' AND is_active=true LIMIT 1`);
|
|
||||||
const subinstallationType = await this.type(q, `SELECT id FROM asset_types WHERE lower(code)='subinstalacion' AND is_active=true LIMIT 1`);
|
|
||||||
|
|
||||||
await q.query(`
|
|
||||||
CREATE TABLE IF NOT EXISTS concession_types (
|
|
||||||
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
code varchar(80) NOT NULL UNIQUE,
|
|
||||||
name varchar(120) NOT NULL UNIQUE,
|
|
||||||
is_active boolean NOT NULL DEFAULT true,
|
|
||||||
created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
CONSTRAINT chk_concession_types_name CHECK (length(btrim(name)) >= 3)
|
|
||||||
)
|
|
||||||
`);
|
|
||||||
await q.query(`ALTER TABLE assets ADD COLUMN IF NOT EXISTS concession_type_id uuid`);
|
|
||||||
await q.query(`
|
|
||||||
DO $$ BEGIN
|
|
||||||
IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname='fk_assets_concession_type') THEN
|
|
||||||
ALTER TABLE assets ADD CONSTRAINT fk_assets_concession_type
|
|
||||||
FOREIGN KEY (concession_type_id) REFERENCES concession_types(id) ON DELETE RESTRICT;
|
|
||||||
END IF;
|
|
||||||
END $$
|
|
||||||
`);
|
|
||||||
await q.query(`CREATE INDEX IF NOT EXISTS idx_assets_concession_type_id ON assets(concession_type_id)`);
|
|
||||||
await q.query(`
|
|
||||||
DO $$ BEGIN
|
|
||||||
IF EXISTS (SELECT 1 FROM pg_roles WHERE rolname='dhv2_app') THEN
|
|
||||||
GRANT SELECT ON concession_types TO dhv2_app;
|
|
||||||
END IF;
|
|
||||||
END $$
|
|
||||||
`);
|
|
||||||
|
|
||||||
await q.query(`DELETE FROM asset_type_parent_rules WHERE child_type_id IN ($1::uuid,$2::uuid,$3::uuid,$4::uuid)`, [areaType, fieldType, installationType, subinstallationType]);
|
|
||||||
await q.query(`
|
|
||||||
INSERT INTO asset_type_parent_rules(child_type_id,parent_type_id) VALUES
|
|
||||||
($1::uuid,$2::uuid),($3::uuid,$1::uuid),($4::uuid,$3::uuid),($5::uuid,$4::uuid)
|
|
||||||
ON CONFLICT DO NOTHING
|
|
||||||
`, [areaType, departmentType, fieldType, installationType, subinstallationType]);
|
|
||||||
await q.query(`UPDATE asset_types SET can_be_root=true,updated_at=CURRENT_TIMESTAMP WHERE id IN ($1::uuid,$2::uuid)`, [companyType, departmentType]);
|
|
||||||
await q.query(`UPDATE asset_types SET can_be_root=false,updated_at=CURRENT_TIMESTAMP WHERE id IN ($1::uuid,$2::uuid,$3::uuid,$4::uuid)`, [areaType, fieldType, installationType, subinstallationType]);
|
|
||||||
await q.query(`UPDATE asset_types SET description='Área territorial. Sólo posee Nombre y pertenece obligatoriamente a un Departamento.',updated_at=CURRENT_TIMESTAMP WHERE id=$1::uuid`, [areaType]);
|
|
||||||
await q.query(`UPDATE asset_types SET description='Yacimiento. Pertenece a un Área y define directamente Tipo de concesión y Empresa relacionada.',updated_at=CURRENT_TIMESTAMP WHERE id=$1::uuid`, [fieldType]);
|
|
||||||
await q.query(`UPDATE asset_types SET description='Instalación física. Pertenece obligatoriamente a un Yacimiento y utiliza una clasificación técnica.',updated_at=CURRENT_TIMESTAMP WHERE id=$1::uuid`, [installationType]);
|
|
||||||
await q.query(`UPDATE asset_types SET description='Subinstalación física. Pertenece obligatoriamente a una Instalación y utiliza una clasificación técnica compatible.',updated_at=CURRENT_TIMESTAMP WHERE id=$1::uuid`, [subinstallationType]);
|
|
||||||
|
|
||||||
await q.query(`DELETE FROM asset_attribute_definitions WHERE asset_type_id IN ($1::uuid,$2::uuid,$3::uuid,$4::uuid,$5::uuid,$6::uuid)`, [companyType, departmentType, areaType, fieldType, installationType, subinstallationType]);
|
|
||||||
await this.insertCommonAttributes(q, installationType, [
|
|
||||||
['campo_marca','Marca',10],
|
|
||||||
['tipo_instalacion','Tipo de instalación',20],
|
|
||||||
['campo_modelo','Modelo',30],
|
|
||||||
['campo_capacidad','Capacidad',40],
|
|
||||||
['campo_numero_serie','Número de serie',50],
|
|
||||||
['campo_funcion','Función',60],
|
|
||||||
]);
|
|
||||||
await this.insertCommonAttributes(q, subinstallationType, [
|
|
||||||
['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],
|
|
||||||
]);
|
|
||||||
|
|
||||||
await q.query(`
|
|
||||||
DO $$ DECLARE trigger_name text; BEGIN
|
|
||||||
FOR trigger_name IN
|
|
||||||
SELECT trigger_row.tgname
|
|
||||||
FROM pg_trigger trigger_row
|
|
||||||
JOIN pg_proc function_row ON function_row.oid=trigger_row.tgfoid
|
|
||||||
WHERE trigger_row.tgrelid='assets'::regclass
|
|
||||||
AND NOT trigger_row.tgisinternal
|
|
||||||
AND function_row.proname='enforce_asset_operational_context'
|
|
||||||
LOOP
|
|
||||||
EXECUTE format('DROP TRIGGER %I ON assets',trigger_name);
|
|
||||||
END LOOP;
|
|
||||||
END $$
|
|
||||||
`);
|
|
||||||
await q.query(`DROP FUNCTION IF EXISTS enforce_asset_operational_context()`);
|
|
||||||
|
|
||||||
await q.query(`
|
|
||||||
CREATE OR REPLACE FUNCTION enforce_authoritative_inventory_relationships()
|
|
||||||
RETURNS trigger LANGUAGE plpgsql AS $$
|
|
||||||
DECLARE
|
|
||||||
kind text;
|
|
||||||
asset_role asset_type_operational_role;
|
|
||||||
parent_kind text;
|
|
||||||
parent_area uuid;
|
|
||||||
parent_company uuid;
|
|
||||||
parent_family uuid;
|
|
||||||
company_role asset_type_operational_role;
|
|
||||||
family_level text;
|
|
||||||
BEGIN
|
|
||||||
SELECT lower(code),operational_role INTO kind,asset_role FROM asset_types WHERE id=NEW.asset_type_id;
|
|
||||||
IF kind IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='asset type does not exist'; END IF;
|
|
||||||
|
|
||||||
IF asset_role='COMPANY'::asset_type_operational_role THEN
|
|
||||||
IF NEW.parent_id IS NOT NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Empresa no admite padre'; END IF;
|
|
||||||
NEW.operational_area_id:=NULL; NEW.operator_company_id:=NULL; NEW.concession_type_id:=NULL;
|
|
||||||
NEW.inventory_family_id:=NULL; NEW.is_inventory_instance:=false;
|
|
||||||
RETURN NEW;
|
|
||||||
ELSIF kind='departamento' THEN
|
|
||||||
IF NEW.parent_id IS NOT NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Departamento no admite padre'; END IF;
|
|
||||||
NEW.operational_area_id:=NULL; NEW.operator_company_id:=NULL; NEW.concession_type_id:=NULL;
|
|
||||||
NEW.inventory_family_id:=NULL; NEW.is_inventory_instance:=false;
|
|
||||||
RETURN NEW;
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
IF NEW.parent_id IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='El nivel requiere un padre estructural'; END IF;
|
|
||||||
SELECT lower(parent_type.code), parent.operational_area_id, parent.operator_company_id, parent.inventory_family_id
|
|
||||||
INTO parent_kind,parent_area,parent_company,parent_family
|
|
||||||
FROM assets parent JOIN asset_types parent_type ON parent_type.id=parent.asset_type_id
|
|
||||||
WHERE parent.id=NEW.parent_id AND parent.information_status<>'INACTIVE';
|
|
||||||
IF parent_kind IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='El padre estructural no existe o está inactivo'; END IF;
|
|
||||||
|
|
||||||
IF kind='area' THEN
|
|
||||||
IF parent_kind<>'departamento' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Área debe pertenecer a un Departamento'; END IF;
|
|
||||||
NEW.operational_area_id:=NULL; NEW.operator_company_id:=NULL; NEW.concession_type_id:=NULL;
|
|
||||||
NEW.inventory_family_id:=NULL; NEW.is_inventory_instance:=false;
|
|
||||||
ELSIF kind='yacimiento' THEN
|
|
||||||
IF parent_kind<>'area' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Yacimiento debe pertenecer a un Área'; END IF;
|
|
||||||
IF NEW.operator_company_id IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Yacimiento requiere Empresa relacionada'; END IF;
|
|
||||||
SELECT type.operational_role INTO company_role FROM assets company JOIN asset_types type ON type.id=company.asset_type_id
|
|
||||||
WHERE company.id=NEW.operator_company_id AND company.information_status<>'INACTIVE' AND type.is_active=true;
|
|
||||||
IF company_role IS DISTINCT FROM 'COMPANY'::asset_type_operational_role THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='La Empresa relacionada del Yacimiento no es válida'; END IF;
|
|
||||||
IF NEW.concession_type_id IS NULL OR NOT EXISTS(SELECT 1 FROM concession_types c WHERE c.id=NEW.concession_type_id AND c.is_active=true) THEN
|
|
||||||
RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Yacimiento requiere un Tipo de concesión válido';
|
|
||||||
END IF;
|
|
||||||
IF NEW.operational_area_id IS NOT NULL AND NEW.operational_area_id<>NEW.parent_id THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='El Área operativa del Yacimiento debe coincidir con su Área padre'; END IF;
|
|
||||||
NEW.operational_area_id:=NEW.parent_id; NEW.inventory_family_id:=NULL; NEW.is_inventory_instance:=false;
|
|
||||||
ELSIF kind='instalacion' THEN
|
|
||||||
IF parent_kind<>'yacimiento' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Instalación debe pertenecer a un Yacimiento'; END IF;
|
|
||||||
SELECT level::text INTO family_level FROM inventory_families WHERE id=NEW.inventory_family_id AND is_active=true;
|
|
||||||
IF family_level IS DISTINCT FROM 'INSTALLATION' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Instalación requiere un Tipo de instalación válido'; END IF;
|
|
||||||
NEW.operational_area_id:=parent_area; NEW.operator_company_id:=parent_company; NEW.concession_type_id:=NULL; NEW.is_inventory_instance:=true;
|
|
||||||
ELSIF kind='subinstalacion' THEN
|
|
||||||
IF parent_kind<>'instalacion' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Subinstalación debe pertenecer a una Instalación'; END IF;
|
|
||||||
SELECT level::text INTO family_level FROM inventory_families WHERE id=NEW.inventory_family_id AND is_active=true;
|
|
||||||
IF family_level IS DISTINCT FROM 'SUBINSTALLATION' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Subinstalación requiere un Tipo de subinstalación válido'; END IF;
|
|
||||||
IF NOT EXISTS(SELECT 1 FROM inventory_family_parent_rules rule WHERE rule.child_family_id=NEW.inventory_family_id AND rule.parent_family_id=parent_family) THEN
|
|
||||||
RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='El Tipo de subinstalación no es compatible con el Tipo de instalación padre';
|
|
||||||
END IF;
|
|
||||||
NEW.operational_area_id:=parent_area; NEW.operator_company_id:=parent_company; NEW.concession_type_id:=NULL; NEW.is_inventory_instance:=true;
|
|
||||||
END IF;
|
|
||||||
RETURN NEW;
|
|
||||||
END $$
|
|
||||||
`);
|
|
||||||
await q.query(`DROP TRIGGER IF EXISTS trg_assets_authoritative_inventory_relationships ON assets`);
|
|
||||||
await q.query(`
|
|
||||||
CREATE TRIGGER trg_assets_authoritative_inventory_relationships
|
|
||||||
BEFORE INSERT OR UPDATE OF asset_type_id,parent_id,operational_area_id,operator_company_id,inventory_family_id,concession_type_id
|
|
||||||
ON assets FOR EACH ROW EXECUTE FUNCTION enforce_authoritative_inventory_relationships()
|
|
||||||
`);
|
|
||||||
|
|
||||||
await q.query(`TRUNCATE TABLE assets CASCADE`);
|
|
||||||
await q.query(`TRUNCATE TABLE source_documents CASCADE`);
|
|
||||||
await q.query(`TRUNCATE TABLE inventory_families CASCADE`);
|
|
||||||
await q.query(`TRUNCATE TABLE finding_categories CASCADE`);
|
|
||||||
await q.query(`TRUNCATE TABLE concession_types CASCADE`);
|
|
||||||
|
|
||||||
const [territoryDoc] = (await q.query(`
|
|
||||||
INSERT INTO source_documents(document_type,document_number,title,issuer,external_reference,notes)
|
|
||||||
VALUES('SPREADSHEET',$1,$2,'Dirección de Hidrocarburos',$3,$4) RETURNING id
|
|
||||||
`, [TERRITORY_DOC,'modelo_yacimientos.sql','sha256:6a1d96bc8af7e755dd0e2fd9faf08335625b9c76865208c3b8413d868aa5eb1a','Modelo relacional exacto de Departamentos, Áreas, Yacimientos, Empresas y Tipo de concesión.'])) as IdRow[];
|
|
||||||
const [inventoryDoc] = (await q.query(`
|
|
||||||
INSERT INTO source_documents(document_type,document_number,title,issuer,external_reference,notes)
|
|
||||||
VALUES('SPREADSHEET',$1,$2,'Dirección de Hidrocarburos',$3,$4) RETURNING id
|
|
||||||
`, [INVENTORY_DOC,'modelo_relacional instalaciones y sub.sql','sha256:fb513f3909e78db298361a8a6998ca77026748f9b03cbab44c77b884ca862b49','Modelo relacional exacto de tipos de Instalación/Subinstalación y sus Hallazgos.'])) as IdRow[];
|
|
||||||
if(!territoryDoc?.id || !inventoryDoc?.id) throw new Error('Authoritative source documents could not be created');
|
|
||||||
|
|
||||||
const concessionIds=new Map<number,string>();
|
|
||||||
for(const row of SOURCE.concessionTypes){
|
|
||||||
const [created]=(await q.query(`INSERT INTO concession_types(code,name,is_active) VALUES($1,$2,true) RETURNING id`,[sourceCode('CONC',row.id),row.nombre])) as IdRow[];
|
|
||||||
if(!created?.id)throw new Error(`Could not create concession ${row.nombre}`); concessionIds.set(row.id,created.id);
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.seedFamiliesAndFindings(q);
|
|
||||||
|
|
||||||
const companyIds=new Map<number,string>();
|
|
||||||
for(const row of SOURCE.companies){
|
|
||||||
const id=await this.asset(q,companyType,null,null,null,null,sourceCode('ORG',row.id),row.nombre,'modelo_yacimientos.sql',`empresas:${row.id}`);
|
|
||||||
companyIds.set(row.id,id);
|
|
||||||
await q.query(`INSERT INTO organization_profiles(asset_id,organization_kind,legal_name) VALUES($1::uuid,$2::organization_kind,$3)`,[id,row.nombre.toUpperCase().startsWith('UTE (')?'UTE':'COMPANY',row.nombre]);
|
|
||||||
await this.link(q,id,territoryDoc.id,`Empresa · source id ${row.id}`);
|
|
||||||
}
|
|
||||||
const departmentIds=new Map<number,string>();
|
|
||||||
for(const row of SOURCE.departments){
|
|
||||||
const id=await this.asset(q,departmentType,null,null,null,null,sourceCode('DEP',row.id),row.nombre,'modelo_yacimientos.sql',`departamentos:${row.id}`);
|
|
||||||
departmentIds.set(row.id,id); await this.link(q,id,territoryDoc.id,`Departamento · source id ${row.id}`);
|
|
||||||
}
|
|
||||||
const areaIds=new Map<number,string>();
|
|
||||||
for(const row of SOURCE.areas){
|
|
||||||
const parent=departmentIds.get(row.departamento_id); if(!parent)throw new Error(`Missing source Departamento ${row.departamento_id}`);
|
|
||||||
const id=await this.asset(q,areaType,parent,null,null,null,sourceCode('AREA',row.id),row.nombre,'modelo_yacimientos.sql',`areas:${row.id}`);
|
|
||||||
areaIds.set(row.id,id); await this.link(q,id,territoryDoc.id,`Área · source id ${row.id}`);
|
|
||||||
}
|
|
||||||
for(const row of SOURCE.fields){
|
|
||||||
const area=areaIds.get(row.area_id); const company=companyIds.get(row.empresa_id); const concession=concessionIds.get(row.tipo_concesion_id);
|
|
||||||
if(!area||!company||!concession)throw new Error(`Incomplete source relations for Yacimiento ${row.id}`);
|
|
||||||
const id=await this.asset(q,fieldType,area,area,company,concession,sourceCode('YAC',row.id),row.nombre,'modelo_yacimientos.sql',`yacimientos:${row.id}`);
|
|
||||||
await this.link(q,id,territoryDoc.id,`Yacimiento · source id ${row.id}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
await q.query(`TRUNCATE TABLE area_company_relations CASCADE`);
|
|
||||||
await q.query(`TRUNCATE TABLE area_legal_rights CASCADE`);
|
|
||||||
const projectedPairs=new Set<string>();
|
|
||||||
const projectedRights=new Set<string>();
|
|
||||||
for(const row of SOURCE.fields){
|
|
||||||
const area=areaIds.get(row.area_id)!; const company=companyIds.get(row.empresa_id)!; const concession=concessionIds.get(row.tipo_concesion_id)!;
|
|
||||||
const pair=`${area}|${company}`;
|
|
||||||
if(!projectedPairs.has(pair)){
|
|
||||||
projectedPairs.add(pair);
|
|
||||||
await q.query(`INSERT INTO area_company_relations(area_id,company_id,relation_role,source_document_id,valid_from,start_reason)
|
|
||||||
VALUES($1::uuid,$2::uuid,'OPERATOR',$3::uuid,CURRENT_TIMESTAMP,$4)`,[area,company,territoryDoc.id,'Derivado automáticamente de Yacimientos del modelo autoritativo']);
|
|
||||||
}
|
|
||||||
const rightKey=`${area}|${concession}`;
|
|
||||||
if(!projectedRights.has(rightKey)){
|
|
||||||
projectedRights.add(rightKey);
|
|
||||||
const concessionRow=SOURCE.concessionTypes.find((item)=>item.id===row.tipo_concesion_id)!;
|
|
||||||
await q.query(`INSERT INTO area_legal_rights(area_id,right_type,name,status,source_document_id,notes)
|
|
||||||
VALUES($1::uuid,$2::area_legal_right_type,$3,'ACTIVE',$4::uuid,$5)`,[
|
|
||||||
area,concessionRow.nombre==='Exploración'?'EXPLORATION_PERMIT':'EXPLOITATION_CONCESSION',
|
|
||||||
`${concessionRow.nombre} · proyección del Yacimiento`,territoryDoc.id,'Compatibilidad derivada; el Tipo de concesión canónico está en Yacimiento.']);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.installFamilyFindingSync(q);
|
|
||||||
await this.verify(q);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down():Promise<void>{
|
|
||||||
throw new Error('Authoritative inventory model is a deliberate clean-load migration; restore the deploy PRE database backup.');
|
|
||||||
}
|
|
||||||
|
|
||||||
private assertSource():void{
|
|
||||||
if(SOURCE.departments.length!==7||SOURCE.companies.length!==13||SOURCE.concessionTypes.length!==2||SOURCE.areas.length!==64||SOURCE.fields.length!==230)
|
|
||||||
throw new Error('Authoritative territory source cardinality mismatch');
|
|
||||||
if(SOURCE.installationFamilies.length!==14||SOURCE.subinstallationFamilies.length!==109||SOURCE.findings.length!==181||SOURCE.installationFindings.length!==48||SOURCE.subinstallationFindings.length!==880)
|
|
||||||
throw new Error('Authoritative inventory source cardinality mismatch');
|
|
||||||
for(const area of SOURCE.areas) if(!SOURCE.departments.some((d)=>d.id===area.departamento_id)) throw new Error(`Area ${area.id} has no source Departamento`);
|
|
||||||
for(const field of SOURCE.fields){
|
|
||||||
if(!SOURCE.areas.some((a)=>a.id===field.area_id)||!SOURCE.companies.some((c)=>c.id===field.empresa_id)||!SOURCE.concessionTypes.some((c)=>c.id===field.tipo_concesion_id))
|
|
||||||
throw new Error(`Yacimiento ${field.id} has invalid source relationship`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async insertCommonAttributes(q:QueryRunner,typeId:string,rows:Array<[string,string,number]>):Promise<void>{
|
|
||||||
for(const [code,name,sortOrder] of rows) await q.query(`
|
|
||||||
INSERT INTO asset_attribute_definitions(asset_type_id,code,name,data_type,is_required,is_active,unit,options,sort_order)
|
|
||||||
VALUES($1::uuid,$2,$3,'TEXT'::asset_attribute_data_type,false,true,NULL,NULL,$4)
|
|
||||||
`,[typeId,code,name,sortOrder]);
|
|
||||||
}
|
|
||||||
|
|
||||||
private async seedFamiliesAndFindings(q:QueryRunner):Promise<void>{
|
|
||||||
const installationIds=new Map<number,string>();
|
|
||||||
for(const row of SOURCE.installationFamilies){
|
|
||||||
const [created]=(await q.query(`INSERT INTO inventory_families(code,name,level,information_labels,source_reference,is_active)
|
|
||||||
VALUES($1,$2,'INSTALLATION','[]'::jsonb,$3,true) RETURNING id`,[sourceCode('AUTH-I',row.id),row.nombre,`modelo_relacional:instalaciones:${row.id}`])) as IdRow[];
|
|
||||||
if(!created?.id)throw new Error(`Could not create Instalación family ${row.id}`); installationIds.set(row.id,created.id);
|
|
||||||
}
|
|
||||||
const subIds=new Map<number,string>();
|
|
||||||
for(const row of SOURCE.subinstallationFamilies){
|
|
||||||
const [created]=(await q.query(`INSERT INTO inventory_families(code,name,level,information_labels,source_reference,is_active)
|
|
||||||
VALUES($1,$2,'SUBINSTALLATION','[]'::jsonb,$3,true) RETURNING id`,[sourceCode('AUTH-S',row.id),row.nombre,`modelo_relacional:subinstalaciones:${row.id}`])) as IdRow[];
|
|
||||||
const parent=installationIds.get(row.instalacion_id); if(!created?.id||!parent)throw new Error(`Invalid Subinstalación family ${row.id}`);
|
|
||||||
subIds.set(row.id,created.id);
|
|
||||||
await q.query(`INSERT INTO inventory_family_parent_rules(child_family_id,parent_family_id) VALUES($1::uuid,$2::uuid)`,[created.id,parent]);
|
|
||||||
}
|
|
||||||
|
|
||||||
const [category]=(await q.query(`INSERT INTO finding_categories(code,name,sort_order,is_active) VALUES($1,$2,300,true) RETURNING id`,[FINDING_CATEGORY_CODE,'DH · Hallazgos del modelo autoritativo'])) as IdRow[];
|
|
||||||
if(!category?.id)throw new Error('Could not create authoritative finding category');
|
|
||||||
const findingIds=new Map<number,string>();
|
|
||||||
for(const row of SOURCE.findings){
|
|
||||||
const [created]=(await q.query(`INSERT INTO finding_catalog_items(category_id,code,source_number,title,import_note,revision,is_active)
|
|
||||||
VALUES($1::uuid,$2,$3,$4,$5,1,true) RETURNING id`,[category.id,sourceCode('AUTH-H',row.id),row.id,row.nombre,'modelo_relacional instalaciones y sub.sql'])) as IdRow[];
|
|
||||||
if(!created?.id)throw new Error(`Could not create Hallazgo ${row.id}`); findingIds.set(row.id,created.id);
|
|
||||||
await q.query(`INSERT INTO finding_catalog_item_versions(item_id,revision,snapshot,actor_username)
|
|
||||||
SELECT item.id,item.revision,jsonb_build_object('id',item.id,'categoryId',item.category_id,'code',item.code,'sourceNumber',item.source_number,'title',item.title,'revision',item.revision,'isActive',item.is_active),'migration:AUTHORITATIVE'
|
|
||||||
FROM finding_catalog_items item WHERE item.id=$1::uuid`,[created.id]);
|
|
||||||
}
|
|
||||||
for(const mapping of SOURCE.installationFindings){
|
|
||||||
const family=installationIds.get(mapping.instalacion_id); const finding=findingIds.get(mapping.hallazgo_id);
|
|
||||||
if(!family||!finding)throw new Error('Invalid installation finding mapping');
|
|
||||||
await q.query(`INSERT INTO finding_catalog_item_inventory_families(catalog_item_id,inventory_family_id) VALUES($1::uuid,$2::uuid)`,[finding,family]);
|
|
||||||
}
|
|
||||||
for(const mapping of SOURCE.subinstallationFindings){
|
|
||||||
const family=subIds.get(mapping.subinstalacion_id); const finding=findingIds.get(mapping.hallazgo_id);
|
|
||||||
if(!family||!finding)throw new Error('Invalid subinstallation finding mapping');
|
|
||||||
await q.query(`INSERT INTO finding_catalog_item_inventory_families(catalog_item_id,inventory_family_id) VALUES($1::uuid,$2::uuid)`,[finding,family]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async installFamilyFindingSync(q:QueryRunner):Promise<void>{
|
|
||||||
await q.query(`
|
|
||||||
CREATE OR REPLACE FUNCTION sync_asset_inventory_family_catalog()
|
|
||||||
RETURNS trigger LANGUAGE plpgsql AS $$
|
|
||||||
BEGIN
|
|
||||||
DELETE FROM finding_catalog_asset_overrides WHERE asset_id=NEW.id AND reason LIKE 'AUTHORITATIVE familia técnica:%';
|
|
||||||
IF NEW.inventory_family_id IS NOT NULL THEN
|
|
||||||
INSERT INTO finding_catalog_asset_overrides(asset_id,catalog_item_id,is_enabled,reason,created_by,updated_by)
|
|
||||||
SELECT NEW.id,m.catalog_item_id,true,'AUTHORITATIVE familia técnica: catálogo contextual automático',NEW.created_by,NEW.updated_by
|
|
||||||
FROM finding_catalog_item_inventory_families m WHERE m.inventory_family_id=NEW.inventory_family_id
|
|
||||||
ON CONFLICT(asset_id,catalog_item_id) DO UPDATE SET is_enabled=true,reason='AUTHORITATIVE familia técnica: catálogo contextual automático',updated_by=NEW.updated_by,updated_at=CURRENT_TIMESTAMP;
|
|
||||||
END IF;
|
|
||||||
RETURN NEW;
|
|
||||||
END $$
|
|
||||||
`);
|
|
||||||
await q.query(`
|
|
||||||
CREATE OR REPLACE FUNCTION sync_inventory_family_mapping_assets()
|
|
||||||
RETURNS trigger LANGUAGE plpgsql AS $$
|
|
||||||
BEGIN
|
|
||||||
IF TG_OP='DELETE' THEN
|
|
||||||
DELETE FROM finding_catalog_asset_overrides o USING assets a
|
|
||||||
WHERE o.asset_id=a.id AND a.inventory_family_id=OLD.inventory_family_id AND o.catalog_item_id=OLD.catalog_item_id AND o.reason LIKE 'AUTHORITATIVE familia técnica:%';
|
|
||||||
RETURN OLD;
|
|
||||||
END IF;
|
|
||||||
INSERT INTO finding_catalog_asset_overrides(asset_id,catalog_item_id,is_enabled,reason,created_by,updated_by)
|
|
||||||
SELECT a.id,NEW.catalog_item_id,true,'AUTHORITATIVE familia técnica: catálogo contextual automático',a.created_by,a.updated_by
|
|
||||||
FROM assets a WHERE a.inventory_family_id=NEW.inventory_family_id
|
|
||||||
ON CONFLICT(asset_id,catalog_item_id) DO UPDATE SET is_enabled=true,reason='AUTHORITATIVE familia técnica: catálogo contextual automático',updated_at=CURRENT_TIMESTAMP;
|
|
||||||
RETURN NEW;
|
|
||||||
END $$
|
|
||||||
`);
|
|
||||||
}
|
|
||||||
|
|
||||||
private async asset(q:QueryRunner,typeId:string,parentId:string|null,areaId:string|null,companyId:string|null,concessionId:string|null,
|
|
||||||
code:string,name:string,sourceName:string,sourceReference:string):Promise<string>{
|
|
||||||
const [row]=(await q.query(`INSERT INTO assets(asset_type_id,parent_id,operational_area_id,operator_company_id,concession_type_id,inventory_family_id,
|
|
||||||
code,name,information_status,operational_status,data_origin,source_name,source_reference,is_inventory_instance)
|
|
||||||
VALUES($1::uuid,$2::uuid,$3::uuid,$4::uuid,$5::uuid,NULL,$6,$7,'VALIDATED','UNKNOWN','PROVIDED_DOCUMENT',$8,$9,false) RETURNING id`,
|
|
||||||
[typeId,parentId,areaId,companyId,concessionId,code,name,sourceName,sourceReference])) as IdRow[];
|
|
||||||
if(!row?.id)throw new Error(`Could not seed ${code}`); return row.id;
|
|
||||||
}
|
|
||||||
|
|
||||||
private async link(q:QueryRunner,assetId:string,documentId:string,notes:string):Promise<void>{
|
|
||||||
await q.query(`INSERT INTO asset_source_documents(asset_id,document_id,relation_type,notes) VALUES($1::uuid,$2::uuid,'SOURCE',$3)`,[assetId,documentId,notes]);
|
|
||||||
}
|
|
||||||
|
|
||||||
private async type(q:QueryRunner,sql:string):Promise<string>{
|
|
||||||
const rows=(await q.query(sql)) as IdRow[]; if(!rows[0]?.id)throw new Error(`Missing canonical asset type: ${sql}`); return rows[0].id;
|
|
||||||
}
|
|
||||||
|
|
||||||
private async verify(q:QueryRunner):Promise<void>{
|
|
||||||
const [row]=await q.query(`SELECT
|
|
||||||
(SELECT COUNT(*) FROM assets a JOIN asset_types t ON t.id=a.asset_type_id WHERE t.operational_role='COMPANY')::integer companies,
|
|
||||||
(SELECT COUNT(*) FROM assets a JOIN asset_types t ON t.id=a.asset_type_id WHERE lower(t.code)='departamento')::integer departments,
|
|
||||||
(SELECT COUNT(*) FROM assets a JOIN asset_types t ON t.id=a.asset_type_id WHERE lower(t.code)='area')::integer areas,
|
|
||||||
(SELECT COUNT(*) FROM assets a JOIN asset_types t ON t.id=a.asset_type_id WHERE lower(t.code)='yacimiento')::integer fields,
|
|
||||||
(SELECT COUNT(*) FROM concession_types)::integer concessions,
|
|
||||||
(SELECT COUNT(*) FROM inventory_families WHERE level='INSTALLATION')::integer installation_families,
|
|
||||||
(SELECT COUNT(*) FROM inventory_families WHERE level='SUBINSTALLATION')::integer subinstallation_families,
|
|
||||||
(SELECT COUNT(*) FROM finding_catalog_items)::integer findings,
|
|
||||||
(SELECT COUNT(*) FROM finding_catalog_item_inventory_families m JOIN inventory_families f ON f.id=m.inventory_family_id WHERE f.level='INSTALLATION')::integer installation_mappings,
|
|
||||||
(SELECT COUNT(*) FROM finding_catalog_item_inventory_families m JOIN inventory_families f ON f.id=m.inventory_family_id WHERE f.level='SUBINSTALLATION')::integer subinstallation_mappings,
|
|
||||||
(SELECT COUNT(*) FROM assets y JOIN asset_types t ON t.id=y.asset_type_id JOIN assets a ON a.id=y.parent_id WHERE lower(t.code)='yacimiento' AND (y.operational_area_id IS DISTINCT FROM a.id OR y.operator_company_id IS NULL OR y.concession_type_id IS NULL))::integer invalid_fields`);
|
|
||||||
const expected:Record<string,number>={companies:13,departments:7,areas:64,fields:230,concessions:2,installation_families:14,subinstallation_families:109,findings:181,installation_mappings:48,subinstallation_mappings:880,invalid_fields:0};
|
|
||||||
for(const [key,value] of Object.entries(expected)) if(Number(row?.[key]??-1)!==value)throw new Error(`Authoritative inventory verification failed: ${key}=${row?.[key]} expected=${value}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,179 +0,0 @@
|
|||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class F7SimpleInventoryContext1790110200000 implements MigrationInterface {
|
|
||||||
name = 'F7SimpleInventoryContext1790110200000';
|
|
||||||
|
|
||||||
public async up(q: QueryRunner): Promise<void> {
|
|
||||||
await q.query(`
|
|
||||||
UPDATE asset_types
|
|
||||||
SET description='Yacimiento. Pertenece a un Área, tiene una única Empresa operadora vigente y puede recibir Hallazgos.',
|
|
||||||
updated_at=CURRENT_TIMESTAMP
|
|
||||||
WHERE lower(code)='yacimiento'
|
|
||||||
`);
|
|
||||||
|
|
||||||
await q.query(`
|
|
||||||
CREATE OR REPLACE FUNCTION enforce_authoritative_inventory_relationships()
|
|
||||||
RETURNS trigger LANGUAGE plpgsql AS $$
|
|
||||||
DECLARE
|
|
||||||
kind text;
|
|
||||||
asset_role asset_type_operational_role;
|
|
||||||
parent_kind text;
|
|
||||||
parent_area uuid;
|
|
||||||
parent_company uuid;
|
|
||||||
parent_family uuid;
|
|
||||||
company_role asset_type_operational_role;
|
|
||||||
family_level text;
|
|
||||||
BEGIN
|
|
||||||
SELECT lower(code),operational_role INTO kind,asset_role FROM asset_types WHERE id=NEW.asset_type_id;
|
|
||||||
IF kind IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='asset type does not exist'; END IF;
|
|
||||||
|
|
||||||
IF asset_role='COMPANY'::asset_type_operational_role THEN
|
|
||||||
IF NEW.parent_id IS NOT NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Empresa no admite padre'; END IF;
|
|
||||||
NEW.operational_area_id:=NULL; NEW.operator_company_id:=NULL; NEW.concession_type_id:=NULL;
|
|
||||||
NEW.inventory_family_id:=NULL; NEW.is_inventory_instance:=false;
|
|
||||||
RETURN NEW;
|
|
||||||
ELSIF kind='departamento' THEN
|
|
||||||
IF NEW.parent_id IS NOT NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Departamento no admite padre'; END IF;
|
|
||||||
NEW.operational_area_id:=NULL; NEW.operator_company_id:=NULL; NEW.concession_type_id:=NULL;
|
|
||||||
NEW.inventory_family_id:=NULL; NEW.is_inventory_instance:=false;
|
|
||||||
RETURN NEW;
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
IF NEW.parent_id IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='El nivel requiere un padre estructural'; END IF;
|
|
||||||
SELECT lower(parent_type.code), parent.operational_area_id, parent.operator_company_id, parent.inventory_family_id
|
|
||||||
INTO parent_kind,parent_area,parent_company,parent_family
|
|
||||||
FROM assets parent JOIN asset_types parent_type ON parent_type.id=parent.asset_type_id
|
|
||||||
WHERE parent.id=NEW.parent_id AND parent.information_status<>'INACTIVE';
|
|
||||||
IF parent_kind IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='El padre estructural no existe o está inactivo'; END IF;
|
|
||||||
|
|
||||||
IF kind='area' THEN
|
|
||||||
IF parent_kind<>'departamento' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Área debe pertenecer a un Departamento'; END IF;
|
|
||||||
NEW.operational_area_id:=NULL; NEW.operator_company_id:=NULL; NEW.concession_type_id:=NULL;
|
|
||||||
NEW.inventory_family_id:=NULL; NEW.is_inventory_instance:=false;
|
|
||||||
ELSIF kind='yacimiento' THEN
|
|
||||||
IF parent_kind<>'area' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Yacimiento debe pertenecer a un Área'; END IF;
|
|
||||||
IF NEW.operator_company_id IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Yacimiento requiere una Empresa operadora'; END IF;
|
|
||||||
SELECT type.operational_role INTO company_role
|
|
||||||
FROM assets company JOIN asset_types type ON type.id=company.asset_type_id
|
|
||||||
WHERE company.id=NEW.operator_company_id AND company.information_status<>'INACTIVE' AND type.is_active=true;
|
|
||||||
IF company_role IS DISTINCT FROM 'COMPANY'::asset_type_operational_role THEN
|
|
||||||
RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='La Empresa operadora del Yacimiento no es válida';
|
|
||||||
END IF;
|
|
||||||
IF NOT EXISTS(
|
|
||||||
SELECT 1 FROM area_company_relations relation
|
|
||||||
WHERE relation.area_id=NEW.parent_id
|
|
||||||
AND relation.company_id=NEW.operator_company_id
|
|
||||||
AND relation.relation_role='OPERATOR'::area_organization_role
|
|
||||||
AND relation.valid_until IS NULL
|
|
||||||
) THEN
|
|
||||||
RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='La Empresa del Yacimiento debe estar vinculada como explotadora del Área';
|
|
||||||
END IF;
|
|
||||||
IF NEW.concession_type_id IS NOT NULL
|
|
||||||
AND NOT EXISTS(SELECT 1 FROM concession_types c WHERE c.id=NEW.concession_type_id AND c.is_active=true) THEN
|
|
||||||
RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='El Tipo de concesión indicado no es válido';
|
|
||||||
END IF;
|
|
||||||
IF NEW.operational_area_id IS NOT NULL AND NEW.operational_area_id<>NEW.parent_id THEN
|
|
||||||
RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='El Área operativa del Yacimiento debe coincidir con su Área padre';
|
|
||||||
END IF;
|
|
||||||
NEW.operational_area_id:=NEW.parent_id; NEW.inventory_family_id:=NULL; NEW.is_inventory_instance:=false;
|
|
||||||
ELSIF kind='instalacion' THEN
|
|
||||||
IF parent_kind<>'yacimiento' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Instalación debe pertenecer a un Yacimiento'; END IF;
|
|
||||||
SELECT level::text INTO family_level FROM inventory_families WHERE id=NEW.inventory_family_id AND is_active=true;
|
|
||||||
IF family_level IS DISTINCT FROM 'INSTALLATION' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Instalación requiere un Tipo de instalación válido'; END IF;
|
|
||||||
IF parent_company IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='El Yacimiento debe tener una Empresa operadora'; END IF;
|
|
||||||
NEW.operational_area_id:=parent_area; NEW.operator_company_id:=parent_company; NEW.concession_type_id:=NULL; NEW.is_inventory_instance:=true;
|
|
||||||
ELSIF kind='subinstalacion' THEN
|
|
||||||
IF parent_kind<>'instalacion' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Subinstalación debe pertenecer a una Instalación'; END IF;
|
|
||||||
SELECT level::text INTO family_level FROM inventory_families WHERE id=NEW.inventory_family_id AND is_active=true;
|
|
||||||
IF family_level IS DISTINCT FROM 'SUBINSTALLATION' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Subinstalación requiere un Tipo de subinstalación válido'; END IF;
|
|
||||||
IF NOT EXISTS(
|
|
||||||
SELECT 1 FROM inventory_family_parent_rules rule
|
|
||||||
WHERE rule.child_family_id=NEW.inventory_family_id AND rule.parent_family_id=parent_family
|
|
||||||
) THEN
|
|
||||||
RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='El Tipo de subinstalación no está habilitado dentro del Tipo de instalación padre';
|
|
||||||
END IF;
|
|
||||||
IF parent_company IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='La Instalación debe pertenecer a un Yacimiento con Empresa operadora'; END IF;
|
|
||||||
NEW.operational_area_id:=parent_area; NEW.operator_company_id:=parent_company; NEW.concession_type_id:=NULL; NEW.is_inventory_instance:=true;
|
|
||||||
END IF;
|
|
||||||
RETURN NEW;
|
|
||||||
END $$
|
|
||||||
`);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(q: QueryRunner): Promise<void> {
|
|
||||||
await q.query(`
|
|
||||||
UPDATE asset_types
|
|
||||||
SET description='Yacimiento. Pertenece a un Área y define directamente Tipo de concesión y Empresa relacionada.',
|
|
||||||
updated_at=CURRENT_TIMESTAMP
|
|
||||||
WHERE lower(code)='yacimiento'
|
|
||||||
`);
|
|
||||||
|
|
||||||
await q.query(`
|
|
||||||
CREATE OR REPLACE FUNCTION enforce_authoritative_inventory_relationships()
|
|
||||||
RETURNS trigger LANGUAGE plpgsql AS $$
|
|
||||||
DECLARE
|
|
||||||
kind text;
|
|
||||||
asset_role asset_type_operational_role;
|
|
||||||
parent_kind text;
|
|
||||||
parent_area uuid;
|
|
||||||
parent_company uuid;
|
|
||||||
parent_family uuid;
|
|
||||||
company_role asset_type_operational_role;
|
|
||||||
family_level text;
|
|
||||||
BEGIN
|
|
||||||
SELECT lower(code),operational_role INTO kind,asset_role FROM asset_types WHERE id=NEW.asset_type_id;
|
|
||||||
IF kind IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='asset type does not exist'; END IF;
|
|
||||||
|
|
||||||
IF asset_role='COMPANY'::asset_type_operational_role THEN
|
|
||||||
IF NEW.parent_id IS NOT NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Empresa no admite padre'; END IF;
|
|
||||||
NEW.operational_area_id:=NULL; NEW.operator_company_id:=NULL; NEW.concession_type_id:=NULL;
|
|
||||||
NEW.inventory_family_id:=NULL; NEW.is_inventory_instance:=false;
|
|
||||||
RETURN NEW;
|
|
||||||
ELSIF kind='departamento' THEN
|
|
||||||
IF NEW.parent_id IS NOT NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Departamento no admite padre'; END IF;
|
|
||||||
NEW.operational_area_id:=NULL; NEW.operator_company_id:=NULL; NEW.concession_type_id:=NULL;
|
|
||||||
NEW.inventory_family_id:=NULL; NEW.is_inventory_instance:=false;
|
|
||||||
RETURN NEW;
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
IF NEW.parent_id IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='El nivel requiere un padre estructural'; END IF;
|
|
||||||
SELECT lower(parent_type.code), parent.operational_area_id, parent.operator_company_id, parent.inventory_family_id
|
|
||||||
INTO parent_kind,parent_area,parent_company,parent_family
|
|
||||||
FROM assets parent JOIN asset_types parent_type ON parent_type.id=parent.asset_type_id
|
|
||||||
WHERE parent.id=NEW.parent_id AND parent.information_status<>'INACTIVE';
|
|
||||||
IF parent_kind IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='El padre estructural no existe o está inactivo'; END IF;
|
|
||||||
|
|
||||||
IF kind='area' THEN
|
|
||||||
IF parent_kind<>'departamento' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Área debe pertenecer a un Departamento'; END IF;
|
|
||||||
NEW.operational_area_id:=NULL; NEW.operator_company_id:=NULL; NEW.concession_type_id:=NULL;
|
|
||||||
NEW.inventory_family_id:=NULL; NEW.is_inventory_instance:=false;
|
|
||||||
ELSIF kind='yacimiento' THEN
|
|
||||||
IF parent_kind<>'area' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Yacimiento debe pertenecer a un Área'; END IF;
|
|
||||||
IF NEW.operator_company_id IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Yacimiento requiere Empresa relacionada'; END IF;
|
|
||||||
SELECT type.operational_role INTO company_role FROM assets company JOIN asset_types type ON type.id=company.asset_type_id
|
|
||||||
WHERE company.id=NEW.operator_company_id AND company.information_status<>'INACTIVE' AND type.is_active=true;
|
|
||||||
IF company_role IS DISTINCT FROM 'COMPANY'::asset_type_operational_role THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='La Empresa relacionada del Yacimiento no es válida'; END IF;
|
|
||||||
IF NEW.concession_type_id IS NULL OR NOT EXISTS(SELECT 1 FROM concession_types c WHERE c.id=NEW.concession_type_id AND c.is_active=true) THEN
|
|
||||||
RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Yacimiento requiere un Tipo de concesión válido';
|
|
||||||
END IF;
|
|
||||||
IF NEW.operational_area_id IS NOT NULL AND NEW.operational_area_id<>NEW.parent_id THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='El Área operativa del Yacimiento debe coincidir con su Área padre'; END IF;
|
|
||||||
NEW.operational_area_id:=NEW.parent_id; NEW.inventory_family_id:=NULL; NEW.is_inventory_instance:=false;
|
|
||||||
ELSIF kind='instalacion' THEN
|
|
||||||
IF parent_kind<>'yacimiento' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Instalación debe pertenecer a un Yacimiento'; END IF;
|
|
||||||
SELECT level::text INTO family_level FROM inventory_families WHERE id=NEW.inventory_family_id AND is_active=true;
|
|
||||||
IF family_level IS DISTINCT FROM 'INSTALLATION' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Instalación requiere un Tipo de instalación válido'; END IF;
|
|
||||||
NEW.operational_area_id:=parent_area; NEW.operator_company_id:=parent_company; NEW.concession_type_id:=NULL; NEW.is_inventory_instance:=true;
|
|
||||||
ELSIF kind='subinstalacion' THEN
|
|
||||||
IF parent_kind<>'instalacion' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Subinstalación debe pertenecer a una Instalación'; END IF;
|
|
||||||
SELECT level::text INTO family_level FROM inventory_families WHERE id=NEW.inventory_family_id AND is_active=true;
|
|
||||||
IF family_level IS DISTINCT FROM 'SUBINSTALLATION' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Subinstalación requiere un Tipo de subinstalación válido'; END IF;
|
|
||||||
IF NOT EXISTS(SELECT 1 FROM inventory_family_parent_rules rule WHERE rule.child_family_id=NEW.inventory_family_id AND rule.parent_family_id=parent_family) THEN
|
|
||||||
RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='El Tipo de subinstalación no es compatible con el Tipo de instalación padre';
|
|
||||||
END IF;
|
|
||||||
NEW.operational_area_id:=parent_area; NEW.operator_company_id:=parent_company; NEW.concession_type_id:=NULL; NEW.is_inventory_instance:=true;
|
|
||||||
END IF;
|
|
||||||
RETURN NEW;
|
|
||||||
END $$
|
|
||||||
`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -5,16 +5,10 @@ import {
|
|||||||
InspectionVisitActsController,
|
InspectionVisitActsController,
|
||||||
} from './inspection-acts.controller';
|
} from './inspection-acts.controller';
|
||||||
import { InspectionActsService } from './inspection-acts.service';
|
import { InspectionActsService } from './inspection-acts.service';
|
||||||
import { MobileInspectionActsController } from './mobile-inspection-acts.controller';
|
|
||||||
import { MobileInspectionActsService } from './mobile-inspection-acts.service';
|
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [AuditModule],
|
imports: [AuditModule],
|
||||||
controllers: [
|
controllers: [InspectionVisitActsController, InspectionActsController],
|
||||||
InspectionVisitActsController,
|
providers: [InspectionActsService],
|
||||||
MobileInspectionActsController,
|
|
||||||
InspectionActsController,
|
|
||||||
],
|
|
||||||
providers: [InspectionActsService, MobileInspectionActsService],
|
|
||||||
})
|
})
|
||||||
export class InspectionActsModule {}
|
export class InspectionActsModule {}
|
||||||
|
|||||||
@@ -1,18 +0,0 @@
|
|||||||
import { Controller, Get, Param, ParseUUIDPipe, Query } from '@nestjs/common';
|
|
||||||
import { RequirePermissions } from '../authorization/decorators/require-permissions.decorator';
|
|
||||||
import { ListInspectionActsQueryDto } from './dto/list-inspection-acts-query.dto';
|
|
||||||
import { MobileInspectionActsService } from './mobile-inspection-acts.service';
|
|
||||||
|
|
||||||
@Controller('inspection-visits/:visitId/acts/mobile')
|
|
||||||
export class MobileInspectionActsController {
|
|
||||||
constructor(private readonly acts: MobileInspectionActsService) {}
|
|
||||||
|
|
||||||
@Get()
|
|
||||||
@RequirePermissions('inspection_acts.read')
|
|
||||||
list(
|
|
||||||
@Param('visitId', new ParseUUIDPipe({ version: '4' })) visitId: string,
|
|
||||||
@Query() query: ListInspectionActsQueryDto,
|
|
||||||
) {
|
|
||||||
return this.acts.listForVisit(visitId, query);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,102 +0,0 @@
|
|||||||
import { Injectable, NotFoundException } from '@nestjs/common';
|
|
||||||
import { DataSource } from 'typeorm';
|
|
||||||
import type { ListInspectionActsQueryDto } from './dto/list-inspection-acts-query.dto';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Read model intentionally kept small for the field client.
|
|
||||||
*
|
|
||||||
* The Android app only needs the Act identity/lifecycle, deadlines and counters to
|
|
||||||
* open an Inspection. It must not fail because an office-document/report module is
|
|
||||||
* unavailable or temporarily schema-drifted. The canonical office endpoints keep
|
|
||||||
* their richer projection in InspectionActsService.
|
|
||||||
*/
|
|
||||||
@Injectable()
|
|
||||||
export class MobileInspectionActsService {
|
|
||||||
constructor(private readonly dataSource: DataSource) {}
|
|
||||||
|
|
||||||
async listForVisit(visitId: string, query: ListInspectionActsQueryDto) {
|
|
||||||
const [visit] = (await this.dataSource.query(
|
|
||||||
'SELECT id FROM inspection_visits WHERE id = $1::uuid',
|
|
||||||
[visitId],
|
|
||||||
)) as Array<{ id: string }>;
|
|
||||||
if (!visit) {
|
|
||||||
throw new NotFoundException({
|
|
||||||
code: 'INSPECTION_VISIT_NOT_FOUND',
|
|
||||||
message: 'Visita de inspección no encontrada',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const conditions = ['act.visit_id = $1::uuid'];
|
|
||||||
const parameters: unknown[] = [visitId];
|
|
||||||
const add = (value: unknown): string => {
|
|
||||||
parameters.push(value);
|
|
||||||
return `$${parameters.length}`;
|
|
||||||
};
|
|
||||||
|
|
||||||
if (query.search?.trim()) {
|
|
||||||
const search = add(`%${query.search.trim()}%`);
|
|
||||||
conditions.push(`(act.code ILIKE ${search} OR act.title ILIKE ${search})`);
|
|
||||||
}
|
|
||||||
if (query.status) conditions.push(`act.status = ${add(query.status)}`);
|
|
||||||
if (query.year) conditions.push(`act.act_year = ${add(query.year)}`);
|
|
||||||
if (query.dateFrom) conditions.push(`act.occurred_at::date >= ${add(query.dateFrom)}::date`);
|
|
||||||
if (query.dateTo) conditions.push(`act.occurred_at::date <= ${add(query.dateTo)}::date`);
|
|
||||||
|
|
||||||
const where = `WHERE ${conditions.join(' AND ')}`;
|
|
||||||
const [countRow] = (await this.dataSource.query(
|
|
||||||
`SELECT COUNT(*)::integer AS total FROM inspection_acts act ${where}`,
|
|
||||||
parameters,
|
|
||||||
)) as Array<{ total: number }>;
|
|
||||||
const total = Number(countRow?.total ?? 0);
|
|
||||||
|
|
||||||
const limit = add(query.pageSize);
|
|
||||||
const offset = add((query.page - 1) * query.pageSize);
|
|
||||||
const data = await this.dataSource.query(`
|
|
||||||
SELECT
|
|
||||||
act.id,
|
|
||||||
act.visit_id AS "visitId",
|
|
||||||
act.code,
|
|
||||||
act.status,
|
|
||||||
act.occurred_at AS "occurredAt",
|
|
||||||
act.title,
|
|
||||||
act.summary,
|
|
||||||
act.observations,
|
|
||||||
act.urgency,
|
|
||||||
act.deadline_days AS "deadlineDays",
|
|
||||||
act.deadline_day_type AS "deadlineDayType",
|
|
||||||
act.deadline_basis AS "deadlineBasis",
|
|
||||||
act.deadline_base_at AS "deadlineBaseAt",
|
|
||||||
act.deadline_at AS "deadlineAt",
|
|
||||||
act.locked_at AS "lockedAt",
|
|
||||||
act.locked_sha256 AS "lockedSha256",
|
|
||||||
act.sealed_at AS "sealedAt",
|
|
||||||
act.current_version AS "currentVersion",
|
|
||||||
act.closed_at AS "closedAt",
|
|
||||||
act.closure_sha256 AS "closureSha256",
|
|
||||||
COALESCE((
|
|
||||||
SELECT COUNT(*)::integer
|
|
||||||
FROM inspection_act_assets link
|
|
||||||
WHERE link.act_id = act.id AND link.included = true
|
|
||||||
), 0)::integer AS "assetCount",
|
|
||||||
COALESCE((
|
|
||||||
SELECT COUNT(*)::integer
|
|
||||||
FROM inspection_findings finding
|
|
||||||
WHERE finding.act_id = act.id AND finding.status <> 'VOIDED'
|
|
||||||
), 0)::integer AS "findingCount"
|
|
||||||
FROM inspection_acts act
|
|
||||||
${where}
|
|
||||||
ORDER BY act.act_year DESC, act.act_number DESC
|
|
||||||
LIMIT ${limit} OFFSET ${offset}
|
|
||||||
`, parameters);
|
|
||||||
|
|
||||||
return {
|
|
||||||
data,
|
|
||||||
meta: {
|
|
||||||
page: query.page,
|
|
||||||
pageSize: query.pageSize,
|
|
||||||
total,
|
|
||||||
totalPages: total === 0 ? 0 : Math.ceil(total / query.pageSize),
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -10,9 +10,9 @@ import { validateInspectionPlanningScope } from './inspection-planning-scope';
|
|||||||
import { InspectionVisitsService } from './inspection-visits.service';
|
import { InspectionVisitsService } from './inspection-visits.service';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creación WEB. La ubicación territorial es Departamento → Área → Yacimiento.
|
* Creación WEB F6.1. Separa explícitamente ubicación territorial y alcance:
|
||||||
* Empresa y Tipo de concesión pertenecen directamente al Yacimiento; por eso
|
* Departamento → Área → Yacimiento. La Operadora no es un padre físico; se
|
||||||
* la Operadora elegida debe coincidir con el Yacimiento seleccionado.
|
* valida contra la relación temporal vigente del Área para la fecha planificada.
|
||||||
*/
|
*/
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class InspectionPlanningCreateService {
|
export class InspectionPlanningCreateService {
|
||||||
@@ -52,27 +52,27 @@ export class InspectionPlanningCreateService {
|
|||||||
|
|
||||||
stage = 'operator:validate';
|
stage = 'operator:validate';
|
||||||
const [context] = await manager.query(`
|
const [context] = await manager.query(`
|
||||||
SELECT yacimiento.id
|
SELECT relation.id
|
||||||
FROM assets yacimiento
|
FROM area_company_relations relation
|
||||||
INNER JOIN asset_types yacimiento_type ON yacimiento_type.id=yacimiento.asset_type_id
|
INNER JOIN assets area ON area.id=relation.area_id
|
||||||
INNER JOIN assets company ON company.id=yacimiento.operator_company_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
|
INNER JOIN asset_types company_type ON company_type.id=company.asset_type_id
|
||||||
WHERE yacimiento.id=$1::uuid
|
WHERE relation.area_id=$1::uuid
|
||||||
AND yacimiento.parent_id=$2::uuid
|
AND relation.company_id=$2::uuid
|
||||||
AND yacimiento.operator_company_id=$3::uuid
|
AND relation.relation_role='OPERATOR'
|
||||||
AND lower(yacimiento_type.code)='yacimiento'
|
AND relation.valid_from <= $3::timestamptz
|
||||||
AND yacimiento_type.is_active=true
|
AND (relation.valid_until IS NULL OR relation.valid_until > $3::timestamptz)
|
||||||
AND yacimiento.information_status<>'INACTIVE'
|
AND area_type.operational_role='AREA'
|
||||||
AND yacimiento.concession_type_id IS NOT NULL
|
|
||||||
AND company_type.operational_role='COMPANY'
|
AND company_type.operational_role='COMPANY'
|
||||||
AND company_type.is_active=true
|
AND area.information_status<>'INACTIVE'
|
||||||
AND company.information_status<>'INACTIVE'
|
AND company.information_status<>'INACTIVE'
|
||||||
LIMIT 1
|
LIMIT 1
|
||||||
`, [scopeAssetId, dto.operationalAreaId, dto.operatorCompanyId]) as Array<{ id: string }>;
|
`, [dto.operationalAreaId, dto.operatorCompanyId, plannedStartAt]) as Array<{ id: string }>;
|
||||||
if (!context) {
|
if (!context) {
|
||||||
throw new BadRequestException({
|
throw new BadRequestException({
|
||||||
code: 'INSPECTION_OPERATOR_NOT_RELATED_TO_YACIMIENTO',
|
code: 'INSPECTION_OPERATOR_NOT_ACTIVE_IN_AREA',
|
||||||
message: 'La Empresa seleccionada no es la Empresa relacionada con el Yacimiento',
|
message: 'La Operadora seleccionada no está vigente para el Área en la fecha de la Inspección',
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -129,6 +129,8 @@ export class InspectionPlanningCreateService {
|
|||||||
VALUES ($1::uuid,$2::uuid,true,$3::uuid)
|
VALUES ($1::uuid,$2::uuid,true,$3::uuid)
|
||||||
`, [visit.id, dto.leadInspectorUserId, principal.userId]);
|
`, [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';
|
stage = 'checklist:insert';
|
||||||
await manager.query(`
|
await manager.query(`
|
||||||
INSERT INTO inspection_visit_checklist_items (
|
INSERT INTO inspection_visit_checklist_items (
|
||||||
@@ -195,7 +197,7 @@ export class InspectionPlanningCreateService {
|
|||||||
)
|
)
|
||||||
SELECT DISTINCT
|
SELECT DISTINCT
|
||||||
$1::uuid, item.asset_id, 'AUTO_INCLUDED', NULL, $2::uuid,
|
$1::uuid, item.asset_id, 'AUTO_INCLUDED', NULL, $2::uuid,
|
||||||
jsonb_build_object('generation',1,'source','AUTHORITATIVE_CREATE')
|
jsonb_build_object('generation',1,'source','F6.1_CREATE')
|
||||||
FROM inspection_visit_checklist_items item
|
FROM inspection_visit_checklist_items item
|
||||||
WHERE item.visit_id=$1::uuid
|
WHERE item.visit_id=$1::uuid
|
||||||
AND item.generation_number=1
|
AND item.generation_number=1
|
||||||
@@ -222,7 +224,6 @@ export class InspectionPlanningCreateService {
|
|||||||
operationalAreaId: dto.operationalAreaId,
|
operationalAreaId: dto.operationalAreaId,
|
||||||
scopeAssetId,
|
scopeAssetId,
|
||||||
operatorCompanyId: dto.operatorCompanyId,
|
operatorCompanyId: dto.operatorCompanyId,
|
||||||
operatorSource: 'YACIMIENTO',
|
|
||||||
plannedStartAt: plannedStartAt.toISOString(),
|
plannedStartAt: plannedStartAt.toISOString(),
|
||||||
leadInspectorUserId: dto.leadInspectorUserId,
|
leadInspectorUserId: dto.leadInspectorUserId,
|
||||||
},
|
},
|
||||||
@@ -242,7 +243,7 @@ export class InspectionPlanningCreateService {
|
|||||||
const technical = error instanceof Error
|
const technical = error instanceof Error
|
||||||
? `${error.name}: ${error.message}${error.stack ? `\n${error.stack}` : ''}`
|
? `${error.name}: ${error.message}${error.stack ? `\n${error.stack}` : ''}`
|
||||||
: String(error);
|
: String(error);
|
||||||
this.logger.error(`inspection create failed at ${stage}: ${technical}`);
|
this.logger.error(`F6.1 inspection create failed at ${stage}: ${technical}`);
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -67,34 +67,27 @@ export class InspectionPlanningHierarchyService {
|
|||||||
at?: string,
|
at?: string,
|
||||||
): Promise<{ data: InspectionPlanningHierarchyItem[] }> {
|
): Promise<{ data: InspectionPlanningHierarchyItem[] }> {
|
||||||
await this.requireType(areaId, 'area', 'El Área seleccionada no es válida');
|
await this.requireType(areaId, 'area', 'El Área seleccionada no es válida');
|
||||||
if (at) {
|
const effectiveAt = at ? new Date(at) : new Date();
|
||||||
const effectiveAt = new Date(at);
|
if (!Number.isFinite(effectiveAt.getTime())) {
|
||||||
if (!Number.isFinite(effectiveAt.getTime())) {
|
throw new BadRequestException({
|
||||||
throw new BadRequestException({
|
code: 'INSPECTION_PLANNING_DATE_INVALID',
|
||||||
code: 'INSPECTION_PLANNING_DATE_INVALID',
|
message: 'La fecha de planificación no es válida',
|
||||||
message: 'La fecha de planificación no es válida',
|
});
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
// Modelo autoritativo: la Empresa pertenece al Yacimiento. Para mantener el
|
|
||||||
// selector de planificación por Área, se proyectan las Empresas de todos los
|
|
||||||
// Yacimientos activos que pertenecen a esa Área.
|
|
||||||
const data = await this.dataSource.query(`
|
const data = await this.dataSource.query(`
|
||||||
SELECT DISTINCT company.id, company.code, COALESCE(profile.legal_name,company.name) AS name
|
SELECT DISTINCT company.id, company.code, company.name
|
||||||
FROM assets yacimiento
|
FROM area_company_relations relation
|
||||||
INNER JOIN asset_types yacimiento_type ON yacimiento_type.id=yacimiento.asset_type_id
|
INNER JOIN assets company ON company.id=relation.company_id
|
||||||
INNER JOIN assets company ON company.id=yacimiento.operator_company_id
|
INNER JOIN asset_types type ON type.id=company.asset_type_id
|
||||||
INNER JOIN asset_types company_type ON company_type.id=company.asset_type_id
|
WHERE relation.area_id=$1::uuid
|
||||||
LEFT JOIN organization_profiles profile ON profile.asset_id=company.id
|
AND relation.relation_role='OPERATOR'
|
||||||
WHERE yacimiento.parent_id=$1::uuid
|
AND relation.valid_from <= $2::timestamptz
|
||||||
AND lower(yacimiento_type.code)='yacimiento'
|
AND (relation.valid_until IS NULL OR relation.valid_until > $2::timestamptz)
|
||||||
AND yacimiento_type.is_active=true
|
AND type.operational_role='COMPANY'
|
||||||
AND yacimiento.information_status<>'INACTIVE'
|
AND type.is_active=true
|
||||||
AND company_type.operational_role='COMPANY'
|
|
||||||
AND company_type.is_active=true
|
|
||||||
AND company.information_status<>'INACTIVE'
|
AND company.information_status<>'INACTIVE'
|
||||||
ORDER BY name, company.code
|
ORDER BY company.name, company.code
|
||||||
`, [areaId]) as InspectionPlanningHierarchyItem[];
|
`, [areaId, effectiveAt]) as InspectionPlanningHierarchyItem[];
|
||||||
return { data };
|
return { data };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
export default 'eNqtfUtz5MiR5l+B4bBWZVZdlQgAAUA3MAmS6M1X54Pq7hnZGCqJYqM3maDyUdZVMh103MMctPMLdJyDDmO6jc2Nf2w9gCQZAQQSHwo6yMSu9PgCCHeP8Fc4/mTepY/J7vCQbg9783f/8iczuzN/Z70zt/nDx11q/s5cJFtjmOw2+d7887vyZyb9PM8+J3fJ5yx5+dWWfh0df33629a4S43h8Uv+QuJIJONkk+zun/4nffnVrcw+Tz4l6eblZy79vDw+Hrf3yeEV2pNnT4xZ8tX88x/emev84THZZqn+HWfpYff0j02a743F8S55SHfZOtnSf0XbdHf/xVi8D9/r3346vFF/ld9+tYyMNz+s4skynIRG9L9mRji/jibLmP5r8X7+fvT+nfH68ySaX/9kxJPbaLEcE9WiAH5nXIf013I6D68jI5xcGuP4crGcR+HYWETz23gYPRMOp+NZ+PTXp38PjeXiovjHt9olX2RbI3p43KX7xJg+prvkLt8l2uW/SQ4HWov/Iy/E4r2eFcn2PtcumMyS23SbZxv1d1/6/afZlfpjILNpOFd/tAbyr5vj/pEYmVfgLZnT0fvx++i9+rvM0NkvebrNfjOuN/nHZGPM031+3K3TfQVS5vL1l2tjKt4p3X3O1umJsyep29LYfZZvl18eG2Qv+u1xkx+Sdfb0j61WxgqC3TMBoSa7NFGwShVOhA7n/1bFv82+rpP1L8RlRYFrY5iqOJ/ph2SraHVtiLwKF8lul2zX0iSOZoQsheH9MTEu6NXvFNk7P2ZzyB43pMjrLKVdZUP6/eW4leXx7HuF9EO2/+Mxk2WzNsJVRhxpFpkFxiTfHVJZeAGAxXH3CpJvZekGRhczGlpBERpwli9DwfvjIVHU4ewaD5NfxWvSnk17Pm39pAfy5m+x1vGbh+M6V5SlZcDTfyV3Ys7wIdllNNvrWKeFo8P0E23WW2lEmwgN090uNy5zmtP4/iiLuMWhoVfEjSMdDtKcHjRwnG/oqHsd5beN+oV4l/xyTLdCfl7H6YSGq+Po5Wh3N25oXtrcJcUftM6Z/XLM7vKC/YmxSDaZtELM+pbhytMz1hEiE+9gTNJ76YhirSI1MW7j2AhfRzitI767faVuFaJ8+2lDjFlnlbdrE6FoY4yT7ddEkljmtY+Zkcwp50PbtkNjFvl+mxL3XwcFLRNd5x/T3VZYA0b4hcyy182/TWy+T4QFt6HdgkwKYtwsS+8kftltckMHzgWdaq8DWMv7FabdJn+QhrTJxCjb3qW7XPd4bcIx2oijbZtKO5PdJiIjejhjSHxLaNbk1Xy1eduriYGl8I9l5bM9ZEZiwmX2OduLWaWn1cmLYirTVr/Md3di990b03QvHXF224YzFobkbbq7ex3jDFreUryaUe6L4YZOZDLA//Yq306bwMyS/WmH2BtketzR/6nnssNaEb48/fe28qqO3fKqpeTQsZiLs5ym/S7aH3bH9eFIm1S8PaS7h/ROcoacNtGa0QGfSi/uttPvD7nY2bcJyfPX15EcG0mnkFj6ymp5be9dDp7lX3PBtTVtEsZ0vc7uhJn4KtyO/y04u6yCEmCvMs9/lexNd9A6ansg+U4Kw/HmmG3Xssi5Vsujz9NPx/ssN+o+p9sma3MaVphyr0PsFsNmXsy0PX5JpEdsE6bTYRl+PW6UY8l1sYFiYSbpZ/nQcNvE6pbMw9IWF498vRNS+Tq6zb6+Te+T2iC/ZW1+TsiZl9YyAM0vYQsZkazvfNBuSMRkSKjawtt2p3mypS1tUx3WJiYX+SZV923eeqjRbj1Ldpvy51dl4A5uXJ6ekjzLT1m6udO7qaWRTiJCG51Z+qDPrmZahhKe/5M8tPzfSs+XXJ3yX3V+rVDHRN3DZWDWCVjvikpwdic4eaVW97SKKXlR3w7nNri9EqCjArLzgLzdJ5awXRXbPo/t1TRnlNGWt06+HdKvQQp7Pv92wEAPWGx63wyqRJNeQwUSHu/EdSXw9IJXfcaOmIrzS4KefU02QonCj8mveQ9cW3UefjimD+IY+HbA6i4ltDIlf1DsUt+O6tatgHDzKdn1eVIlilkchPS0m9oO0hHVa0YttHRMdmKfp/bP4Jc7+rdjB/oQlIzoqYiOFpHJcYd6SEzG81U8twXPqp6B+boqWR2fkGlM5UwYJkkPULstlpcrG3WgovOWw9TRHXonj+abzyrmalEr7OqIyZWc0HYjjv7vnrevHrheFyXoiO3roqiy5TNQ8bwWvECNseb1EKsMbnWyB+yBDrx09frAWrVz9tVG7QHLKlEL0t90I7zp0jrvgWwrLtSWyF6Dyj1gdfFtGY512hZst2ZYNz2n3cmCsXmNXycZm2R3FQHriOyp9sHwl2x7n/d7WL8S48zIIdmq20FXyEAPWd29OsI6AzXyOCJv4Pg16YOoZJ8Tsg3zXS885fQSG9/XY9qLO45Gk4qdtReoUwclAY3262STb3stgKtLCsl4TjcHkKssp0ekBc0qJ0BHTE8TCNtl6aHXg/pnc1sysNtpk3IUI3B7yNbiMNkYRZQ5POySzwSkGkdWxcz0W7ziwZncWg9Yqxm2bhx1BWdnwKu7TEdoW2OBJtu9CFn2gVWCdflmnWyNRSJCL2M6b3ohuw0pzrrpZVXs5qAFmTcEezX864jsNT1zb2S/OXUro/rd1jg4n9iVkbt5D3zQmvaVo3GDTtsxt1qTwsN0exBxmz6zMHSWRZ9Z7NZZavLedQosh95jAtWp+zU3hNM8yj+qIsSsbqi882N3nMBDJijshz6z+PVkOxkmVVekK2rFFv05qVgkHfG8gdZ2GuYirNYH1zqD25N/Xv20FHI3Tjeb7GtF9FinfdGTlfIy3X/KNoVXalwkX/I+uM4Z3LpIdASvVGiM812vZ+UVuU2yfbLthSjr2/WRzLtNHzRftaGH+aZiMHYFDCpeU5HT6wHoD85l1nvgWk159z6gmghlUQPTh+O+rauakvFsBO/Fa/BrNVUyltMp';
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
export default 'yOu7ZyquZFi3k+Hjy2pzcSQpmqebz8cHBZJ3iu35nrJrkCqmh0x1Yroi+pUA9zi/zw/pvg9kUIEsnYFemMGgWtKz/CXNeiFamjz6sM9SBtWyilO5QQ9EJaxPpxodDcNcmCfputeTOnXc8rzcHtd5r1V19TWIPRC5FrHuRnXF9fS4VZ3viFo18ZJ9NdTaFVHRpuxoDI9k1Gx7IFqDgbYKUATFH0m19r2wNScSHck/kHYlvXCZ1nauO0Rex1S83VDMKmP6nRx0a1C5SUBCVYlgs4oLLVI85yHrIZCb5CFZ61zCztj1YP7NMdkeN/1QvQbUmoZ1Rq7oGHkQa3Iw+2EGWsx/wuoqxR768uW6ud95Eqt9kr7LbjFATOxBV1RZ/35K1tmDqNEUx9zNwki3xjA1LtJt+ilb04H6/XDWb7JKtbu29qY7qqt/hYjM3OINisjQP/EtuDrfe4M4fqwzvJj7Iu0/n9dZuLrP4evXkI6OcPOY7O6FE/ZPeyHVvXt4fC4q7wPKBpprBjKg1e0QUStPNsI0qduTnUGZ7nQmCz29r1QxdgXW5RSOT/+Vf+2F6lRu6F6JIpFsrxq/nVH19ztkRNYRkVcs/5t8WzEhOhbfeW0Vgl0BfU2J7WWlxLYrZuXMvCC/kWzdbQ9IpbzktTpQcwx3xLVU3Hm+T3oxSKksEXppXCS/ijUti4L6INtqaGybrHNNQrwrauUS1O3p1m0PRFeLaPyrGf6r2QeX63GLY7QSJuyI7OmRa9ZXR1hfD9tbZgM9btWO61gtqx5Te9qqdg/ZfZ+SeEspMqnffpM3VhsJzEnI7ByypvKuK759Fr9q1XRFb7jaJ0M63U4axz1z80/G7VaDYTl1H/B0Wy5R9nO7WuDbKhvemRuHvYD9usWxEYGG9OOuEv3vjh1UHzpSbjvK2F43mXAHLZchZWy/GxOVghTprqQMGXQsg2f6q5SisFwrIM6gm0ArxSjiygqdoeEu3dIBrcBanbINllKMIhUVFdd/hPNyqIblOs+gRGSOu11mDCv2VGfISqgz3CQPtYBkZ9DKqVcubqXArDOof/aKbC/oALl922MCrs1vn1a7F7Baa/nluK2rtMM6pZAspfKkdidYQba7BVS5Xb8cLMM53fYe7oAZTsftuKqa4q9kk2zqN7scjjyyhMxrN4fIYd33gvTaEsedEX0dYs1m7QwbtFzY7oGtKyCpOzCdUS38lrg8jddxGnZ+GgXb76bMSi2J0qpFBg26HaCeRvHCu/xj2gvUbboE3weUV+Mue8JS00LuoCO7PG09ulHcHMizPx7TXuj+2Vv9quXTGTyoXtaN9kR7l6nGq1u9+Mza7usN0COjO7RVb1PQD5Bpe+z1grR1kPWTuDuwU7tjVweFAoevp6ZSeSJ3YpAx7Y73NfmZRg0ybscTXqk9qfdxkJE7Op9KDUqhCeKe8S6rSGu3onHLb7xXIIzIz1n1JlxX/EB7FW66SQ6V+svOwPV7Bc83GLNDP+R6Cq8MH/RDrR9rel+5M7BzBrgmzl3B63YlHRrXSc8VrsdRZsnukPVcYdWHuz9uS9WbZfmv/YD9aqAj3KieYWfEQIdYs1c7wrJ6yUoB208G2MCqoWrvG3XGZVXPgiShem28M6hdAR0mn5OekI4Wsj+33Erf3U15++6QbLP9Jsl7YXMNtqbLQWdcr5YUnhF65QJuZ1S/tSawM2SgheyrC0qdStEtSSzrKO+1hTOlMEXuwSRjVlw0y24DZZpk5mhDZ/rXatywY9cgy67U14oU6dfKBc+OkE597y6cn+xzryd1K3mc70Wrg30fRLUHWdm1eSRKL/qAehVhXaTrl7vi4upHskl1l+06zuLXm3bJAtYtjs6U+pBaF4na7tix3QMbnO0YJj930E3ZlJIRpaGY3KFl0LFdCWvsNyajWh1RbW07MhmRdUQ8161MxrU74rrnmpnJwE5HYK7rela0t9uuRQ/Wb9cHVtW62yz9tU+Klyn1I1InyuHu+LUh1dtxgqChlfi3r4JSTHKbiFYt42O6O3zTQvzhnZltyYDZCP8u314lD9mmqcv/RbiM5nGobbI+Ww61Lfxny1DbQn81iS/DS2MUDpfaxvnLeThZzKbzZaRtlj+T/l0xcKTHU4Jcy2ttR/x5NJsu4uV0Hk8bmuJPf54u9K3wh+HoMpqH+j748+jSGE4n9BpGPBlGk8tYhlFWaBROlqFxGRkRkUfXoaltAfZKNpuO4nE0F3jEvf3xYxsDy9+LZkm17vbD6Sga0vvLTD1HvwwnP6wimdXt1OVCTEeyIACjrsUXHcKRLB7AqNlqNH76j4ksNcCoaBTdhpdTWabOjVpEs3BO9HPjIr4KF/FwatyQDP1M7yk9sN8Z5DaaL+OhBBGgEMv5CUMR43NjL6bji9AYCqGLr1ay2FnIwIubpSL57SMuowUJ8c/hOKY5p0ahePHt1HhzuZqNoh/fKurRA46keRKPRtO3iiK1AxJkHF7Nw+txqHTD77KIxng1WsbRMpyFC6UvPjL9LBzRyIUxpZ3gmva/8PtoofTIP6vI4fw6pP1o+oEW5uU/lGb554bPYjF3sQvR3kKqN4zlN2iRw/GUFl0o0ZDWgeT4Tam7JJhvldb57Rih+ArLxWqxjKcTPUzbhkaLSFp4KW9pLeJZ3WiYRv5Y8x7IHIScjrpb9alcaNiQzkB1HIfGLf53PCZOKl3ygWFCq8LhzVTplA89prrFswAaVl16ewANq27ytgUNq+7yNjs/7GV7VZrknxtx9fup0hX/HK1GUu0WmbiZLo1pPFJ64Z+jL3YWpQH++Qc6u4XYLZLwoqxK4/vzE64uQ2HMLKVpnBYROO1U4SxWut2fZf88XJanZDQfy2ekoxEAu3H9HPs8dYPmOQ40rKoKjnt+2DAaXdJhQTv21Wi6DIe0YSq97M+NHcWTqBxLenu5GorB4r/C61VpYs6np39VOtyfg9QdIEpb+3ODr+LRci4ZyE7QsmTT+bzYq6Y/xjSV4G2o';
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
export default '9LE/N3gcXcY0ICrfvxBBpYl9dWyr26IRIler59Jx7trnB0ULMYKecGSQhS64sZwqfezPDSZX4ediTcQbLobzcCaJo+ueHzyPhtFsKQ9WRvOWl52vxAfV6BSJSABG8ht750eSzC2jUhKH4XJ6SXaw0tG+OpbXhG+hbApucH5M9MMqJqPRKDf5YUznSfHGT/8xIvFYKC3uz+G87pqGvG2WwjWm15HWgFvnsYr9ZqE0vD9LTg65TG6fJ6/YLVwjRV6NXIJ3z9OrmyXn56kX9OyjeBkJc/cyXpDdeLGKVR3h3nmIcLiKCsUwPhjFjmbKHYnOjezEM40c+TojQRrjDVrGjFbXQsqHN5Jqedb5QeLzhDSJOhFrGzO5jCYL5VT27PNjwtE4JI/m2bE6HRIliin3+TkLQssZTa7mcXVl3PPjTkJXHEan5/heCvXwltGnc4FQ4nIHFAymnWX28g+m3KvnHNY8uiBTS+aPf35ARXm9FrnRHgt+i+BEP96EK/ExS3lMi9wsSLuicWhMotU4XMrmj8+Q5bwe0ZiR8Sa8INm7pWeOXr0xv0WWbsgXl+ZrExqSt/nwRgrh6dzvQWXNo6kxjoZPf5kIzzOML0y5UU230XQEhVej6EdTbkyDQJSu79RYrITxE1+MXmXW91sghuFtYVSQmF4TX+Pb0HgzG86kRQ5aEBark8FlTMLlSjYig0HL0HjyUxH/k+QpsFrG0Bobb17XLhRL9/q0Aeu0ZJoVC+wWBFod40192aRncKAVk4LIgU7SzkV7A51wKe5QOJqRLTMfvpokgdcyprKFBH4LPYHX/IZAJy12sxlQtE05O0DjqBb9UM4OUq2Bos9JyyQ651N7IhfNTc6CnXVGij4mteHq15xEGvcuNR7zzdPfH+QPChUdS84ODu8zUXm2S6VPfg54y6CrbHPYlXNuEmOfb47lt1IfkrtdairNR87iXNAf4vsY+T77lK2L7xIXoMmp+vAuOyGbStsRCDM1su2XdF0+mMAUlUoiw1TBC1rwRElLsT4CZJ0c75INId9ln7O7Y5E2f8x39L+veTnfId+dvq1ENNt7fWqqMP+eVYHMQXJZyMnTp6pK2stTzCqe6ugV53QVnZyh4nPRUqZIfqvJ1JgSSljEoEUE15ifHAvJiVa6iNKPE/Lgv5uNQjp1pvMx/S1En2wO8a/xQmiAbN7LAl4+r5imos7Kx6LD0e1qRH7R7exWmxajs3ZWvFp8KT6rfUU+l/K8gaqgZLErCUB1S42e/hqOyMoqXLjJFQG/mdMmIMfh1Q316a8CzXhz8nU/xBPlKd42fGF6JeiN0FjG0ZwYQwcBDRInwQdDuPaVocqeNI9FyORlQuNiNaKdhR7irT7pJhyTUGweJ1t4HE/i8dTUfk2H/Ob41V5eij2H1mEcjS9EKN/Ufi1HP4aMpnF8LbHBUt2sYcGyUTyexdHPoan9og1tmiRfxnN6rxhxOVetaaUeZDqnxTd+qsMqdR0niSJ9uZr+3tR+TeZF6EQcKRbWeFVEldKL63l8JbzwkJ5YcFaWeKWaorA8p6b24y0nhtYC+a5Wfktdvl4Jabg0td9YqQiZqf1gioZ7clBaqS0gJS/ZJnBHIsJgaj9scvv0l3KFtc+opP7H4WRahE4XpvZ7I8+8Enwgc6f444o8OTX+La3haesxtR8DUZeYLNRyB1q8NbUf+dCvjfEdneaTU5rru1JGFzrRtBs4R1sE7Q60x4am9psdJ19ncQpingJKH65X4fxSaAP5M2o8vOYlSas1MsoYkan94oZwiovNJhJxp8jUf0NjL2yB4rRcr9O99IFBpWFBTEdbcVrTAb2TjtjPZbegN+Nke5+8NfVfv8j25b3ltahpK0rI31zvks+JWOy0KBSiv6ZkXrw1tZ+7GD797SE52QlkbWyTX9XvuaoXphIjMQ7lLYk363yb/lY8a7p5+s/1YUcv8dbUfqxinByST8f0nmycN8Nke8jukjt6rGX2KD+WzPV4c3zItpXPtauflXj6+zZNynW6S0ztZyJq+69yv35Moihtdcr9+GE0J4+QxLzIT8gx4oE+aimOISO8jUzthxSicbw4Rdmvw4UcF1UOt116yNSvnL789vnpb5vPR2EepvfHnVhAU/uNgot8XSzKTfkP+q8NJI+H5EXM7uWvwMorfFmKQyEan0Tvn3dGWkr0FxK3koum9tMA8VYUU5VlasWnlMjoU1mp3LWukpNkkcBuiLF7sglPk5rapv7CyDLm4U+VkK28TZZ7321xhpvaFvuach0yD6Ifl2ITU2KSTBekN3QJFVPbAH+Zkol7fEx3n0XTtC3Nss/2Bu29kvWpXDom8/NahEjnkZwCUK4PL9PtvjCo062x/iWjZSzVIt2vk8f0xGHJH1FuCFdtnHkRu6c/QmMqDpdyE3z6f2pctmqJmtpm8KdTwNT2dCdzekYzPv37pPTyRtFVOCyPiXJhTW3r9memFGZrrbTKU4ub5vPpRUjmz/zFNDTeCaOIbCgCCIu3FOeoqe24LiVhqm+i3HmdPf3f8jA0tW3Qy/qON2Rjj43Sw39r6luaV8/YZ9wPxvU8HM+UgYq58vSfO3HBcv/OOG5JqkgUPhY7hPgX8iZPfz3vIPTnY3YgZ+q9qe1cHov7xoUDqaqsp4YVST/EoUneDjk/5d+mttW4bFvK+62v42slslmxaE1tN++hqJsSfsPlKWIwii9K14u0Xg30qA27hYAsFKtNuQ55WnVT21FbdXiEkKhZOuXCYoW1Lx7nwtT2wH6xkj4Yw6e/FGaSqW1tXZipJQMWUqmlekkwXoykBNcqGk1NbQPqofhQ7ybdPf09Megk+iykgOyID8aiduIEddYsTG3HaGJqdF2YsfVQlYYXBcsWK5lKwxF6JvIH5OVT7r09K06RRhhGsRzo402p4El8Szx8c0FeOR36o5GsbcpNNbJmF8+DFqvvI9XsV+6eSTY4icotnSpvSkURG+5bU9sM+eR7VDwPtbvxbVYelR/W';
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
export default 'yUcRMjmcTgBT37B4nq7FkVMEZE7HK6n4vvgCjr4V8Szb5Ifc1PcTFi270pwOLjpu6N+Oe1F5muxMfafg8ujPny0NQ4hVKh/nahfgeXqf7Q9lv6qH01BT39T3hjyp8OdrubJWbc9byLPxup0VFnZaBpfEWZk8iDut+g68bYM3+TqpPFvlq8rr3KBFp+NYNHgzYnrr3ZaM8+RjsiMLLXkko/tQvOZHGpTmcpxkcA4p+k1F+ngy+Ion+2KkfzwqVrXaRfciv0vvE7Oh/W0RjSvmkZZFjdPmRVV5viPz6LdfEuJ9LjFeDaOK76eLZTP1PWWX4tYFWSmb8qa1vhHs8MWrKaKFD8XpZuqbuJLQpofSkSmETMb01faDu7tkXX75paF96lEAFKu6y++Oa5XT6ud4t+sNGcmFwVUsvfjrIMBNfdfTS+E9PaR6IVKCIxfp7qHoD/tQN4LV3qQL0pmUaBfrRHKF1E6jRSBXPFz8Esc19d1Db8WXzU7y/okc0vK7Eaa+Mehyl2z3n/Ldg8pqJVRyVQSLD8mj8DjWGfmBxdu/OHCiCWK6zsnl28rT+DobR4x8sWSKiPkJRrjOB3l4oAgbbZS70nH5uFH3HzWsktCfQgHUdTdy45N4CVPffHO2yw+S4/4oNo+98fD0j88kk5K8KiGX2+wUnS9iA0J1C4Pd1DfNvAkv4lG8PJ3kM7KAp/PrcBIvxlNjSsZPLEzGy+lwNRbZmoJKjoM6akRlEi2NZ0Q6octKo1lZwHcORi3ZWUVk2d7El/Onv6xGZH+9QNLZq31CU98QMxyF83FoLKYTOUWvtrY80VSsA7VP5WI6G52MwPORNLUN5YvBeLKRWsYqsZtT5eurBXGqozP1fSQlclHNoZgOal9I4Z4sjEk0jBbhXLk+okZlnmN7ixWxT6yyFOFVYjANUUC1+aLk8wxX4eUpBXeqyZaztGpvRe2wyjLowm2Lm9XSuJz+Xl4EX2cIm/ouhvPolqaOX2tVRHA6JHdezhcqERt9TL+8fFMOJU+lkr1UIjkNAHq/WWabEum5nNJiGqVMm/q2gfpgpqlvBni1Em7OQkRIo5lwisv/pKFlvt3Ud/ir+CU1r0Rt3hcOSb9KVBFWWSnXn5T4TyHbhVtUSKTYYcgFJOmYrYo1K95qcRXekr6LhXgjNpGw2EPGRYmJmIN4Yep785FxPJ5NS5rFyWAumS/49zqpqe+/95wyemesLopsE2nhO/IUSNVisX8JZ+Un4zW8M55O4sI1NaJitxM7pny/Y9C8okJ7Th5cGf6frWSGK1GoS/J/nrNfND/NF81vQ+0wpeg8Gt6UCU2RNqeBs5tiTN2hVrvjdV0FLaBi8MVj2jSHQvi1wRm16d1pF9TeN1EiVGFxnWdRcvtqTg7981b9kv581hF6dEnSlUBVnS+FtLwssbpZcXUTmtGEYjlKgZOHGG9eZZF2hhlJymntpFNTiXsVFe/PR+sLTPTjcLRayIkNteHcyQqRbZ8PvxZ34z9sMjJ/JBtDiYE9JNunf7zYM4/kcDw8/U1YHftPyed8J2whYXhsjT0Z/sVN3cIdkewcJSRGhmAqenkRTLI9JhtT3wVOBGXnalBW7ej2vP8335FUImNSduaUKpIpz2TuXrKPCyHK1R3Z8/Rpppk4ViYizWR8oGcrkvNLlTeKfIzCZ8U9sVTsfpcrZSpZBC7i6Sw+5UjL56SdZTwTyTwyX2RFULuexZWjUAmQSWv0mkzW3hGVKyleflPuRv0iaL/e569XjwE61kDHKnQ2SOeAdC5Ix0E6D6TzQboApLMGKKGFEqIssVCeWChTLJQrFsoWC+WLhTLGQjnDUM4wlDMM5Qxr4owNapUNapUNapUNapUNapUNapUNapWNapWNapWNapWNapWNapWNapWNapWNapWNapWNapWNapWNapWNapWNapUDapUDapUDapUDapUDapUDapUDapWDapWDapWDapWDapWDapWDapWDapWDapWDapWDapWDapWDapWDapWDapULapULapULapULapULapULapULapWLapWLapWLapWLapWLapWLapWLapWLapWLapWLapWLapWLapWLapWLahUHtYqDWsVBreKgVnFQqzioVRzUKo5qFUe1iqNaxVGt4qhWcVSrOKpVHNUqjmoVR7WKo1rFUa3iqFZxVKs89GWqhMxBCV2UkKOEHkroo4ToW9sDlNBCCZtY6KOc8VHO+ChnfJQzPsoZH+WMj3LGRznjo5zxUc4EKGcClDMBypkA5UyAciZAOROgnAlQzgQoZwKUM6KSCGNNjdK2YUoHpnRhSg5TejBlEyctC14lC14lC14lC14lC14lC14lC14lOH5ao2xeJQavEoNXicGrxOBVYvAqwfGwGmXzKtnwKtnwKtnwKtnwKtnwKsHxjRpl8yo58Co58Co58Co58Co58CrB/mqNsnmVXHiVXHiVXHiVXHiVXHiVYP+jRtm8ShxeJQ6vEodXicOrxOFVgh2bGqUNUzoDmNKCKRlMacOUDkzpwpSN3Kza0Y4HU/owZYBSuo08CtCghAVb3TVKtzFDOoBTzQN09hpl8+wWmrS34Mkt1JGoUboMprRhSgemdGFK+N1dD6ZsXKVa3UeAUvIBTGnBlI08QjPzDE3NMzQ3z9DkPEOz8wxNzzM0P8/gBD2DM/QMTtEzOEfP4CQ9g7P0DE7TMzhPz+BEPYM9Ewan6hmcq2dwsp7B2XqGpusZmq9naMKeoRl7hqbsGZqzZ2jSnsFZewan7Rmct2dw4p7BmXsGp+4ZnLtncPKewdl7Bru3DM7fMziBz+AMPoNT+AzN4TM0ic/QLD5D0/gMzeMzNJHP0Ew+g1P5DM7lMziZz+BsPoPT+QzO5zM4oc/gjD6DU/oMjpEwOKnP4Kw+g9P6DM7rMzSxz9DMPkNT+wzN7TM0uc/Q7D5D0/sMzu8zOMHP4Aw/g1P8DM7xMzjJz+AsP4PT/AzO8zM40MbgTD+DU/0MzvUzONnP';
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
export default 'PFTVPFTVPFTVPFTVPFTVPFTVPFTVPFjVPFjVPFjVPFjVPFjVPFjVPFjVPFjVPFjV4GhtjZLBPGIwjxjMo2ZV81FV81FV81FV81FV81FV81FV81FV82FV82FV82FV82FV82FV82FV82FV82FV82FVg+uKapQM5hGDecRgHjWrWoCqWoCqWoCqWoCqWoCqWoCqWoCqWgCrWgCrWgCrWgCrGpyPqVPC/LFgBlkwhyyYRRbMIwbziME8YjCPmm/hDdBreAP0Ht4AvYg3QG/iDdCreAP0Lt4AvYw3gG/jDeDreAP4Pt4AvpAHJx/rlDB/LJhBFswhC2aRBfOIwTxiMI8YzKNmVbNQVbNQVbNQVbNQVbNQVbNQVUMT0zXCZlWzYFWzYFWzYFWzYFWzYFWzYFWzYFWzYFWDq0drlAzmEYN5xGAeNasaXOlZo2ys6K5TujAlhyk9mNKHKeF3b6zrrlNaMGUjN+EL8Ta8nDa8nDa8nHCRa43ShSl5IyWaKq0RNi+SAy+SAy8SXONao3RhSnyRuANTujBl43qiKbYaIYMhGYzZWD5Zo+QeTIljws/pNW41cIzehothbbgY1oaLYW24GNaGi2FtuBjWhsOrNlwMa8PFsDZcDGvDxbA2XAxrw8WwNlwMa8PFsDYcP7ThS3c1ysYyTxsuXK1Reo3tElBn2IFdshqlA1M2VvfWKD0GU9owZWPLDdSNceD6Wgeur3Xg+loHrq914PpaB66vdeD6Wgeur3Xg+loHNvod+HqXA1/vcuDrXQ58vcuBr3c58PUuB63uddDqXget7nXQ6l4Hre510OpeB3U2HLi614Grex24uteBq3sduLrXgat7Hbi614Grex24uteBq3sduLrXgat7Hbi618F7ccHNuOBuXHA7LrgfF9yQC+7IBbfkwnty4U258K5ceFsuvC8X3pgL78yFt+bCe3Phzbnw7lx4ey68Pxdc3eu4aHDOgb3wOqWHUjbbE7Wyw8bn9FF/qEbpcZiy8Y1gP8OtmdCNvatQE7pG6MGU/gCmtGDKxkZXaKNcFw4Iu3CYt0bpwo/Z6BPUKR2Y0oUp4Xdv9AnqlI2rZKPh/Rplo9NYo/RxSnh2v3E9a+cwhykb19OFMV0Yk8OYcCOqGqXfyHd4/+JwUKNGacOUjZG0OqUFUzKY0oYpHZjShSkbVx5OO3K4aQ2Hm9ZwuGkNh5vWcLhpDYeb1nA4qlGj9GHKoFE+0WgBR6MFHI0WcDRawNFoAUejBRyNFnA4WsDhaAGHowUcjhZwOFrA4WgBh6MFHI4WcDhawOFoAYejBRyOFnA4WsDhaAFHowUcjRZwNFrA0WgBR6MFHI0WcDRawOFoAYejBRyOFnA4WsDhaAGHowUcjhZwOFrA4WgBh6MFHI4WcDhawOFoAYejBRy+cslhz57Dbak43JaKw22pONyWisMVA5yjHlGNMmjkpgdj1u54MZgSx2zkEXynokZpw5TNXoEPewU+7BXA8aQ6JbxKzV6BD3sFcIk9h5uxcrgbK8f9RrgfK4cbsnK4IyuHW7JyuCcrh5uyerDPXKNsbjI9gLtMw+2z6pQeTOnDlPC7N7eaHsC9pgcwj+A6hBpl0LjycBzTgysxPTjuVqMM4NmDxtnhskkP7R/iof1DPLR/iIf2D/HQ/iEe2j/EQ4sbPbh/iAf3D/Hg/iEe3D/Eg/uHeHD/EA/uH+LB/UM8uH+IBxuzHtw/xIP7h3hw/xAP7h/icVgpYTOtRtloyNcpHZjShSnhN2o05OuUjRKCXiz1YOvHg22aGmVjnqpOacOUDkzpwpTwuzfmqeqUjR9JqJ3BjZTwGVyjbKz49mvnZeM3Ghy0sNOvx2sGOKmFkzKc1MZJHZy08Zsb9SOR46QeTtooKhx/AI4/AMcfwMMfwMMfwMMfwEcTHX79Tn3j1zDqN30bv4dRv6nY+EWM+kdyG79WUs8lNEl2AMfuAtgSrmM22lAaUhcn7fAAHk7q46TwWlmNlpSG1MJJGU6KSwDDucVwbnUQF4Zzi+HcYji3bJxbNs6t5q8L1b0TGyd1cFIXJ+U4qYeT+jhpAJM2hkk1pBZOinPLwbnl4NxycG45OLcaW/MH8L26AL4DV6NsXlSORorrz9n4DQENKfxOVuM9Iw2phZMynLRRquC7fQH8wb0apQ3P3rwBebCceKj7W6f0YEofXs/mTb3eXc/BSRtfv95IjOOkHk7q46QBTNr47QENqYWTMpzUxkkdnBTnFse5xXFucZxbHOeWh3PLw7nVeNUyQDu1BWintgDt1BagndoCtFNbgHZqC9CAWgB3agvgTm0B3KktgDu1BXCntgDu1BbAndoCuFNbAHdqC/BPesKd2gK4U1sAd2oL4E5t1gC9p12nbP680QBOfNZJXYaT4m/lOjipi5PiK+B6OGnzYuFf5Bzgn+Qc4N/kHOAf5RzgX+Uc4J/lHODf5RzgH+askdo4afPH3eqkFk7KcFIbJ3VwUhcnbWasDW8u+PdBa6R8gKN6dgdapwNt83I5+OO6HR6Xd3hc/COHddIzb+bjsH4H2AAWmvoRz//8h3dmSbhJDkR5lW3vsu393vzdv/zJrCFoX6CNqrwO2IpVXoOsNVGFpmTQlAyb0oamtKEpbWxKB5rSgaZ0sCldaEoXmtLFpuTQlByakmNTetCUHjSlh03pQ1P60JQ+NmUATamvv2yjciAs/eMH3/j45e3ldjLo0Szw2cq7yK2ff2/Y8wbYpjfAVsQCd1pwqwX3WgvbbC1st7XA7dbC9lsL23AtcMe1sC3XwvZcS7fp/uHP/x8ocJi7';
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
import { inflateSync } from 'node:zlib';
|
|
||||||
import payload1 from './authoritative-inventory-model.payload-1';
|
|
||||||
import payload2 from './authoritative-inventory-model.payload-2';
|
|
||||||
import payload3 from './authoritative-inventory-model.payload-3';
|
|
||||||
import payload4 from './authoritative-inventory-model.payload-4';
|
|
||||||
import payload5 from './authoritative-inventory-model.payload-5';
|
|
||||||
|
|
||||||
export const AUTHORITATIVE_INVENTORY_MODEL_SOURCES = {
|
|
||||||
territory: {
|
|
||||||
file: 'modelo_yacimientos.sql',
|
|
||||||
sha256: '6a1d96bc8af7e755dd0e2fd9faf08335625b9c76865208c3b8413d868aa5eb1a',
|
|
||||||
},
|
|
||||||
inventory: {
|
|
||||||
file: 'modelo_relacional instalaciones y sub.sql',
|
|
||||||
sha256: 'fb513f3909e78db298361a8a6998ca77026748f9b03cbab44c77b884ca862b49',
|
|
||||||
},
|
|
||||||
} as const;
|
|
||||||
|
|
||||||
export type AuthoritativeInventoryModel = {
|
|
||||||
departments: Array<{ id: number; nombre: string }>;
|
|
||||||
companies: Array<{ id: number; nombre: string }>;
|
|
||||||
concessionTypes: Array<{ id: number; nombre: string }>;
|
|
||||||
areas: Array<{ id: number; departamento_id: number; nombre: string }>;
|
|
||||||
fields: Array<{
|
|
||||||
id: number;
|
|
||||||
nombre: string;
|
|
||||||
area_id: number;
|
|
||||||
empresa_id: number;
|
|
||||||
tipo_concesion_id: number;
|
|
||||||
}>;
|
|
||||||
installationFamilies: Array<{ id: number; nombre: string }>;
|
|
||||||
subinstallationFamilies: Array<{ id: number; instalacion_id: number; nombre: string }>;
|
|
||||||
findings: Array<{ id: number; nombre: string }>;
|
|
||||||
subinstallationFindings: Array<{ subinstalacion_id: number; hallazgo_id: number }>;
|
|
||||||
installationFindings: Array<{ instalacion_id: number; hallazgo_id: number }>;
|
|
||||||
};
|
|
||||||
|
|
||||||
const payload = payload1 + payload2 + payload3 + payload4 + payload5;
|
|
||||||
|
|
||||||
export const AUTHORITATIVE_INVENTORY_MODEL: AuthoritativeInventoryModel =
|
|
||||||
JSON.parse(inflateSync(Buffer.from(payload, 'base64')).toString('utf8')) as AuthoritativeInventoryModel;
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
import assert from 'node:assert/strict';
|
|
||||||
import test from 'node:test';
|
|
||||||
import {
|
|
||||||
AUTHORITATIVE_INVENTORY_MODEL as model,
|
|
||||||
AUTHORITATIVE_INVENTORY_MODEL_SOURCES as sources,
|
|
||||||
} from '../../src/reference-data/authoritative-inventory-model';
|
|
||||||
|
|
||||||
test('authoritative SQL sources keep their exact cardinalities', () => {
|
|
||||||
assert.equal(sources.territory.file, 'modelo_yacimientos.sql');
|
|
||||||
assert.equal(sources.territory.sha256, '6a1d96bc8af7e755dd0e2fd9faf08335625b9c76865208c3b8413d868aa5eb1a');
|
|
||||||
assert.equal(sources.inventory.file, 'modelo_relacional instalaciones y sub.sql');
|
|
||||||
assert.equal(sources.inventory.sha256, 'fb513f3909e78db298361a8a6998ca77026748f9b03cbab44c77b884ca862b49');
|
|
||||||
assert.equal(model.departments.length, 7);
|
|
||||||
assert.equal(model.companies.length, 13);
|
|
||||||
assert.equal(model.concessionTypes.length, 2);
|
|
||||||
assert.equal(model.areas.length, 64);
|
|
||||||
assert.equal(model.fields.length, 230);
|
|
||||||
assert.equal(model.installationFamilies.length, 14);
|
|
||||||
assert.equal(model.subinstallationFamilies.length, 109);
|
|
||||||
assert.equal(model.findings.length, 181);
|
|
||||||
assert.equal(model.installationFindings.length, 48);
|
|
||||||
assert.equal(model.subinstallationFindings.length, 880);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('Area belongs only to Departamento while Yacimiento owns Area Empresa and concession', () => {
|
|
||||||
for (const area of model.areas) {
|
|
||||||
assert.ok(model.departments.some((department) => department.id === area.departamento_id));
|
|
||||||
assert.deepEqual(Object.keys(area).sort(), ['departamento_id', 'id', 'nombre']);
|
|
||||||
}
|
|
||||||
for (const field of model.fields) {
|
|
||||||
assert.ok(model.areas.some((area) => area.id === field.area_id));
|
|
||||||
assert.ok(model.companies.some((company) => company.id === field.empresa_id));
|
|
||||||
assert.ok(model.concessionTypes.some((type) => type.id === field.tipo_concesion_id));
|
|
||||||
assert.deepEqual(Object.keys(field).sort(), ['area_id', 'empresa_id', 'id', 'nombre', 'tipo_concesion_id']);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
test('Subinstalación classifications belong to one installation classification and every mapping resolves', () => {
|
|
||||||
for (const subinstallation of model.subinstallationFamilies) {
|
|
||||||
assert.ok(model.installationFamilies.some((installation) => installation.id === subinstallation.instalacion_id));
|
|
||||||
}
|
|
||||||
for (const mapping of model.installationFindings) {
|
|
||||||
assert.ok(model.installationFamilies.some((installation) => installation.id === mapping.instalacion_id));
|
|
||||||
assert.ok(model.findings.some((finding) => finding.id === mapping.hallazgo_id));
|
|
||||||
}
|
|
||||||
for (const mapping of model.subinstallationFindings) {
|
|
||||||
assert.ok(model.subinstallationFamilies.some((subinstallation) => subinstallation.id === mapping.subinstalacion_id));
|
|
||||||
assert.ok(model.findings.some((finding) => finding.id === mapping.hallazgo_id));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
@@ -32,17 +32,15 @@ test('F5.1 canonical hierarchy starts at Departamento and Area is no longer root
|
|||||||
assert.match(migration, /SET can_be_root=false/);
|
assert.match(migration, /SET can_be_root=false/);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('Historical authoritative endpoint keeps the former Yacimiento Company plus concession contract for compatibility', () => {
|
test('F5.1 manual creation permits Area context without requiring an operator', () => {
|
||||||
|
const migration = source('src/database/migrations/1790087400000-f5-1-clean-manual-inventory.ts');
|
||||||
const structure = source('src/asset-master/inventory-structure.service.ts');
|
const structure = source('src/asset-master/inventory-structure.service.ts');
|
||||||
const dto = source('src/asset-master/dto/create-inventory-structure.dto.ts');
|
|
||||||
|
|
||||||
assert.match(structure, /operator_company_id,concession_type_id,inventory_family_id/);
|
assert.match(migration, /DROP CONSTRAINT IF EXISTS chk_asset_context_history_context_pair/);
|
||||||
assert.match(structure, /dto\.kind === 'YACIMIENTO'/);
|
assert.match(migration, /CHECK \(operator_company_id IS NULL OR operational_area_id IS NOT NULL\)/);
|
||||||
assert.match(structure, /INVENTORY_YACIMIENTO_COMPANY_REQUIRED/);
|
assert.match(structure, /operator_company_id,inventory_family_id/);
|
||||||
assert.match(structure, /INVENTORY_YACIMIENTO_CONCESSION_REQUIRED/);
|
|
||||||
assert.match(structure, /asset_context_history/);
|
assert.match(structure, /asset_context_history/);
|
||||||
assert.match(dto, /operatorCompanyId\?: string \| null/);
|
assert.match(structure, /operational_area_id,operator_company_id/);
|
||||||
assert.match(dto, /concessionTypeId\?: string \| null/);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
test('F5.1 Inventory browser exposes every canonical level instead of filtering by is_inventory_instance', () => {
|
test('F5.1 Inventory browser exposes every canonical level instead of filtering by is_inventory_instance', () => {
|
||||||
@@ -66,60 +64,23 @@ test('F5.1 Finding Catalog defaults to associated findings and exposes all items
|
|||||||
assert.match(panel, /Esta clasificación todavía no tiene Hallazgos asociados/);
|
assert.match(panel, /Esta clasificación todavía no tiene Hallazgos asociados/);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('F7 Inventory Configuration exposes only simple types, containment and fields', () => {
|
test('F5.1/F6 Configuration manages findings inline and filters Subinstallations by compatible Installation classifications', () => {
|
||||||
const configPage = source('../web-v2/src/pages/AuthoritativeInventoryConfigPage.tsx');
|
const configPage = source('../web-v2/src/pages/AssetTypesPage.tsx');
|
||||||
|
|
||||||
assert.match(configPage, /Tipos y campos/);
|
assert.match(configPage, /replaceInventoryFamilyFindings/);
|
||||||
assert.match(configPage, /Departamento → Área → Yacimiento → Instalación → Subinstalación/);
|
assert.match(configPage, /Agregar o quitar/);
|
||||||
assert.match(configPage, /Un Área puede estar vinculada a varias Empresas/);
|
assert.match(configPage, /familyFindingIds/);
|
||||||
assert.match(configPage, /Cada Yacimiento elige una sola Empresa operadora/);
|
assert.match(configPage, /selectedInstallationFamilyId/);
|
||||||
assert.match(configPage, /Tipos de Instalación/);
|
assert.match(configPage, /family\.parentFamilyIds\.includes\(selectedInstallationFamilyId\)/);
|
||||||
assert.match(configPage, /Tipos de Subinstalación/);
|
assert.match(configPage, /Filtrar por tipo de Instalación/);
|
||||||
assert.match(configPage, /Puede estar dentro de/);
|
|
||||||
assert.match(configPage, /\{ value: 'TEXT', label: 'Texto' \}/);
|
|
||||||
assert.match(configPage, /\{ value: 'NUMBER', label: 'Número' \}/);
|
|
||||||
assert.match(configPage, /\{ value: 'DATE', label: 'Fecha' \}/);
|
|
||||||
assert.match(configPage, /\{ value: 'BOOLEAN', label: 'Sí \/ No' \}/);
|
|
||||||
assert.doesNotMatch(configPage, /Hallazgos asociados/);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
test('F7 Web creation keeps the fixed hierarchy and asks only the required simple context', () => {
|
test('F5.1 Web creation and configuration expose Departamento as the physical root', () => {
|
||||||
const createPage = source('../web-v2/src/pages/InventoryCreatePage.tsx');
|
const createPage = source('../web-v2/src/pages/InventoryCreatePage.tsx');
|
||||||
const configPage = source('../web-v2/src/pages/AuthoritativeInventoryConfigPage.tsx');
|
const configPage = source('../web-v2/src/pages/AssetTypesPage.tsx');
|
||||||
|
|
||||||
assert.match(createPage, /kind: 'DEPARTAMENTO'/);
|
assert.match(createPage, /kind: 'DEPARTAMENTO'/);
|
||||||
assert.match(createPage, /AREA: 'Departamento'/);
|
assert.match(createPage, /AREA:'Departamento'/);
|
||||||
assert.match(createPage, /YACIMIENTO: 'Área'/);
|
assert.match(createPage, /Datos opcionales/);
|
||||||
assert.match(createPage, /INSTALACION: 'Yacimiento'/);
|
assert.match(configPage, /<strong>Departamento<\/strong>/);
|
||||||
assert.match(createPage, /SUBINSTALACION: 'Instalación'/);
|
assert.match(configPage, /familyId=\$\{familyEditor\.id\}/);
|
||||||
assert.match(createPage, /listCompaniesForInventoryArea/);
|
|
||||||
assert.match(createPage, /Empresa operadora/);
|
|
||||||
assert.match(createPage, /ALTA RÁPIDA/);
|
|
||||||
assert.doesNotMatch(createPage, /Tipo de concesión/);
|
|
||||||
assert.match(configPage, /Departamento → Área → Yacimiento → Instalación → Subinstalación/);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('F7 canonical detail uses one short everyday profile and keeps advanced administration separate', () => {
|
|
||||||
const detailRoute = source('../web-v2/src/pages/InventoryDetailPage.tsx');
|
|
||||||
const detail = source('../web-v2/src/pages/SimpleInventoryDetailPage.tsx');
|
|
||||||
|
|
||||||
assert.match(detailRoute, /isSimpleInventoryAsset\(asset\) && !advanced/);
|
|
||||||
assert.match(detailRoute, /<SimpleInventoryDetailPage initialAsset=\{asset\}/);
|
|
||||||
assert.match(detail, /DEPARTAMENTO/);
|
|
||||||
assert.match(detail, /AREA/);
|
|
||||||
assert.match(detail, /YACIMIENTO/);
|
|
||||||
assert.match(detail, /INSTALACION/);
|
|
||||||
assert.match(detail, /SUBINSTALACION/);
|
|
||||||
assert.match(detail, />Resumen</);
|
|
||||||
assert.match(detail, />Actividad</);
|
|
||||||
assert.match(detail, />Ubicación</);
|
|
||||||
assert.match(detail, />Fotos</);
|
|
||||||
assert.match(detail, />Cambios</);
|
|
||||||
assert.match(detail, /Empresa operadora/);
|
|
||||||
assert.match(detail, /Tipo técnico/);
|
|
||||||
assert.match(detail, /AssetTechnicalDataPanel/);
|
|
||||||
assert.match(detail, /AssetDossierPanel/);
|
|
||||||
assert.match(detail, /Administración avanzada/);
|
|
||||||
assert.doesNotMatch(detail, /Tipo de concesión/);
|
|
||||||
assert.doesNotMatch(detail, /AssetProvenancePanel/);
|
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -10,8 +10,8 @@ function mountedRepoFile(path: string): string {
|
|||||||
test('F6.3 Android test cut targets production API and has a distinct installable debug version', () => {
|
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');
|
const gradle = mountedRepoFile('android-app/app/build.gradle.kts');
|
||||||
|
|
||||||
assert.match(gradle, /versionCode = 28/);
|
assert.match(gradle, /versionCode = 25/);
|
||||||
assert.match(gradle, /versionName = "0\.19\.0"/);
|
assert.match(gradle, /versionName = "0\.16\.0"/);
|
||||||
assert.match(gradle, /https:\/\/dhv2\.korexlabs\.com\/api\/v3\//);
|
assert.match(gradle, /https:\/\/dhv2\.korexlabs\.com\/api\/v3\//);
|
||||||
assert.match(gradle, /applicationIdSuffix = "\.debug"/);
|
assert.match(gradle, /applicationIdSuffix = "\.debug"/);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ test('F6.1 inspection planning exposes Departamento → Área → Yacimiento exp
|
|||||||
assert.doesNotMatch(createPage, /Área \/ Yacimiento/);
|
assert.doesNotMatch(createPage, /Área \/ Yacimiento/);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('Authoritative WEB creation freezes Area and validates Company against selected 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 dto = source('src/inspection-visits/dto/create-inspection-visit.dto.ts');
|
||||||
const scope = source('src/inspection-visits/inspection-planning-scope.ts');
|
const scope = source('src/inspection-visits/inspection-planning-scope.ts');
|
||||||
const create = source('src/inspection-visits/inspection-planning-create.service.ts');
|
const create = source('src/inspection-visits/inspection-planning-create.service.ts');
|
||||||
@@ -37,18 +37,15 @@ test('Authoritative WEB creation freezes Area and validates Company against sele
|
|||||||
assert.match(scope, /lower\(type\.code\)='yacimiento'/);
|
assert.match(scope, /lower\(type\.code\)='yacimiento'/);
|
||||||
assert.match(create, /scopeAssetId,/);
|
assert.match(create, /scopeAssetId,/);
|
||||||
assert.match(create, /operationalAreaId: dto\.operationalAreaId/);
|
assert.match(create, /operationalAreaId: dto\.operationalAreaId/);
|
||||||
assert.match(create, /yacimiento\.operator_company_id=\$3::uuid/);
|
assert.match(create, /relation\.relation_role='OPERATOR'/);
|
||||||
assert.match(create, /yacimiento\.concession_type_id IS NOT NULL/);
|
assert.match(create, /relation\.valid_from <= \$3::timestamptz/);
|
||||||
assert.match(create, /INSPECTION_OPERATOR_NOT_RELATED_TO_YACIMIENTO/);
|
|
||||||
assert.match(createPage, /scopeAssetId: yacimientoId/);
|
assert.match(createPage, /scopeAssetId: yacimientoId/);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('Authoritative WEB inspection creation uses Yacimiento context and not descendant Inventory snapshots', () => {
|
test('F6.1 WEB inspection creation does not use Inventory operator snapshots', () => {
|
||||||
const create = source('src/inspection-visits/inspection-planning-create.service.ts');
|
const create = source('src/inspection-visits/inspection-planning-create.service.ts');
|
||||||
|
|
||||||
assert.match(create, /yacimiento\.operator_company_id/);
|
assert.match(create, /area_company_relations relation/);
|
||||||
assert.match(create, /operatorSource: 'YACIMIENTO'/);
|
|
||||||
assert.doesNotMatch(create, /area_company_relations relation/);
|
|
||||||
assert.doesNotMatch(create, /inventory\.operator_company_id/);
|
assert.doesNotMatch(create, /inventory\.operator_company_id/);
|
||||||
assert.doesNotMatch(create, /asset\.operator_company_id/);
|
assert.doesNotMatch(create, /asset\.operator_company_id/);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ test('F6.1 field Findings reject Inventory outside the frozen Yacimiento scope',
|
|||||||
assert.doesNotMatch(source, /AS "insideArea"/);
|
assert.doesNotMatch(source, /AS "insideArea"/);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('F6.1 planning preserves Yacimiento and never validates descendant Inventory ownership', () => {
|
test('F6.1 planning preserves Yacimiento and never validates Inventory ownership from Company snapshot', () => {
|
||||||
const source = api('src/inspection-visits/inspection-visits.service.ts');
|
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, /const nextScope = dto\.scopeAssetId === undefined \? visit\.scopeAssetId : dto\.scopeAssetId/);
|
||||||
@@ -38,6 +38,7 @@ test('F6.1 planning preserves Yacimiento and never validates descendant Inventor
|
|||||||
assert.doesNotMatch(source, /visit\.scopeAssetId = nextAreaId/);
|
assert.doesNotMatch(source, /visit\.scopeAssetId = nextAreaId/);
|
||||||
assert.doesNotMatch(source, /assertAssetsMatchContext/);
|
assert.doesNotMatch(source, /assertAssetsMatchContext/);
|
||||||
assert.doesNotMatch(source, /assertCurrentAssetsMatchContext/);
|
assert.doesNotMatch(source, /assertCurrentAssetsMatchContext/);
|
||||||
|
assert.doesNotMatch(source, /asset\.operator_company_id IS DISTINCT FROM/);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('F6.1 creation selects actionable checklist Inventory automatically', () => {
|
test('F6.1 creation selects actionable checklist Inventory automatically', () => {
|
||||||
@@ -48,17 +49,14 @@ test('F6.1 creation selects actionable checklist Inventory automatically', () =>
|
|||||||
assert.match(source, /'AUTO_INCLUDED'/);
|
assert.match(source, /'AUTO_INCLUDED'/);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('Authoritative operator choices are projected from Yacimientos of the selected Area', () => {
|
test('F6.1 operator choices are resolved at the planned timestamp', () => {
|
||||||
const hierarchy = api('src/inspection-visits/inspection-planning-hierarchy.service.ts');
|
const hierarchy = api('src/inspection-visits/inspection-planning-hierarchy.service.ts');
|
||||||
const controller = api('src/inspection-visits/inspection-visits.controller.ts');
|
const controller = api('src/inspection-visits/inspection-visits.controller.ts');
|
||||||
const createPage = web('src/pages/InspectionVisitCreateF61Page.tsx');
|
const createPage = web('src/pages/InspectionVisitCreateF61Page.tsx');
|
||||||
|
|
||||||
assert.match(hierarchy, /operatorsForArea\([\s\S]*at\?: string/);
|
assert.match(hierarchy, /operatorsForArea\([\s\S]*at\?: string/);
|
||||||
assert.match(hierarchy, /FROM assets yacimiento/);
|
assert.match(hierarchy, /relation\.valid_from <= \$2::timestamptz/);
|
||||||
assert.match(hierarchy, /yacimiento\.parent_id=\$1::uuid/);
|
assert.match(hierarchy, /relation\.valid_until > \$2::timestamptz/);
|
||||||
assert.match(hierarchy, /yacimiento\.operator_company_id/);
|
|
||||||
assert.match(hierarchy, /SELECT DISTINCT company\.id/);
|
|
||||||
assert.doesNotMatch(hierarchy, /FROM area_company_relations relation/);
|
|
||||||
assert.match(controller, /@Query\('at'\) at\?: string/);
|
assert.match(controller, /@Query\('at'\) at\?: string/);
|
||||||
assert.match(createPage, /operators\?at=\$\{at\}/);
|
assert.match(createPage, /operators\?at=\$\{at\}/);
|
||||||
assert.match(createPage, /\[areaId, plannedStartAt\]/);
|
assert.match(createPage, /\[areaId, plannedStartAt\]/);
|
||||||
|
|||||||
@@ -7,24 +7,24 @@ function source(path: string): string {
|
|||||||
return readFileSync(resolve(process.cwd(), path), 'utf8');
|
return readFileSync(resolve(process.cwd(), path), 'utf8');
|
||||||
}
|
}
|
||||||
|
|
||||||
test('Authoritative model stores Company on Yacimiento and propagates it to physical descendants', () => {
|
test('F6.1 preserves Inventory operator snapshots and changes operator only through Area relations', () => {
|
||||||
const migration = source('src/database/migrations/1790106600000-authoritative-inventory-relationships.ts');
|
const relations = source('src/asset-master/asset-operational-relations.service.ts');
|
||||||
const structure = source('src/asset-master/inventory-structure.service.ts');
|
const migration = source('src/database/migrations/1790087250000-f5-operational-context-compatibility.ts');
|
||||||
|
|
||||||
assert.match(migration, /Yacimiento requiere Empresa relacionada/);
|
assert.match(migration, /Runtime ownership and search MUST NOT depend on it/);
|
||||||
assert.match(migration, /NEW\.operational_area_id:=NEW\.parent_id/);
|
assert.match(migration, /La Empresa se cambia en la relación temporal del Área, no en el Inventario/);
|
||||||
assert.match(migration, /NEW\.operator_company_id:=parent_company/);
|
assert.match(relations, /operatorSnapshotPreserved:true/);
|
||||||
assert.match(structure, /dto\.kind === 'YACIMIENTO'/);
|
assert.doesNotMatch(relations, /UPDATE assets asset[\s\S]*SET operator_company_id=/);
|
||||||
assert.match(structure, /parent\?\.operatorCompanyId/);
|
|
||||||
assert.match(structure, /ensureCompatibilityProjection/);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
test('Authoritative Yacimiento relationships cannot be mutated through generic Inventory edits', () => {
|
test('F6.1 blocks operator mutation through generic Inventory edit DTOs', () => {
|
||||||
const updateDto = source('src/asset-master/dto/update-asset.dto.ts');
|
const updateDto = source('src/asset-master/dto/update-asset.dto.ts');
|
||||||
|
const contextDto = source('src/asset-master/dto/change-asset-context.dto.ts');
|
||||||
|
|
||||||
assert.match(updateDto, /@IsEmpty/);
|
for (const dto of [updateDto, contextDto]) {
|
||||||
assert.match(updateDto, /La Empresa relacionada se administra en el Yacimiento/);
|
assert.match(dto, /@IsEmpty/);
|
||||||
assert.match(updateDto, /El Tipo de concesión se administra en el Yacimiento/);
|
assert.match(dto, /La Operadora se administra en la relación temporal del Área, no en el Inventario/);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
test('F6.1 rejects legacy Inventory searches that filter by operator snapshot', () => {
|
test('F6.1 rejects legacy Inventory searches that filter by operator snapshot', () => {
|
||||||
@@ -34,25 +34,28 @@ test('F6.1 rejects legacy Inventory searches that filter by operator snapshot',
|
|||||||
for (const dto of [listDto, treeDto]) {
|
for (const dto of [listDto, treeDto]) {
|
||||||
assert.match(dto, /operatorCompanyId\?: string/);
|
assert.match(dto, /operatorCompanyId\?: string/);
|
||||||
assert.match(dto, /@IsEmpty/);
|
assert.match(dto, /@IsEmpty/);
|
||||||
|
assert.match(dto, /Filtrá la Operadora mediante la relación temporal del Área/);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
test('Compatibility Area relation history remains available for legacy temporal queries', () => {
|
test('F6.1 resolves temporal Inventory operator from Area relation history', () => {
|
||||||
const temporal = source('src/asset-master/asset-temporal.service.ts');
|
const temporal = source('src/asset-master/asset-temporal.service.ts');
|
||||||
const migration = source('src/database/migrations/1790106600000-authoritative-inventory-relationships.ts');
|
|
||||||
|
|
||||||
assert.match(temporal, /FROM area_company_relations relation/);
|
assert.match(temporal, /FROM area_company_relations relation/);
|
||||||
assert.match(migration, /Derivado automáticamente de Yacimientos del modelo autoritativo/);
|
assert.match(temporal, /relation\.valid_from <= \$2/);
|
||||||
assert.match(migration, /TRUNCATE TABLE area_company_relations CASCADE/);
|
assert.match(temporal, /relation\.valid_until IS NULL OR relation\.valid_until > \$2/);
|
||||||
|
assert.match(temporal, /operator_company\.id=operator_relation\.company_id/);
|
||||||
|
assert.doesNotMatch(temporal, /operator_company\.id=history\.operator_company_id/);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('F6.1 verification planning can consume the Area compatibility projection', () => {
|
test('F6.1 verification planning uses Area relation truth instead of Inventory operator snapshot', () => {
|
||||||
const verification = source('src/inspection-verifications/inspection-verifications.service.ts');
|
const verification = source('src/inspection-verifications/inspection-verifications.service.ts');
|
||||||
const migration = source('src/database/migrations/1790106600000-authoritative-inventory-relationships.ts');
|
|
||||||
|
|
||||||
assert.match(verification, /FROM area_company_relations relation/);
|
assert.match(verification, /FROM area_company_relations relation/);
|
||||||
|
assert.match(verification, /relation\.valid_from <= \$2::timestamptz/);
|
||||||
assert.match(verification, /VERIFICATION_OPERATOR_NOT_ACTIVE/);
|
assert.match(verification, /VERIFICATION_OPERATOR_NOT_ACTIVE/);
|
||||||
assert.match(migration, /relation_role,source_document_id,valid_from,start_reason/);
|
assert.match(verification, /operatorSource: 'area_company_relations'/);
|
||||||
|
assert.doesNotMatch(verification, /company\.id = asset\.operator_company_id/);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('F6.1 historical operational lists read Company and Area from the parent Inspection', () => {
|
test('F6.1 historical operational lists read Company and Area from the parent Inspection', () => {
|
||||||
@@ -65,9 +68,11 @@ test('F6.1 historical operational lists read Company and Area from the parent In
|
|||||||
assert.doesNotMatch(acts, /context_asset\.operator_company_id/);
|
assert.doesNotMatch(acts, /context_asset\.operator_company_id/);
|
||||||
assert.match(findings, /company\.id = visit\.operator_company_id/);
|
assert.match(findings, /company\.id = visit\.operator_company_id/);
|
||||||
assert.match(findings, /area\.id = visit\.operational_area_id/);
|
assert.match(findings, /area\.id = visit\.operational_area_id/);
|
||||||
|
assert.doesNotMatch(findings, /company\.id = asset\.operator_company_id/);
|
||||||
assert.match(reports, /visit\.\$\{column\} = \$\{parameter\}::uuid/);
|
assert.match(reports, /visit\.\$\{column\} = \$\{parameter\}::uuid/);
|
||||||
assert.match(reports, /company\.id=context_visit\.operator_company_id/);
|
assert.match(reports, /company\.id=context_visit\.operator_company_id/);
|
||||||
assert.match(reports, /area\.id=context_visit\.operational_area_id/);
|
assert.match(reports, /area\.id=context_visit\.operational_area_id/);
|
||||||
|
assert.doesNotMatch(reports, /context_asset\.operator_company_id/);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('F6.1 WEB Inventory searches use physical scope and never the operator snapshot filter', () => {
|
test('F6.1 WEB Inventory searches use physical scope and never the operator snapshot filter', () => {
|
||||||
@@ -80,29 +85,26 @@ test('F6.1 WEB Inventory searches use physical scope and never the operator snap
|
|||||||
assert.match(inspectionEditor, /listInspectionPreventiveCandidates\(id, assetSearch\)/);
|
assert.match(inspectionEditor, /listInspectionPreventiveCandidates\(id, assetSearch\)/);
|
||||||
assert.match(preventiveApi, /inspection-visits\/\$\{visitId\}\/preventive-candidates/);
|
assert.match(preventiveApi, /inspection-visits\/\$\{visitId\}\/preventive-candidates/);
|
||||||
assert.match(preventiveService, /COALESCE\(visit\.scope_asset_id, visit\.operational_area_id\) AS "scopeAssetId"/);
|
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:/);
|
assert.doesNotMatch(inspectionEditor, /listAssets\(\{[\s\S]{0,300}operatorCompanyId:/);
|
||||||
|
|
||||||
for (const page of [fieldDiscoveries, inventoryMerge]) {
|
for (const page of [fieldDiscoveries, inventoryMerge]) {
|
||||||
assert.match(page, /listAssets\(\{[\s\S]{0,300}operationalAreaId:/);
|
assert.match(page, /listAssets\(\{[\s\S]{0,300}operationalAreaId:/);
|
||||||
assert.doesNotMatch(page, /listAssets\(\{[\s\S]{0,300}operatorCompanyId:/);
|
assert.doesNotMatch(page, /listAssets\(\{[\s\S]{0,300}operatorCompanyId:/);
|
||||||
}
|
}
|
||||||
|
assert.doesNotMatch(inventoryMerge, /source\.operatorCompany/);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('F7 WEB creation selects one Area-linked Company for Yacimiento and retires concession from the simple flow', () => {
|
test('F6.1 WEB derives the creation snapshot from the active Area operator and removes it from Inventory edits', () => {
|
||||||
const page = source('../web-v2/src/pages/InventoryCreatePage.tsx');
|
const editor = source('../web-v2/src/pages/AssetEditorPage.tsx');
|
||||||
const api = source('../web-v2/src/lib/inventoryStructureApi.ts');
|
const contextPanel = source('../web-v2/src/features/assets/AssetContextHistoryPanel.tsx');
|
||||||
const simpleStructure = source('src/asset-master/simple-inventory-structure.service.ts');
|
|
||||||
const migration = source('src/database/migrations/1790110200000-f7-simple-inventory-context.ts');
|
|
||||||
|
|
||||||
assert.match(page, /const requiresCompany = kind === 'YACIMIENTO'/);
|
assert.match(editor, /createAsset\(\{[\s\S]*operatorCompanyId: operatorCompanyId \|\| null/);
|
||||||
assert.match(page, /listCompaniesForInventoryArea\(parentId\)/);
|
assert.doesNotMatch(editor, /updateAsset\(id, \{[^}]*operatorCompanyId/);
|
||||||
assert.match(page, /Empresa operadora/);
|
assert.doesNotMatch(editor, /parent\.operatorCompany/);
|
||||||
assert.match(page, /operatorCompanyId: operatorCompanyId \|\| null/);
|
assert.match(editor, /listCompaniesForArea\(operationalAreaId\)\.then\(\(loadedCompanies\)/);
|
||||||
assert.doesNotMatch(page, /Tipo de concesión/);
|
assert.match(editor, /loadedCompanies\.length === 1 \? \(loadedCompanies\[0\]\?\.id \?\? ''\) : ''/);
|
||||||
assert.doesNotMatch(page, /concessionTypeId/);
|
assert.match(editor, /Snapshot histórico de alta/);
|
||||||
assert.match(api, /inventory-structure\/simple/);
|
assert.match(contextPanel, /Cambiar contexto físico/);
|
||||||
assert.match(simpleStructure, /requireAreaCompanyRelation/);
|
assert.doesNotMatch(contextPanel, /operatorCompanyId:/);
|
||||||
assert.match(simpleStructure, /INVENTORY_YACIMIENTO_COMPANY_NOT_IN_AREA/);
|
|
||||||
assert.match(migration, /La Empresa del Yacimiento debe estar vinculada como explotadora del Área/);
|
|
||||||
assert.match(migration, /NEW\.operational_area_id:=NEW\.parent_id/);
|
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ function source(path: string): string {
|
|||||||
return readFileSync(resolve(process.cwd(), path), 'utf8');
|
return readFileSync(resolve(process.cwd(), path), 'utf8');
|
||||||
}
|
}
|
||||||
|
|
||||||
test('F6.1 planning preloads the local start time and resolves Companies projected by Yacimientos', () => {
|
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 page = source('../web-v2/src/pages/InspectionVisitCreateF61Page.tsx');
|
||||||
const hierarchy = source('src/inspection-visits/inspection-planning-hierarchy.service.ts');
|
const hierarchy = source('src/inspection-visits/inspection-planning-hierarchy.service.ts');
|
||||||
|
|
||||||
@@ -17,9 +17,9 @@ test('F6.1 planning preloads the local start time and resolves Companies project
|
|||||||
assert.match(page, /response\.data\.length === 1/);
|
assert.match(page, /response\.data\.length === 1/);
|
||||||
assert.match(page, /setOperatorId\(response\.data\[0\]\.id\)/);
|
assert.match(page, /setOperatorId\(response\.data\[0\]\.id\)/);
|
||||||
assert.match(page, /Sin Operadora vigente para esa fecha/);
|
assert.match(page, /Sin Operadora vigente para esa fecha/);
|
||||||
assert.match(hierarchy, /FROM assets yacimiento/);
|
assert.match(hierarchy, /relation\.relation_role='OPERATOR'/);
|
||||||
assert.match(hierarchy, /yacimiento\.operator_company_id/);
|
assert.match(hierarchy, /relation\.valid_from <= \$2::timestamptz/);
|
||||||
assert.match(hierarchy, /SELECT DISTINCT company\.id/);
|
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', () => {
|
test('F6.1 WEB cancellation requires an explicit audited reason and is available while in progress', () => {
|
||||||
|
|||||||
@@ -1,43 +0,0 @@
|
|||||||
import assert from 'node:assert/strict';
|
|
||||||
import { readFileSync } from 'node:fs';
|
|
||||||
import { resolve } from 'node:path';
|
|
||||||
import test from 'node:test';
|
|
||||||
|
|
||||||
function apiFile(path: string): string {
|
|
||||||
return readFileSync(resolve(process.cwd(), path), 'utf8');
|
|
||||||
}
|
|
||||||
|
|
||||||
function repoFile(path: string): string {
|
|
||||||
return readFileSync(resolve(process.cwd(), '..', path), 'utf8');
|
|
||||||
}
|
|
||||||
|
|
||||||
test('F6.4 Android Installation picker searches live and selects a concrete parent', () => {
|
|
||||||
const screen = repoFile('android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/ModernVisitRoot.kt');
|
|
||||||
|
|
||||||
assert.match(screen, /LaunchedEffect\(modeName, parentSearch\)/);
|
|
||||||
assert.match(screen, /delay\(280\)/);
|
|
||||||
assert.match(screen, /model\.searchInventory\(parentSearch\.trim\(\), visit\.scopeAsset\?\.id\)/);
|
|
||||||
assert.match(screen, /ElevatedCard\(onClick = \{ chooseParent\(item\) \}/);
|
|
||||||
assert.match(screen, /model\.loadFieldTypes\(item\.id\)/);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('F6.4 Android field shell uses the modern theme and workspace', () => {
|
|
||||||
const gate = repoFile('android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/LoginGate.kt');
|
|
||||||
const theme = repoFile('android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/DhTheme.kt');
|
|
||||||
|
|
||||||
assert.match(gate, /DhTheme \{/);
|
|
||||||
assert.match(gate, /model\.visit != null -> ModernVisitRoot\(model\)/);
|
|
||||||
assert.match(theme, /RoundedCornerShape\(16\.dp\)/);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('F6.4 Android Act list uses a mobile read model independent from office reports', () => {
|
|
||||||
const android = repoFile('android-app/app/src/main/java/com/korexlabs/dhinspeccion/data/MobileActs.kt');
|
|
||||||
const controller = apiFile('src/inspection-acts/mobile-inspection-acts.controller.ts');
|
|
||||||
const service = apiFile('src/inspection-acts/mobile-inspection-acts.service.ts');
|
|
||||||
|
|
||||||
assert.match(android, /inspection-visits\/\{visitId\}\/acts\/mobile/);
|
|
||||||
assert.match(controller, /inspection-visits\/:visitId\/acts\/mobile/);
|
|
||||||
assert.match(service, /FROM inspection_acts act/);
|
|
||||||
assert.doesNotMatch(service, /inspection_reports/);
|
|
||||||
assert.doesNotMatch(service, /inspection_document/);
|
|
||||||
});
|
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
import 'reflect-metadata';
|
|
||||||
import assert from 'node:assert/strict';
|
|
||||||
import test from 'node:test';
|
|
||||||
import { readFileSync } from 'node:fs';
|
|
||||||
import { ActivityDossierService } from '../../src/asset-master/activity-dossier.service';
|
|
||||||
|
|
||||||
test('F7 Actividad no usa DISTINCT con ORDER BY COALESCE en visitas', () => {
|
|
||||||
const source = readFileSync('src/asset-master/activity-dossier.service.ts', 'utf8');
|
|
||||||
assert.doesNotMatch(source, /SELECT\s+DISTINCT\s+visit\.id/i);
|
|
||||||
assert.match(source, /ORDER BY COALESCE\(visit\.actual_started_at, visit\.planned_start_at, visit\.created_at\) DESC/);
|
|
||||||
assert.match(source, /EXISTS \(\s*SELECT 1\s*FROM inspection_visit_assets/s);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('F7 una faceta auxiliar defectuosa no derriba todo el expediente', async () => {
|
|
||||||
const dataSource = {
|
|
||||||
query: async (sql: string) => {
|
|
||||||
if (sql.includes('FROM assets\n WHERE id = $1')) {
|
|
||||||
return [{
|
|
||||||
id: 'bcba740f-cc84-48b3-8d06-88a9c439e25c',
|
|
||||||
code: 'YAC-0005',
|
|
||||||
name: 'Agua Botada',
|
|
||||||
commonName: null,
|
|
||||||
createdAt: new Date('2026-01-01T00:00:00Z'),
|
|
||||||
}];
|
|
||||||
}
|
|
||||||
if (sql.includes('inspection_finding_communications')) {
|
|
||||||
throw new Error('simulated optional facet failure');
|
|
||||||
}
|
|
||||||
return [];
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
const service = new ActivityDossierService(dataSource as never);
|
|
||||||
const dossier = await service.dossier('bcba740f-cc84-48b3-8d06-88a9c439e25c') as {
|
|
||||||
asset: { code: string; name: string };
|
|
||||||
counters: { inspections: number; findings: number };
|
|
||||||
warnings: string[];
|
|
||||||
timeline: unknown[];
|
|
||||||
};
|
|
||||||
|
|
||||||
assert.equal(dossier.asset.code, 'YAC-0005');
|
|
||||||
assert.equal(dossier.asset.name, 'Agua Botada');
|
|
||||||
assert.equal(dossier.counters.inspections, 0);
|
|
||||||
assert.equal(dossier.counters.findings, 0);
|
|
||||||
assert.deepEqual(dossier.warnings, ['communications']);
|
|
||||||
assert.deepEqual(dossier.timeline, []);
|
|
||||||
});
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
import 'reflect-metadata';
|
|
||||||
import assert from 'node:assert/strict';
|
|
||||||
import test from 'node:test';
|
|
||||||
import { readFileSync } from 'node:fs';
|
|
||||||
|
|
||||||
const mergedDossier = readFileSync('src/asset-master/merged-inventory-dossier.service.ts', 'utf8');
|
|
||||||
const dossierPanel = readFileSync('../web-v2/src/features/assets/AssetDossierPanel.tsx', 'utf8');
|
|
||||||
const simpleDetail = readFileSync('../web-v2/src/pages/SimpleInventoryDetailPage.tsx', 'utf8');
|
|
||||||
|
|
||||||
test('F7 mantiene Actividad disponible para Yacimiento', () => {
|
|
||||||
assert.match(simpleDetail, /kind === 'YACIMIENTO'/);
|
|
||||||
assert.match(simpleDetail, /setTab\('activity'\)/);
|
|
||||||
assert.match(simpleDetail, /AssetDossierPanel assetId=\{asset\.id\}/);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('F7 no hace depender el dossier territorial del subsistema de fusión', () => {
|
|
||||||
assert.match(mergedDossier, /MERGEABLE_DOSSIER_TYPES = new Set\(\['instalacion', 'subinstalacion'\]\)/);
|
|
||||||
assert.match(mergedDossier, /if \(!MERGEABLE_DOSSIER_TYPES\.has\(requestedTypeCode\)\)/);
|
|
||||||
assert.match(mergedDossier, /private readonly activity: ActivityDossierService/);
|
|
||||||
assert.match(mergedDossier, /return await this\.activity\.dossier\(requestedAssetId\)/);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('F7 la consulta auxiliar de merge nunca bloquea la carga de Actividad', () => {
|
|
||||||
assert.match(dossierPanel, /getInventoryMergeStatus\(assetId\)\.catch\(\(\) => null\)/);
|
|
||||||
assert.match(dossierPanel, /getAssetDossier\(assetId\)/);
|
|
||||||
});
|
|
||||||
@@ -1,136 +0,0 @@
|
|||||||
# F7 · Modelo simple de Inventarios
|
|
||||||
|
|
||||||
Este documento fija el nuevo eje funcional de Inventarios para DH Inspección V2. Su objetivo es reducir la complejidad visible y orientar toda la experiencia al trabajo real de inspección.
|
|
||||||
|
|
||||||
## 1. Jerarquía
|
|
||||||
|
|
||||||
La estructura física es única:
|
|
||||||
|
|
||||||
**Departamento → Área → Yacimiento → Instalación → Subinstalación**
|
|
||||||
|
|
||||||
- Departamento y Área organizan el territorio.
|
|
||||||
- Yacimiento, Instalación y Subinstalación son niveles válidos para registrar Hallazgos.
|
|
||||||
- Una Instalación pertenece a un Yacimiento.
|
|
||||||
- Una Subinstalación pertenece a una Instalación.
|
|
||||||
|
|
||||||
## 2. Empresas
|
|
||||||
|
|
||||||
- Un Área puede estar explotada por varias Empresas al mismo tiempo.
|
|
||||||
- Cada Yacimiento tiene una sola Empresa operadora vigente.
|
|
||||||
- La Empresa del Yacimiento se elige entre las Empresas vinculadas al Área.
|
|
||||||
- Instalaciones y Subinstalaciones heredan el contexto de Empresa desde su Yacimiento.
|
|
||||||
- Cambiar la Empresa de un Yacimiento no mueve ni recrea su Inventario físico.
|
|
||||||
|
|
||||||
## 3. Datos simples
|
|
||||||
|
|
||||||
Todos los registros usan una base común reducida:
|
|
||||||
|
|
||||||
- Nombre.
|
|
||||||
- Código, opcional y autogenerable.
|
|
||||||
- Ubicación jerárquica.
|
|
||||||
- Estado.
|
|
||||||
- GPS cuando corresponda.
|
|
||||||
- Observaciones sólo cuando aporten valor.
|
|
||||||
|
|
||||||
Departamento, Área y Yacimiento no necesitan un constructor técnico complejo.
|
|
||||||
|
|
||||||
Instalaciones y Subinstalaciones pueden tener campos específicos configurados por el Superadmin técnico.
|
|
||||||
|
|
||||||
Los tipos de campo visibles para la puesta a punto deben mantenerse simples:
|
|
||||||
|
|
||||||
- Texto.
|
|
||||||
- Número.
|
|
||||||
- Fecha.
|
|
||||||
- Sí / No.
|
|
||||||
|
|
||||||
Teléfono, email o identificadores simples pueden resolverse como Texto. GPS es un dato básico del registro, no un atributo técnico configurable.
|
|
||||||
|
|
||||||
## 4. Administración de tipos
|
|
||||||
|
|
||||||
Sólo el Superadmin técnico modifica la configuración.
|
|
||||||
|
|
||||||
La pantalla administrativa debe permitir únicamente:
|
|
||||||
|
|
||||||
1. Crear/ocultar Tipos de Instalación.
|
|
||||||
2. Crear/ocultar Tipos de Subinstalación.
|
|
||||||
3. Definir qué Tipos de Subinstalación puede contener cada Tipo de Instalación.
|
|
||||||
4. Agregar, mostrar/ocultar y marcar como obligatorios los campos simples de cada tipo.
|
|
||||||
|
|
||||||
Los términos técnicos internos como `inventory_families`, reglas de compatibilidad o schemas no deben exponerse al usuario.
|
|
||||||
|
|
||||||
## 5. Cambio de tipo / función
|
|
||||||
|
|
||||||
La identidad física del elemento no cambia cuando cambia su función.
|
|
||||||
|
|
||||||
Ejemplo: `TK-57` sigue siendo `TK-57`, aunque hoy funcione como tanque de petróleo y mañana como tanque de agua.
|
|
||||||
|
|
||||||
El cambio debe registrarse cronológicamente con:
|
|
||||||
|
|
||||||
- tipo / función anterior;
|
|
||||||
- tipo / función nueva;
|
|
||||||
- fecha efectiva;
|
|
||||||
- observación opcional.
|
|
||||||
|
|
||||||
No se crea un Inventario nuevo para representar un cambio de función.
|
|
||||||
|
|
||||||
## 6. Cronología útil
|
|
||||||
|
|
||||||
Para Yacimiento, Instalación y Subinstalación la cronología debe concentrar sólo hechos operativos relevantes:
|
|
||||||
|
|
||||||
- Hallazgos.
|
|
||||||
- Acta asociada.
|
|
||||||
- Empresa operadora correspondiente a la fecha.
|
|
||||||
- Cambio de tipo / función.
|
|
||||||
- Cambio de ubicación cuando corresponda.
|
|
||||||
- Alta e inactivación.
|
|
||||||
|
|
||||||
La experiencia normal no debe obligar a navegar por procedencia, snapshots, registros técnicos o paneles administrativos separados.
|
|
||||||
|
|
||||||
## 7. Filosofía de la APK
|
|
||||||
|
|
||||||
La APK existe para **inspeccionar, generar Acta y generar Informe**.
|
|
||||||
|
|
||||||
El Inspector no administra Inventarios como tarea separada.
|
|
||||||
|
|
||||||
La mayoría de las altas reales ocurren en campo mientras se registra un Hallazgo.
|
|
||||||
|
|
||||||
Flujo:
|
|
||||||
|
|
||||||
1. La Inspección se planifica desde WEB y ya conoce el Yacimiento.
|
|
||||||
2. El Inspector abre la Inspección al llegar.
|
|
||||||
3. Pulsa `+ Crear hallazgo`.
|
|
||||||
4. Decide si el Hallazgo corresponde a Yacimiento, Instalación o Subinstalación.
|
|
||||||
5. Si la Instalación no existe, puede crearla rápidamente sin abandonar el flujo.
|
|
||||||
6. Si necesita una Subinstalación que no existe, puede crearla rápidamente dentro de la Instalación seleccionada.
|
|
||||||
7. El catálogo ayuda, pero `OTRO` siempre está disponible.
|
|
||||||
8. Con el tiempo, el Inventario se completa naturalmente y disminuye la necesidad de altas nuevas.
|
|
||||||
|
|
||||||
## 8. Planificación y recorrido
|
|
||||||
|
|
||||||
La planificación WEB define:
|
|
||||||
|
|
||||||
- Área.
|
|
||||||
- Empresa.
|
|
||||||
- Yacimiento.
|
|
||||||
- Inspector.
|
|
||||||
- Fecha/hora.
|
|
||||||
- Instalaciones/Subinstalaciones elegidas preventivamente.
|
|
||||||
- pendientes por vencer, mostrados por elemento a controlar.
|
|
||||||
- pendientes vencidos, mostrados por elemento a controlar.
|
|
||||||
|
|
||||||
La APK presenta ese conjunto como recorrido sugerido. No es una ruta rígida: el Inspector puede registrar Hallazgos nuevos en cualquier momento.
|
|
||||||
|
|
||||||
## 9. Actas e Informes
|
|
||||||
|
|
||||||
- Abrir una Inspección no crea automáticamente un Acta.
|
|
||||||
- El Inspector pulsa `+ Nueva Acta` cuando empieza a documentar.
|
|
||||||
- El número definitivo del Acta se genera al cerrarla.
|
|
||||||
- Una Inspección puede tener varias Actas.
|
|
||||||
- Al cerrar un Acta se pueden agregar uno o más acompañantes con Nombre + Email.
|
|
||||||
- El Acta se envía a Empresa, Inspector y acompañantes.
|
|
||||||
- El Informe se genera automáticamente en Word y se envía únicamente al Inspector que realizó el Acta.
|
|
||||||
- La firma o validación legal definitiva queda para una etapa posterior; la prioridad actual es la usabilidad.
|
|
||||||
|
|
||||||
## 10. Regla de diseño
|
|
||||||
|
|
||||||
Si una pantalla, campo o estado necesita explicación técnica para ser usado correctamente, debe simplificarse antes de incorporarse a la experiencia cotidiana.
|
|
||||||
@@ -4,59 +4,37 @@ set -Eeuo pipefail
|
|||||||
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||||
LAYOUT="$ROOT/web-v2/src/layout/AppLayout.tsx"
|
LAYOUT="$ROOT/web-v2/src/layout/AppLayout.tsx"
|
||||||
APP="$ROOT/web-v2/src/app/App.tsx"
|
APP="$ROOT/web-v2/src/app/App.tsx"
|
||||||
CREATE_PAGE="$ROOT/web-v2/src/pages/InventoryCreatePage.tsx"
|
PAGE="$ROOT/web-v2/src/pages/InventoryCreatePage.tsx"
|
||||||
ADMIN_PAGE="$ROOT/web-v2/src/pages/AuthoritativeInventoryConfigPage.tsx"
|
|
||||||
API="$ROOT/web-v2/src/lib/inventoryStructureApi.ts"
|
|
||||||
|
|
||||||
for file in "$LAYOUT" "$APP" "$CREATE_PAGE" "$ADMIN_PAGE" "$API"; do
|
for file in "$LAYOUT" "$APP" "$PAGE"; do
|
||||||
test -f "$file" || {
|
test -f "$file" || {
|
||||||
echo "F7 WEB contract: falta $file"
|
echo "F4 WEB contract: falta $file"
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
done
|
done
|
||||||
|
|
||||||
if grep -Fq "label: 'Relevamientos'" "$LAYOUT"; then
|
if grep -Fq "label: 'Relevamientos'" "$LAYOUT"; then
|
||||||
echo "F7 WEB contract: Relevamientos no debe volver al menú principal"
|
echo "F4 WEB contract: Relevamientos no debe volver al menú principal"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if grep -Fq 'path="/relevamiento/*"' "$APP"; then
|
if grep -Fq 'path="/relevamiento/*"' "$APP"; then
|
||||||
echo "F7 WEB contract: Survey/Relevamiento no debe volver a exponer rutas activas"
|
echo "F4 WEB contract: Survey/Relevamiento no debe volver a exponer rutas activas"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
grep -Fq 'path="/inventarios/nuevo"' "$APP"
|
grep -Fq 'path="/inventarios/nuevo"' "$APP"
|
||||||
grep -Fq 'InventoryCreatePage' "$APP"
|
grep -Fq 'InventoryCreatePage' "$APP"
|
||||||
|
|
||||||
for kind in DEPARTAMENTO AREA YACIMIENTO INSTALACION SUBINSTALACION; do
|
for kind in AREA YACIMIENTO INSTALACION SUBINSTALACION; do
|
||||||
grep -Fq "kind: '$kind'" "$CREATE_PAGE"
|
grep -Fq "kind: '$kind'" "$PAGE"
|
||||||
done
|
done
|
||||||
|
|
||||||
if grep -Fq "kind: 'EQUIPO'" "$CREATE_PAGE"; then
|
if grep -Fq "kind: 'EQUIPO'" "$PAGE"; then
|
||||||
echo "F7 WEB contract: EQUIPO no debe restaurarse como nivel estructural"
|
echo "F4 WEB contract: el alta guiada no debe restaurar EQUIPO como quinto nivel estructural"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# F7: Yacimiento elige una Empresa ya vinculada al Área; concesión deja de ser una decisión del alta cotidiana.
|
grep -Fq 'getInventoryFamilyFindings' "$PAGE"
|
||||||
grep -Fq 'listCompaniesForInventoryArea' "$CREATE_PAGE"
|
|
||||||
if grep -Fq 'concessionTypeId' "$CREATE_PAGE"; then
|
|
||||||
echo "F7 WEB contract: el alta simple no debe exponer Tipo de concesión"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# El alta normal usa el endpoint simple; el endpoint histórico queda sólo por compatibilidad transitoria.
|
echo 'F4 WEB contract: OK'
|
||||||
grep -Fq "'/inventory-structure/simple'" "$API"
|
|
||||||
|
|
||||||
# La configuración técnica visible se reduce a tipos, contención y campos sencillos.
|
|
||||||
grep -Fq 'Tipos y campos' "$ADMIN_PAGE"
|
|
||||||
grep -Fq 'Tipos de Instalación' "$ADMIN_PAGE"
|
|
||||||
grep -Fq 'Tipos de Subinstalación' "$ADMIN_PAGE"
|
|
||||||
grep -Fq '+ Agregar campo' "$ADMIN_PAGE"
|
|
||||||
|
|
||||||
# El catálogo de Hallazgos no debe mezclarse con el formulario de alta de Inventario.
|
|
||||||
if grep -Fq 'getInventoryFamilyFindings' "$CREATE_PAGE"; then
|
|
||||||
echo "F7 WEB contract: el alta simple no debe cargar catálogo de Hallazgos"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo 'F7 WEB contract: OK'
|
|
||||||
|
|||||||
@@ -1,327 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
set -Eeuo pipefail
|
|
||||||
|
|
||||||
APP="/var/www/dhv2.korexlabs.com"
|
|
||||||
BACKUP_ROOT="/root/DH_V2_BACKUPS"
|
|
||||||
LOCK="/var/lock/dhv2-deploy.lock"
|
|
||||||
|
|
||||||
exec 9>"$LOCK"
|
|
||||||
|
|
||||||
if ! flock -n 9; then
|
|
||||||
echo "Otro deploy de DH V2 ya está en curso. No se realiza ninguna modificación."
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
DEPLOY_REF="${DHV2_DEPLOY_REF:-deploy}"
|
|
||||||
STAMP="$(date +%Y%m%d_%H%M%S)"
|
|
||||||
BACKUP="$BACKUP_ROOT/GITEA_DEPLOY_${STAMP}"
|
|
||||||
STAGE="/root/dhv2-gitea-stage-${STAMP}"
|
|
||||||
LOG="/tmp/dhv2-gitea-deploy-${STAMP}.log"
|
|
||||||
API_TEST_IMAGE="dhv2-api:gitea-${STAMP}"
|
|
||||||
WEB_TEST_IMAGE="dhv2-web:gitea-${STAMP}"
|
|
||||||
PHASE="bootstrap"
|
|
||||||
PREV_SHA=""
|
|
||||||
TARGET_SHA=""
|
|
||||||
EXPECTED_API_VERSION=""
|
|
||||||
EXPECTED_WEB_VERSION=""
|
|
||||||
APP_TOUCHED=0
|
|
||||||
|
|
||||||
cd "$APP"
|
|
||||||
exec > >(tee -a "$LOG") 2>&1
|
|
||||||
|
|
||||||
cleanup() {
|
|
||||||
set +e
|
|
||||||
git worktree remove --force "$STAGE" >/dev/null 2>&1 || true
|
|
||||||
rm -rf "$STAGE"
|
|
||||||
docker image rm "$API_TEST_IMAGE" "$WEB_TEST_IMAGE" >/dev/null 2>&1 || true
|
|
||||||
}
|
|
||||||
|
|
||||||
publish_status() {
|
|
||||||
local rc="${1:-1}"
|
|
||||||
set +e
|
|
||||||
|
|
||||||
local outcome="failure"
|
|
||||||
[ "$rc" -eq 0 ] && outcome="success"
|
|
||||||
local current="unknown"
|
|
||||||
current="$(git rev-parse HEAD 2>/dev/null || echo unknown)"
|
|
||||||
local status_file log_file status_blob log_blob tree commit
|
|
||||||
|
|
||||||
status_file="$(mktemp /tmp/dhv2-status.XXXXXX)"
|
|
||||||
log_file="$(mktemp /tmp/dhv2-log.XXXXXX)"
|
|
||||||
|
|
||||||
{
|
|
||||||
echo "status=$outcome"
|
|
||||||
echo "exit_code=$rc"
|
|
||||||
echo "phase=$PHASE"
|
|
||||||
echo "timestamp=$(date --iso-8601=seconds)"
|
|
||||||
echo "deploy_ref=$DEPLOY_REF"
|
|
||||||
echo "previous_sha=${PREV_SHA:-unknown}"
|
|
||||||
echo "target_sha=${TARGET_SHA:-unknown}"
|
|
||||||
echo "current_sha=$current"
|
|
||||||
echo "api_version=${EXPECTED_API_VERSION:-unknown}"
|
|
||||||
echo "web_version=${EXPECTED_WEB_VERSION:-unknown}"
|
|
||||||
echo "app_touched=$APP_TOUCHED"
|
|
||||||
echo "backup=${BACKUP:-unknown}"
|
|
||||||
} > "$status_file"
|
|
||||||
|
|
||||||
tail -n 500 "$LOG" > "$log_file" 2>/dev/null || true
|
|
||||||
status_blob="$(git hash-object -w "$status_file" 2>/dev/null || true)"
|
|
||||||
log_blob="$(git hash-object -w "$log_file" 2>/dev/null || true)"
|
|
||||||
|
|
||||||
if [ -n "$status_blob" ] && [ -n "$log_blob" ]; then
|
|
||||||
tree="$(printf '100644 blob %s\tdeploy.log\n100644 blob %s\tstatus.txt\n' "$log_blob" "$status_blob" | git mktree 2>/dev/null || true)"
|
|
||||||
if [ -n "$tree" ]; then
|
|
||||||
commit="$(printf 'deploy-status: %s · phase %s\n' "$outcome" "$PHASE" | git -c user.name='DH V2 Deploy Bot' -c user.email='deploy@dhv2.local' commit-tree "$tree" 2>/dev/null || true)"
|
|
||||||
[ -z "$commit" ] || git push --force origin "$commit:refs/heads/deploy-status" >/dev/null 2>&1 || true
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
rm -f "$status_file" "$log_file"
|
|
||||||
}
|
|
||||||
|
|
||||||
on_exit() {
|
|
||||||
local rc=$?
|
|
||||||
trap - EXIT ERR
|
|
||||||
cleanup
|
|
||||||
publish_status "$rc"
|
|
||||||
exit "$rc"
|
|
||||||
}
|
|
||||||
trap on_exit EXIT
|
|
||||||
|
|
||||||
rollback() {
|
|
||||||
local rc=$?
|
|
||||||
trap - ERR
|
|
||||||
PHASE="rollback"
|
|
||||||
|
|
||||||
echo
|
|
||||||
echo "============================================================"
|
|
||||||
echo " DH V2 · DEPLOY FALLÓ · ROLLBACK"
|
|
||||||
echo "============================================================"
|
|
||||||
|
|
||||||
cd "$APP"
|
|
||||||
if [ "$APP_TOUCHED" -eq 1 ] && [ -n "${PREV_SHA:-}" ]; then
|
|
||||||
echo "Restaurando aplicación al commit previo: $PREV_SHA"
|
|
||||||
git reset --hard "$PREV_SHA" || true
|
|
||||||
docker compose build api web </dev/null || true
|
|
||||||
docker compose up -d --no-deps --force-recreate api web </dev/null || true
|
|
||||||
else
|
|
||||||
echo "El candidato falló antes de modificar producción; no se reconstruye ni reinicia la aplicación activa."
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo
|
|
||||||
echo "Estado actual:"
|
|
||||||
docker compose ps -a </dev/null || true
|
|
||||||
|
|
||||||
if [ "$APP_TOUCHED" -eq 1 ]; then
|
|
||||||
echo
|
|
||||||
echo "Últimos logs:"
|
|
||||||
docker compose logs --tail=160 api web </dev/null || true
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo
|
|
||||||
if [ -d "$BACKUP" ]; then
|
|
||||||
echo "Backup PRE disponible en: $BACKUP"
|
|
||||||
echo "Las migraciones son forward-only; database-before.dump queda disponible para restauración manual si hiciera falta."
|
|
||||||
else
|
|
||||||
echo "No fue necesario crear backup PRE: el fallo ocurrió durante el preflight del candidato, antes de tocar producción."
|
|
||||||
fi
|
|
||||||
exit "$rc"
|
|
||||||
}
|
|
||||||
trap rollback ERR
|
|
||||||
|
|
||||||
echo
|
|
||||||
echo "============================================================"
|
|
||||||
echo " DH V2 · DEPLOY DESDE GITEA · $DEPLOY_REF"
|
|
||||||
echo "============================================================"
|
|
||||||
|
|
||||||
for cmd in git docker curl tar node; do
|
|
||||||
command -v "$cmd" >/dev/null || { echo "ERROR: falta $cmd"; false; }
|
|
||||||
done
|
|
||||||
[ -d .git ] || { echo "ERROR: $APP no es repositorio Git"; false; }
|
|
||||||
[ -f .env ] || { echo "ERROR: falta $APP/.env"; false; }
|
|
||||||
|
|
||||||
ORIGIN_URL="$(git remote get-url origin)"
|
|
||||||
EXPECTED_ORIGIN="https://git.korexlabs.com.ar/admin/dh-inspeccion-v2.git"
|
|
||||||
|
|
||||||
if [ "$ORIGIN_URL" != "$EXPECTED_ORIGIN" ]; then
|
|
||||||
echo "ERROR: origin no apunta al Gitea autorizado."
|
|
||||||
echo "Actual: $ORIGIN_URL"
|
|
||||||
echo "Esperado: $EXPECTED_ORIGIN"
|
|
||||||
false
|
|
||||||
fi
|
|
||||||
|
|
||||||
git config --global --get-all safe.directory 2>/dev/null | grep -Fxq "$APP" || git config --global --add safe.directory "$APP"
|
|
||||||
|
|
||||||
if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
|
|
||||||
echo "ERROR: hay cambios locales versionados en producción."
|
|
||||||
git status --short
|
|
||||||
false
|
|
||||||
fi
|
|
||||||
|
|
||||||
PREV_SHA="$(git rev-parse HEAD)"
|
|
||||||
PHASE="fetch"
|
|
||||||
git fetch origin "$DEPLOY_REF"
|
|
||||||
TARGET_SHA="$(git rev-parse "origin/$DEPLOY_REF")"
|
|
||||||
|
|
||||||
echo "Actual: $PREV_SHA"
|
|
||||||
echo "Objetivo: $TARGET_SHA"
|
|
||||||
|
|
||||||
if [ "$TARGET_SHA" = "$PREV_SHA" ]; then
|
|
||||||
echo "Producción ya está en el commit autorizado."
|
|
||||||
PHASE="complete"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! git merge-base --is-ancestor "$PREV_SHA" "$TARGET_SHA"; then
|
|
||||||
echo "ERROR: origin/$DEPLOY_REF no es fast-forward desde producción."
|
|
||||||
false
|
|
||||||
fi
|
|
||||||
|
|
||||||
PHASE="candidate-preflight"
|
|
||||||
rm -rf "$STAGE"
|
|
||||||
git worktree add --detach "$STAGE" "$TARGET_SHA" >/dev/null
|
|
||||||
|
|
||||||
EXPECTED_API_VERSION="$(node -p "require('$STAGE/api-v3/package.json').version")"
|
|
||||||
EXPECTED_WEB_VERSION="$(node -p "require('$STAGE/web-v2/package.json').version")"
|
|
||||||
|
|
||||||
echo "API candidata: $EXPECTED_API_VERSION"
|
|
||||||
echo "WEB candidata: $EXPECTED_WEB_VERSION"
|
|
||||||
|
|
||||||
docker compose --env-file "$APP/.env" -f "$STAGE/docker-compose.yml" config >/dev/null
|
|
||||||
|
|
||||||
while IFS= read -r -d '' script; do
|
|
||||||
bash -n "$script"
|
|
||||||
done < <(find "$STAGE/scripts" -type f -name '*.sh' -print0)
|
|
||||||
|
|
||||||
echo
|
|
||||||
echo "========== TEST API CANDIDATA =========="
|
|
||||||
docker build --target builder -t "$API_TEST_IMAGE" "$STAGE/api-v3" </dev/null
|
|
||||||
docker run --rm \
|
|
||||||
-v "$STAGE/api-v3/test:/app/test:ro" \
|
|
||||||
-v "$STAGE/api-v3/tsconfig.test.json:/app/tsconfig.test.json:ro" \
|
|
||||||
-v "$STAGE/docker-compose.yml:/docker-compose.yml:ro" \
|
|
||||||
-v "$STAGE/web-v2:/web-v2:ro" \
|
|
||||||
-v "$STAGE/android-app:/android-app:ro" \
|
|
||||||
"$API_TEST_IMAGE" npm test </dev/null
|
|
||||||
|
|
||||||
echo
|
|
||||||
echo "========== BUILD WEB CANDIDATA =========="
|
|
||||||
docker build -t "$WEB_TEST_IMAGE" "$STAGE/web-v2" </dev/null
|
|
||||||
|
|
||||||
PHASE="backup"
|
|
||||||
echo
|
|
||||||
echo "========== BACKUP PRE =========="
|
|
||||||
install -d -m 700 "$BACKUP"
|
|
||||||
docker compose exec -T db sh -lc 'pg_dump -U "$POSTGRES_USER" -d "$POSTGRES_DB" -Fc' </dev/null > "$BACKUP/database-before.dump"
|
|
||||||
tar \
|
|
||||||
--exclude='./.git' \
|
|
||||||
--exclude='./.env' \
|
|
||||||
--exclude='*/node_modules' \
|
|
||||||
--exclude='*/dist' \
|
|
||||||
--exclude='*.zip' \
|
|
||||||
--exclude='*.tar.gz' \
|
|
||||||
--exclude='*.tgz' \
|
|
||||||
-czf "$BACKUP/source-before.tar.gz" .
|
|
||||||
install -m 600 .env "$BACKUP/.env"
|
|
||||||
git rev-parse HEAD > "$BACKUP/previous.sha"
|
|
||||||
printf '%s\n' "$TARGET_SHA" > "$BACKUP/target.sha"
|
|
||||||
docker compose ps -a > "$BACKUP/docker-before.txt"
|
|
||||||
(
|
|
||||||
cd "$BACKUP"
|
|
||||||
sha256sum database-before.dump source-before.tar.gz .env previous.sha target.sha docker-before.txt > SHA256SUMS.txt
|
|
||||||
sha256sum -c SHA256SUMS.txt
|
|
||||||
)
|
|
||||||
chmod 600 "$BACKUP"/* "$BACKUP/.env" 2>/dev/null || true
|
|
||||||
|
|
||||||
PHASE="fast-forward"
|
|
||||||
echo
|
|
||||||
echo "========== FAST-FORWARD =========="
|
|
||||||
git log --oneline --no-decorate "$PREV_SHA..$TARGET_SHA"
|
|
||||||
APP_TOUCHED=1
|
|
||||||
git merge --ff-only "origin/$DEPLOY_REF"
|
|
||||||
|
|
||||||
PHASE="build"
|
|
||||||
echo
|
|
||||||
echo "========== BUILD PRODUCCIÓN =========="
|
|
||||||
docker compose build api migrate web </dev/null
|
|
||||||
|
|
||||||
PHASE="migrations"
|
|
||||||
echo
|
|
||||||
echo "========== MIGRACIONES =========="
|
|
||||||
docker compose --profile tools run --rm migrate </dev/null
|
|
||||||
docker compose --profile tools run --rm migrate npm run migration:show </dev/null | tee "$BACKUP/migrations.txt"
|
|
||||||
grep -Fq 'Pending migrations: no' "$BACKUP/migrations.txt"
|
|
||||||
|
|
||||||
PHASE="recreate"
|
|
||||||
echo
|
|
||||||
echo "========== RECREATE API + WEB =========="
|
|
||||||
docker compose up -d --no-deps --force-recreate api web </dev/null
|
|
||||||
|
|
||||||
PHASE="health"
|
|
||||||
echo
|
|
||||||
echo "========== HEALTH =========="
|
|
||||||
HEALTH_OK=0
|
|
||||||
for _ in $(seq 1 60); do
|
|
||||||
if curl -fsS --max-time 5 http://127.0.0.1:3101/api/v3/health > "$BACKUP/health.json" 2>/dev/null; then
|
|
||||||
if grep -Fq '"status":"ok"' "$BACKUP/health.json" \
|
|
||||||
&& grep -Fq "\"version\":\"$EXPECTED_API_VERSION\"" "$BACKUP/health.json" \
|
|
||||||
&& grep -Fq '"database":"ok"' "$BACKUP/health.json"; then
|
|
||||||
HEALTH_OK=1
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
|
|
||||||
CURRENT_API_VERSION="$(node -e 'try { const h = JSON.parse(require("fs").readFileSync(process.argv[1], "utf8")); process.stdout.write(String(h.version || "unknown")); } catch { process.stdout.write("invalid"); }' "$BACKUP/health.json")"
|
|
||||||
echo "API respondió pero aún no es la candidata (actual=$CURRENT_API_VERSION, esperada=$EXPECTED_API_VERSION). Reintentando..."
|
|
||||||
fi
|
|
||||||
sleep 2
|
|
||||||
done
|
|
||||||
|
|
||||||
if [ "$HEALTH_OK" -ne 1 ]; then
|
|
||||||
echo "ERROR: API candidata no pasó healthcheck/version/database dentro del plazo."
|
|
||||||
[ ! -f "$BACKUP/health.json" ] || cat "$BACKUP/health.json"
|
|
||||||
docker compose logs --tail=180 api
|
|
||||||
false
|
|
||||||
fi
|
|
||||||
|
|
||||||
cat "$BACKUP/health.json"
|
|
||||||
echo
|
|
||||||
|
|
||||||
grep -Fq "\"version\":\"$EXPECTED_API_VERSION\"" "$BACKUP/health.json"
|
|
||||||
grep -Fq '"database":"ok"' "$BACKUP/health.json"
|
|
||||||
|
|
||||||
WEB_CODE="$(curl -sS -o /dev/null -w '%{http_code}' --max-time 10 http://127.0.0.1:8182/)"
|
|
||||||
[ "$WEB_CODE" = "200" ] || { echo "ERROR: WEB HTTP $WEB_CODE"; false; }
|
|
||||||
|
|
||||||
PHASE="verify"
|
|
||||||
echo
|
|
||||||
echo "========== VERIFICACIÓN FINAL =========="
|
|
||||||
docker compose ps -a | tee "$BACKUP/docker-after.txt"
|
|
||||||
if docker compose ps --status running --services | grep -Fxq api && docker compose ps --status running --services | grep -Fxq web && docker compose ps --status running --services | grep -Fxq db; then
|
|
||||||
echo "Servicios críticos: OK"
|
|
||||||
else
|
|
||||||
echo "ERROR: falta un servicio crítico en ejecución."
|
|
||||||
false
|
|
||||||
fi
|
|
||||||
|
|
||||||
PHASE="post-backup"
|
|
||||||
docker compose exec -T db sh -lc 'pg_dump -U "$POSTGRES_USER" -d "$POSTGRES_DB" -Fc' </dev/null > "$BACKUP/database-after.dump"
|
|
||||||
git rev-parse HEAD > "$BACKUP/deployed.sha"
|
|
||||||
printf 'API=%s\nWEB=%s\n' "$EXPECTED_API_VERSION" "$EXPECTED_WEB_VERSION" > "$BACKUP/deployed-versions.txt"
|
|
||||||
(
|
|
||||||
cd "$BACKUP"
|
|
||||||
sha256sum database-after.dump deployed.sha deployed-versions.txt health.json migrations.txt docker-after.txt >> SHA256SUMS.txt
|
|
||||||
sha256sum -c SHA256SUMS.txt
|
|
||||||
)
|
|
||||||
chmod 600 "$BACKUP"/* "$BACKUP/.env" 2>/dev/null || true
|
|
||||||
|
|
||||||
PHASE="complete"
|
|
||||||
trap - ERR
|
|
||||||
|
|
||||||
echo
|
|
||||||
echo "============================================================"
|
|
||||||
echo " DH V2 · DEPLOY OK"
|
|
||||||
echo "============================================================"
|
|
||||||
echo "Commit: $TARGET_SHA"
|
|
||||||
echo "API: $EXPECTED_API_VERSION"
|
|
||||||
echo "WEB: $EXPECTED_WEB_VERSION"
|
|
||||||
echo "Backup: $BACKUP"
|
|
||||||
echo "============================================================"
|
|
||||||
@@ -14,10 +14,10 @@ import { AccessDeniedPage, NotFoundPage } from '../pages/SystemPages';
|
|||||||
import { UserDetailPage } from '../pages/UserDetailPage';
|
import { UserDetailPage } from '../pages/UserDetailPage';
|
||||||
import { UsersPage } from '../pages/UsersPage';
|
import { UsersPage } from '../pages/UsersPage';
|
||||||
import { AssetsPage } from '../pages/AssetsPage';
|
import { AssetsPage } from '../pages/AssetsPage';
|
||||||
import { InventoryDetailPage } from '../pages/InventoryDetailPage';
|
import { AssetEditorPage } from '../pages/AssetEditorPage';
|
||||||
import { InventoryCreatePage } from '../pages/InventoryCreatePage';
|
import { InventoryCreatePage } from '../pages/InventoryCreatePage';
|
||||||
import { FieldDiscoveriesPage } from '../pages/FieldDiscoveriesPage';
|
import { FieldDiscoveriesPage } from '../pages/FieldDiscoveriesPage';
|
||||||
import { AuthoritativeInventoryConfigPage } from '../pages/AuthoritativeInventoryConfigPage';
|
import { AssetTypesPage } from '../pages/AssetTypesPage';
|
||||||
import { HistoryPage } from '../pages/HistoryPage';
|
import { HistoryPage } from '../pages/HistoryPage';
|
||||||
import { TemporalAssetsPage } from '../pages/TemporalAssetsPage';
|
import { TemporalAssetsPage } from '../pages/TemporalAssetsPage';
|
||||||
import { InspectionVisitsPage } from '../pages/InspectionVisitsPage';
|
import { InspectionVisitsPage } from '../pages/InspectionVisitsPage';
|
||||||
@@ -49,9 +49,9 @@ export function App() {
|
|||||||
<Route element={<PermissionRoute permission="assets.read" />}><Route path="/mapa" element={<MapPage />} /></Route>
|
<Route element={<PermissionRoute permission="assets.read" />}><Route path="/mapa" element={<MapPage />} /></Route>
|
||||||
<Route element={<PermissionRoute permission="assets.read" />}>
|
<Route element={<PermissionRoute permission="assets.read" />}>
|
||||||
<Route path="/inventarios" element={<AssetsPage />} />
|
<Route path="/inventarios" element={<AssetsPage />} />
|
||||||
<Route path="/inventarios/:id" element={<InventoryDetailPage />} />
|
<Route path="/inventarios/:id" element={<AssetEditorPage />} />
|
||||||
<Route path="/activos" element={<Navigate to="/inventarios" replace />} />
|
<Route path="/activos" element={<Navigate to="/inventarios" replace />} />
|
||||||
<Route path="/activos/:id" element={<InventoryDetailPage />} />
|
<Route path="/activos/:id" element={<AssetEditorPage />} />
|
||||||
</Route>
|
</Route>
|
||||||
<Route element={<PermissionRoute permission="assets.change_status" />}><Route path="/inventarios/revision-campo" element={<FieldDiscoveriesPage />} /></Route>
|
<Route element={<PermissionRoute permission="assets.change_status" />}><Route path="/inventarios/revision-campo" element={<FieldDiscoveriesPage />} /></Route>
|
||||||
<Route element={<PermissionRoute permission="assets.create" />}><Route path="/inventarios/nuevo" element={<InventoryCreatePage />} /><Route path="/activos/nuevo" element={<Navigate to="/inventarios/nuevo" replace />} /></Route>
|
<Route element={<PermissionRoute permission="assets.create" />}><Route path="/inventarios/nuevo" element={<InventoryCreatePage />} /><Route path="/activos/nuevo" element={<Navigate to="/inventarios/nuevo" replace />} /></Route>
|
||||||
@@ -79,7 +79,7 @@ export function App() {
|
|||||||
<Route element={<PermissionRoute permission="users.create" />}><Route path="/admin/users/new" element={<NewUserPage />} /></Route>
|
<Route element={<PermissionRoute permission="users.create" />}><Route path="/admin/users/new" element={<NewUserPage />} /></Route>
|
||||||
<Route element={<PermissionRoute permission="roles.read" />}><Route path="/admin/roles" element={<RolesPage />} /></Route>
|
<Route element={<PermissionRoute permission="roles.read" />}><Route path="/admin/roles" element={<RolesPage />} /></Route>
|
||||||
<Route element={<PermissionRoute permission="audit.read" />}><Route path="/admin/audit" element={<AuditPage />} /></Route>
|
<Route element={<PermissionRoute permission="audit.read" />}><Route path="/admin/audit" element={<AuditPage />} /></Route>
|
||||||
<Route element={<PermissionRoute permission="asset_types.read" />}><Route path="/admin/asset-types" element={<AuthoritativeInventoryConfigPage />} /></Route>
|
<Route element={<PermissionRoute permission="asset_types.read" />}><Route path="/admin/asset-types" element={<AssetTypesPage />} /></Route>
|
||||||
<Route element={<PermissionRoute permission="finding_catalog.manage" />}><Route path="/admin/finding-catalog" element={<FindingCatalogPage />} /></Route>
|
<Route element={<PermissionRoute permission="finding_catalog.manage" />}><Route path="/admin/finding-catalog" element={<FindingCatalogPage />} /></Route>
|
||||||
<Route element={<PermissionRoute permission="document_delivery.read" />}><Route path="/admin/document-delivery" element={<DocumentDeliveryPage />} /></Route>
|
<Route element={<PermissionRoute permission="document_delivery.read" />}><Route path="/admin/document-delivery" element={<DocumentDeliveryPage />} /></Route>
|
||||||
<Route path="/sin-acceso" element={<AccessDeniedPage />} />
|
<Route path="/sin-acceso" element={<AccessDeniedPage />} />
|
||||||
|
|||||||
@@ -1,26 +0,0 @@
|
|||||||
import type { AuthUser } from '../lib/api';
|
|
||||||
|
|
||||||
function normalizeRole(value: string) {
|
|
||||||
return value
|
|
||||||
.normalize('NFD')
|
|
||||||
.replace(/[\u0300-\u036f]/g, '')
|
|
||||||
.toLowerCase()
|
|
||||||
.replace(/[^a-z0-9]+/g, ' ')
|
|
||||||
.trim();
|
|
||||||
}
|
|
||||||
|
|
||||||
const ADMIN_ROLES = new Set([
|
|
||||||
'admin',
|
|
||||||
'administrator',
|
|
||||||
'administrador',
|
|
||||||
'superadmin',
|
|
||||||
'super admin',
|
|
||||||
'superadministrator',
|
|
||||||
'super administrator',
|
|
||||||
'superadministrador',
|
|
||||||
'super administrador',
|
|
||||||
]);
|
|
||||||
|
|
||||||
export function hasAdministratorRole(user: AuthUser | null) {
|
|
||||||
return Boolean(user?.roles.some((role) => ADMIN_ROLES.has(normalizeRole(role))));
|
|
||||||
}
|
|
||||||
@@ -81,12 +81,10 @@ export function AssetDossierPanel({ assetId }: { assetId: string }) {
|
|||||||
const load = () => {
|
const load = () => {
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
setError('');
|
setError('');
|
||||||
setMergeStatus(null);
|
|
||||||
Promise.all([
|
Promise.all([
|
||||||
getAssetDossier(assetId),
|
getAssetDossier(assetId),
|
||||||
getAsset(assetId),
|
getAsset(assetId),
|
||||||
// La conciliación es auxiliar: nunca debe bloquear la Actividad del Inventario.
|
getInventoryMergeStatus(assetId),
|
||||||
getInventoryMergeStatus(assetId).catch(() => null),
|
|
||||||
])
|
])
|
||||||
.then(([loadedDossier, loadedAsset, loadedMerge]) => {
|
.then(([loadedDossier, loadedAsset, loadedMerge]) => {
|
||||||
setDossier(loadedDossier as ExtendedDossier);
|
setDossier(loadedDossier as ExtendedDossier);
|
||||||
|
|||||||
@@ -34,10 +34,10 @@ function supportsFunctionChange(code: string, name: string): boolean {
|
|||||||
|
|
||||||
export function AssetHistoryPanel({
|
export function AssetHistoryPanel({
|
||||||
assetId,
|
assetId,
|
||||||
refreshKey = 0,
|
refreshKey,
|
||||||
}: {
|
}: {
|
||||||
assetId: string;
|
assetId: string;
|
||||||
refreshKey?: number;
|
refreshKey: number;
|
||||||
}) {
|
}) {
|
||||||
const [versions, setVersions] = useState<AssetVersionSummary[]>([]);
|
const [versions, setVersions] = useState<AssetVersionSummary[]>([]);
|
||||||
const [total, setTotal] = useState(0);
|
const [total, setTotal] = useState(0);
|
||||||
|
|||||||
@@ -52,12 +52,12 @@ export function AssetMediaPanel({
|
|||||||
assetId,
|
assetId,
|
||||||
assetName,
|
assetName,
|
||||||
canManage,
|
canManage,
|
||||||
onChanged = () => undefined,
|
onChanged,
|
||||||
}: {
|
}: {
|
||||||
assetId: string;
|
assetId: string;
|
||||||
assetName: string;
|
assetName: string;
|
||||||
canManage: boolean;
|
canManage: boolean;
|
||||||
onChanged?: () => void;
|
onChanged: () => void;
|
||||||
}) {
|
}) {
|
||||||
const fileRef = useRef<HTMLInputElement | null>(null);
|
const fileRef = useRef<HTMLInputElement | null>(null);
|
||||||
const [items, setItems] = useState<AssetMedia[]>([]);
|
const [items, setItems] = useState<AssetMedia[]>([]);
|
||||||
|
|||||||
@@ -21,16 +21,7 @@ export interface InventoryTechnicalValues {
|
|||||||
values:Record<string,unknown>;
|
values:Record<string,unknown>;
|
||||||
}
|
}
|
||||||
export interface InventoryStructureLevel { kind:InventoryStructureKind; label:string; type:{id:string;code:string;name:string}; parentKind:InventoryStructureKind|null; requiresFamily:boolean; }
|
export interface InventoryStructureLevel { kind:InventoryStructureKind; label:string; type:{id:string;code:string;name:string}; parentKind:InventoryStructureKind|null; requiresFamily:boolean; }
|
||||||
export interface InventoryStructureOption { id:string; code:string; name:string; }
|
export interface InventoryStructureOptions { independentMasters:InventoryStructureLevel[]; levels:InventoryStructureLevel[]; installationFamilies:InventoryFamily[]; subinstallationFamilies:InventoryFamily[]; }
|
||||||
export interface InventoryAreaCompanyOption extends InventoryStructureOption { commonName?:string|null; typeName?:string; }
|
|
||||||
export interface InventoryStructureOptions {
|
|
||||||
independentMasters:InventoryStructureLevel[];
|
|
||||||
levels:InventoryStructureLevel[];
|
|
||||||
companies:InventoryStructureOption[];
|
|
||||||
concessionTypes:InventoryStructureOption[];
|
|
||||||
installationFamilies:InventoryFamily[];
|
|
||||||
subinstallationFamilies:InventoryFamily[];
|
|
||||||
}
|
|
||||||
export interface InventoryStructureParent {
|
export interface InventoryStructureParent {
|
||||||
id:string; code:string; name:string; commonName:string|null; type:{id:string;code:string;name:string};
|
id:string; code:string; name:string; commonName:string|null; type:{id:string;code:string;name:string};
|
||||||
inventoryFamily:null|{id:string;code:string;name:string;level:'INSTALLATION'|'SUBINSTALLATION';informationLabels:string[]};
|
inventoryFamily:null|{id:string;code:string;name:string;level:'INSTALLATION'|'SUBINSTALLATION';informationLabels:string[]};
|
||||||
@@ -44,9 +35,7 @@ export interface InventoryFamilyFindings { family:InventoryFamily; items:Invento
|
|||||||
export interface CreatedInventoryStructure {
|
export interface CreatedInventoryStructure {
|
||||||
id:string; code:string; name:string; commonName:string|null; description:string|null; informationStatus:string; operationalStatus:string;
|
id:string; code:string; name:string; commonName:string|null; description:string|null; informationStatus:string; operationalStatus:string;
|
||||||
type:{id:string;code:string;name:string}; parent:null|{id:string;code:string;name:string}; operationalArea?:null|{id:string;code:string;name:string};
|
type:{id:string;code:string;name:string}; parent:null|{id:string;code:string;name:string}; operationalArea?:null|{id:string;code:string;name:string};
|
||||||
operatorCompany?:null|{id:string;code:string;name:string};
|
inventoryFamily:null|{id:string;code:string;name:string;level:string;informationLabels:string[]};
|
||||||
concessionType?:null|{id:string;code:string;name:string};
|
|
||||||
inventoryFamily:null|{id:string;code:string;name:string;level:string;informationLabels?:string[]};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getInventoryStructureOptions(){return apiRequest<InventoryStructureOptions>('/inventory-structure');}
|
export function getInventoryStructureOptions(){return apiRequest<InventoryStructureOptions>('/inventory-structure');}
|
||||||
@@ -54,9 +43,6 @@ export async function listInventoryStructureParents(kind:InventoryStructureKind,
|
|||||||
const query=new URLSearchParams(); if(search.trim()) query.set('search',search.trim()); const suffix=query.size?`?${query}`:'';
|
const query=new URLSearchParams(); if(search.trim()) query.set('search',search.trim()); const suffix=query.size?`?${query}`:'';
|
||||||
return (await apiRequest<{data:InventoryStructureParent[]}>(`/inventory-structure/parents/${kind}${suffix}`)).data;
|
return (await apiRequest<{data:InventoryStructureParent[]}>(`/inventory-structure/parents/${kind}${suffix}`)).data;
|
||||||
}
|
}
|
||||||
export async function listCompaniesForInventoryArea(areaId:string){
|
|
||||||
return (await apiRequest<{data:InventoryAreaCompanyOption[]}>(`/asset-operational-relations/areas/${areaId}/companies`)).data;
|
|
||||||
}
|
|
||||||
export function getInventoryFamilyFindings(familyId:string){return apiRequest<InventoryFamilyFindings>(`/inventory-families/${familyId}/findings`);}
|
export function getInventoryFamilyFindings(familyId:string){return apiRequest<InventoryFamilyFindings>(`/inventory-families/${familyId}/findings`);}
|
||||||
export function getInventoryFamilyAttributes(familyId:string){return apiRequest<InventoryFamilyAttributes>(`/inventory-families/${familyId}/attributes`);}
|
export function getInventoryFamilyAttributes(familyId:string){return apiRequest<InventoryFamilyAttributes>(`/inventory-families/${familyId}/attributes`);}
|
||||||
export function getInventoryTechnicalValues(assetId:string){return apiRequest<InventoryTechnicalValues>(`/assets/${assetId}/technical-values`);}
|
export function getInventoryTechnicalValues(assetId:string){return apiRequest<InventoryTechnicalValues>(`/assets/${assetId}/technical-values`);}
|
||||||
@@ -67,4 +53,4 @@ export function updateInventoryFamily(familyId:string,input:{name?:string;parent
|
|||||||
export function createInventoryFamilyAttribute(familyId:string,input:{code:string;name:string;dataType:InventoryFamilyAttributeDataType;isRequired?:boolean;unit?:string|null;options?:string[];sortOrder?:number}){return apiRequest<InventoryFamilyAttribute>(`/inventory-families/${familyId}/attributes`,{method:'POST',body:JSON.stringify(input)});}
|
export function createInventoryFamilyAttribute(familyId:string,input:{code:string;name:string;dataType:InventoryFamilyAttributeDataType;isRequired?:boolean;unit?:string|null;options?:string[];sortOrder?:number}){return apiRequest<InventoryFamilyAttribute>(`/inventory-families/${familyId}/attributes`,{method:'POST',body:JSON.stringify(input)});}
|
||||||
export function updateInventoryFamilyAttribute(familyId:string,attributeId:string,input:{name?:string;dataType?:InventoryFamilyAttributeDataType;isRequired?:boolean;isActive?:boolean;unit?:string|null;options?:string[]|null;sortOrder?:number}){return apiRequest<InventoryFamilyAttribute>(`/inventory-families/${familyId}/attributes/${attributeId}`,{method:'PATCH',body:JSON.stringify(input)});}
|
export function updateInventoryFamilyAttribute(familyId:string,attributeId:string,input:{name?:string;dataType?:InventoryFamilyAttributeDataType;isRequired?:boolean;isActive?:boolean;unit?:string|null;options?:string[]|null;sortOrder?:number}){return apiRequest<InventoryFamilyAttribute>(`/inventory-families/${familyId}/attributes/${attributeId}`,{method:'PATCH',body:JSON.stringify(input)});}
|
||||||
export function replaceInventoryFamilyFindings(familyId:string,input:{itemIds:string[];reason:string}){return apiRequest<InventoryFamilyFindings>(`/inventory-families/${familyId}/findings`,{method:'PUT',body:JSON.stringify(input)});}
|
export function replaceInventoryFamilyFindings(familyId:string,input:{itemIds:string[];reason:string}){return apiRequest<InventoryFamilyFindings>(`/inventory-families/${familyId}/findings`,{method:'PUT',body:JSON.stringify(input)});}
|
||||||
export function createInventoryStructure(input:{kind:InventoryStructureKind;code?:string|null;name:string;commonName?:string|null;parentId?:string|null;familyId?:string|null;operatorCompanyId?:string|null;concessionTypeId?:string|null;description?:string|null}){return apiRequest<CreatedInventoryStructure>('/inventory-structure/simple',{method:'POST',body:JSON.stringify(input)});}
|
export function createInventoryStructure(input:{kind:InventoryStructureKind;code?:string|null;name:string;commonName?:string|null;parentId?:string|null;familyId?:string|null;description?:string|null}){return apiRequest<CreatedInventoryStructure>('/inventory-structure',{method:'POST',body:JSON.stringify(input)});}
|
||||||
|
|||||||
@@ -1,215 +0,0 @@
|
|||||||
.asset-compact-form {
|
|
||||||
gap: 0;
|
|
||||||
padding: 0;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-section {
|
|
||||||
display: grid;
|
|
||||||
gap: 14px;
|
|
||||||
padding: 20px 22px;
|
|
||||||
border-bottom: 1px solid var(--line);
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-section-heading {
|
|
||||||
display: flex;
|
|
||||||
align-items: flex-start;
|
|
||||||
justify-content: space-between;
|
|
||||||
gap: 16px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-section-heading h2 {
|
|
||||||
margin: 0;
|
|
||||||
font-size: 17px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-primary-grid {
|
|
||||||
gap: 12px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-meta {
|
|
||||||
display: flex;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
gap: 8px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-meta > span {
|
|
||||||
min-width: 0;
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 7px;
|
|
||||||
padding: 7px 10px;
|
|
||||||
border: 1px solid #e0e5ed;
|
|
||||||
border-radius: 8px;
|
|
||||||
background: #f8fafc;
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-meta small {
|
|
||||||
color: var(--muted);
|
|
||||||
font-size: 9px;
|
|
||||||
font-weight: 700;
|
|
||||||
text-transform: uppercase;
|
|
||||||
letter-spacing: .05em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-meta strong {
|
|
||||||
min-width: 0;
|
|
||||||
overflow: hidden;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
color: var(--ink);
|
|
||||||
font-size: 11px;
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-context-button {
|
|
||||||
min-height: 34px;
|
|
||||||
padding: 7px 11px;
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-context-grid {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
|
||||||
gap: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-context-item {
|
|
||||||
min-width: 0;
|
|
||||||
display: grid;
|
|
||||||
gap: 3px;
|
|
||||||
padding: 12px 13px;
|
|
||||||
border: 1px solid #e1e6ee;
|
|
||||||
border-radius: 10px;
|
|
||||||
background: #f8fafc;
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-context-item small {
|
|
||||||
color: var(--muted);
|
|
||||||
font-size: 9px;
|
|
||||||
font-weight: 750;
|
|
||||||
text-transform: uppercase;
|
|
||||||
letter-spacing: .05em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-context-item strong {
|
|
||||||
overflow: hidden;
|
|
||||||
color: var(--ink);
|
|
||||||
font-size: 12px;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-context-item span {
|
|
||||||
overflow: hidden;
|
|
||||||
color: var(--muted);
|
|
||||||
font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
|
|
||||||
font-size: 9px;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-details {
|
|
||||||
border-bottom: 1px solid var(--line);
|
|
||||||
background: #fff;
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-details > summary {
|
|
||||||
min-height: 54px;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: space-between;
|
|
||||||
gap: 14px;
|
|
||||||
padding: 13px 22px;
|
|
||||||
cursor: pointer;
|
|
||||||
list-style: none;
|
|
||||||
user-select: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-details > summary::-webkit-details-marker {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-details > summary:hover {
|
|
||||||
background: #f8fafc;
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-details > summary > span:first-child {
|
|
||||||
min-width: 0;
|
|
||||||
display: grid;
|
|
||||||
gap: 2px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-details > summary strong {
|
|
||||||
color: var(--ink);
|
|
||||||
font-size: 12px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-details > summary small {
|
|
||||||
overflow: hidden;
|
|
||||||
color: var(--muted);
|
|
||||||
font-size: 10px;
|
|
||||||
font-weight: 500;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-details > summary > span:last-child {
|
|
||||||
color: #7b8496;
|
|
||||||
font-size: 16px;
|
|
||||||
transition: transform .18s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-details[open] > summary > span:last-child {
|
|
||||||
transform: rotate(180deg);
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-details-body {
|
|
||||||
display: grid;
|
|
||||||
gap: 16px;
|
|
||||||
padding: 2px 22px 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-technical {
|
|
||||||
display: grid;
|
|
||||||
gap: 12px;
|
|
||||||
padding-top: 2px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-technical h3 {
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-form > .form-actions {
|
|
||||||
padding: 16px 22px 18px;
|
|
||||||
background: #fafbfc;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (max-width: 720px) {
|
|
||||||
.asset-compact-section {
|
|
||||||
padding: 17px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-section-heading {
|
|
||||||
display: grid;
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-context-button {
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-context-grid {
|
|
||||||
grid-template-columns: 1fr;
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-details > summary {
|
|
||||||
padding: 13px 17px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-details-body {
|
|
||||||
padding: 2px 17px 18px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.asset-compact-form > .form-actions {
|
|
||||||
padding: 14px 17px 17px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,18 +1,11 @@
|
|||||||
import './AssetEditorPage.css';
|
|
||||||
import { SearchableSelect } from '../components/SearchableSelect';
|
import { SearchableSelect } from '../components/SearchableSelect';
|
||||||
import { lazy, Suspense, useEffect, useMemo, useState } from 'react';
|
import { lazy, Suspense, useEffect, useMemo, useState } from 'react';
|
||||||
import type { FormEvent, ReactNode } from 'react';
|
import type { FormEvent } from 'react';
|
||||||
import { Link, useNavigate, useParams, useSearchParams } from 'react-router';
|
import { Link, useNavigate, useParams, useSearchParams } from 'react-router';
|
||||||
import { useAuth } from '../auth/AuthContext';
|
import { useAuth } from '../auth/AuthContext';
|
||||||
import { Alert, LoadingBlock, errorMessage } from '../components/Feedback';
|
import { Alert, LoadingBlock, errorMessage } from '../components/Feedback';
|
||||||
import { Icon } from '../components/Icon';
|
import { Icon } from '../components/Icon';
|
||||||
import {
|
import { ASSET_OPERATIONAL_STATUSES, ASSET_STATUSES, assetOperationalStatusLabel, assetStatusClass, assetStatusLabel } from '../features/assets/assetPresentation';
|
||||||
ASSET_OPERATIONAL_STATUSES,
|
|
||||||
ASSET_STATUSES,
|
|
||||||
assetOperationalStatusLabel,
|
|
||||||
assetStatusClass,
|
|
||||||
assetStatusLabel,
|
|
||||||
} from '../features/assets/assetPresentation';
|
|
||||||
import { AssetHistoryPanel } from '../features/assets/AssetHistoryPanel';
|
import { AssetHistoryPanel } from '../features/assets/AssetHistoryPanel';
|
||||||
import { AssetDossierPanel } from '../features/assets/AssetDossierPanel';
|
import { AssetDossierPanel } from '../features/assets/AssetDossierPanel';
|
||||||
import { AssetMediaPanel } from '../features/assets/AssetMediaPanel';
|
import { AssetMediaPanel } from '../features/assets/AssetMediaPanel';
|
||||||
@@ -22,31 +15,15 @@ import { AssetRegistryPanel } from '../features/assets/AssetRegistryPanel';
|
|||||||
import { AssetContextHistoryPanel } from '../features/assets/AssetContextHistoryPanel';
|
import { AssetContextHistoryPanel } from '../features/assets/AssetContextHistoryPanel';
|
||||||
import { AssetFindingCatalogPanel } from '../features/assets/AssetFindingCatalogPanel';
|
import { AssetFindingCatalogPanel } from '../features/assets/AssetFindingCatalogPanel';
|
||||||
import {
|
import {
|
||||||
createAsset,
|
createAsset, getAsset, getAssetLineage, listAssetParentOptions, listAssetTypes, listCompaniesForArea,
|
||||||
getAsset,
|
listOperationalAreas, updateAsset, updateAssetInformationStatus, updateAssetOperationalStatus,
|
||||||
getAssetLineage,
|
|
||||||
listAssetParentOptions,
|
|
||||||
listAssetTypes,
|
|
||||||
listCompaniesForArea,
|
|
||||||
listOperationalAreas,
|
|
||||||
updateAsset,
|
|
||||||
updateAssetInformationStatus,
|
|
||||||
updateAssetOperationalStatus,
|
|
||||||
} from '../lib/api';
|
} from '../lib/api';
|
||||||
import type {
|
import type {
|
||||||
AssetAttributeDefinition,
|
AssetAttributeDefinition, AssetDetail, AssetInformationStatus, AssetOperationalStatus,
|
||||||
AssetDetail,
|
AssetLineageItem, AssetListItem, AssetType, OperationalAssetSummary,
|
||||||
AssetInformationStatus,
|
|
||||||
AssetOperationalStatus,
|
|
||||||
AssetLineageItem,
|
|
||||||
AssetListItem,
|
|
||||||
AssetType,
|
|
||||||
OperationalAssetSummary,
|
|
||||||
} from '../lib/api';
|
} from '../lib/api';
|
||||||
|
|
||||||
const AssetGeometryEditor = lazy(() =>
|
const AssetGeometryEditor = lazy(() => import('../features/map/AssetGeometryEditor').then((module) => ({ default: module.AssetGeometryEditor })));
|
||||||
import('../features/map/AssetGeometryEditor').then((module) => ({ default: module.AssetGeometryEditor })),
|
|
||||||
);
|
|
||||||
|
|
||||||
type DetailTab = 'summary' | 'dossier' | 'findings' | 'location' | 'registry' | 'files' | 'history';
|
type DetailTab = 'summary' | 'dossier' | 'findings' | 'location' | 'registry' | 'files' | 'history';
|
||||||
|
|
||||||
@@ -58,34 +35,16 @@ function localDateTime(value: unknown): string {
|
|||||||
return local.toISOString().slice(0, 16);
|
return local.toISOString().slice(0, 16);
|
||||||
}
|
}
|
||||||
|
|
||||||
function normalizeAttributeValues(
|
function normalizeAttributeValues(definitions: AssetAttributeDefinition[], values: Record<string, unknown>): Record<string, unknown> {
|
||||||
definitions: AssetAttributeDefinition[],
|
|
||||||
values: Record<string, unknown>,
|
|
||||||
): Record<string, unknown> {
|
|
||||||
const result: Record<string, unknown> = {};
|
const result: Record<string, unknown> = {};
|
||||||
definitions.filter((item) => item.isActive).forEach((definition) => {
|
definitions.filter((item) => item.isActive).forEach((definition) => {
|
||||||
const raw = values[definition.id];
|
const raw = values[definition.id];
|
||||||
if (definition.dataType === 'BOOLEAN') result[definition.id] = Boolean(raw);
|
if (definition.dataType === 'BOOLEAN') result[definition.id] = Boolean(raw);
|
||||||
else if (raw !== undefined && raw !== null && raw !== '') {
|
else if (raw !== undefined && raw !== null && raw !== '') result[definition.id] = definition.dataType === 'NUMBER' ? Number(raw) : raw;
|
||||||
result[definition.id] = definition.dataType === 'NUMBER' ? Number(raw) : raw;
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
function hasAttributeValue(definition: AssetAttributeDefinition, value: unknown): boolean {
|
|
||||||
if (definition.dataType === 'BOOLEAN') return value === true;
|
|
||||||
return value !== undefined && value !== null && String(value).trim() !== '';
|
|
||||||
}
|
|
||||||
|
|
||||||
function normalizeStructuralType(value: string | null | undefined): string {
|
|
||||||
return (value ?? '')
|
|
||||||
.normalize('NFD')
|
|
||||||
.replace(/[\u0300-\u036f]/g, '')
|
|
||||||
.trim()
|
|
||||||
.toLowerCase();
|
|
||||||
}
|
|
||||||
|
|
||||||
export function AssetEditorPage() {
|
export function AssetEditorPage() {
|
||||||
const { id } = useParams();
|
const { id } = useParams();
|
||||||
const editing = Boolean(id);
|
const editing = Boolean(id);
|
||||||
@@ -93,11 +52,7 @@ export function AssetEditorPage() {
|
|||||||
const [searchParams] = useSearchParams();
|
const [searchParams] = useSearchParams();
|
||||||
const contextParentId = !editing ? searchParams.get('parentId') : null;
|
const contextParentId = !editing ? searchParams.get('parentId') : null;
|
||||||
const requestedTab = searchParams.get('tab') as DetailTab | null;
|
const requestedTab = searchParams.get('tab') as DetailTab | null;
|
||||||
const tab: DetailTab = requestedTab
|
const tab: DetailTab = requestedTab && ['summary','dossier','findings','location','registry','files','history'].includes(requestedTab) ? requestedTab : 'summary';
|
||||||
&& ['summary', 'dossier', 'findings', 'location', 'registry', 'files', 'history'].includes(requestedTab)
|
|
||||||
? requestedTab
|
|
||||||
: 'summary';
|
|
||||||
|
|
||||||
const { hasPermission } = useAuth();
|
const { hasPermission } = useAuth();
|
||||||
const canEdit = editing ? hasPermission('assets.update') : hasPermission('assets.create');
|
const canEdit = editing ? hasPermission('assets.update') : hasPermission('assets.create');
|
||||||
const canCreate = hasPermission('assets.create');
|
const canCreate = hasPermission('assets.create');
|
||||||
@@ -149,14 +104,10 @@ export function AssetEditorPage() {
|
|||||||
const [success, setSuccess] = useState('');
|
const [success, setSuccess] = useState('');
|
||||||
const [historyRefreshKey, setHistoryRefreshKey] = useState(0);
|
const [historyRefreshKey, setHistoryRefreshKey] = useState(0);
|
||||||
|
|
||||||
const canDirectContextEdit = !editing
|
const canDirectContextEdit = !editing || Boolean(asset?.dataOrigin === 'FIELD_SURVEY' && asset.informationStatus === 'DRAFT');
|
||||||
|| Boolean(asset?.dataOrigin === 'FIELD_SURVEY' && asset.informationStatus === 'DRAFT');
|
|
||||||
|
|
||||||
const selectedType = types.find((type) => type.id === typeId) ?? null;
|
const selectedType = types.find((type) => type.id === typeId) ?? null;
|
||||||
const definitions = useMemo(
|
const definitions = useMemo(() => selectedType?.attributes.filter((item) => item.isActive) ?? [], [selectedType]);
|
||||||
() => selectedType?.attributes.filter((item) => item.isActive) ?? [],
|
|
||||||
[selectedType],
|
|
||||||
);
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
Promise.all([
|
Promise.all([
|
||||||
@@ -168,26 +119,13 @@ export function AssetEditorPage() {
|
|||||||
setTypes(loadedTypes);
|
setTypes(loadedTypes);
|
||||||
setLineage(loadedLineage);
|
setLineage(loadedLineage);
|
||||||
if (loadedAsset) {
|
if (loadedAsset) {
|
||||||
setAsset(loadedAsset);
|
setAsset(loadedAsset); setCode(loadedAsset.code); setName(loadedAsset.name); setCommonName(loadedAsset.commonName ?? ''); setTypeId(loadedAsset.type.id);
|
||||||
setCode(loadedAsset.code);
|
setParentId(loadedAsset.parent?.id ?? ''); setOperationalAreaId(loadedAsset.operationalArea?.id ?? '');
|
||||||
setName(loadedAsset.name);
|
setOperatorCompanyId(loadedAsset.operatorCompany?.id ?? ''); setDescription(loadedAsset.description ?? '');
|
||||||
setCommonName(loadedAsset.commonName ?? '');
|
setStatus(loadedAsset.informationStatus); setOperationalStatus(loadedAsset.operationalStatus);
|
||||||
setTypeId(loadedAsset.type.id);
|
setAttributeValues(Object.fromEntries(loadedAsset.attributes.map((attribute) => [attribute.definitionId, attribute.dataType === 'DATETIME' ? localDateTime(attribute.value) : attribute.value ?? ''])));
|
||||||
setParentId(loadedAsset.parent?.id ?? '');
|
|
||||||
setOperationalAreaId(loadedAsset.operationalArea?.id ?? '');
|
|
||||||
setOperatorCompanyId(loadedAsset.operatorCompany?.id ?? '');
|
|
||||||
setDescription(loadedAsset.description ?? '');
|
|
||||||
setStatus(loadedAsset.informationStatus);
|
|
||||||
setOperationalStatus(loadedAsset.operationalStatus);
|
|
||||||
setAttributeValues(Object.fromEntries(
|
|
||||||
loadedAsset.attributes.map((attribute) => [
|
|
||||||
attribute.definitionId,
|
|
||||||
attribute.dataType === 'DATETIME' ? localDateTime(attribute.value) : attribute.value ?? '',
|
|
||||||
]),
|
|
||||||
));
|
|
||||||
} else if (!contextParentId) {
|
} else if (!contextParentId) {
|
||||||
const first = loadedTypes.find((type) => type.isActive && type.canBeRoot)
|
const first = loadedTypes.find((type) => type.isActive && type.canBeRoot) ?? loadedTypes.find((type) => type.isActive);
|
||||||
?? loadedTypes.find((type) => type.isActive);
|
|
||||||
if (first) setTypeId(first.id);
|
if (first) setTypeId(first.id);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@@ -197,56 +135,38 @@ export function AssetEditorPage() {
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (editing || !contextParentId || types.length === 0) return;
|
if (editing || !contextParentId || types.length === 0) return;
|
||||||
Promise.all([getAsset(contextParentId), getAssetLineage(contextParentId)])
|
Promise.all([getAsset(contextParentId), getAssetLineage(contextParentId)]).then(([parent, parentLineage]) => {
|
||||||
.then(([parent, parentLineage]) => {
|
setContextParent(parent);
|
||||||
setContextParent(parent);
|
setLineage(parentLineage);
|
||||||
setLineage(parentLineage);
|
const compatible = types.find((type) => type.isActive && type.allowedParentTypes.some((allowed) => allowed.id === parent.type.id));
|
||||||
const compatible = types.find(
|
if (compatible) {
|
||||||
(type) => type.isActive && type.allowedParentTypes.some((allowed) => allowed.id === parent.type.id),
|
setTypeId(compatible.id); setParentId(parent.id);
|
||||||
);
|
const parentType = types.find((type) => type.id === parent.type.id);
|
||||||
if (compatible) {
|
if (parentType?.operationalRole === 'AREA') setOperationalAreaId(parent.id);
|
||||||
setTypeId(compatible.id);
|
else if (parent.operationalArea) setOperationalAreaId(parent.operationalArea.id);
|
||||||
setParentId(parent.id);
|
}
|
||||||
const parentType = types.find((type) => type.id === parent.type.id);
|
}).catch((requestError) => setError(errorMessage(requestError)));
|
||||||
if (parentType?.operationalRole === 'AREA') setOperationalAreaId(parent.id);
|
|
||||||
else if (parent.operationalArea) setOperationalAreaId(parent.operationalArea.id);
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.catch((requestError) => setError(errorMessage(requestError)));
|
|
||||||
}, [editing, contextParentId, types]);
|
}, [editing, contextParentId, types]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!typeId) {
|
if (!typeId) { setParents([]); return; }
|
||||||
setParents([]);
|
const timer = window.setTimeout(() => listAssetParentOptions(typeId, id, parentSearch).then(setParents).catch((requestError) => setError(errorMessage(requestError))), 220);
|
||||||
return;
|
|
||||||
}
|
|
||||||
const timer = window.setTimeout(
|
|
||||||
() => listAssetParentOptions(typeId, id, parentSearch)
|
|
||||||
.then(setParents)
|
|
||||||
.catch((requestError) => setError(errorMessage(requestError))),
|
|
||||||
220,
|
|
||||||
);
|
|
||||||
return () => window.clearTimeout(timer);
|
return () => window.clearTimeout(timer);
|
||||||
}, [typeId, id, parentSearch]);
|
}, [typeId, id, parentSearch]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!canReadRelations || selectedType?.operationalRole !== 'GENERIC' || !parentId) {
|
if (!canReadRelations || selectedType?.operationalRole !== 'GENERIC' || !parentId) {
|
||||||
setOperationalAreas([]);
|
setOperationalAreas([]);
|
||||||
if (!parentId) {
|
if (!parentId) { setOperationalAreaId(''); if (!editing) setOperatorCompanyId(''); }
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
listOperationalAreas(parentId).then((loadedAreas) => {
|
||||||
|
setOperationalAreas(loadedAreas);
|
||||||
|
if (operationalAreaId && !loadedAreas.some((area) => area.id === operationalAreaId)) {
|
||||||
setOperationalAreaId('');
|
setOperationalAreaId('');
|
||||||
if (!editing) setOperatorCompanyId('');
|
if (!editing) setOperatorCompanyId('');
|
||||||
}
|
}
|
||||||
return;
|
}).catch((requestError) => setError(errorMessage(requestError)));
|
||||||
}
|
|
||||||
listOperationalAreas(parentId)
|
|
||||||
.then((loadedAreas) => {
|
|
||||||
setOperationalAreas(loadedAreas);
|
|
||||||
if (operationalAreaId && !loadedAreas.some((area) => area.id === operationalAreaId)) {
|
|
||||||
setOperationalAreaId('');
|
|
||||||
if (!editing) setOperatorCompanyId('');
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.catch((requestError) => setError(errorMessage(requestError)));
|
|
||||||
}, [canReadRelations, selectedType?.operationalRole, parentId, editing]);
|
}, [canReadRelations, selectedType?.operationalRole, parentId, editing]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -254,85 +174,39 @@ export function AssetEditorPage() {
|
|||||||
setOperationalCompanies([]);
|
setOperationalCompanies([]);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
listCompaniesForArea(operationalAreaId)
|
listCompaniesForArea(operationalAreaId).then((loadedCompanies) => {
|
||||||
.then((loadedCompanies) => {
|
setOperationalCompanies(loadedCompanies);
|
||||||
setOperationalCompanies(loadedCompanies);
|
setOperatorCompanyId((current) => loadedCompanies.some((company) => company.id === current)
|
||||||
setOperatorCompanyId((current) => loadedCompanies.some((company) => company.id === current)
|
? current
|
||||||
? current
|
: loadedCompanies.length === 1 ? (loadedCompanies[0]?.id ?? '') : '');
|
||||||
: loadedCompanies.length === 1 ? (loadedCompanies[0]?.id ?? '') : '');
|
}).catch((requestError) => {
|
||||||
})
|
setOperationalCompanies([]);
|
||||||
.catch((requestError) => {
|
setOperatorCompanyId('');
|
||||||
setOperationalCompanies([]);
|
setError(errorMessage(requestError));
|
||||||
setOperatorCompanyId('');
|
});
|
||||||
setError(errorMessage(requestError));
|
|
||||||
});
|
|
||||||
}, [editing, canReadRelations, operationalAreaId, selectedType?.operationalRole]);
|
}, [editing, canReadRelations, operationalAreaId, selectedType?.operationalRole]);
|
||||||
|
|
||||||
const changeType = (nextTypeId: string) => {
|
const changeType = (nextTypeId: string) => { setTypeId(nextTypeId); setParentId(''); setOperationalAreaId(''); if (!editing) setOperatorCompanyId(''); setAttributeValues({}); setParentSearch(''); };
|
||||||
setTypeId(nextTypeId);
|
const setAttribute = (definitionId: string, value: unknown) => setAttributeValues((current) => ({ ...current, [definitionId]: value }));
|
||||||
setParentId('');
|
|
||||||
setOperationalAreaId('');
|
|
||||||
if (!editing) setOperatorCompanyId('');
|
|
||||||
setAttributeValues({});
|
|
||||||
setParentSearch('');
|
|
||||||
};
|
|
||||||
|
|
||||||
const setAttribute = (definitionId: string, value: unknown) =>
|
|
||||||
setAttributeValues((current) => ({ ...current, [definitionId]: value }));
|
|
||||||
|
|
||||||
const save = async (event: FormEvent) => {
|
const save = async (event: FormEvent) => {
|
||||||
event.preventDefault();
|
event.preventDefault(); if (!selectedType) return;
|
||||||
if (!selectedType) return;
|
setSaving(true); setError(''); setSuccess('');
|
||||||
setSaving(true);
|
|
||||||
setError('');
|
|
||||||
setSuccess('');
|
|
||||||
try {
|
try {
|
||||||
const attributes = normalizeAttributeValues(definitions, attributeValues);
|
const attributes = normalizeAttributeValues(definitions, attributeValues);
|
||||||
let saved: AssetDetail;
|
let saved: AssetDetail;
|
||||||
if (editing && id) {
|
if (editing && id) {
|
||||||
if (canEdit) {
|
if (canEdit) saved = await updateAsset(id, { typeId: canDirectContextEdit ? typeId : undefined, code, name, commonName: commonName.trim() || null, parentId: canDirectContextEdit ? parentId || null : undefined, operationalAreaId: canDirectContextEdit ? operationalAreaId || null : undefined, description: description.trim() || null, attributes });
|
||||||
saved = await updateAsset(id, {
|
else if (asset) saved = asset; else return;
|
||||||
typeId: canDirectContextEdit ? typeId : undefined,
|
if (canChangeStatus && saved.informationStatus !== status) saved = await updateAssetInformationStatus(id, status);
|
||||||
code,
|
if (canChangeOperationalStatus && saved.operationalStatus !== operationalStatus) saved = await updateAssetOperationalStatus(id, operationalStatus);
|
||||||
name,
|
setAsset(saved); setSuccess('Registro actualizado correctamente'); setHistoryRefreshKey((current) => current + 1);
|
||||||
commonName: commonName.trim() || null,
|
|
||||||
parentId: canDirectContextEdit ? parentId || null : undefined,
|
|
||||||
operationalAreaId: canDirectContextEdit ? operationalAreaId || null : undefined,
|
|
||||||
description: description.trim() || null,
|
|
||||||
attributes,
|
|
||||||
});
|
|
||||||
} else if (asset) saved = asset;
|
|
||||||
else return;
|
|
||||||
|
|
||||||
if (canChangeStatus && saved.informationStatus !== status) {
|
|
||||||
saved = await updateAssetInformationStatus(id, status);
|
|
||||||
}
|
|
||||||
if (canChangeOperationalStatus && saved.operationalStatus !== operationalStatus) {
|
|
||||||
saved = await updateAssetOperationalStatus(id, operationalStatus);
|
|
||||||
}
|
|
||||||
setAsset(saved);
|
|
||||||
setSuccess('Registro actualizado correctamente');
|
|
||||||
setHistoryRefreshKey((current) => current + 1);
|
|
||||||
} else {
|
} else {
|
||||||
saved = await createAsset({
|
saved = await createAsset({ code, name, commonName: commonName.trim() || null, typeId, parentId: parentId || null, operationalAreaId: operationalAreaId || null, operatorCompanyId: operatorCompanyId || null, description: description.trim() || null, informationStatus: canChangeStatus ? status : 'DRAFT', attributes });
|
||||||
code,
|
|
||||||
name,
|
|
||||||
commonName: commonName.trim() || null,
|
|
||||||
typeId,
|
|
||||||
parentId: parentId || null,
|
|
||||||
operationalAreaId: operationalAreaId || null,
|
|
||||||
operatorCompanyId: operatorCompanyId || null,
|
|
||||||
description: description.trim() || null,
|
|
||||||
informationStatus: canChangeStatus ? status : 'DRAFT',
|
|
||||||
attributes,
|
|
||||||
});
|
|
||||||
navigate(`/inventarios/${saved.id}`, { replace: true });
|
navigate(`/inventarios/${saved.id}`, { replace: true });
|
||||||
}
|
}
|
||||||
} catch (requestError) {
|
} catch (requestError) { setError(errorMessage(requestError)); }
|
||||||
setError(errorMessage(requestError));
|
finally { setSaving(false); }
|
||||||
} finally {
|
|
||||||
setSaving(false);
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
if (loading) return <LoadingBlock label="Cargando registro…" />;
|
if (loading) return <LoadingBlock label="Cargando registro…" />;
|
||||||
@@ -347,627 +221,44 @@ export function AssetEditorPage() {
|
|||||||
{ key: 'history', label: 'Historial', show: editing && canReadHistory },
|
{ key: 'history', label: 'Historial', show: editing && canReadHistory },
|
||||||
] as const;
|
] as const;
|
||||||
|
|
||||||
const breadcrumbSection = asset?.type.code === 'empresa' || contextParent?.type.code === 'empresa'
|
const breadcrumbSection = asset?.type.code === 'empresa' || contextParent?.type.code === 'empresa' ? 'companies' : 'territory';
|
||||||
? 'companies'
|
|
||||||
: 'territory';
|
|
||||||
|
|
||||||
const structuralTypeCode = normalizeStructuralType(selectedType?.code);
|
|
||||||
const structuralTypeName = normalizeStructuralType(selectedType?.name);
|
|
||||||
const compactStructuralSummary = editing && (
|
|
||||||
['instalacion', 'instalacion-superficie', 'instalacion_de_superficie', 'instalacion-de-superficie', 'subinstalacion']
|
|
||||||
.includes(structuralTypeCode)
|
|
||||||
|| structuralTypeName === 'instalacion'
|
|
||||||
|| structuralTypeName === 'instalacion de superficie'
|
|
||||||
|| structuralTypeName === 'subinstalacion'
|
|
||||||
);
|
|
||||||
|
|
||||||
const technicalFilledCount = definitions.filter(
|
|
||||||
(definition) => hasAttributeValue(definition, attributeValues[definition.id]),
|
|
||||||
).length;
|
|
||||||
const missingRequiredTechnical = definitions.some(
|
|
||||||
(definition) => definition.isRequired && !hasAttributeValue(definition, attributeValues[definition.id]),
|
|
||||||
);
|
|
||||||
|
|
||||||
const handleContextChanged = (saved: AssetDetail) => {
|
|
||||||
setAsset(saved);
|
|
||||||
setParentId(saved.parent?.id ?? '');
|
|
||||||
setOperationalAreaId(saved.operationalArea?.id ?? '');
|
|
||||||
setOperatorCompanyId(saved.operatorCompany?.id ?? '');
|
|
||||||
setLineage([]);
|
|
||||||
getAssetLineage(saved.id).then(setLineage).catch(() => undefined);
|
|
||||||
setHistoryRefreshKey((current) => current + 1);
|
|
||||||
};
|
|
||||||
|
|
||||||
const renderAttributes = (): ReactNode => {
|
|
||||||
if (definitions.length === 0) {
|
|
||||||
return <div className="inline-empty">Este tipo no requiere datos técnicos adicionales.</div>;
|
|
||||||
}
|
|
||||||
|
|
||||||
return <div className="dynamic-attributes">
|
|
||||||
{definitions.map((definition) => {
|
|
||||||
const value = attributeValues[definition.id];
|
|
||||||
const label = <span>
|
|
||||||
{definition.name}{definition.unit ? ` (${definition.unit})` : ''}
|
|
||||||
{definition.isRequired ? <em>obligatorio</em> : <em>opcional</em>}
|
|
||||||
</span>;
|
|
||||||
|
|
||||||
if (definition.dataType === 'BOOLEAN') {
|
|
||||||
return <label className="check-row attribute-check" key={definition.id}>
|
|
||||||
<input
|
|
||||||
type="checkbox"
|
|
||||||
checked={Boolean(value)}
|
|
||||||
onChange={(event) => setAttribute(definition.id, event.target.checked)}
|
|
||||||
disabled={!canEdit}
|
|
||||||
/>
|
|
||||||
<span><strong>{definition.name}</strong><small>{definition.code}</small></span>
|
|
||||||
</label>;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (definition.dataType === 'SELECT') {
|
|
||||||
return <label className="field" key={definition.id}>
|
|
||||||
{label}
|
|
||||||
<SearchableSelect
|
|
||||||
value={String(value ?? '')}
|
|
||||||
onChange={(event) => setAttribute(definition.id, event.target.value)}
|
|
||||||
disabled={!canEdit}
|
|
||||||
required={definition.isRequired}
|
|
||||||
>
|
|
||||||
<option value="">Seleccionar…</option>
|
|
||||||
{definition.options?.map((option) =>
|
|
||||||
<option key={option} value={option}>{option}</option>)}
|
|
||||||
</SearchableSelect>
|
|
||||||
</label>;
|
|
||||||
}
|
|
||||||
|
|
||||||
const inputType = definition.dataType === 'NUMBER'
|
|
||||||
? 'number'
|
|
||||||
: definition.dataType === 'DATE'
|
|
||||||
? 'date'
|
|
||||||
: definition.dataType === 'DATETIME'
|
|
||||||
? 'datetime-local'
|
|
||||||
: 'text';
|
|
||||||
|
|
||||||
return <label className="field" key={definition.id}>
|
|
||||||
{label}
|
|
||||||
<input
|
|
||||||
type={inputType}
|
|
||||||
value={String(value ?? '')}
|
|
||||||
onChange={(event) => setAttribute(definition.id, event.target.value)}
|
|
||||||
disabled={!canEdit}
|
|
||||||
required={definition.isRequired}
|
|
||||||
step={definition.dataType === 'NUMBER' ? 'any' : undefined}
|
|
||||||
maxLength={definition.dataType === 'TEXT' ? 4000 : undefined}
|
|
||||||
/>
|
|
||||||
</label>;
|
|
||||||
})}
|
|
||||||
</div>;
|
|
||||||
};
|
|
||||||
|
|
||||||
const renderSaveActions = () => canSave && <div className="form-actions">
|
|
||||||
<Link className="button secondary" to="/inventarios">Cancelar</Link>
|
|
||||||
<button className="button primary" disabled={saving}>
|
|
||||||
<Icon name="check" />
|
|
||||||
{saving ? 'Guardando…' : editing && !canEdit ? 'Actualizar estado' : editing ? 'Guardar cambios' : 'Crear registro'}
|
|
||||||
</button>
|
|
||||||
</div>;
|
|
||||||
|
|
||||||
const renderCompactStructuralForm = () => <form className="panel form-panel asset-compact-form" onSubmit={save}>
|
|
||||||
<section className="asset-compact-section">
|
|
||||||
<div className="asset-compact-section-heading">
|
|
||||||
<div>
|
|
||||||
<h2>Datos principales</h2>
|
|
||||||
<p className="section-copy">Lo que se usa todos los días para reconocer este registro.</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="form-grid asset-compact-primary-grid">
|
|
||||||
<label className="field">
|
|
||||||
<span>Nombre técnico</span>
|
|
||||||
<input
|
|
||||||
value={name}
|
|
||||||
onChange={(event) => setName(event.target.value)}
|
|
||||||
disabled={!canEdit}
|
|
||||||
required
|
|
||||||
maxLength={200}
|
|
||||||
/>
|
|
||||||
</label>
|
|
||||||
<label className="field">
|
|
||||||
<span>Nombre habitual / sobrenombre <em>opcional</em></span>
|
|
||||||
<input
|
|
||||||
value={commonName}
|
|
||||||
onChange={(event) => setCommonName(event.target.value)}
|
|
||||||
disabled={!canEdit}
|
|
||||||
maxLength={200}
|
|
||||||
placeholder="Ej.: planta vieja, celda principal…"
|
|
||||||
/>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="asset-compact-meta">
|
|
||||||
<span><small>Código DH</small><strong>{code}</strong></span>
|
|
||||||
<span><small>Tipo</small><strong>{selectedType?.name ?? 'Sin tipo'}</strong></span>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section className="asset-compact-section">
|
|
||||||
<div className="asset-compact-section-heading">
|
|
||||||
<div>
|
|
||||||
<h2>Ubicación actual</h2>
|
|
||||||
<p className="section-copy">Dónde está contenido el elemento dentro del Inventario.</p>
|
|
||||||
</div>
|
|
||||||
{canReadHistory && id && <Link className="button secondary asset-compact-context-button" to={`/inventarios/${id}?tab=history`}>
|
|
||||||
<Icon name="edit" />Cambiar / ver historial
|
|
||||||
</Link>}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="asset-compact-context-grid">
|
|
||||||
<div className="asset-compact-context-item">
|
|
||||||
<small>Registro padre</small>
|
|
||||||
<strong>{asset?.parent?.name ?? 'Sin padre'}</strong>
|
|
||||||
{asset?.parent?.code && <span>{asset.parent.code}</span>}
|
|
||||||
</div>
|
|
||||||
<div className="asset-compact-context-item">
|
|
||||||
<small>Área</small>
|
|
||||||
<strong>{asset?.operationalArea?.name ?? 'Sin área asignada'}</strong>
|
|
||||||
{asset?.operationalArea?.code && <span>{asset.operationalArea.code}</span>}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
{(canChangeStatus || canChangeOperationalStatus) && <details className="asset-compact-details">
|
|
||||||
<summary>
|
|
||||||
<span><strong>Estado y opciones</strong><small>Calidad del dato y situación operativa</small></span>
|
|
||||||
<span aria-hidden="true">⌄</span>
|
|
||||||
</summary>
|
|
||||||
<div className="asset-compact-details-body">
|
|
||||||
<div className="form-grid">
|
|
||||||
{canChangeStatus && <label className="field">
|
|
||||||
<span>Estado del dato</span>
|
|
||||||
<SearchableSelect
|
|
||||||
value={status}
|
|
||||||
onChange={(event) => setStatus(event.target.value as AssetInformationStatus)}
|
|
||||||
disabled={!canEdit && !canChangeStatus}
|
|
||||||
>
|
|
||||||
{ASSET_STATUSES.map((item) =>
|
|
||||||
<option key={item.value} value={item.value}>{item.label}</option>)}
|
|
||||||
</SearchableSelect>
|
|
||||||
</label>}
|
|
||||||
{canChangeOperationalStatus && <label className="field">
|
|
||||||
<span>Estado operativo</span>
|
|
||||||
<SearchableSelect
|
|
||||||
value={operationalStatus}
|
|
||||||
onChange={(event) => setOperationalStatus(event.target.value as AssetOperationalStatus)}
|
|
||||||
>
|
|
||||||
{ASSET_OPERATIONAL_STATUSES.map((item) =>
|
|
||||||
<option key={item.value} value={item.value}>{item.label}</option>)}
|
|
||||||
</SearchableSelect>
|
|
||||||
</label>}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</details>}
|
|
||||||
|
|
||||||
<details className="asset-compact-details" open={missingRequiredTechnical || canDirectContextEdit}>
|
|
||||||
<summary>
|
|
||||||
<span>
|
|
||||||
<strong>Más datos</strong>
|
|
||||||
<small>
|
|
||||||
{description.trim() ? 'Descripción cargada' : 'Sin descripción'}
|
|
||||||
{' · '}
|
|
||||||
{technicalFilledCount}/{definitions.length} datos técnicos cargados
|
|
||||||
</small>
|
|
||||||
</span>
|
|
||||||
<span aria-hidden="true">⌄</span>
|
|
||||||
</summary>
|
|
||||||
<div className="asset-compact-details-body">
|
|
||||||
<div className="form-grid">
|
|
||||||
<label className="field">
|
|
||||||
<span>Código DH</span>
|
|
||||||
<input
|
|
||||||
value={code}
|
|
||||||
onChange={(event) => setCode(event.target.value.toUpperCase())}
|
|
||||||
disabled={!canEdit}
|
|
||||||
required
|
|
||||||
maxLength={120}
|
|
||||||
pattern="[A-Z0-9][A-Z0-9._/-]*"
|
|
||||||
/>
|
|
||||||
</label>
|
|
||||||
|
|
||||||
{canDirectContextEdit && <label className="field">
|
|
||||||
<span>Tipo de elemento</span>
|
|
||||||
<SearchableSelect
|
|
||||||
value={typeId}
|
|
||||||
onChange={(event) => changeType(event.target.value)}
|
|
||||||
disabled={!canEdit}
|
|
||||||
required
|
|
||||||
>
|
|
||||||
<option value="">Seleccionar…</option>
|
|
||||||
{types.filter((type) => type.isActive || type.id === typeId).map((type) =>
|
|
||||||
<option key={type.id} value={type.id}>{type.name}</option>)}
|
|
||||||
</SearchableSelect>
|
|
||||||
</label>}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{canDirectContextEdit && <div className="form-grid">
|
|
||||||
<div className="field parent-picker">
|
|
||||||
<span>Registro padre {!selectedType?.canBeRoot && <em>obligatorio</em>}</span>
|
|
||||||
<input
|
|
||||||
className="parent-search"
|
|
||||||
value={parentSearch}
|
|
||||||
onChange={(event) => setParentSearch(event.target.value)}
|
|
||||||
disabled={!canEdit}
|
|
||||||
placeholder="Buscar planta, batería, estación…"
|
|
||||||
/>
|
|
||||||
<SearchableSelect
|
|
||||||
value={parentId}
|
|
||||||
onChange={(event) => {
|
|
||||||
setParentId(event.target.value);
|
|
||||||
setParentSearch('');
|
|
||||||
}}
|
|
||||||
disabled={!canEdit}
|
|
||||||
required={!selectedType?.canBeRoot}
|
|
||||||
>
|
|
||||||
<option value="">
|
|
||||||
{selectedType?.canBeRoot ? 'Sin padre · registro raíz' : 'Seleccionar registro padre…'}
|
|
||||||
</option>
|
|
||||||
{parents.map((parent) =>
|
|
||||||
<option key={parent.id} value={parent.id}>{parent.name} · {parent.code} ({parent.type.name})</option>)}
|
|
||||||
</SearchableSelect>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{selectedType?.operationalRole === 'GENERIC' && canReadRelations && <label className="field">
|
|
||||||
<span>Área</span>
|
|
||||||
<SearchableSelect
|
|
||||||
value={operationalAreaId}
|
|
||||||
onChange={(event) => setOperationalAreaId(event.target.value)}
|
|
||||||
disabled={!canEdit}
|
|
||||||
>
|
|
||||||
<option value="">Sin asignación operativa</option>
|
|
||||||
{operationalAreas.map((area) =>
|
|
||||||
<option key={area.id} value={area.id}>{area.name}</option>)}
|
|
||||||
</SearchableSelect>
|
|
||||||
</label>}
|
|
||||||
</div>}
|
|
||||||
|
|
||||||
<label className="field">
|
|
||||||
<span>Descripción <em>opcional</em></span>
|
|
||||||
<textarea
|
|
||||||
value={description}
|
|
||||||
onChange={(event) => setDescription(event.target.value)}
|
|
||||||
disabled={!canEdit}
|
|
||||||
maxLength={4000}
|
|
||||||
rows={2}
|
|
||||||
/>
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<div className="asset-compact-technical">
|
|
||||||
<div>
|
|
||||||
<h3>Datos técnicos</h3>
|
|
||||||
<p className="section-copy">Sólo completá lo que corresponda para este tipo.</p>
|
|
||||||
</div>
|
|
||||||
{renderAttributes()}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</details>
|
|
||||||
|
|
||||||
{renderSaveActions()}
|
|
||||||
</form>;
|
|
||||||
|
|
||||||
const renderFullForm = () => <form className="panel form-panel" onSubmit={save}>
|
|
||||||
<div className="form-section">
|
|
||||||
<div>
|
|
||||||
<h2>Identificación</h2>
|
|
||||||
<p className="section-copy">Conservá el nombre técnico y, cuando exista, agregá el nombre habitual usado en campo.</p>
|
|
||||||
</div>
|
|
||||||
<div className="form-grid">
|
|
||||||
<label className="field">
|
|
||||||
<span>Código DH</span>
|
|
||||||
<input
|
|
||||||
value={code}
|
|
||||||
onChange={(event) => setCode(event.target.value.toUpperCase())}
|
|
||||||
disabled={!canEdit}
|
|
||||||
required
|
|
||||||
maxLength={120}
|
|
||||||
pattern="[A-Z0-9][A-Z0-9._/-]*"
|
|
||||||
/>
|
|
||||||
</label>
|
|
||||||
<label className="field">
|
|
||||||
<span>Nombre técnico</span>
|
|
||||||
<input value={name} onChange={(event) => setName(event.target.value)} disabled={!canEdit} required maxLength={200} />
|
|
||||||
</label>
|
|
||||||
<label className="field">
|
|
||||||
<span>Nombre habitual / sobrenombre <em>opcional</em></span>
|
|
||||||
<input
|
|
||||||
value={commonName}
|
|
||||||
onChange={(event) => setCommonName(event.target.value)}
|
|
||||||
disabled={!canEdit}
|
|
||||||
maxLength={200}
|
|
||||||
placeholder="Ej.: tanque grande, ET vieja, batería norte…"
|
|
||||||
/>
|
|
||||||
<small>También se usa en las búsquedas del Inventario.</small>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<label className="field">
|
|
||||||
<span>Descripción <em>opcional</em></span>
|
|
||||||
<textarea
|
|
||||||
value={description}
|
|
||||||
onChange={(event) => setDescription(event.target.value)}
|
|
||||||
disabled={!canEdit}
|
|
||||||
maxLength={4000}
|
|
||||||
rows={2}
|
|
||||||
/>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="form-section">
|
|
||||||
<div>
|
|
||||||
<h2>Ubicación en la estructura</h2>
|
|
||||||
<p className="section-copy">
|
|
||||||
Elegí qué es y dónde está contenido. La ubicación física es independiente de la Operadora del Área.
|
|
||||||
Los registros ya consolidados cambian de ubicación desde el bloque histórico inferior.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div className="form-grid">
|
|
||||||
<label className="field">
|
|
||||||
<span>Tipo de elemento</span>
|
|
||||||
<SearchableSelect
|
|
||||||
value={typeId}
|
|
||||||
onChange={(event) => changeType(event.target.value)}
|
|
||||||
disabled={(editing && !(asset?.dataOrigin === 'FIELD_SURVEY' && asset.informationStatus === 'DRAFT')) || !canEdit}
|
|
||||||
required
|
|
||||||
>
|
|
||||||
<option value="">Seleccionar…</option>
|
|
||||||
{types.filter((type) => type.isActive || type.id === typeId).map((type) =>
|
|
||||||
<option key={type.id} value={type.id}>{type.name}</option>)}
|
|
||||||
</SearchableSelect>
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<div className="field parent-picker">
|
|
||||||
<span>Registro padre {!selectedType?.canBeRoot && <em>obligatorio</em>}</span>
|
|
||||||
<input
|
|
||||||
className="parent-search"
|
|
||||||
value={parentSearch}
|
|
||||||
onChange={(event) => setParentSearch(event.target.value)}
|
|
||||||
disabled={!canEdit || !canDirectContextEdit}
|
|
||||||
placeholder="Buscar planta, batería, estación…"
|
|
||||||
/>
|
|
||||||
<SearchableSelect
|
|
||||||
value={parentId}
|
|
||||||
onChange={(event) => {
|
|
||||||
setParentId(event.target.value);
|
|
||||||
setParentSearch('');
|
|
||||||
}}
|
|
||||||
disabled={!canEdit || !canDirectContextEdit}
|
|
||||||
required={!selectedType?.canBeRoot}
|
|
||||||
>
|
|
||||||
<option value="">
|
|
||||||
{selectedType?.canBeRoot ? 'Sin padre · registro raíz' : 'Seleccionar registro padre…'}
|
|
||||||
</option>
|
|
||||||
{parents.map((parent) =>
|
|
||||||
<option key={parent.id} value={parent.id}>{parent.name} · {parent.code} ({parent.type.name})</option>)}
|
|
||||||
</SearchableSelect>
|
|
||||||
<small>Escribí para buscar entre los registros compatibles.</small>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="form-grid">
|
|
||||||
{canChangeStatus && <label className="field">
|
|
||||||
<span>Estado del dato</span>
|
|
||||||
<SearchableSelect
|
|
||||||
value={status}
|
|
||||||
onChange={(event) => setStatus(event.target.value as AssetInformationStatus)}
|
|
||||||
disabled={!canEdit && !canChangeStatus}
|
|
||||||
>
|
|
||||||
{ASSET_STATUSES.map((item) =>
|
|
||||||
<option key={item.value} value={item.value}>{item.label}</option>)}
|
|
||||||
</SearchableSelect>
|
|
||||||
<small>Calidad y validación del registro.</small>
|
|
||||||
</label>}
|
|
||||||
|
|
||||||
{editing && canChangeOperationalStatus && <label className="field">
|
|
||||||
<span>Estado operativo</span>
|
|
||||||
<SearchableSelect
|
|
||||||
value={operationalStatus}
|
|
||||||
onChange={(event) => setOperationalStatus(event.target.value as AssetOperationalStatus)}
|
|
||||||
>
|
|
||||||
{ASSET_OPERATIONAL_STATUSES.map((item) =>
|
|
||||||
<option key={item.value} value={item.value}>{item.label}</option>)}
|
|
||||||
</SearchableSelect>
|
|
||||||
<small>Situación física u operativa del elemento.</small>
|
|
||||||
</label>}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{selectedType?.operationalRole === 'GENERIC' && canReadRelations && <div className="form-section">
|
|
||||||
<div>
|
|
||||||
<h2>{editing ? 'Área física' : 'Área y operadora al alta'}</h2>
|
|
||||||
<p className="section-copy">
|
|
||||||
{editing
|
|
||||||
? 'El Inventario pertenece físicamente al Área. La Operadora vigente se administra en las relaciones temporales del Área y no se reescribe dentro del Inventario.'
|
|
||||||
: 'Al crear el registro, la Operadora activa del Área queda guardada únicamente como snapshot histórico de alta.'}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div className="form-grid">
|
|
||||||
<label className="field">
|
|
||||||
<span>Área</span>
|
|
||||||
<SearchableSelect
|
|
||||||
value={operationalAreaId}
|
|
||||||
onChange={(event) => {
|
|
||||||
setOperationalAreaId(event.target.value);
|
|
||||||
if (!editing) setOperatorCompanyId('');
|
|
||||||
}}
|
|
||||||
disabled={!canEdit || !canDirectContextEdit}
|
|
||||||
>
|
|
||||||
<option value="">Sin asignación operativa</option>
|
|
||||||
{operationalAreas.map((area) =>
|
|
||||||
<option key={area.id} value={area.id}>{area.name}</option>)}
|
|
||||||
</SearchableSelect>
|
|
||||||
{editing && <small>La Operadora se resuelve por la relación Área↔Empresa vigente.</small>}
|
|
||||||
</label>
|
|
||||||
|
|
||||||
{!editing && <label className="field">
|
|
||||||
<span>Operadora {operationalAreaId && <em>obligatoria</em>}</span>
|
|
||||||
<SearchableSelect
|
|
||||||
value={operatorCompanyId}
|
|
||||||
onChange={(event) => setOperatorCompanyId(event.target.value)}
|
|
||||||
disabled={!canEdit || !operationalAreaId}
|
|
||||||
required={Boolean(operationalAreaId)}
|
|
||||||
>
|
|
||||||
<option value="">{operationalAreaId ? 'Seleccionar operadora…' : 'Primero seleccioná un área'}</option>
|
|
||||||
{operationalCompanies.map((company) =>
|
|
||||||
<option key={company.id} value={company.id}>{company.name}</option>)}
|
|
||||||
</SearchableSelect>
|
|
||||||
</label>}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{!editing && operationalAreaId && operatorCompanyId && <div className="temporal-notice">
|
|
||||||
<Icon name="check" />
|
|
||||||
<p><strong>Contexto de alta confirmado.</strong> La Operadora seleccionada se conservará como referencia histórica; futuros cambios se harán en la relación temporal del Área.</p>
|
|
||||||
</div>}
|
|
||||||
|
|
||||||
{editing && asset?.operatorCompany && <div className="temporal-notice">
|
|
||||||
<Icon name="layers" />
|
|
||||||
<p><strong>Snapshot histórico de alta:</strong> {asset.operatorCompany.name}. No se modifica desde este registro.</p>
|
|
||||||
</div>}
|
|
||||||
</div>}
|
|
||||||
|
|
||||||
<div className="form-section">
|
|
||||||
<div>
|
|
||||||
<h2>Datos técnicos</h2>
|
|
||||||
<p className="section-copy">Campos definidos para el tipo seleccionado.</p>
|
|
||||||
</div>
|
|
||||||
{renderAttributes()}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{renderSaveActions()}
|
|
||||||
</form>;
|
|
||||||
|
|
||||||
return <section className="narrow-section asset-detail-page">
|
return <section className="narrow-section asset-detail-page">
|
||||||
<nav className="breadcrumb asset-detail-breadcrumb" aria-label="Ruta del inventario">
|
<nav className="breadcrumb asset-detail-breadcrumb" aria-label="Ruta del inventario">
|
||||||
<Link to="/inventarios">Inventarios</Link><span>›</span>
|
<Link to="/inventarios">Inventarios</Link><span>›</span>
|
||||||
<Link to={breadcrumbSection === 'companies' ? '/inventarios?section=companies' : '/inventarios?section=territory'}>
|
<Link to={breadcrumbSection === 'companies' ? '/inventarios?section=companies' : '/inventarios?section=territory'}>{breadcrumbSection === 'companies' ? 'Empresas' : 'Áreas y yacimientos'}</Link>
|
||||||
{breadcrumbSection === 'companies' ? 'Empresas' : 'Áreas y yacimientos'}
|
|
||||||
</Link>
|
|
||||||
{lineage.map((item, index) => {
|
{lineage.map((item, index) => {
|
||||||
const isLast = index === lineage.length - 1;
|
const isLast = index === lineage.length - 1;
|
||||||
const showAsCurrent = editing ? isLast : false;
|
const showAsCurrent = editing ? isLast : false;
|
||||||
return <span className="asset-detail-crumb-part" key={item.id}>
|
return <span className="asset-detail-crumb-part" key={item.id}><span>›</span>{showAsCurrent ? <strong>{item.name}</strong> : <Link to={`/inventarios?section=${breadcrumbSection}&parentId=${item.id}`}>{item.name}</Link>}</span>;
|
||||||
<span>›</span>
|
|
||||||
{showAsCurrent
|
|
||||||
? <strong>{item.name}</strong>
|
|
||||||
: <Link to={`/inventarios?section=${breadcrumbSection}&parentId=${item.id}`}>{item.name}</Link>}
|
|
||||||
</span>;
|
|
||||||
})}
|
})}
|
||||||
{!editing && <><span>›</span><strong>Nuevo registro</strong></>}
|
{!editing && <><span>›</span><strong>Nuevo registro</strong></>}
|
||||||
</nav>
|
</nav>
|
||||||
|
<div className="page-heading asset-editor-heading"><div><span className="eyebrow">INVENTARIO</span><h1>{editing ? asset?.name ?? 'Registro' : contextParent ? `Agregar en ${contextParent.name}` : 'Nuevo registro'}</h1><p>{editing ? `${asset?.type.name} · ${asset?.code}` : contextParent ? `El sistema heredará el contexto disponible de ${contextParent.code}.` : 'Creá una entidad con identidad, jerarquía y atributos propios.'}</p></div><div className="asset-heading-actions">{editing && asset && <div className="heading-statuses"><span className={`status-badge ${assetStatusClass(asset.informationStatus)}`}>{assetStatusLabel(asset.informationStatus)}</span><small>{assetOperationalStatusLabel(asset.operationalStatus)}</small></div>}{editing && id && canCreate && <Link className="button primary" to={`/inventarios/nuevo?parentId=${id}`}><Icon name="plus" />Agregar registro aquí</Link>}</div></div>
|
||||||
|
{error && <Alert>{error}</Alert>}{success && <Alert type="success">{success}</Alert>}
|
||||||
|
|
||||||
<div className="page-heading asset-editor-heading">
|
{editing && <nav className="asset-detail-tabs">{detailTabs.filter((item) => item.show).map((item) => <Link key={item.key} className={tab === item.key ? 'active' : ''} to={`/inventarios/${id}${item.key === 'summary' ? '' : `?tab=${item.key}`}`}>{item.label}</Link>)}</nav>}
|
||||||
<div>
|
|
||||||
<span className="eyebrow">INVENTARIO</span>
|
|
||||||
<h1>{editing ? asset?.name ?? 'Registro' : contextParent ? `Agregar en ${contextParent.name}` : 'Nuevo registro'}</h1>
|
|
||||||
<p>
|
|
||||||
{editing
|
|
||||||
? `${asset?.type.name} · ${asset?.code}`
|
|
||||||
: contextParent
|
|
||||||
? `El sistema heredará el contexto disponible de ${contextParent.code}.`
|
|
||||||
: 'Creá una entidad con identidad, jerarquía y atributos propios.'}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div className="asset-heading-actions">
|
|
||||||
{editing && asset && <div className="heading-statuses">
|
|
||||||
<span className={`status-badge ${assetStatusClass(asset.informationStatus)}`}>
|
|
||||||
{assetStatusLabel(asset.informationStatus)}
|
|
||||||
</span>
|
|
||||||
<small>{assetOperationalStatusLabel(asset.operationalStatus)}</small>
|
|
||||||
</div>}
|
|
||||||
{editing && id && canCreate && <Link className="button primary" to={`/inventarios/nuevo?parentId=${id}`}>
|
|
||||||
<Icon name="plus" />Agregar registro aquí
|
|
||||||
</Link>}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{error && <Alert>{error}</Alert>}
|
|
||||||
{success && <Alert type="success">{success}</Alert>}
|
|
||||||
|
|
||||||
{editing && <nav className="asset-detail-tabs">
|
|
||||||
{detailTabs.filter((item) => item.show).map((item) =>
|
|
||||||
<Link
|
|
||||||
key={item.key}
|
|
||||||
className={tab === item.key ? 'active' : ''}
|
|
||||||
to={`/inventarios/${id}${item.key === 'summary' ? '' : `?tab=${item.key}`}`}
|
|
||||||
>
|
|
||||||
{item.label}
|
|
||||||
</Link>)}
|
|
||||||
</nav>}
|
|
||||||
|
|
||||||
{(!editing || tab === 'summary') && <>
|
{(!editing || tab === 'summary') && <>
|
||||||
{contextParent && !editing && <div className="context-create-banner">
|
{contextParent && !editing && <div className="context-create-banner"><Icon name="layers" /><div><strong>Alta contextual</strong><span>{contextParent.name} · {contextParent.code}</span></div><Link to={`/inventarios/${contextParent.id}`}>Ver padre</Link></div>}
|
||||||
<Icon name="layers" />
|
<form className="panel form-panel" onSubmit={save}>
|
||||||
<div><strong>Alta contextual</strong><span>{contextParent.name} · {contextParent.code}</span></div>
|
<div className="form-section"><div><h2>Identificación</h2><p className="section-copy">Conservá el nombre técnico y, cuando exista, agregá el nombre habitual usado en campo.</p></div><div className="form-grid"><label className="field"><span>Código DH</span><input value={code} onChange={(event) => setCode(event.target.value.toUpperCase())} disabled={!canEdit} required maxLength={120} pattern="[A-Z0-9][A-Z0-9._/-]*" /></label><label className="field"><span>Nombre técnico</span><input value={name} onChange={(event) => setName(event.target.value)} disabled={!canEdit} required maxLength={200} /></label><label className="field"><span>Nombre habitual / sobrenombre <em>opcional</em></span><input value={commonName} onChange={(event) => setCommonName(event.target.value)} disabled={!canEdit} maxLength={200} placeholder="Ej.: tanque grande, ET vieja, batería norte…" /><small>También se usa en las búsquedas del Inventario.</small></label></div><label className="field"><span>Descripción <em>opcional</em></span><textarea value={description} onChange={(event) => setDescription(event.target.value)} disabled={!canEdit} maxLength={4000} rows={2} /></label></div>
|
||||||
<Link to={`/inventarios/${contextParent.id}`}>Ver padre</Link>
|
|
||||||
</div>}
|
|
||||||
|
|
||||||
{compactStructuralSummary ? renderCompactStructuralForm() : renderFullForm()}
|
<div className="form-section"><div><h2>Ubicación en la estructura</h2><p className="section-copy">Elegí qué es y dónde está contenido. La ubicación física es independiente de la Operadora del Área. Los registros ya consolidados cambian de ubicación desde el bloque histórico inferior.</p></div><div className="form-grid"><label className="field"><span>Tipo de elemento</span><SearchableSelect value={typeId} onChange={(event) => changeType(event.target.value)} disabled={(editing && !(asset?.dataOrigin === 'FIELD_SURVEY' && asset.informationStatus === 'DRAFT')) || !canEdit} required><option value="">Seleccionar…</option>{types.filter((type) => type.isActive || type.id === typeId).map((type) => <option key={type.id} value={type.id}>{type.name}</option>)}</SearchableSelect></label><div className="field parent-picker"><span>Registro padre {!selectedType?.canBeRoot && <em>obligatorio</em>}</span><input className="parent-search" value={parentSearch} onChange={(event) => setParentSearch(event.target.value)} disabled={!canEdit || !canDirectContextEdit} placeholder="Buscar planta, batería, estación…" /><SearchableSelect value={parentId} onChange={(event) => { setParentId(event.target.value); setParentSearch(''); }} disabled={!canEdit || !canDirectContextEdit} required={!selectedType?.canBeRoot}><option value="">{selectedType?.canBeRoot ? 'Sin padre · registro raíz' : 'Seleccionar registro padre…'}</option>{parents.map((parent) => <option key={parent.id} value={parent.id}>{parent.name} · {parent.code} ({parent.type.name})</option>)}</SearchableSelect><small>Escribí para buscar entre los registros compatibles.</small></div></div><div className="form-grid">{canChangeStatus && <label className="field"><span>Estado del dato</span><SearchableSelect value={status} onChange={(event) => setStatus(event.target.value as AssetInformationStatus)} disabled={!canEdit && !canChangeStatus}>{ASSET_STATUSES.map((item) => <option key={item.value} value={item.value}>{item.label}</option>)}</SearchableSelect><small>Calidad y validación del registro.</small></label>}{editing && canChangeOperationalStatus && <label className="field"><span>Estado operativo</span><SearchableSelect value={operationalStatus} onChange={(event) => setOperationalStatus(event.target.value as AssetOperationalStatus)}>{ASSET_OPERATIONAL_STATUSES.map((item) => <option key={item.value} value={item.value}>{item.label}</option>)}</SearchableSelect><small>Situación física u operativa del elemento.</small></label>}</div></div>
|
||||||
|
|
||||||
{!compactStructuralSummary && editing && id && asset && selectedType && canReadHistory
|
{selectedType?.operationalRole === 'GENERIC' && canReadRelations && <div className="form-section"><div><h2>{editing ? 'Área física' : 'Área y operadora al alta'}</h2><p className="section-copy">{editing ? 'El Inventario pertenece físicamente al Área. La Operadora vigente se administra en las relaciones temporales del Área y no se reescribe dentro del Inventario.' : 'Al crear el registro, la Operadora activa del Área queda guardada únicamente como snapshot histórico de alta.'}</p></div><div className="form-grid"><label className="field"><span>Área</span><SearchableSelect value={operationalAreaId} onChange={(event) => { setOperationalAreaId(event.target.value); if (!editing) setOperatorCompanyId(''); }} disabled={!canEdit || !canDirectContextEdit}><option value="">Sin asignación operativa</option>{operationalAreas.map((area) => <option key={area.id} value={area.id}>{area.name}</option>)}</SearchableSelect>{editing && <small>La Operadora se resuelve por la relación Área↔Empresa vigente.</small>}</label>{!editing && <label className="field"><span>Operadora {operationalAreaId && <em>obligatoria</em>}</span><SearchableSelect value={operatorCompanyId} onChange={(event) => setOperatorCompanyId(event.target.value)} disabled={!canEdit || !operationalAreaId} required={Boolean(operationalAreaId)}><option value="">{operationalAreaId ? 'Seleccionar operadora…' : 'Primero seleccioná un área'}</option>{operationalCompanies.map((company) => <option key={company.id} value={company.id}>{company.name}</option>)}</SearchableSelect></label>}</div>{!editing && operationalAreaId && operatorCompanyId && <div className="temporal-notice"><Icon name="check" /><p><strong>Contexto de alta confirmado.</strong> La Operadora seleccionada se conservará como referencia histórica; futuros cambios se harán en la relación temporal del Área.</p></div>}{editing && asset?.operatorCompany && <div className="temporal-notice"><Icon name="layers" /><p><strong>Snapshot histórico de alta:</strong> {asset.operatorCompany.name}. No se modifica desde este registro.</p></div>}</div>}
|
||||||
&& <AssetContextHistoryPanel
|
|
||||||
asset={asset}
|
|
||||||
type={selectedType}
|
|
||||||
canManage={canManageContext}
|
|
||||||
onChanged={handleContextChanged}
|
|
||||||
/>}
|
|
||||||
|
|
||||||
{editing && id && asset && canReadRelations && selectedType && selectedType.operationalRole !== 'GENERIC'
|
<div className="form-section"><div><h2>Datos técnicos</h2><p className="section-copy">Campos definidos para el tipo seleccionado.</p></div>{definitions.length === 0 ? <div className="inline-empty">Este tipo no requiere datos técnicos adicionales.</div> : <div className="dynamic-attributes">{definitions.map((definition) => { const value = attributeValues[definition.id]; const label = <span>{definition.name}{definition.unit ? ` (${definition.unit})` : ''}{definition.isRequired ? <em>obligatorio</em> : <em>opcional</em>}</span>; if (definition.dataType === 'BOOLEAN') return <label className="check-row attribute-check" key={definition.id}><input type="checkbox" checked={Boolean(value)} onChange={(event) => setAttribute(definition.id, event.target.checked)} disabled={!canEdit} /><span><strong>{definition.name}</strong><small>{definition.code}</small></span></label>; if (definition.dataType === 'SELECT') return <label className="field" key={definition.id}>{label}<SearchableSelect value={String(value ?? '')} onChange={(event) => setAttribute(definition.id, event.target.value)} disabled={!canEdit} required={definition.isRequired}><option value="">Seleccionar…</option>{definition.options?.map((option) => <option key={option} value={option}>{option}</option>)}</SearchableSelect></label>; const inputType = definition.dataType === 'NUMBER' ? 'number' : definition.dataType === 'DATE' ? 'date' : definition.dataType === 'DATETIME' ? 'datetime-local' : 'text'; return <label className="field" key={definition.id}>{label}<input type={inputType} value={String(value ?? '')} onChange={(event) => setAttribute(definition.id, event.target.value)} disabled={!canEdit} required={definition.isRequired} step={definition.dataType === 'NUMBER' ? 'any' : undefined} maxLength={definition.dataType === 'TEXT' ? 4000 : undefined} /></label>; })}</div>}</div>
|
||||||
&& <AssetOperationalRelationsPanel assetId={id} role={selectedType.operationalRole} canManage={canManageRelations} />}
|
{canSave && <div className="form-actions"><Link className="button secondary" to="/inventarios">Cancelar</Link><button className="button primary" disabled={saving}><Icon name="check" />{saving ? 'Guardando…' : editing && !canEdit ? 'Actualizar estado' : editing ? 'Guardar cambios' : 'Crear registro'}</button></div>}
|
||||||
|
</form>
|
||||||
|
{editing && id && asset && selectedType && canReadHistory && <AssetContextHistoryPanel asset={asset} type={selectedType} canManage={canManageContext} onChanged={(saved) => { setAsset(saved); setParentId(saved.parent?.id ?? ''); setOperationalAreaId(saved.operationalArea?.id ?? ''); setOperatorCompanyId(saved.operatorCompany?.id ?? ''); setLineage([]); getAssetLineage(saved.id).then(setLineage).catch(() => undefined); setHistoryRefreshKey((current) => current + 1); }} />}
|
||||||
|
{editing && id && asset && canReadRelations && selectedType && selectedType.operationalRole !== 'GENERIC' && <AssetOperationalRelationsPanel assetId={id} role={selectedType.operationalRole} canManage={canManageRelations} />}
|
||||||
</>}
|
</>}
|
||||||
|
|
||||||
{editing && id && asset && tab === 'findings' && canReadFindingCatalog
|
{editing && id && asset && tab === 'findings' && canReadFindingCatalog && <AssetFindingCatalogPanel assetId={id} canManage={canManageFindingCatalog} />}
|
||||||
&& <AssetFindingCatalogPanel assetId={id} canManage={canManageFindingCatalog} />}
|
{editing && id && asset && tab === 'dossier' && canReadDossier && <AssetDossierPanel assetId={id} />}
|
||||||
|
{editing && id && asset && tab === 'location' && <Suspense fallback={<div className="panel"><LoadingBlock label="Cargando ubicación…" /></div>}><AssetGeometryEditor assetId={id} assetName={asset.name} canEdit={canEditGeometry} onChanged={() => setHistoryRefreshKey((current) => current + 1)} /></Suspense>}
|
||||||
{editing && id && asset && tab === 'dossier' && canReadDossier
|
{editing && id && asset && tab === 'registry' && <div className="asset-tab-stack">{canReadRegistry && selectedType && <AssetRegistryPanel assetId={id} assetName={asset.name} role={selectedType.operationalRole} canManage={canManageRegistry} onChanged={() => setHistoryRefreshKey((current) => current + 1)} />}{canReadProvenance && <AssetProvenancePanel assetId={id} canManage={canManageProvenance} canVerify={canVerifyProvenance} onChanged={() => setHistoryRefreshKey((current) => current + 1)} />}</div>}
|
||||||
&& <AssetDossierPanel assetId={id} />}
|
{editing && id && asset && tab === 'files' && canReadMedia && <AssetMediaPanel assetId={id} assetName={asset.name} canManage={canManageMedia} onChanged={() => setHistoryRefreshKey((current) => current + 1)} />}
|
||||||
|
{editing && id && tab === 'history' && canReadHistory && <AssetHistoryPanel assetId={id} refreshKey={historyRefreshKey} />}
|
||||||
{editing && id && asset && tab === 'location'
|
|
||||||
&& <Suspense fallback={<div className="panel"><LoadingBlock label="Cargando ubicación…" /></div>}>
|
|
||||||
<AssetGeometryEditor
|
|
||||||
assetId={id}
|
|
||||||
assetName={asset.name}
|
|
||||||
canEdit={canEditGeometry}
|
|
||||||
onChanged={() => setHistoryRefreshKey((current) => current + 1)}
|
|
||||||
/>
|
|
||||||
</Suspense>}
|
|
||||||
|
|
||||||
{editing && id && asset && tab === 'registry' && <div className="asset-tab-stack">
|
|
||||||
{canReadRegistry && selectedType && <AssetRegistryPanel
|
|
||||||
assetId={id}
|
|
||||||
assetName={asset.name}
|
|
||||||
role={selectedType.operationalRole}
|
|
||||||
canManage={canManageRegistry}
|
|
||||||
onChanged={() => setHistoryRefreshKey((current) => current + 1)}
|
|
||||||
/>}
|
|
||||||
{canReadProvenance && <AssetProvenancePanel
|
|
||||||
assetId={id}
|
|
||||||
canManage={canManageProvenance}
|
|
||||||
canVerify={canVerifyProvenance}
|
|
||||||
onChanged={() => setHistoryRefreshKey((current) => current + 1)}
|
|
||||||
/>}
|
|
||||||
</div>}
|
|
||||||
|
|
||||||
{editing && id && asset && tab === 'files' && canReadMedia
|
|
||||||
&& <AssetMediaPanel
|
|
||||||
assetId={id}
|
|
||||||
assetName={asset.name}
|
|
||||||
canManage={canManageMedia}
|
|
||||||
onChanged={() => setHistoryRefreshKey((current) => current + 1)}
|
|
||||||
/>}
|
|
||||||
|
|
||||||
{editing && id && tab === 'history' && canReadHistory && <div className="asset-tab-stack">
|
|
||||||
{compactStructuralSummary && asset && selectedType && <AssetContextHistoryPanel
|
|
||||||
asset={asset}
|
|
||||||
type={selectedType}
|
|
||||||
canManage={canManageContext}
|
|
||||||
onChanged={handleContextChanged}
|
|
||||||
/>}
|
|
||||||
<AssetHistoryPanel assetId={id} refreshKey={historyRefreshKey} />
|
|
||||||
</div>}
|
|
||||||
</section>;
|
</section>;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,305 +0,0 @@
|
|||||||
import { useEffect, useMemo, useState } from 'react';
|
|
||||||
import { useAuth } from '../auth/AuthContext';
|
|
||||||
import { Alert, LoadingBlock, errorMessage } from '../components/Feedback';
|
|
||||||
import { Icon } from '../components/Icon';
|
|
||||||
import {
|
|
||||||
createInventoryFamily,
|
|
||||||
createInventoryFamilyAttribute,
|
|
||||||
getInventoryFamilyAttributes,
|
|
||||||
listInventoryFamiliesAdmin,
|
|
||||||
updateInventoryFamily,
|
|
||||||
updateInventoryFamilyAttribute,
|
|
||||||
} from '../lib/inventoryStructureApi';
|
|
||||||
import type {
|
|
||||||
InventoryFamily,
|
|
||||||
InventoryFamilyAttribute,
|
|
||||||
InventoryFamilyAttributeDataType,
|
|
||||||
} from '../lib/inventoryStructureApi';
|
|
||||||
|
|
||||||
type FamilyLevel = 'INSTALLATION' | 'SUBINSTALLATION';
|
|
||||||
|
|
||||||
const FIELD_TYPES: Array<{ value: InventoryFamilyAttributeDataType; label: string }> = [
|
|
||||||
{ value: 'TEXT', label: 'Texto' },
|
|
||||||
{ value: 'NUMBER', label: 'Número' },
|
|
||||||
{ value: 'DATE', label: 'Fecha' },
|
|
||||||
{ value: 'BOOLEAN', label: 'Sí / No' },
|
|
||||||
];
|
|
||||||
|
|
||||||
function fieldTypeLabel(value: InventoryFamilyAttributeDataType) {
|
|
||||||
return FIELD_TYPES.find((item) => item.value === value)?.label
|
|
||||||
?? (value === 'DATETIME' ? 'Fecha y hora' : value === 'SELECT' ? 'Lista' : value);
|
|
||||||
}
|
|
||||||
|
|
||||||
function fieldCode(name: string) {
|
|
||||||
return name
|
|
||||||
.normalize('NFD')
|
|
||||||
.replace(/[\u0300-\u036f]/g, '')
|
|
||||||
.trim()
|
|
||||||
.toLowerCase()
|
|
||||||
.replace(/[^a-z0-9]+/g, '_')
|
|
||||||
.replace(/^_+|_+$/g, '')
|
|
||||||
.slice(0, 100) || `campo_${Date.now()}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function AuthoritativeInventoryConfigPage() {
|
|
||||||
const { hasPermission } = useAuth();
|
|
||||||
const canManage = hasPermission('asset_types.manage');
|
|
||||||
const [families, setFamilies] = useState<InventoryFamily[]>([]);
|
|
||||||
const [level, setLevel] = useState<FamilyLevel>('INSTALLATION');
|
|
||||||
const [selectedFamilyId, setSelectedFamilyId] = useState('');
|
|
||||||
const [attributes, setAttributes] = useState<InventoryFamilyAttribute[]>([]);
|
|
||||||
const [newTypeName, setNewTypeName] = useState('');
|
|
||||||
const [newTypeParents, setNewTypeParents] = useState<string[]>([]);
|
|
||||||
const [newFieldName, setNewFieldName] = useState('');
|
|
||||||
const [newFieldType, setNewFieldType] = useState<InventoryFamilyAttributeDataType>('TEXT');
|
|
||||||
const [newFieldRequired, setNewFieldRequired] = useState(false);
|
|
||||||
const [loading, setLoading] = useState(true);
|
|
||||||
const [saving, setSaving] = useState(false);
|
|
||||||
const [error, setError] = useState('');
|
|
||||||
const [success, setSuccess] = useState('');
|
|
||||||
|
|
||||||
const refreshFamilies = async () => {
|
|
||||||
const loaded = await listInventoryFamiliesAdmin();
|
|
||||||
setFamilies(loaded);
|
|
||||||
return loaded;
|
|
||||||
};
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
refreshFamilies()
|
|
||||||
.catch((requestError) => setError(errorMessage(requestError)))
|
|
||||||
.finally(() => setLoading(false));
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const installationFamilies = useMemo(
|
|
||||||
() => families.filter((family) => family.level === 'INSTALLATION'),
|
|
||||||
[families],
|
|
||||||
);
|
|
||||||
const visibleFamilies = useMemo(
|
|
||||||
() => families.filter((family) => family.level === level),
|
|
||||||
[families, level],
|
|
||||||
);
|
|
||||||
const selectedFamily = families.find((family) => family.id === selectedFamilyId) ?? null;
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const first = visibleFamilies.find((family) => family.isActive !== false) ?? visibleFamilies[0] ?? null;
|
|
||||||
setSelectedFamilyId((current) => visibleFamilies.some((family) => family.id === current) ? current : first?.id ?? '');
|
|
||||||
}, [level, visibleFamilies]);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (!selectedFamilyId) {
|
|
||||||
setAttributes([]);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
getInventoryFamilyAttributes(selectedFamilyId)
|
|
||||||
.then((result) => setAttributes(result.items.sort((a, b) => a.sortOrder - b.sortOrder || a.name.localeCompare(b.name))))
|
|
||||||
.catch((requestError) => setError(errorMessage(requestError)));
|
|
||||||
}, [selectedFamilyId]);
|
|
||||||
|
|
||||||
const run = async (action: () => Promise<void>, message: string) => {
|
|
||||||
setSaving(true);
|
|
||||||
setError('');
|
|
||||||
setSuccess('');
|
|
||||||
try {
|
|
||||||
await action();
|
|
||||||
setSuccess(message);
|
|
||||||
} catch (requestError) {
|
|
||||||
setError(errorMessage(requestError));
|
|
||||||
} finally {
|
|
||||||
setSaving(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const createType = async () => {
|
|
||||||
if (!newTypeName.trim()) return;
|
|
||||||
if (level === 'SUBINSTALLATION' && newTypeParents.length === 0) {
|
|
||||||
setError('Elegí al menos un Tipo de Instalación que pueda contener esta Subinstalación.');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
await run(async () => {
|
|
||||||
const created = await createInventoryFamily({
|
|
||||||
level,
|
|
||||||
name: newTypeName.trim(),
|
|
||||||
parentFamilyIds: level === 'SUBINSTALLATION' ? newTypeParents : undefined,
|
|
||||||
});
|
|
||||||
await refreshFamilies();
|
|
||||||
setSelectedFamilyId(created.id);
|
|
||||||
setNewTypeName('');
|
|
||||||
setNewTypeParents([]);
|
|
||||||
}, `${level === 'INSTALLATION' ? 'Tipo de Instalación' : 'Tipo de Subinstalación'} creado.`);
|
|
||||||
};
|
|
||||||
|
|
||||||
const toggleParent = (parentId: string) => {
|
|
||||||
setNewTypeParents((current) => current.includes(parentId)
|
|
||||||
? current.filter((id) => id !== parentId)
|
|
||||||
: [...current, parentId]);
|
|
||||||
};
|
|
||||||
|
|
||||||
const toggleSelectedParent = async (parentId: string) => {
|
|
||||||
if (!selectedFamily || selectedFamily.level !== 'SUBINSTALLATION') return;
|
|
||||||
const next = selectedFamily.parentFamilyIds.includes(parentId)
|
|
||||||
? selectedFamily.parentFamilyIds.filter((id) => id !== parentId)
|
|
||||||
: [...selectedFamily.parentFamilyIds, parentId];
|
|
||||||
if (next.length === 0) {
|
|
||||||
setError('Una Subinstalación debe quedar habilitada dentro de al menos un Tipo de Instalación.');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
await run(async () => {
|
|
||||||
await updateInventoryFamily(selectedFamily.id, { parentFamilyIds: next });
|
|
||||||
await refreshFamilies();
|
|
||||||
}, 'Tipos permitidos actualizados.');
|
|
||||||
};
|
|
||||||
|
|
||||||
const createField = async () => {
|
|
||||||
if (!selectedFamily || !newFieldName.trim()) return;
|
|
||||||
await run(async () => {
|
|
||||||
await createInventoryFamilyAttribute(selectedFamily.id, {
|
|
||||||
code: fieldCode(newFieldName),
|
|
||||||
name: newFieldName.trim(),
|
|
||||||
dataType: newFieldType,
|
|
||||||
isRequired: newFieldRequired,
|
|
||||||
sortOrder: attributes.length,
|
|
||||||
});
|
|
||||||
const loaded = await getInventoryFamilyAttributes(selectedFamily.id);
|
|
||||||
setAttributes(loaded.items.sort((a, b) => a.sortOrder - b.sortOrder || a.name.localeCompare(b.name)));
|
|
||||||
setNewFieldName('');
|
|
||||||
setNewFieldType('TEXT');
|
|
||||||
setNewFieldRequired(false);
|
|
||||||
}, 'Campo agregado.');
|
|
||||||
};
|
|
||||||
|
|
||||||
const toggleField = async (attribute: InventoryFamilyAttribute, key: 'isRequired' | 'isActive') => {
|
|
||||||
if (!selectedFamily) return;
|
|
||||||
await run(async () => {
|
|
||||||
await updateInventoryFamilyAttribute(selectedFamily.id, attribute.id, { [key]: !attribute[key] });
|
|
||||||
const loaded = await getInventoryFamilyAttributes(selectedFamily.id);
|
|
||||||
setAttributes(loaded.items.sort((a, b) => a.sortOrder - b.sortOrder || a.name.localeCompare(b.name)));
|
|
||||||
}, key === 'isActive' ? 'Visibilidad del campo actualizada.' : 'Obligatoriedad actualizada.');
|
|
||||||
};
|
|
||||||
|
|
||||||
const toggleFamilyActive = async () => {
|
|
||||||
if (!selectedFamily) return;
|
|
||||||
await run(async () => {
|
|
||||||
await updateInventoryFamily(selectedFamily.id, { isActive: selectedFamily.isActive === false });
|
|
||||||
await refreshFamilies();
|
|
||||||
}, selectedFamily.isActive === false ? 'Tipo activado.' : 'Tipo desactivado.');
|
|
||||||
};
|
|
||||||
|
|
||||||
if (loading) return <LoadingBlock label="Cargando configuración de Inventarios…" />;
|
|
||||||
|
|
||||||
return <section className="inventory-config-page">
|
|
||||||
<div className="page-heading">
|
|
||||||
<div>
|
|
||||||
<span className="eyebrow">ADMINISTRACIÓN · INVENTARIOS</span>
|
|
||||||
<h1>Tipos y campos</h1>
|
|
||||||
<p>Configuración simple para la puesta a punto. Los usuarios de campo no ven esta pantalla.</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{error && <Alert>{error}</Alert>}
|
|
||||||
{success && <Alert type="success">{success}</Alert>}
|
|
||||||
|
|
||||||
<article className="panel" style={{ marginBottom: 18 }}>
|
|
||||||
<div className="panel-heading">
|
|
||||||
<div>
|
|
||||||
<span className="eyebrow">ESTRUCTURA FIJA</span>
|
|
||||||
<h2>Departamento → Área → Yacimiento → Instalación → Subinstalación</h2>
|
|
||||||
<p className="section-copy">Un Área puede estar vinculada a varias Empresas. Cada Yacimiento elige una sola Empresa operadora de las vinculadas a su Área.</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="temporal-notice">
|
|
||||||
<Icon name="map" />
|
|
||||||
<p><strong>Campos básicos del sistema:</strong> nombre, código, ubicación jerárquica, estado y GPS. No hace falta configurarlos acá.</p>
|
|
||||||
</div>
|
|
||||||
</article>
|
|
||||||
|
|
||||||
<div className="quick-view-row" style={{ marginBottom: 18 }}>
|
|
||||||
<button type="button" className={level === 'INSTALLATION' ? 'active' : ''} onClick={() => setLevel('INSTALLATION')}>Tipos de Instalación</button>
|
|
||||||
<button type="button" className={level === 'SUBINSTALLATION' ? 'active' : ''} onClick={() => setLevel('SUBINSTALLATION')}>Tipos de Subinstalación</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="dashboard-grid" style={{ alignItems: 'start' }}>
|
|
||||||
<article className="panel">
|
|
||||||
<div className="panel-heading">
|
|
||||||
<div>
|
|
||||||
<span className="eyebrow">TIPOS</span>
|
|
||||||
<h2>{level === 'INSTALLATION' ? 'Instalaciones' : 'Subinstalaciones'}</h2>
|
|
||||||
<p className="section-copy">Seleccioná un tipo para administrar sus campos.</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="attribute-list" style={{ maxHeight: 520, overflow: 'auto' }}>
|
|
||||||
{visibleFamilies.length === 0 && <p className="muted">Todavía no hay tipos configurados.</p>}
|
|
||||||
{visibleFamilies.map((family) => <button
|
|
||||||
type="button"
|
|
||||||
key={family.id}
|
|
||||||
onClick={() => setSelectedFamilyId(family.id)}
|
|
||||||
className="attribute-card"
|
|
||||||
style={{ width: '100%', textAlign: 'left', borderColor: selectedFamilyId === family.id ? 'var(--primary)' : undefined, opacity: family.isActive === false ? .55 : 1 }}
|
|
||||||
>
|
|
||||||
<span className="asset-symbol"><Icon name="layers" size={16} /></span>
|
|
||||||
<span><strong>{family.name}</strong><small>{family.isActive === false ? 'Oculto' : `${family.technicalAttributeCount ?? 0} campos`}</small></span>
|
|
||||||
<Icon name="chevron" size={16} />
|
|
||||||
</button>)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{canManage && <div style={{ marginTop: 18, borderTop: '1px solid var(--border)', paddingTop: 18 }}>
|
|
||||||
<h3 style={{ marginTop: 0 }}>+ Nuevo tipo</h3>
|
|
||||||
<label className="field"><span>Nombre</span><input value={newTypeName} onChange={(event) => setNewTypeName(event.target.value)} placeholder={level === 'INSTALLATION' ? 'Ej. Planta de tratamiento' : 'Ej. Bomba centrífuga'} /></label>
|
|
||||||
{level === 'SUBINSTALLATION' && <div className="field"><span>Puede estar dentro de</span><div className="inventory-parent-options">
|
|
||||||
{installationFamilies.filter((family) => family.isActive !== false).map((family) => <label key={family.id} className="inventory-parent-option"><input type="checkbox" checked={newTypeParents.includes(family.id)} onChange={() => toggleParent(family.id)} /><span>{family.name}</span></label>)}
|
|
||||||
</div></div>}
|
|
||||||
<button type="button" className="button primary" disabled={saving || !newTypeName.trim()} onClick={() => void createType()}><Icon name="plus" />Crear tipo</button>
|
|
||||||
</div>}
|
|
||||||
</article>
|
|
||||||
|
|
||||||
<article className="panel">
|
|
||||||
{!selectedFamily ? <div className="inline-empty">Seleccioná un tipo para ver sus campos.</div> : <>
|
|
||||||
<div className="panel-heading">
|
|
||||||
<div>
|
|
||||||
<span className="eyebrow">{selectedFamily.level === 'INSTALLATION' ? 'INSTALACIÓN' : 'SUBINSTALACIÓN'}</span>
|
|
||||||
<h2>{selectedFamily.name}</h2>
|
|
||||||
<p className="section-copy">Campos sencillos que se muestran al cargar este tipo.</p>
|
|
||||||
</div>
|
|
||||||
{canManage && <button type="button" className="button secondary" onClick={() => void toggleFamilyActive()}>{selectedFamily.isActive === false ? 'Activar tipo' : 'Ocultar tipo'}</button>}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{selectedFamily.level === 'SUBINSTALLATION' && <div style={{ marginBottom: 22 }}>
|
|
||||||
<strong>Puede estar dentro de:</strong>
|
|
||||||
<div className="inventory-parent-options">
|
|
||||||
{installationFamilies.filter((family) => family.isActive !== false).map((family) => <label key={family.id} className="inventory-parent-option">
|
|
||||||
<input type="checkbox" disabled={!canManage || saving} checked={selectedFamily.parentFamilyIds.includes(family.id)} onChange={() => void toggleSelectedParent(family.id)} />
|
|
||||||
<span>{family.name}</span>
|
|
||||||
</label>)}
|
|
||||||
</div>
|
|
||||||
</div>}
|
|
||||||
|
|
||||||
<div className="attribute-list">
|
|
||||||
{attributes.length === 0 && <p className="muted">Este tipo no tiene campos específicos. Puede usarse sólo con los datos básicos.</p>}
|
|
||||||
{attributes.map((attribute) => <div className="attribute-card" key={attribute.id} style={{ opacity: attribute.isActive ? 1 : .5 }}>
|
|
||||||
<span className="attribute-order">{attribute.sortOrder + 1}</span>
|
|
||||||
<span>
|
|
||||||
<strong>{attribute.name}</strong>
|
|
||||||
<small>{fieldTypeLabel(attribute.dataType)}{attribute.isRequired ? ' · Obligatorio' : ' · Opcional'}{attribute.isActive ? '' : ' · Oculto'}</small>
|
|
||||||
</span>
|
|
||||||
{canManage && <span className="attribute-flags" style={{ display: 'flex', gap: 6 }}>
|
|
||||||
<button type="button" className="button secondary" disabled={saving} onClick={() => void toggleField(attribute, 'isRequired')}>{attribute.isRequired ? 'Hacer opcional' : 'Hacer obligatorio'}</button>
|
|
||||||
<button type="button" className="button secondary" disabled={saving} onClick={() => void toggleField(attribute, 'isActive')}>{attribute.isActive ? 'Ocultar' : 'Mostrar'}</button>
|
|
||||||
</span>}
|
|
||||||
</div>)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{canManage && selectedFamily.isActive !== false && <div style={{ marginTop: 22, borderTop: '1px solid var(--border)', paddingTop: 18 }}>
|
|
||||||
<h3 style={{ marginTop: 0 }}>+ Agregar campo</h3>
|
|
||||||
<div className="form-grid">
|
|
||||||
<label className="field"><span>Nombre</span><input value={newFieldName} onChange={(event) => setNewFieldName(event.target.value)} placeholder="Ej. Capacidad" /></label>
|
|
||||||
<label className="field"><span>Tipo</span><select value={newFieldType} onChange={(event) => setNewFieldType(event.target.value as InventoryFamilyAttributeDataType)}>{FIELD_TYPES.map((item) => <option key={item.value} value={item.value}>{item.label}</option>)}</select></label>
|
|
||||||
</div>
|
|
||||||
<label style={{ display: 'flex', alignItems: 'center', gap: 8, marginBottom: 14 }}><input type="checkbox" checked={newFieldRequired} onChange={(event) => setNewFieldRequired(event.target.checked)} />Obligatorio</label>
|
|
||||||
<button type="button" className="button primary" disabled={saving || !newFieldName.trim()} onClick={() => void createField()}><Icon name="plus" />Agregar campo</button>
|
|
||||||
<p className="muted" style={{ marginBottom: 0, marginTop: 12 }}>Teléfono, email o identificadores simples se cargan como Texto. GPS es un dato básico del registro y no se configura como campo.</p>
|
|
||||||
</div>}
|
|
||||||
</>}
|
|
||||||
</article>
|
|
||||||
</div>
|
|
||||||
</section>;
|
|
||||||
}
|
|
||||||
@@ -1,437 +0,0 @@
|
|||||||
import { useEffect, useMemo, useState } from 'react';
|
|
||||||
import type { FormEvent } from 'react';
|
|
||||||
import { Link, useSearchParams } from 'react-router';
|
|
||||||
import { useAuth } from '../auth/AuthContext';
|
|
||||||
import { Alert, EmptyState, LoadingBlock, errorMessage } from '../components/Feedback';
|
|
||||||
import { Icon } from '../components/Icon';
|
|
||||||
import { SearchableSelect } from '../components/SearchableSelect';
|
|
||||||
import { AssetHistoryPanel } from '../features/assets/AssetHistoryPanel';
|
|
||||||
import { AssetMediaPanel } from '../features/assets/AssetMediaPanel';
|
|
||||||
import { assetStatusClass, assetStatusLabel } from '../features/assets/assetPresentation';
|
|
||||||
import {
|
|
||||||
createAreaCompanyRelation,
|
|
||||||
endAreaCompanyRelation,
|
|
||||||
getAssetRegistry,
|
|
||||||
listAreaCompanyRelations,
|
|
||||||
listInspectionVisits,
|
|
||||||
listOperationalAreas,
|
|
||||||
updateAsset,
|
|
||||||
upsertOrganizationProfile,
|
|
||||||
} from '../lib/api';
|
|
||||||
import type {
|
|
||||||
AreaCompanyRelation,
|
|
||||||
AssetDetail,
|
|
||||||
AssetRegistry,
|
|
||||||
OperationalAssetSummary,
|
|
||||||
OrganizationKind,
|
|
||||||
} from '../lib/api';
|
|
||||||
import {
|
|
||||||
listInspectionActsGlobalF4,
|
|
||||||
type InspectionActListItemF4,
|
|
||||||
type InspectionActStatusF4,
|
|
||||||
} from '../lib/inspectionActF4Api';
|
|
||||||
import {
|
|
||||||
listInspectionReportsF4,
|
|
||||||
type InspectionReportDetailF4,
|
|
||||||
} from '../lib/reportWorkflowApi';
|
|
||||||
import { formatDate } from '../lib/format';
|
|
||||||
import './companyInventory.css';
|
|
||||||
|
|
||||||
type CompanyTab = 'summary' | 'issued' | 'documents' | 'history';
|
|
||||||
|
|
||||||
const organizationLabels: Record<OrganizationKind, string> = {
|
|
||||||
COMPANY: 'Empresa',
|
|
||||||
UTE: 'UTE',
|
|
||||||
PUBLIC_ENTITY: 'Entidad pública',
|
|
||||||
OTHER: 'Otra organización',
|
|
||||||
};
|
|
||||||
|
|
||||||
function relationRoleLabel(role: AreaCompanyRelation['relationRole']) {
|
|
||||||
if (role === 'OPERATOR') return 'Operadora';
|
|
||||||
if (role === 'TECHNICAL_OPERATOR') return 'Operadora técnica';
|
|
||||||
if (role === 'CONCESSIONAIRE') return 'Concesionaria / titular';
|
|
||||||
if (role === 'PERMIT_HOLDER') return 'Permisionaria';
|
|
||||||
if (role === 'PARTICIPANT') return 'Participante';
|
|
||||||
return 'Otro vínculo';
|
|
||||||
}
|
|
||||||
|
|
||||||
function reportStatusLabel(report: InspectionReportDetailF4) {
|
|
||||||
if (report.status === 'OFFICIALIZED') return report.gedoIfIdentifier ? `GEDO · ${report.gedoIfIdentifier}` : 'Oficializado en GEDO';
|
|
||||||
if (report.status === 'WORKING') return 'INF en preparación';
|
|
||||||
if (report.status === 'CANCELLED') return 'Cancelado';
|
|
||||||
return 'Informe histórico';
|
|
||||||
}
|
|
||||||
|
|
||||||
function reportStatusClass(report: InspectionReportDetailF4) {
|
|
||||||
if (report.status === 'OFFICIALIZED') return 'active';
|
|
||||||
if (report.status === 'CANCELLED') return 'danger';
|
|
||||||
return 'pending';
|
|
||||||
}
|
|
||||||
|
|
||||||
function areaLabel(items: Array<{ name: string }>) {
|
|
||||||
if (!items.length) return 'Área sin informar';
|
|
||||||
const first = items[0];
|
|
||||||
if (!first) return 'Área sin informar';
|
|
||||||
return items.length === 1 ? first.name : `${first.name} +${items.length - 1}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function loadAllActs(companyId: string): Promise<InspectionActListItemF4[]> {
|
|
||||||
const statuses: InspectionActStatusF4[] = ['SEALED', 'CLOSED', 'RECTIFIED'];
|
|
||||||
const groups = await Promise.all(statuses.map(async (status) => {
|
|
||||||
const collected: InspectionActListItemF4[] = [];
|
|
||||||
let page = 1;
|
|
||||||
let totalPages = 1;
|
|
||||||
do {
|
|
||||||
const response = await listInspectionActsGlobalF4({ companyId, status, page, pageSize: 100 });
|
|
||||||
collected.push(...response.data);
|
|
||||||
totalPages = response.meta.totalPages;
|
|
||||||
page += 1;
|
|
||||||
} while (page <= totalPages);
|
|
||||||
return collected;
|
|
||||||
}));
|
|
||||||
return groups.flat().sort((a, b) => new Date(b.occurredAt).getTime() - new Date(a.occurredAt).getTime());
|
|
||||||
}
|
|
||||||
|
|
||||||
async function loadAllReports(companyId: string): Promise<InspectionReportDetailF4[]> {
|
|
||||||
const collected: InspectionReportDetailF4[] = [];
|
|
||||||
let page = 1;
|
|
||||||
let totalPages = 1;
|
|
||||||
do {
|
|
||||||
const response = await listInspectionReportsF4({ companyId, page, pageSize: 100 });
|
|
||||||
collected.push(...response.data);
|
|
||||||
totalPages = response.meta.totalPages;
|
|
||||||
page += 1;
|
|
||||||
} while (page <= totalPages);
|
|
||||||
return collected
|
|
||||||
.filter((item) => item.status !== 'CANCELLED')
|
|
||||||
.sort((a, b) => new Date(b.generatedAt).getTime() - new Date(a.generatedAt).getTime());
|
|
||||||
}
|
|
||||||
|
|
||||||
export function CompanyInventoryPage({ initialAsset }: { initialAsset: AssetDetail }) {
|
|
||||||
const [params, setParams] = useSearchParams();
|
|
||||||
const requestedTab = params.get('tab') as CompanyTab | null;
|
|
||||||
const tab: CompanyTab = requestedTab && ['summary', 'issued', 'documents', 'history'].includes(requestedTab)
|
|
||||||
? requestedTab
|
|
||||||
: 'summary';
|
|
||||||
const { hasPermission } = useAuth();
|
|
||||||
const canEditAsset = hasPermission('assets.update');
|
|
||||||
const canReadRegistry = hasPermission('asset_registry.read');
|
|
||||||
const canManageRegistry = hasPermission('asset_registry.manage');
|
|
||||||
const canReadRelations = hasPermission('asset_relations.read');
|
|
||||||
const canManageRelations = hasPermission('asset_relations.manage');
|
|
||||||
const canReadActs = hasPermission('inspection_acts.read');
|
|
||||||
const canReadReports = hasPermission('inspection_reports.read');
|
|
||||||
const canReadInspections = hasPermission('inspections.read');
|
|
||||||
const canReadMedia = hasPermission('assets.read_media');
|
|
||||||
const canManageMedia = hasPermission('assets.manage_media');
|
|
||||||
const canReadHistory = hasPermission('assets.read_history');
|
|
||||||
|
|
||||||
const [asset, setAsset] = useState(initialAsset);
|
|
||||||
const [registry, setRegistry] = useState<AssetRegistry | null>(null);
|
|
||||||
const [relations, setRelations] = useState<AreaCompanyRelation[]>([]);
|
|
||||||
const [areas, setAreas] = useState<OperationalAssetSummary[]>([]);
|
|
||||||
const [loadingContext, setLoadingContext] = useState(true);
|
|
||||||
const [contextError, setContextError] = useState('');
|
|
||||||
const [success, setSuccess] = useState('');
|
|
||||||
const [editing, setEditing] = useState(false);
|
|
||||||
const [saving, setSaving] = useState(false);
|
|
||||||
const [companyForm, setCompanyForm] = useState({
|
|
||||||
name: initialAsset.name,
|
|
||||||
commonName: initialAsset.commonName ?? '',
|
|
||||||
organizationKind: 'COMPANY' as OrganizationKind,
|
|
||||||
legalName: initialAsset.name,
|
|
||||||
taxId: '',
|
|
||||||
notificationEmail: '',
|
|
||||||
notes: '',
|
|
||||||
});
|
|
||||||
const [relationForm, setRelationForm] = useState({ areaId: '', reason: '' });
|
|
||||||
const [metrics, setMetrics] = useState({ acts: 0, reports: 0, activeInspections: 0 });
|
|
||||||
const [acts, setActs] = useState<InspectionActListItemF4[]>([]);
|
|
||||||
const [reports, setReports] = useState<InspectionReportDetailF4[]>([]);
|
|
||||||
const [documentsLoading, setDocumentsLoading] = useState(false);
|
|
||||||
const [documentsError, setDocumentsError] = useState('');
|
|
||||||
const [documentSearch, setDocumentSearch] = useState('');
|
|
||||||
|
|
||||||
const activeRelations = useMemo(() => relations.filter((item) => item.active), [relations]);
|
|
||||||
|
|
||||||
const loadContext = async () => {
|
|
||||||
setLoadingContext(true);
|
|
||||||
setContextError('');
|
|
||||||
try {
|
|
||||||
const [loadedRegistry, loadedRelations, loadedAreas] = await Promise.all([
|
|
||||||
canReadRegistry ? getAssetRegistry(asset.id) : Promise.resolve(null),
|
|
||||||
canReadRelations ? listAreaCompanyRelations({ companyId: asset.id, includeHistory: true }) : Promise.resolve([]),
|
|
||||||
canManageRelations ? listOperationalAreas() : Promise.resolve([]),
|
|
||||||
]);
|
|
||||||
setRegistry(loadedRegistry);
|
|
||||||
setRelations(loadedRelations);
|
|
||||||
setAreas(loadedAreas);
|
|
||||||
if (loadedRegistry?.organizationProfile) {
|
|
||||||
const profile = loadedRegistry.organizationProfile;
|
|
||||||
setCompanyForm({
|
|
||||||
name: asset.name,
|
|
||||||
commonName: asset.commonName ?? '',
|
|
||||||
organizationKind: profile.organizationKind,
|
|
||||||
legalName: profile.legalName ?? asset.name,
|
|
||||||
taxId: profile.taxId ?? '',
|
|
||||||
notificationEmail: profile.notificationEmail ?? '',
|
|
||||||
notes: profile.notes ?? '',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
} catch (requestError) {
|
|
||||||
setContextError(errorMessage(requestError));
|
|
||||||
} finally {
|
|
||||||
setLoadingContext(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
useEffect(() => { void loadContext(); }, [asset.id]);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
let cancelled = false;
|
|
||||||
const loadMetrics = async () => {
|
|
||||||
try {
|
|
||||||
const [sealed, closed, rectified, reportPage, planned, inProgress] = await Promise.all([
|
|
||||||
canReadActs ? listInspectionActsGlobalF4({ companyId: asset.id, status: 'SEALED', pageSize: 1 }) : Promise.resolve(null),
|
|
||||||
canReadActs ? listInspectionActsGlobalF4({ companyId: asset.id, status: 'CLOSED', pageSize: 1 }) : Promise.resolve(null),
|
|
||||||
canReadActs ? listInspectionActsGlobalF4({ companyId: asset.id, status: 'RECTIFIED', pageSize: 1 }) : Promise.resolve(null),
|
|
||||||
canReadReports ? listInspectionReportsF4({ companyId: asset.id, pageSize: 1 }) : Promise.resolve(null),
|
|
||||||
canReadInspections ? listInspectionVisits({ companyId: asset.id, status: 'PLANNED', pageSize: 1 }) : Promise.resolve(null),
|
|
||||||
canReadInspections ? listInspectionVisits({ companyId: asset.id, status: 'IN_PROGRESS', pageSize: 1 }) : Promise.resolve(null),
|
|
||||||
]);
|
|
||||||
if (cancelled) return;
|
|
||||||
setMetrics({
|
|
||||||
acts: (sealed?.meta.total ?? 0) + (closed?.meta.total ?? 0) + (rectified?.meta.total ?? 0),
|
|
||||||
reports: reportPage?.meta.total ?? 0,
|
|
||||||
activeInspections: (planned?.meta.total ?? 0) + (inProgress?.meta.total ?? 0),
|
|
||||||
});
|
|
||||||
} catch {
|
|
||||||
if (!cancelled) setMetrics({ acts: 0, reports: 0, activeInspections: 0 });
|
|
||||||
}
|
|
||||||
};
|
|
||||||
void loadMetrics();
|
|
||||||
return () => { cancelled = true; };
|
|
||||||
}, [asset.id, canReadActs, canReadReports, canReadInspections]);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (tab !== 'issued' || (!canReadActs && !canReadReports)) return;
|
|
||||||
let cancelled = false;
|
|
||||||
setDocumentsLoading(true);
|
|
||||||
setDocumentsError('');
|
|
||||||
Promise.all([
|
|
||||||
canReadActs ? loadAllActs(asset.id) : Promise.resolve([]),
|
|
||||||
canReadReports ? loadAllReports(asset.id) : Promise.resolve([]),
|
|
||||||
])
|
|
||||||
.then(([loadedActs, loadedReports]) => {
|
|
||||||
if (cancelled) return;
|
|
||||||
setActs(loadedActs);
|
|
||||||
setReports(loadedReports);
|
|
||||||
})
|
|
||||||
.catch((requestError) => { if (!cancelled) setDocumentsError(errorMessage(requestError)); })
|
|
||||||
.finally(() => { if (!cancelled) setDocumentsLoading(false); });
|
|
||||||
return () => { cancelled = true; };
|
|
||||||
}, [tab, asset.id, canReadActs, canReadReports]);
|
|
||||||
|
|
||||||
const saveCompany = async (event: FormEvent) => {
|
|
||||||
event.preventDefault();
|
|
||||||
setSaving(true); setContextError(''); setSuccess('');
|
|
||||||
try {
|
|
||||||
let savedAsset = asset;
|
|
||||||
if (canEditAsset) {
|
|
||||||
savedAsset = await updateAsset(asset.id, {
|
|
||||||
name: companyForm.name.trim(),
|
|
||||||
commonName: companyForm.commonName.trim() || null,
|
|
||||||
});
|
|
||||||
setAsset(savedAsset);
|
|
||||||
}
|
|
||||||
if (canManageRegistry) {
|
|
||||||
await upsertOrganizationProfile(asset.id, {
|
|
||||||
organizationKind: companyForm.organizationKind,
|
|
||||||
legalName: companyForm.legalName.trim() || null,
|
|
||||||
taxId: companyForm.taxId.trim() || null,
|
|
||||||
notificationEmail: companyForm.notificationEmail.trim() || null,
|
|
||||||
notes: companyForm.notes.trim() || null,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
setEditing(false);
|
|
||||||
setSuccess('Datos de la empresa actualizados.');
|
|
||||||
await loadContext();
|
|
||||||
} catch (requestError) {
|
|
||||||
setContextError(errorMessage(requestError));
|
|
||||||
} finally {
|
|
||||||
setSaving(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const addRelation = async (event: FormEvent) => {
|
|
||||||
event.preventDefault();
|
|
||||||
if (!relationForm.areaId || relationForm.reason.trim().length < 3) return;
|
|
||||||
setSaving(true); setContextError(''); setSuccess('');
|
|
||||||
try {
|
|
||||||
await createAreaCompanyRelation({
|
|
||||||
areaId: relationForm.areaId,
|
|
||||||
companyId: asset.id,
|
|
||||||
reason: relationForm.reason.trim(),
|
|
||||||
});
|
|
||||||
setRelationForm({ areaId: '', reason: '' });
|
|
||||||
setSuccess('Área vinculada a la empresa.');
|
|
||||||
await loadContext();
|
|
||||||
} catch (requestError) {
|
|
||||||
setContextError(errorMessage(requestError));
|
|
||||||
} finally {
|
|
||||||
setSaving(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const endRelation = async (relation: AreaCompanyRelation) => {
|
|
||||||
const reason = window.prompt(`Motivo para finalizar el vínculo con ${relation.area.name}`);
|
|
||||||
if (!reason?.trim() || reason.trim().length < 3) return;
|
|
||||||
setSaving(true); setContextError(''); setSuccess('');
|
|
||||||
try {
|
|
||||||
await endAreaCompanyRelation(relation.id, reason.trim());
|
|
||||||
setSuccess('Vínculo finalizado. El historial quedó conservado.');
|
|
||||||
await loadContext();
|
|
||||||
} catch (requestError) {
|
|
||||||
setContextError(errorMessage(requestError));
|
|
||||||
} finally {
|
|
||||||
setSaving(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const setTab = (next: CompanyTab) => {
|
|
||||||
const nextParams = new URLSearchParams(params);
|
|
||||||
next === 'summary' ? nextParams.delete('tab') : nextParams.set('tab', next);
|
|
||||||
nextParams.delete('advanced');
|
|
||||||
setParams(nextParams);
|
|
||||||
};
|
|
||||||
|
|
||||||
const reportByAct = useMemo(() => new Map(reports.map((report) => [report.actId, report])), [reports]);
|
|
||||||
const filteredActs = useMemo(() => {
|
|
||||||
const needle = documentSearch.trim().toLocaleLowerCase('es');
|
|
||||||
if (!needle) return acts;
|
|
||||||
return acts.filter((act) => [
|
|
||||||
act.code,
|
|
||||||
act.title,
|
|
||||||
act.visit.code,
|
|
||||||
...act.areas.map((item) => item.name),
|
|
||||||
reportByAct.get(act.id)?.code ?? '',
|
|
||||||
reportByAct.get(act.id)?.gedoIfIdentifier ?? '',
|
|
||||||
].join(' ').toLocaleLowerCase('es').includes(needle));
|
|
||||||
}, [acts, documentSearch, reportByAct]);
|
|
||||||
|
|
||||||
const usedAreaIds = new Set(activeRelations.map((relation) => relation.area.id));
|
|
||||||
const availableAreas = areas.filter((item) => !usedAreaIds.has(item.id));
|
|
||||||
const profile = registry?.organizationProfile ?? null;
|
|
||||||
|
|
||||||
return <section className="narrow-section company-page">
|
|
||||||
<nav className="breadcrumb company-breadcrumb" aria-label="Ruta de empresa">
|
|
||||||
<Link to="/inventarios">Inventarios</Link><span>›</span>
|
|
||||||
<Link to="/inventarios?section=companies">Empresas</Link><span>›</span><strong>{asset.name}</strong>
|
|
||||||
</nav>
|
|
||||||
|
|
||||||
<header className="company-hero">
|
|
||||||
<div>
|
|
||||||
<span className="eyebrow">EMPRESA</span>
|
|
||||||
<h1>{asset.name}</h1>
|
|
||||||
<p><strong>{asset.code}</strong>{profile?.taxId ? ` · CUIT ${profile.taxId}` : ''}</p>
|
|
||||||
</div>
|
|
||||||
<div className="company-hero-actions">
|
|
||||||
<span className={`status-badge ${assetStatusClass(asset.informationStatus)}`}>{assetStatusLabel(asset.informationStatus)}</span>
|
|
||||||
{(canEditAsset || canManageRegistry) && tab === 'summary' && <button type="button" className="button primary" onClick={() => setEditing((current) => !current)}><Icon name="edit" />{editing ? 'Cerrar edición' : 'Editar empresa'}</button>}
|
|
||||||
</div>
|
|
||||||
</header>
|
|
||||||
|
|
||||||
<nav className="company-tabs" aria-label="Secciones de la empresa">
|
|
||||||
<button type="button" className={tab === 'summary' ? 'active' : ''} onClick={() => setTab('summary')}>Resumen</button>
|
|
||||||
{(canReadActs || canReadReports) && <button type="button" className={tab === 'issued' ? 'active' : ''} onClick={() => setTab('issued')}>Actas e informes</button>}
|
|
||||||
{(canReadRegistry || canReadMedia) && <button type="button" className={tab === 'documents' ? 'active' : ''} onClick={() => setTab('documents')}>Documentación</button>}
|
|
||||||
{canReadHistory && <button type="button" className={tab === 'history' ? 'active' : ''} onClick={() => setTab('history')}>Historial</button>}
|
|
||||||
</nav>
|
|
||||||
|
|
||||||
{contextError && <Alert>{contextError}</Alert>}
|
|
||||||
{success && <Alert type="success">{success}</Alert>}
|
|
||||||
|
|
||||||
{tab === 'summary' && <div className="company-stack">
|
|
||||||
{loadingContext ? <LoadingBlock label="Cargando empresa…" /> : <>
|
|
||||||
<article className="panel company-card">
|
|
||||||
<div className="company-card-heading">
|
|
||||||
<div><span className="eyebrow">IDENTIDAD</span><h2>Datos de la empresa</h2><p>La información que se usa para identificarla y enviar documentación oficial.</p></div>
|
|
||||||
</div>
|
|
||||||
{editing ? <form className="company-edit-form" onSubmit={saveCompany}>
|
|
||||||
<div className="form-grid">
|
|
||||||
<label className="field"><span>Nombre</span><input value={companyForm.name} disabled={!canEditAsset} onChange={(event) => setCompanyForm({ ...companyForm, name: event.target.value })} required /></label>
|
|
||||||
<label className="field"><span>Nombre corto / sigla <em>opcional</em></span><input value={companyForm.commonName} disabled={!canEditAsset} onChange={(event) => setCompanyForm({ ...companyForm, commonName: event.target.value })} placeholder="Ej.: EMESA" /></label>
|
|
||||||
<label className="field"><span>Tipo</span><SearchableSelect value={companyForm.organizationKind} disabled={!canManageRegistry} onChange={(event) => setCompanyForm({ ...companyForm, organizationKind: event.target.value as OrganizationKind })}>{Object.entries(organizationLabels).map(([value, label]) => <option key={value} value={value}>{label}</option>)}</SearchableSelect></label>
|
|
||||||
<label className="field"><span>Razón social <em>opcional</em></span><input value={companyForm.legalName} disabled={!canManageRegistry} onChange={(event) => setCompanyForm({ ...companyForm, legalName: event.target.value })} /></label>
|
|
||||||
<label className="field"><span>CUIT <em>opcional</em></span><input value={companyForm.taxId} disabled={!canManageRegistry} onChange={(event) => setCompanyForm({ ...companyForm, taxId: event.target.value })} /></label>
|
|
||||||
<label className="field"><span>Email oficial para actas <em>opcional</em></span><input type="email" value={companyForm.notificationEmail} disabled={!canManageRegistry} onChange={(event) => setCompanyForm({ ...companyForm, notificationEmail: event.target.value })} /></label>
|
|
||||||
</div>
|
|
||||||
<label className="field"><span>Notas <em>opcional</em></span><textarea rows={2} value={companyForm.notes} disabled={!canManageRegistry} onChange={(event) => setCompanyForm({ ...companyForm, notes: event.target.value })} /></label>
|
|
||||||
<div className="form-actions"><button type="button" className="button secondary" onClick={() => setEditing(false)}>Cancelar</button><button className="button primary" disabled={saving}>{saving ? 'Guardando…' : 'Guardar cambios'}</button></div>
|
|
||||||
</form> : <div className="company-data-grid">
|
|
||||||
<div><small>Razón social</small><strong>{profile?.legalName || asset.name}</strong></div>
|
|
||||||
<div><small>Tipo</small><strong>{organizationLabels[profile?.organizationKind ?? 'COMPANY']}</strong></div>
|
|
||||||
<div><small>CUIT</small><strong>{profile?.taxId || 'Sin informar'}</strong></div>
|
|
||||||
<div><small>Email oficial para actas</small><strong>{profile?.notificationEmail || 'Sin informar'}</strong></div>
|
|
||||||
</div>}
|
|
||||||
</article>
|
|
||||||
|
|
||||||
<article className="panel company-card">
|
|
||||||
<div className="company-card-heading">
|
|
||||||
<div><span className="eyebrow">OPERACIÓN</span><h2>Áreas donde opera</h2><p>Estas relaciones indican dónde participa la empresa. No cambian la jerarquía física del Inventario.</p></div>
|
|
||||||
<span className="count-pill">{activeRelations.length}</span>
|
|
||||||
</div>
|
|
||||||
{activeRelations.length === 0 ? <EmptyState title="Sin áreas vinculadas" text="Todavía no hay áreas operativas asociadas a esta empresa." /> : <div className="company-area-list">{activeRelations.map((relation) => <div className="company-area-row" key={relation.id}>
|
|
||||||
<Link to={`/inventarios/${relation.area.id}`}><strong>{relation.area.name}</strong><small>{relation.area.code} · {relationRoleLabel(relation.relationRole)}</small></Link>
|
|
||||||
<div><span className="status-badge active">Activa</span>{canManageRelations && <button type="button" className="button text compact" disabled={saving} onClick={() => void endRelation(relation)}>Finalizar</button>}</div>
|
|
||||||
</div>)}</div>}
|
|
||||||
{canManageRelations && <details className="company-inline-action"><summary><Icon name="plus" size={15} />Vincular otra área</summary><form onSubmit={addRelation}><div className="form-grid"><label className="field"><span>Área</span><SearchableSelect value={relationForm.areaId} onChange={(event) => setRelationForm({ ...relationForm, areaId: event.target.value })} required><option value="">Seleccionar área…</option>{availableAreas.map((item) => <option key={item.id} value={item.id}>{item.name} · {item.code}</option>)}</SearchableSelect></label><label className="field"><span>Motivo</span><input value={relationForm.reason} onChange={(event) => setRelationForm({ ...relationForm, reason: event.target.value })} minLength={3} required placeholder="Ej.: operación vigente" /></label></div><button className="button primary" disabled={saving || !relationForm.areaId || relationForm.reason.trim().length < 3}>Vincular área</button></form></details>}
|
|
||||||
</article>
|
|
||||||
|
|
||||||
<article className="panel company-card company-activity-card">
|
|
||||||
<div className="company-card-heading"><div><span className="eyebrow">INSPECCIONES</span><h2>Actividad de la empresa</h2><p>Acceso rápido a la documentación que ya fue emitida.</p></div></div>
|
|
||||||
<div className="company-metrics">
|
|
||||||
<div><small>Actas emitidas</small><strong>{metrics.acts}</strong></div>
|
|
||||||
<div><small>Informes</small><strong>{metrics.reports}</strong></div>
|
|
||||||
<div><small>Inspecciones activas</small><strong>{metrics.activeInspections}</strong></div>
|
|
||||||
</div>
|
|
||||||
{(canReadActs || canReadReports) && <div className="company-card-actions"><button type="button" className="button primary" onClick={() => setTab('issued')}>Ver actas e informes <Icon name="chevron" /></button></div>}
|
|
||||||
</article>
|
|
||||||
</>}
|
|
||||||
</div>}
|
|
||||||
|
|
||||||
{tab === 'issued' && <div className="company-stack">
|
|
||||||
<article className="panel company-card">
|
|
||||||
<div className="company-card-heading company-doc-heading"><div><span className="eyebrow">DOCUMENTACIÓN EMITIDA</span><h2>Actas e informes</h2><p>Historial documental de esta empresa. Sólo se muestran Actas ya emitidas y sus Informes asociados.</p></div><div className="company-doc-counts"><span>{acts.length} actas</span><span>{reports.length} informes</span></div></div>
|
|
||||||
<label className="company-document-search"><Icon name="search" /><input value={documentSearch} onChange={(event) => setDocumentSearch(event.target.value)} placeholder="Buscar por acta, informe, inspección, área o GEDO" /></label>
|
|
||||||
{documentsError && <Alert>{documentsError}</Alert>}
|
|
||||||
{documentsLoading ? <LoadingBlock label="Cargando documentación emitida…" /> : filteredActs.length === 0 ? <EmptyState title="Sin documentación emitida" text="Todavía no hay Actas selladas para esta empresa." /> : <div className="table-scroll company-doc-table"><table><thead><tr><th>Fecha</th><th>Área</th><th>Acta</th><th>Inspección</th><th>Informe</th><th>Oficialización</th><th /></tr></thead><tbody>{filteredActs.map((act) => {
|
|
||||||
const report = reportByAct.get(act.id);
|
|
||||||
return <tr key={act.id}>
|
|
||||||
<td>{formatDate(act.occurredAt)}</td>
|
|
||||||
<td><strong className="table-primary">{areaLabel(act.areas)}</strong></td>
|
|
||||||
<td><Link className="text-link" to={`/inspecciones/actas/${act.id}`}>{act.code}</Link></td>
|
|
||||||
<td><Link className="text-link" to={`/inspecciones/${act.visitId}`}>{act.visit.code}</Link></td>
|
|
||||||
<td>{report ? <Link className="text-link" to={`/informes/${report.id}`}>{report.code}</Link> : <span className="status-badge pending">Pendiente de INF</span>}</td>
|
|
||||||
<td>{report ? <span className={`status-badge ${reportStatusClass(report)}`}>{reportStatusLabel(report)}</span> : <span className="muted">—</span>}</td>
|
|
||||||
<td className="action-cell"><Link className="icon-button" to={`/inspecciones/actas/${act.id}`} aria-label={`Abrir ${act.code}`}><Icon name="chevron" /></Link></td>
|
|
||||||
</tr>;
|
|
||||||
})}</tbody></table></div>}
|
|
||||||
</article>
|
|
||||||
</div>}
|
|
||||||
|
|
||||||
{tab === 'documents' && <div className="company-stack">
|
|
||||||
{loadingContext ? <LoadingBlock label="Cargando documentación…" /> : <>
|
|
||||||
{canReadRegistry && <article className="panel company-card">
|
|
||||||
<div className="company-card-heading"><div><span className="eyebrow">RESPALDO</span><h2>Documentos de la empresa</h2><p>Documentos e identificadores que respaldan los datos institucionales.</p></div><Link className="button secondary" to={`/inventarios/${asset.id}?advanced=1&tab=registry`}>Administrar</Link></div>
|
|
||||||
{registry?.sourceDocuments.length ? <div className="company-document-list">{registry.sourceDocuments.map((document) => <div key={document.linkId}><div><strong>{document.title}</strong><small>{document.documentNumber || document.documentType}{document.issuer ? ` · ${document.issuer}` : ''}</small></div><span className="tag">{document.relationType}</span></div>)}</div> : <div className="inline-empty">Todavía no hay documentos respaldatorios vinculados.</div>}
|
|
||||||
{registry?.externalIdentifiers.length ? <details className="company-more"><summary>Ver identificadores externos ({registry.externalIdentifiers.length})</summary><div className="company-identifier-list">{registry.externalIdentifiers.map((item) => <div key={item.id}><strong>{item.namespace}</strong><span>{item.value}</span><small>{item.validUntil ? 'Histórico' : 'Vigente'}</small></div>)}</div></details> : null}
|
|
||||||
</article>}
|
|
||||||
{canReadMedia && <AssetMediaPanel assetId={asset.id} assetName={asset.name} canManage={canManageMedia} />}
|
|
||||||
<div className="company-advanced-link"><span>¿Necesitás procedencia, composición UTE u otros datos técnicos?</span><Link to={`/inventarios/${asset.id}?advanced=1&tab=registry`}>Abrir administración avanzada</Link></div>
|
|
||||||
</>}
|
|
||||||
</div>}
|
|
||||||
|
|
||||||
{tab === 'history' && canReadHistory && <AssetHistoryPanel assetId={asset.id} />}
|
|
||||||
</section>;
|
|
||||||
}
|
|
||||||
@@ -6,13 +6,13 @@ import { Icon } from '../components/Icon';
|
|||||||
import { getAsset } from '../lib/api';
|
import { getAsset } from '../lib/api';
|
||||||
import {
|
import {
|
||||||
createInventoryStructure,
|
createInventoryStructure,
|
||||||
|
getInventoryFamilyFindings,
|
||||||
getInventoryStructureOptions,
|
getInventoryStructureOptions,
|
||||||
listCompaniesForInventoryArea,
|
|
||||||
listInventoryStructureParents,
|
listInventoryStructureParents,
|
||||||
} from '../lib/inventoryStructureApi';
|
} from '../lib/inventoryStructureApi';
|
||||||
import type {
|
import type {
|
||||||
InventoryAreaCompanyOption,
|
|
||||||
InventoryFamily,
|
InventoryFamily,
|
||||||
|
InventoryFamilyFindings,
|
||||||
InventoryStructureKind,
|
InventoryStructureKind,
|
||||||
InventoryStructureOptions,
|
InventoryStructureOptions,
|
||||||
InventoryStructureParent,
|
InventoryStructureParent,
|
||||||
@@ -26,24 +26,13 @@ const KINDS: Array<{ kind: InventoryStructureKind; label: string }> = [
|
|||||||
{ kind: 'SUBINSTALACION', label: 'Subinstalación' },
|
{ kind: 'SUBINSTALACION', label: 'Subinstalación' },
|
||||||
{ kind: 'EMPRESA', label: 'Empresa' },
|
{ kind: 'EMPRESA', label: 'Empresa' },
|
||||||
];
|
];
|
||||||
|
|
||||||
const childKindByParentType: Record<string, InventoryStructureKind | undefined> = {
|
const childKindByParentType: Record<string, InventoryStructureKind | undefined> = {
|
||||||
departamento: 'AREA',
|
departamento: 'AREA', area: 'YACIMIENTO', yacimiento: 'INSTALACION', instalacion: 'SUBINSTALACION',
|
||||||
area: 'YACIMIENTO',
|
|
||||||
yacimiento: 'INSTALACION',
|
|
||||||
instalacion: 'SUBINSTALACION',
|
|
||||||
};
|
};
|
||||||
|
const parentLabelByKind: Partial<Record<InventoryStructureKind,string>> = {
|
||||||
const parentLabelByKind: Partial<Record<InventoryStructureKind, string>> = {
|
AREA:'Departamento', YACIMIENTO:'Área', INSTALACION:'Yacimiento', SUBINSTALACION:'Instalación',
|
||||||
AREA: 'Departamento',
|
|
||||||
YACIMIENTO: 'Área',
|
|
||||||
INSTALACION: 'Yacimiento',
|
|
||||||
SUBINSTALACION: 'Instalación',
|
|
||||||
};
|
};
|
||||||
|
function kindLabel(kind: InventoryStructureKind) { return KINDS.find((item) => item.kind===kind)?.label ?? kind; }
|
||||||
function kindLabel(kind: InventoryStructureKind) {
|
|
||||||
return KINDS.find((item) => item.kind === kind)?.label ?? kind;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function InventoryCreatePage() {
|
export function InventoryCreatePage() {
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
@@ -55,232 +44,91 @@ export function InventoryCreatePage() {
|
|||||||
const [parentSearch, setParentSearch] = useState('');
|
const [parentSearch, setParentSearch] = useState('');
|
||||||
const [parentId, setParentId] = useState('');
|
const [parentId, setParentId] = useState('');
|
||||||
const [familyId, setFamilyId] = useState('');
|
const [familyId, setFamilyId] = useState('');
|
||||||
const [areaCompanies, setAreaCompanies] = useState<InventoryAreaCompanyOption[]>([]);
|
const [familyFindings, setFamilyFindings] = useState<InventoryFamilyFindings | null>(null);
|
||||||
const [operatorCompanyId, setOperatorCompanyId] = useState('');
|
|
||||||
const [name, setName] = useState('');
|
const [name, setName] = useState('');
|
||||||
const [code, setCode] = useState('');
|
const [code, setCode] = useState('');
|
||||||
|
const [commonName, setCommonName] = useState('');
|
||||||
|
const [description, setDescription] = useState('');
|
||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
const [saving, setSaving] = useState(false);
|
const [saving, setSaving] = useState(false);
|
||||||
const [error, setError] = useState('');
|
const [error, setError] = useState('');
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
getInventoryStructureOptions()
|
getInventoryStructureOptions().then(async (loaded) => {
|
||||||
.then(async (loaded) => {
|
setOptions(loaded);
|
||||||
setOptions(loaded);
|
if (contextParentId) {
|
||||||
if (contextParentId) {
|
const parent = await getAsset(contextParentId);
|
||||||
const parent = await getAsset(contextParentId);
|
const inferred = childKindByParentType[parent.type.code.toLowerCase()];
|
||||||
const inferred = childKindByParentType[parent.type.code.toLowerCase()];
|
if (inferred) { setKind(inferred); setParentId(parent.id); }
|
||||||
if (inferred) {
|
}
|
||||||
setKind(inferred);
|
}).catch((requestError) => setError(errorMessage(requestError))).finally(() => setLoading(false));
|
||||||
setParentId(parent.id);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.catch((requestError) => setError(errorMessage(requestError)))
|
|
||||||
.finally(() => setLoading(false));
|
|
||||||
}, [contextParentId]);
|
}, [contextParentId]);
|
||||||
|
|
||||||
const requiresParent = Boolean(parentLabelByKind[kind]);
|
const requiresParent = Boolean(parentLabelByKind[kind]);
|
||||||
const requiresFamily = kind === 'INSTALACION' || kind === 'SUBINSTALACION';
|
const requiresFamily = kind === 'INSTALACION' || kind === 'SUBINSTALACION';
|
||||||
const requiresCompany = kind === 'YACIMIENTO';
|
|
||||||
const parentLabel = parentLabelByKind[kind] ?? '';
|
const parentLabel = parentLabelByKind[kind] ?? '';
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!requiresParent) {
|
if (!requiresParent) { setParents([]); setParentId(''); return; }
|
||||||
setParents([]);
|
|
||||||
setParentId('');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const timer = window.setTimeout(() => {
|
const timer = window.setTimeout(() => {
|
||||||
listInventoryStructureParents(kind, parentSearch)
|
listInventoryStructureParents(kind,parentSearch).then((loaded) => {
|
||||||
.then((loaded) => {
|
setParents(loaded);
|
||||||
setParents(loaded);
|
if (contextParentId && loaded.some((item) => item.id===contextParentId)) setParentId(contextParentId);
|
||||||
if (contextParentId && loaded.some((item) => item.id === contextParentId)) setParentId(contextParentId);
|
}).catch((requestError) => setError(errorMessage(requestError)));
|
||||||
})
|
},150);
|
||||||
.catch((requestError) => setError(errorMessage(requestError)));
|
|
||||||
}, 150);
|
|
||||||
return () => window.clearTimeout(timer);
|
return () => window.clearTimeout(timer);
|
||||||
}, [kind, parentSearch, contextParentId, requiresParent]);
|
}, [kind,parentSearch,contextParentId,requiresParent]);
|
||||||
|
|
||||||
useEffect(() => {
|
const selectedParent = parents.find((item) => item.id===parentId) ?? null;
|
||||||
if (kind !== 'YACIMIENTO' || !parentId) {
|
|
||||||
setAreaCompanies([]);
|
|
||||||
setOperatorCompanyId('');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
setOperatorCompanyId('');
|
|
||||||
listCompaniesForInventoryArea(parentId)
|
|
||||||
.then(setAreaCompanies)
|
|
||||||
.catch((requestError) => setError(errorMessage(requestError)));
|
|
||||||
}, [kind, parentId]);
|
|
||||||
|
|
||||||
const selectedParent = parents.find((item) => item.id === parentId) ?? null;
|
|
||||||
const families = useMemo(() => {
|
const families = useMemo(() => {
|
||||||
if (!options) return [] as InventoryFamily[];
|
if (!options) return [] as InventoryFamily[];
|
||||||
if (kind === 'INSTALACION') return options.installationFamilies;
|
if (kind==='INSTALACION') return options.installationFamilies;
|
||||||
if (kind === 'SUBINSTALACION') {
|
if (kind==='SUBINSTALACION') {
|
||||||
const parentFamilyId = selectedParent?.inventoryFamily?.id;
|
const parentFamilyId=selectedParent?.inventoryFamily?.id;
|
||||||
return parentFamilyId
|
return parentFamilyId ? options.subinstallationFamilies.filter((item)=>item.parentFamilyIds.includes(parentFamilyId)) : [];
|
||||||
? options.subinstallationFamilies.filter((item) => item.parentFamilyIds.includes(parentFamilyId))
|
|
||||||
: [];
|
|
||||||
}
|
}
|
||||||
return [];
|
return [];
|
||||||
}, [options, kind, selectedParent]);
|
},[options,kind,selectedParent]);
|
||||||
|
const selectedFamily=families.find((item)=>item.id===familyId) ?? null;
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!familyId) { setFamilyFindings(null); return; }
|
||||||
|
getInventoryFamilyFindings(familyId).then(setFamilyFindings).catch((requestError)=>setError(errorMessage(requestError)));
|
||||||
|
},[familyId]);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!requiresFamily) setFamilyId('');
|
if (!requiresFamily) setFamilyId('');
|
||||||
if (kind === 'SUBINSTALACION' && familyId && !families.some((item) => item.id === familyId)) setFamilyId('');
|
if (kind==='SUBINSTALACION' && familyId && !families.some((item)=>item.id===familyId)) setFamilyId('');
|
||||||
}, [kind, requiresFamily, families, familyId]);
|
},[kind,requiresFamily,families,familyId]);
|
||||||
|
|
||||||
const changeKind = (next: InventoryStructureKind) => {
|
const changeKind=(next:InventoryStructureKind) => {
|
||||||
setKind(next);
|
setKind(next); setParentId(''); setParentSearch(''); setFamilyId(''); setFamilyFindings(null); setError('');
|
||||||
setParentId('');
|
|
||||||
setParentSearch('');
|
|
||||||
setFamilyId('');
|
|
||||||
setAreaCompanies([]);
|
|
||||||
setOperatorCompanyId('');
|
|
||||||
setError('');
|
|
||||||
};
|
};
|
||||||
|
const save=async(event:FormEvent) => {
|
||||||
const save = async (event: FormEvent) => {
|
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
if (requiresParent && !parentId) {
|
if (requiresParent && !parentId) { setError(`Seleccioná ${parentLabel}.`); return; }
|
||||||
setError(`Seleccioná ${parentLabel}.`);
|
if (requiresFamily && !familyId) { setError(`Seleccioná el tipo de ${kindLabel(kind).toLowerCase()}.`); return; }
|
||||||
return;
|
setSaving(true); setError('');
|
||||||
}
|
|
||||||
if (requiresCompany && !operatorCompanyId) {
|
|
||||||
setError('Seleccioná la Empresa que opera este Yacimiento.');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (requiresFamily && !familyId) {
|
|
||||||
setError(`Seleccioná el tipo de ${kindLabel(kind).toLowerCase()}.`);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
setSaving(true);
|
|
||||||
setError('');
|
|
||||||
try {
|
try {
|
||||||
const created = await createInventoryStructure({
|
const created=await createInventoryStructure({
|
||||||
kind,
|
kind,name:name.trim(),parentId:parentId || null,familyId:familyId || null,
|
||||||
name: name.trim(),
|
code:code.trim() || null,commonName:commonName.trim() || null,description:description.trim() || null,
|
||||||
parentId: parentId || null,
|
|
||||||
familyId: familyId || null,
|
|
||||||
operatorCompanyId: operatorCompanyId || null,
|
|
||||||
code: code.trim() || null,
|
|
||||||
});
|
});
|
||||||
navigate(`/inventarios/${created.id}`, { replace: true });
|
navigate(`/inventarios/${created.id}`,{replace:true});
|
||||||
} catch (requestError) {
|
} catch(requestError) { setError(errorMessage(requestError)); }
|
||||||
setError(errorMessage(requestError));
|
finally { setSaving(false); }
|
||||||
} finally {
|
|
||||||
setSaving(false);
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
if (loading) return <LoadingBlock label="Preparando alta…" />;
|
if (loading) return <LoadingBlock label="Preparando alta…" />;
|
||||||
|
|
||||||
const disableSave = saving
|
|
||||||
|| !name.trim()
|
|
||||||
|| (requiresParent && !parentId)
|
|
||||||
|| (requiresCompany && !operatorCompanyId)
|
|
||||||
|| (requiresFamily && !familyId);
|
|
||||||
|
|
||||||
return <section className="narrow-section asset-detail-page">
|
return <section className="narrow-section asset-detail-page">
|
||||||
<nav className="breadcrumb asset-detail-breadcrumb" aria-label="Ruta del Inventario">
|
<nav className="breadcrumb asset-detail-breadcrumb" aria-label="Ruta del Inventario"><Link to="/inventarios">Inventarios</Link><span>›</span><strong>Nuevo registro</strong></nav>
|
||||||
<Link to="/inventarios">Inventarios</Link><span>›</span><strong>Nuevo registro</strong>
|
<div className="page-heading asset-editor-heading"><div><span className="eyebrow">CARGA MANUAL</span><h1>Nuevo registro</h1><p>Para crear sólo necesitás ubicación, clasificación cuando corresponda y nombre. DH genera el código automáticamente.</p></div></div>
|
||||||
</nav>
|
|
||||||
|
|
||||||
<div className="page-heading asset-editor-heading">
|
|
||||||
<div>
|
|
||||||
<span className="eyebrow">ALTA RÁPIDA</span>
|
|
||||||
<h1>Agregar al Inventario</h1>
|
|
||||||
<p>Elegí qué querés crear, dónde está y completá sólo los datos necesarios.</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{error && <Alert>{error}</Alert>}
|
{error && <Alert>{error}</Alert>}
|
||||||
|
|
||||||
<form className="panel form-panel" onSubmit={save}>
|
<form className="panel form-panel" onSubmit={save}>
|
||||||
<div className="form-section">
|
<div className="form-section"><div><h2>1. ¿Qué querés crear?</h2><p className="section-copy">Departamento → Área → Yacimiento → Instalación → Subinstalación. Empresa queda fuera del árbol físico.</p></div><label className="field"><span>Tipo</span><select value={kind} onChange={(event)=>changeKind(event.target.value as InventoryStructureKind)}>{KINDS.map((item)=><option key={item.kind} value={item.kind}>{item.label}</option>)}</select></label></div>
|
||||||
<div>
|
{requiresParent && <div className="form-section"><div><h2>2. Ubicación</h2><p className="section-copy">Elegí el {parentLabel.toLowerCase()} concreto.</p></div><label className="field"><span>Buscar {parentLabel.toLowerCase()}</span><input value={parentSearch} onChange={(event)=>setParentSearch(event.target.value)} placeholder={`Buscar ${parentLabel.toLowerCase()}…`} /></label><label className="field"><span>{parentLabel} <em>obligatorio</em></span><select value={parentId} onChange={(event)=>{setParentId(event.target.value);setFamilyId('');}} required><option value="">Seleccionar…</option>{parents.map((parent)=><option key={parent.id} value={parent.id}>{parent.name} · {parent.code}</option>)}</select></label></div>}
|
||||||
<h2>¿Qué querés crear?</h2>
|
{requiresFamily && <div className="form-section"><div><h2>3. Clasificación técnica</h2><p className="section-copy">Define los datos técnicos y Hallazgos aplicables. En Subinstalaciones sólo aparecen clasificaciones compatibles con la Instalación elegida.</p></div>{kind==='SUBINSTALACION' && !selectedParent?.inventoryFamily ? <Alert>La Instalación elegida todavía no tiene clasificación técnica.</Alert> : <label className="field"><span>Tipo de {kindLabel(kind).toLowerCase()} <em>obligatorio</em></span><select value={familyId} onChange={(event)=>setFamilyId(event.target.value)} required><option value="">Seleccionar…</option>{families.map((family)=><option key={family.id} value={family.id}>{family.name}</option>)}</select></label>}{kind==='SUBINSTALACION' && selectedParent?.inventoryFamily && families.length===0 && <Alert>No hay tipos de Subinstalación compatibles con {selectedParent.inventoryFamily.name}. Configuralos primero en Configuración de Inventarios.</Alert>}{selectedFamily && <div className="context-create-banner"><Icon name="alert" /><div><strong>{selectedFamily.name}</strong><span>{familyFindings ? `${familyFindings.count} Hallazgo${familyFindings.count===1?'':'s'} asociado${familyFindings.count===1?'':'s'}` : 'Cargando Hallazgos asociados…'}</span>{familyFindings && familyFindings.items.length>0 && <ul style={{margin:'8px 0 0',paddingLeft:18}}>{familyFindings.items.slice(0,6).map((item)=><li key={item.id}>{item.title}</li>)}{familyFindings.items.length>6 && <li>+ {familyFindings.items.length-6} más</li>}</ul>}</div></div>}</div>}
|
||||||
<p className="section-copy">Departamento → Área → Yacimiento → Instalación → Subinstalación.</p>
|
<div className="form-section"><div><h2>{requiresFamily ? '4' : requiresParent ? '3' : '2'}. Nombre</h2><p className="section-copy">Los datos técnicos se completan después, en la ficha del elemento.</p></div><label className="field"><span>Nombre <em>obligatorio</em></span><input autoFocus value={name} onChange={(event)=>setName(event.target.value)} required maxLength={200} placeholder={`Nombre de ${kindLabel(kind).toLowerCase()}`} /></label><details style={{marginTop:12}}><summary style={{cursor:'pointer',fontWeight:700}}>Datos opcionales</summary><div style={{marginTop:14}}><div className="form-grid"><label className="field"><span>Código DH</span><input value={code} onChange={(event)=>setCode(event.target.value.toUpperCase())} maxLength={120} pattern="[A-Z0-9][A-Z0-9._/-]*" placeholder="Dejalo vacío para generar automáticamente" /></label><label className="field"><span>Nombre habitual</span><input value={commonName} onChange={(event)=>setCommonName(event.target.value)} maxLength={200} /></label></div><label className="field"><span>Descripción</span><textarea value={description} onChange={(event)=>setDescription(event.target.value)} rows={2} maxLength={4000} /></label></div></details></div>
|
||||||
</div>
|
<div className="form-actions"><Link className="button secondary" to="/inventarios">Cancelar</Link><button className="button primary" disabled={saving || !name.trim() || (requiresParent && !parentId) || (requiresFamily && !familyId)}><Icon name="check" />{saving?'Creando…':`Crear ${kindLabel(kind)}`}</button></div>
|
||||||
<div className="quick-view-row" aria-label="Tipo de registro">
|
|
||||||
{KINDS.map((item) => <button
|
|
||||||
type="button"
|
|
||||||
key={item.kind}
|
|
||||||
className={kind === item.kind ? 'active' : ''}
|
|
||||||
onClick={() => changeKind(item.kind)}
|
|
||||||
>{item.label}</button>)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{requiresParent && <div className="form-section">
|
|
||||||
<div>
|
|
||||||
<h2>¿Dónde está?</h2>
|
|
||||||
<p className="section-copy">Seleccioná el {parentLabel.toLowerCase()} al que pertenece.</p>
|
|
||||||
</div>
|
|
||||||
<label className="field">
|
|
||||||
<span>Buscar {parentLabel.toLowerCase()}</span>
|
|
||||||
<input value={parentSearch} onChange={(event) => setParentSearch(event.target.value)} placeholder={`Buscar ${parentLabel.toLowerCase()}…`} />
|
|
||||||
</label>
|
|
||||||
<label className="field">
|
|
||||||
<span>{parentLabel} <em>obligatorio</em></span>
|
|
||||||
<select value={parentId} onChange={(event) => { setParentId(event.target.value); setFamilyId(''); }} required>
|
|
||||||
<option value="">Seleccionar…</option>
|
|
||||||
{parents.map((parent) => <option key={parent.id} value={parent.id}>{parent.name}</option>)}
|
|
||||||
</select>
|
|
||||||
</label>
|
|
||||||
</div>}
|
|
||||||
|
|
||||||
{requiresCompany && <div className="form-section">
|
|
||||||
<div>
|
|
||||||
<h2>Empresa operadora</h2>
|
|
||||||
<p className="section-copy">Un Área puede tener varias Empresas. Cada Yacimiento queda asociado a una sola de ellas.</p>
|
|
||||||
</div>
|
|
||||||
{!parentId ? <Alert>Primero seleccioná el Área.</Alert> : areaCompanies.length === 0 ? <Alert>El Área elegida todavía no tiene Empresas operadoras vinculadas.</Alert> : <label className="field">
|
|
||||||
<span>Empresa <em>obligatorio</em></span>
|
|
||||||
<select value={operatorCompanyId} onChange={(event) => setOperatorCompanyId(event.target.value)} required>
|
|
||||||
<option value="">Seleccionar…</option>
|
|
||||||
{areaCompanies.map((company) => <option key={company.id} value={company.id}>{company.name}</option>)}
|
|
||||||
</select>
|
|
||||||
</label>}
|
|
||||||
</div>}
|
|
||||||
|
|
||||||
{requiresFamily && <div className="form-section">
|
|
||||||
<div>
|
|
||||||
<h2>{kind === 'INSTALACION' ? 'Tipo de instalación' : 'Tipo / función'}</h2>
|
|
||||||
<p className="section-copy">{kind === 'SUBINSTALACION' ? 'Sólo aparecen tipos permitidos dentro de la Instalación seleccionada.' : 'Elegí la clasificación simple que corresponda.'}</p>
|
|
||||||
</div>
|
|
||||||
{kind === 'SUBINSTALACION' && !selectedParent?.inventoryFamily ? <Alert>La Instalación elegida todavía no tiene un tipo configurado.</Alert> : <label className="field">
|
|
||||||
<span>{kind === 'INSTALACION' ? 'Tipo' : 'Tipo / función'} <em>obligatorio</em></span>
|
|
||||||
<select value={familyId} onChange={(event) => setFamilyId(event.target.value)} required>
|
|
||||||
<option value="">Seleccionar…</option>
|
|
||||||
{families.map((family) => <option key={family.id} value={family.id}>{family.name}</option>)}
|
|
||||||
</select>
|
|
||||||
</label>}
|
|
||||||
{kind === 'SUBINSTALACION' && selectedParent?.inventoryFamily && families.length === 0 && <Alert>No hay tipos de Subinstalación configurados para esta Instalación.</Alert>}
|
|
||||||
</div>}
|
|
||||||
|
|
||||||
<div className="form-section">
|
|
||||||
<div>
|
|
||||||
<h2>Datos básicos</h2>
|
|
||||||
<p className="section-copy">El nombre alcanza para identificar el registro. El código puede generarse automáticamente.</p>
|
|
||||||
</div>
|
|
||||||
<label className="field">
|
|
||||||
<span>Nombre <em>obligatorio</em></span>
|
|
||||||
<input autoFocus value={name} onChange={(event) => setName(event.target.value)} required maxLength={200} placeholder={`Nombre de ${kindLabel(kind).toLowerCase()}`} />
|
|
||||||
</label>
|
|
||||||
<label className="field">
|
|
||||||
<span>Código <em>opcional</em></span>
|
|
||||||
<input value={code} onChange={(event) => setCode(event.target.value.toUpperCase())} maxLength={120} pattern="[A-Z0-9][A-Z0-9._/-]*" placeholder="Se genera automáticamente si lo dejás vacío" />
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="form-actions">
|
|
||||||
<Link className="button secondary" to="/inventarios">Cancelar</Link>
|
|
||||||
<button className="button primary" disabled={disableSave}><Icon name="check" />{saving ? 'Guardando…' : `Crear ${kindLabel(kind)}`}</button>
|
|
||||||
</div>
|
|
||||||
</form>
|
</form>
|
||||||
</section>;
|
</section>;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,56 +0,0 @@
|
|||||||
import { useEffect, useState } from 'react';
|
|
||||||
import { useParams, useSearchParams } from 'react-router';
|
|
||||||
import { useAuth } from '../auth/AuthContext';
|
|
||||||
import { hasAdministratorRole } from '../auth/adminAccess';
|
|
||||||
import { Alert, LoadingBlock, errorMessage } from '../components/Feedback';
|
|
||||||
import { getAsset } from '../lib/api';
|
|
||||||
import type { AssetDetail } from '../lib/api';
|
|
||||||
import { AssetEditorPage } from './AssetEditorPage';
|
|
||||||
import { CompanyInventoryPage } from './CompanyInventoryPage';
|
|
||||||
import { SimpleInventoryDetailPage, isSimpleInventoryAsset } from './SimpleInventoryDetailPage';
|
|
||||||
import { TerritorialInventoryPage, isTerritorialInventoryAsset } from './TerritorialInventoryPage';
|
|
||||||
|
|
||||||
export function InventoryDetailPage() {
|
|
||||||
const { id } = useParams();
|
|
||||||
const [params] = useSearchParams();
|
|
||||||
const { user } = useAuth();
|
|
||||||
const [asset, setAsset] = useState<AssetDetail | null>(null);
|
|
||||||
const [loading, setLoading] = useState(true);
|
|
||||||
const [error, setError] = useState('');
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (!id) {
|
|
||||||
setError('No se encontró el registro solicitado.');
|
|
||||||
setLoading(false);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
setLoading(true);
|
|
||||||
setError('');
|
|
||||||
getAsset(id)
|
|
||||||
.then(setAsset)
|
|
||||||
.catch((requestError) => setError(errorMessage(requestError)))
|
|
||||||
.finally(() => setLoading(false));
|
|
||||||
}, [id]);
|
|
||||||
|
|
||||||
if (loading) return <LoadingBlock label="Cargando registro…" />;
|
|
||||||
if (!asset) return <Alert>{error || 'No se pudo cargar el registro.'}</Alert>;
|
|
||||||
|
|
||||||
const advancedRequested = params.get('advanced') === '1';
|
|
||||||
const advancedAllowed = hasAdministratorRole(user);
|
|
||||||
const advanced = advancedRequested && advancedAllowed;
|
|
||||||
const isCompany = asset.type.code.toLowerCase() === 'empresa';
|
|
||||||
|
|
||||||
if (isCompany && !advanced) {
|
|
||||||
return <CompanyInventoryPage initialAsset={asset} />;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isSimpleInventoryAsset(asset) && !advanced) {
|
|
||||||
return <SimpleInventoryDetailPage initialAsset={asset} />;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isTerritorialInventoryAsset(asset) && !advanced) {
|
|
||||||
return <TerritorialInventoryPage initialAsset={asset} />;
|
|
||||||
}
|
|
||||||
|
|
||||||
return <AssetEditorPage />;
|
|
||||||
}
|
|
||||||
File diff suppressed because one or more lines are too long
@@ -1,350 +0,0 @@
|
|||||||
import { lazy, Suspense, useEffect, useMemo, useState } from 'react';
|
|
||||||
import type { FormEvent } from 'react';
|
|
||||||
import { Link, useSearchParams } from 'react-router';
|
|
||||||
import { useAuth } from '../auth/AuthContext';
|
|
||||||
import { hasAdministratorRole } from '../auth/adminAccess';
|
|
||||||
import { Alert, LoadingBlock, errorMessage } from '../components/Feedback';
|
|
||||||
import { Icon } from '../components/Icon';
|
|
||||||
import { AssetDossierPanel } from '../features/assets/AssetDossierPanel';
|
|
||||||
import { AssetFindingCatalogPanel } from '../features/assets/AssetFindingCatalogPanel';
|
|
||||||
import { AssetHistoryPanel } from '../features/assets/AssetHistoryPanel';
|
|
||||||
import { AssetMediaPanel } from '../features/assets/AssetMediaPanel';
|
|
||||||
import { AssetTechnicalDataPanel } from '../features/assets/AssetTechnicalDataPanel';
|
|
||||||
import {
|
|
||||||
ASSET_OPERATIONAL_STATUSES,
|
|
||||||
ASSET_STATUSES,
|
|
||||||
assetOperationalStatusLabel,
|
|
||||||
assetStatusClass,
|
|
||||||
assetStatusLabel,
|
|
||||||
} from '../features/assets/assetPresentation';
|
|
||||||
import {
|
|
||||||
getAssetLineage,
|
|
||||||
listAssetTreeChildren,
|
|
||||||
updateAsset,
|
|
||||||
updateAssetInformationStatus,
|
|
||||||
updateAssetOperationalStatus,
|
|
||||||
} from '../lib/api';
|
|
||||||
import type {
|
|
||||||
AssetDetail,
|
|
||||||
AssetInformationStatus,
|
|
||||||
AssetLineageItem,
|
|
||||||
AssetListItem,
|
|
||||||
AssetOperationalStatus,
|
|
||||||
} from '../lib/api';
|
|
||||||
import { getInventoryTechnicalValues } from '../lib/inventoryStructureApi';
|
|
||||||
import type { InventoryTechnicalValues } from '../lib/inventoryStructureApi';
|
|
||||||
import './SimpleInventoryDetailPage.css';
|
|
||||||
|
|
||||||
const AssetGeometryEditor = lazy(() =>
|
|
||||||
import('../features/map/AssetGeometryEditor').then((module) => ({ default: module.AssetGeometryEditor })),
|
|
||||||
);
|
|
||||||
|
|
||||||
export type SimpleInventoryKind =
|
|
||||||
| 'DEPARTAMENTO'
|
|
||||||
| 'AREA'
|
|
||||||
| 'YACIMIENTO'
|
|
||||||
| 'INSTALACION'
|
|
||||||
| 'SUBINSTALACION';
|
|
||||||
|
|
||||||
type SimpleTab = 'summary' | 'activity' | 'findings' | 'location' | 'photos' | 'history';
|
|
||||||
|
|
||||||
function normalized(value: string | null | undefined): string {
|
|
||||||
return (value ?? '')
|
|
||||||
.normalize('NFD')
|
|
||||||
.replace(/[\u0300-\u036f]/g, '')
|
|
||||||
.trim()
|
|
||||||
.toLowerCase()
|
|
||||||
.replace(/[_\s]+/g, '-');
|
|
||||||
}
|
|
||||||
|
|
||||||
export function simpleInventoryKind(asset: AssetDetail): SimpleInventoryKind | null {
|
|
||||||
const code = normalized(asset.type.code);
|
|
||||||
const name = normalized(asset.type.name);
|
|
||||||
const values = new Set([code, name]);
|
|
||||||
if (values.has('departamento')) return 'DEPARTAMENTO';
|
|
||||||
if (values.has('area')) return 'AREA';
|
|
||||||
if (values.has('yacimiento')) return 'YACIMIENTO';
|
|
||||||
if (values.has('subinstalacion')) return 'SUBINSTALACION';
|
|
||||||
if (
|
|
||||||
values.has('instalacion')
|
|
||||||
|| values.has('instalacion-de-superficie')
|
|
||||||
|| values.has('instalacion-superficie')
|
|
||||||
) return 'INSTALACION';
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function isSimpleInventoryAsset(asset: AssetDetail): boolean {
|
|
||||||
return simpleInventoryKind(asset) !== null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const labels: Record<SimpleInventoryKind, string> = {
|
|
||||||
DEPARTAMENTO: 'Departamento',
|
|
||||||
AREA: 'Área',
|
|
||||||
YACIMIENTO: 'Yacimiento',
|
|
||||||
INSTALACION: 'Instalación',
|
|
||||||
SUBINSTALACION: 'Subinstalación',
|
|
||||||
};
|
|
||||||
|
|
||||||
const childLabels: Partial<Record<SimpleInventoryKind, string>> = {
|
|
||||||
DEPARTAMENTO: 'Área',
|
|
||||||
AREA: 'Yacimiento',
|
|
||||||
YACIMIENTO: 'Instalación',
|
|
||||||
INSTALACION: 'Subinstalación',
|
|
||||||
};
|
|
||||||
|
|
||||||
function lineageLabel(item: AssetLineageItem): string {
|
|
||||||
return item.commonName ? `${item.name} · ${item.commonName}` : item.name;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function SimpleInventoryDetailPage({ initialAsset }: { initialAsset: AssetDetail }) {
|
|
||||||
const [params, setParams] = useSearchParams();
|
|
||||||
const { user, hasPermission } = useAuth();
|
|
||||||
const kind = simpleInventoryKind(initialAsset);
|
|
||||||
const [asset, setAsset] = useState(initialAsset);
|
|
||||||
const [lineage, setLineage] = useState<AssetLineageItem[]>([]);
|
|
||||||
const [children, setChildren] = useState<AssetListItem[]>([]);
|
|
||||||
const [childrenHasMore, setChildrenHasMore] = useState(false);
|
|
||||||
const [technical, setTechnical] = useState<InventoryTechnicalValues | null>(null);
|
|
||||||
const [loadingRelated, setLoadingRelated] = useState(true);
|
|
||||||
const [editing, setEditing] = useState(false);
|
|
||||||
const [saving, setSaving] = useState(false);
|
|
||||||
const [name, setName] = useState(initialAsset.name);
|
|
||||||
const [commonName, setCommonName] = useState(initialAsset.commonName ?? '');
|
|
||||||
const [description, setDescription] = useState(initialAsset.description ?? '');
|
|
||||||
const [status, setStatus] = useState<AssetInformationStatus>(initialAsset.informationStatus);
|
|
||||||
const [operationalStatus, setOperationalStatus] = useState<AssetOperationalStatus>(initialAsset.operationalStatus);
|
|
||||||
const [historyRefreshKey, setHistoryRefreshKey] = useState(0);
|
|
||||||
const [error, setError] = useState('');
|
|
||||||
const [success, setSuccess] = useState('');
|
|
||||||
|
|
||||||
const canEdit = hasPermission('assets.update');
|
|
||||||
const canCreate = hasPermission('assets.create');
|
|
||||||
const canChangeStatus = hasPermission('assets.change_status');
|
|
||||||
const canChangeOperationalStatus = hasPermission('assets.change_operational_status');
|
|
||||||
const canReadHistory = hasPermission('assets.read_history');
|
|
||||||
const canReadMedia = hasPermission('assets.read_media');
|
|
||||||
const canManageMedia = hasPermission('assets.manage_media');
|
|
||||||
const canEditGeometry = hasPermission('assets.update_geometry');
|
|
||||||
const canReadFindingCatalog = hasPermission('finding_catalog.read');
|
|
||||||
const canManageFindingCatalog = hasPermission('finding_catalog.manage');
|
|
||||||
const canReadDossier = hasPermission('inspections.read')
|
|
||||||
&& hasPermission('inspection_acts.read')
|
|
||||||
&& hasPermission('inspection_findings.read')
|
|
||||||
&& hasPermission('inspection_evidence.read')
|
|
||||||
&& hasPermission('inspection_communications.read');
|
|
||||||
const canAdvanced = hasAdministratorRole(user);
|
|
||||||
|
|
||||||
const inspectable = kind === 'YACIMIENTO' || kind === 'INSTALACION' || kind === 'SUBINSTALACION';
|
|
||||||
const technicalLevel = kind === 'INSTALACION' || kind === 'SUBINSTALACION';
|
|
||||||
const hasChildren = kind !== 'SUBINSTALACION';
|
|
||||||
const requestedTab = params.get('tab') as SimpleTab | null;
|
|
||||||
const availableTabs = useMemo(() => new Set<SimpleTab>([
|
|
||||||
'summary',
|
|
||||||
...(inspectable && canReadDossier ? ['activity' as const] : []),
|
|
||||||
...(technicalLevel && canReadFindingCatalog ? ['findings' as const] : []),
|
|
||||||
'location',
|
|
||||||
...(canReadMedia ? ['photos' as const] : []),
|
|
||||||
...(canReadHistory ? ['history' as const] : []),
|
|
||||||
]), [inspectable, technicalLevel, canReadDossier, canReadFindingCatalog, canReadMedia, canReadHistory]);
|
|
||||||
const tab: SimpleTab = requestedTab && availableTabs.has(requestedTab) ? requestedTab : 'summary';
|
|
||||||
|
|
||||||
const loadRelated = async () => {
|
|
||||||
setLoadingRelated(true);
|
|
||||||
try {
|
|
||||||
const [loadedLineage, childPage, loadedTechnical] = await Promise.all([
|
|
||||||
getAssetLineage(asset.id),
|
|
||||||
hasChildren
|
|
||||||
? listAssetTreeChildren({ parentId: asset.id, limit: 100 })
|
|
||||||
: Promise.resolve({ data: [] as AssetListItem[], meta: { count: 0, hasMore: false } }),
|
|
||||||
technicalLevel
|
|
||||||
? getInventoryTechnicalValues(asset.id).catch(() => null)
|
|
||||||
: Promise.resolve(null),
|
|
||||||
]);
|
|
||||||
setLineage(loadedLineage);
|
|
||||||
setChildren(childPage.data);
|
|
||||||
setChildrenHasMore(childPage.meta.hasMore);
|
|
||||||
setTechnical(loadedTechnical);
|
|
||||||
} catch (requestError) {
|
|
||||||
setError(errorMessage(requestError));
|
|
||||||
} finally {
|
|
||||||
setLoadingRelated(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
useEffect(() => { void loadRelated(); }, [asset.id]);
|
|
||||||
|
|
||||||
if (!kind) return <Alert>Este registro no pertenece al modelo simple de Inventarios.</Alert>;
|
|
||||||
|
|
||||||
const save = async (event: FormEvent) => {
|
|
||||||
event.preventDefault();
|
|
||||||
if (!name.trim()) return;
|
|
||||||
setSaving(true);
|
|
||||||
setError('');
|
|
||||||
setSuccess('');
|
|
||||||
try {
|
|
||||||
let saved = asset;
|
|
||||||
if (canEdit) {
|
|
||||||
saved = await updateAsset(asset.id, {
|
|
||||||
name: name.trim(),
|
|
||||||
commonName: commonName.trim() || null,
|
|
||||||
description: description.trim() || null,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
if (canChangeStatus && saved.informationStatus !== status) {
|
|
||||||
saved = await updateAssetInformationStatus(asset.id, status);
|
|
||||||
}
|
|
||||||
if (canChangeOperationalStatus && saved.operationalStatus !== operationalStatus) {
|
|
||||||
saved = await updateAssetOperationalStatus(asset.id, operationalStatus);
|
|
||||||
}
|
|
||||||
setAsset(saved);
|
|
||||||
setName(saved.name);
|
|
||||||
setCommonName(saved.commonName ?? '');
|
|
||||||
setDescription(saved.description ?? '');
|
|
||||||
setStatus(saved.informationStatus);
|
|
||||||
setOperationalStatus(saved.operationalStatus);
|
|
||||||
setEditing(false);
|
|
||||||
setHistoryRefreshKey((current) => current + 1);
|
|
||||||
setSuccess('Registro actualizado.');
|
|
||||||
} catch (requestError) {
|
|
||||||
setError(errorMessage(requestError));
|
|
||||||
} finally {
|
|
||||||
setSaving(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const cancelEdit = () => {
|
|
||||||
setEditing(false);
|
|
||||||
setName(asset.name);
|
|
||||||
setCommonName(asset.commonName ?? '');
|
|
||||||
setDescription(asset.description ?? '');
|
|
||||||
setStatus(asset.informationStatus);
|
|
||||||
setOperationalStatus(asset.operationalStatus);
|
|
||||||
};
|
|
||||||
|
|
||||||
const setTab = (next: SimpleTab) => {
|
|
||||||
const nextParams = new URLSearchParams(params);
|
|
||||||
next === 'summary' ? nextParams.delete('tab') : nextParams.set('tab', next);
|
|
||||||
nextParams.delete('advanced');
|
|
||||||
setParams(nextParams);
|
|
||||||
};
|
|
||||||
|
|
||||||
const childLabel = childLabels[kind];
|
|
||||||
const parentLabel = kind === 'AREA'
|
|
||||||
? 'Departamento'
|
|
||||||
: kind === 'YACIMIENTO'
|
|
||||||
? 'Área'
|
|
||||||
: kind === 'INSTALACION'
|
|
||||||
? 'Yacimiento'
|
|
||||||
: kind === 'SUBINSTALACION'
|
|
||||||
? 'Instalación'
|
|
||||||
: null;
|
|
||||||
|
|
||||||
return <section className="narrow-section simple-inventory-page">
|
|
||||||
<nav className="breadcrumb simple-inventory-breadcrumb" aria-label="Ruta de Inventario">
|
|
||||||
<Link to="/inventarios">Inventarios</Link>
|
|
||||||
{lineage.filter((item) => item.id !== asset.id).map((item) => <span className="simple-inventory-breadcrumb-part" key={item.id}><span>›</span><Link to={`/inventarios/${item.id}`}>{lineageLabel(item)}</Link></span>)}
|
|
||||||
<span>›</span><strong>{asset.name}</strong>
|
|
||||||
</nav>
|
|
||||||
|
|
||||||
<header className="simple-inventory-hero">
|
|
||||||
<div>
|
|
||||||
<span className="eyebrow">{labels[kind].toUpperCase()}</span>
|
|
||||||
<h1>{asset.name}</h1>
|
|
||||||
<div className="simple-inventory-hero-meta"><strong>{asset.code}</strong>{asset.commonName && <span>{asset.commonName}</span>}</div>
|
|
||||||
</div>
|
|
||||||
<div className="simple-inventory-hero-actions">
|
|
||||||
<span className={`status-badge ${assetStatusClass(asset.informationStatus)}`}>{assetStatusLabel(asset.informationStatus)}</span>
|
|
||||||
{tab === 'summary' && (canEdit || canChangeStatus || canChangeOperationalStatus) && <button type="button" className="button secondary" onClick={() => editing ? cancelEdit() : setEditing(true)}><Icon name="edit" />{editing ? 'Cancelar' : 'Editar'}</button>}
|
|
||||||
{tab === 'summary' && canCreate && childLabel && <Link className="button primary" to={`/inventarios/nuevo?parentId=${asset.id}`}><Icon name="plus" />Agregar {childLabel.toLowerCase()}</Link>}
|
|
||||||
</div>
|
|
||||||
</header>
|
|
||||||
|
|
||||||
<div className="simple-inventory-purpose">
|
|
||||||
<Icon name={inspectable ? 'clipboard' : 'layers'} />
|
|
||||||
<span>{inspectable
|
|
||||||
? 'Ficha operativa: identidad, ubicación y actividad de inspección. La información administrativa avanzada queda fuera de la vista cotidiana.'
|
|
||||||
: 'Este nivel organiza la estructura del Inventario. La vista cotidiana muestra sólo los datos necesarios para ubicar y navegar.'}</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<nav className="simple-inventory-tabs" aria-label="Secciones del Inventario">
|
|
||||||
<button type="button" className={tab === 'summary' ? 'active' : ''} onClick={() => setTab('summary')}>Resumen</button>
|
|
||||||
{inspectable && canReadDossier && <button type="button" className={tab === 'activity' ? 'active' : ''} onClick={() => setTab('activity')}>Actividad</button>}
|
|
||||||
{technicalLevel && canReadFindingCatalog && <button type="button" className={tab === 'findings' ? 'active' : ''} onClick={() => setTab('findings')}>Hallazgos</button>}
|
|
||||||
<button type="button" className={tab === 'location' ? 'active' : ''} onClick={() => setTab('location')}>Ubicación</button>
|
|
||||||
{canReadMedia && <button type="button" className={tab === 'photos' ? 'active' : ''} onClick={() => setTab('photos')}>Fotos</button>}
|
|
||||||
{canReadHistory && <button type="button" className={tab === 'history' ? 'active' : ''} onClick={() => setTab('history')}>Cambios</button>}
|
|
||||||
</nav>
|
|
||||||
|
|
||||||
{error && <Alert>{error}</Alert>}
|
|
||||||
{success && <Alert type="success">{success}</Alert>}
|
|
||||||
|
|
||||||
{tab === 'summary' && <div className="simple-inventory-stack">
|
|
||||||
<article className="panel simple-inventory-card">
|
|
||||||
<div className="simple-inventory-card-heading"><div><span className="eyebrow">DATOS PRINCIPALES</span><h2>Identificación</h2></div></div>
|
|
||||||
{editing ? <form className="simple-inventory-form" onSubmit={save}>
|
|
||||||
<div className="form-grid two">
|
|
||||||
<label className="field"><span>Nombre <em>obligatorio</em></span><input value={name} onChange={(event) => setName(event.target.value)} required maxLength={200} /></label>
|
|
||||||
<label className="field"><span>Nombre habitual <em>opcional</em></span><input value={commonName} onChange={(event) => setCommonName(event.target.value)} maxLength={200} /></label>
|
|
||||||
</div>
|
|
||||||
<details className="simple-inventory-details">
|
|
||||||
<summary>Más datos</summary>
|
|
||||||
<label className="field"><span>Descripción <em>opcional</em></span><textarea rows={3} value={description} onChange={(event) => setDescription(event.target.value)} maxLength={4000} /></label>
|
|
||||||
</details>
|
|
||||||
{(canChangeStatus || canChangeOperationalStatus) && <details className="simple-inventory-details">
|
|
||||||
<summary>Estado y opciones</summary>
|
|
||||||
<div className="form-grid two">
|
|
||||||
{canChangeStatus && <label className="field"><span>Estado del dato</span><select value={status} onChange={(event) => setStatus(event.target.value as AssetInformationStatus)}>{ASSET_STATUSES.map((item) => <option key={item.value} value={item.value}>{item.label}</option>)}</select></label>}
|
|
||||||
{canChangeOperationalStatus && <label className="field"><span>Estado operativo</span><select value={operationalStatus} onChange={(event) => setOperationalStatus(event.target.value as AssetOperationalStatus)}>{ASSET_OPERATIONAL_STATUSES.map((item) => <option key={item.value} value={item.value}>{item.label}</option>)}</select></label>}
|
|
||||||
</div>
|
|
||||||
</details>}
|
|
||||||
<div className="form-actions"><button type="button" className="button secondary" onClick={cancelEdit}>Cancelar</button><button className="button primary" disabled={saving}><Icon name="check" />{saving ? 'Guardando…' : 'Guardar cambios'}</button></div>
|
|
||||||
</form> : <div className="simple-inventory-data-grid">
|
|
||||||
<div><small>Nombre</small><strong>{asset.name}</strong></div>
|
|
||||||
<div><small>Código DH</small><strong>{asset.code}</strong></div>
|
|
||||||
{asset.commonName && <div><small>Nombre habitual</small><strong>{asset.commonName}</strong></div>}
|
|
||||||
<div><small>Estado operativo</small><strong>{assetOperationalStatusLabel(asset.operationalStatus)}</strong></div>
|
|
||||||
</div>}
|
|
||||||
</article>
|
|
||||||
|
|
||||||
<article className="panel simple-inventory-card">
|
|
||||||
<div className="simple-inventory-card-heading"><div><span className="eyebrow">UBICACIÓN ACTUAL</span><h2>Dentro del Inventario</h2></div></div>
|
|
||||||
<div className="simple-inventory-context-grid">
|
|
||||||
{parentLabel && <div className="simple-inventory-context-card"><small>{parentLabel}</small>{asset.parent ? <Link to={`/inventarios/${asset.parent.id}`}><strong>{asset.parent.name}</strong><span>{asset.parent.code}</span></Link> : <strong>Sin asignar</strong>}</div>}
|
|
||||||
{kind === 'YACIMIENTO' && <div className="simple-inventory-context-card"><small>Empresa operadora</small>{asset.operatorCompany ? <Link to={`/inventarios/${asset.operatorCompany.id}`}><strong>{asset.operatorCompany.name}</strong><span>{asset.operatorCompany.code}</span></Link> : <strong>Sin asignar</strong>}</div>}
|
|
||||||
{(kind === 'INSTALACION' || kind === 'SUBINSTALACION') && <div className="simple-inventory-context-card"><small>Empresa del Yacimiento</small>{asset.operatorCompany ? <Link to={`/inventarios/${asset.operatorCompany.id}`}><strong>{asset.operatorCompany.name}</strong><span>{asset.operatorCompany.code}</span></Link> : <strong>Sin asignar</strong>}</div>}
|
|
||||||
{technicalLevel && <div className="simple-inventory-context-card"><small>Tipo técnico</small><strong>{technical?.family.name ?? 'Sin clasificación técnica'}</strong>{technical?.family.code && <span>{technical.family.code}</span>}</div>}
|
|
||||||
</div>
|
|
||||||
</article>
|
|
||||||
|
|
||||||
{hasChildren && <article className="panel simple-inventory-card">
|
|
||||||
<div className="simple-inventory-card-heading"><div><span className="eyebrow">CONTENIDO</span><h2>{childLabel ? `${childLabel}s dentro de ${asset.name}` : `Contenido de ${asset.name}`}</h2></div><span className="count-pill">{children.length}{childrenHasMore ? '+' : ''}</span></div>
|
|
||||||
{loadingRelated ? <LoadingBlock label="Cargando contenido…" /> : children.length === 0 ? <div className="inline-empty">Todavía no hay registros dentro de {asset.name}.</div> : <div className="simple-inventory-child-list">{children.map((child) => <Link key={child.id} to={`/inventarios/${child.id}`} className="simple-inventory-child-row"><span className="asset-symbol"><Icon name="layers" /></span><span><strong>{child.name}</strong><small>{child.type.name} · {child.code}</small></span><span className={`status-badge ${assetStatusClass(child.informationStatus)}`}>{assetStatusLabel(child.informationStatus)}</span><Icon name="chevron" size={16} /></Link>)}</div>}
|
|
||||||
</article>}
|
|
||||||
|
|
||||||
{technicalLevel && <details className="panel simple-inventory-card simple-inventory-technical-details">
|
|
||||||
<summary><span><small>DATOS TÉCNICOS</small><strong>{technical?.family.name ?? 'Información técnica'}</strong></span><span>Ver / editar</span></summary>
|
|
||||||
<AssetTechnicalDataPanel assetId={asset.id} canEdit={canEdit} />
|
|
||||||
</details>}
|
|
||||||
|
|
||||||
{!editing && asset.description && <details className="panel simple-inventory-card simple-inventory-extra-details">
|
|
||||||
<summary>Más datos</summary>
|
|
||||||
<p>{asset.description}</p>
|
|
||||||
</details>}
|
|
||||||
|
|
||||||
{!editing && <details className="panel simple-inventory-card simple-inventory-extra-details">
|
|
||||||
<summary>Estado y opciones</summary>
|
|
||||||
<div className="simple-inventory-data-grid">
|
|
||||||
<div><small>Estado del dato</small><strong>{assetStatusLabel(asset.informationStatus)}</strong></div>
|
|
||||||
<div><small>Estado operativo</small><strong>{assetOperationalStatusLabel(asset.operationalStatus)}</strong></div>
|
|
||||||
</div>
|
|
||||||
{canAdvanced && <div className="simple-inventory-advanced"><span>Las herramientas históricas y administrativas quedan separadas de esta ficha.</span><Link to={`/inventarios/${asset.id}?advanced=1`}>Administración avanzada</Link></div>}
|
|
||||||
</details>}
|
|
||||||
</div>}
|
|
||||||
|
|
||||||
{tab === 'activity' && inspectable && canReadDossier && <AssetDossierPanel assetId={asset.id} />}
|
|
||||||
{tab === 'findings' && technicalLevel && canReadFindingCatalog && <AssetFindingCatalogPanel assetId={asset.id} canManage={canManageFindingCatalog} />}
|
|
||||||
{tab === 'location' && <Suspense fallback={<LoadingBlock label="Cargando mapa…" />}><AssetGeometryEditor assetId={asset.id} assetName={asset.name} canEdit={canEditGeometry} onChanged={() => setHistoryRefreshKey((current) => current + 1)} /></Suspense>}
|
|
||||||
{tab === 'photos' && canReadMedia && <AssetMediaPanel assetId={asset.id} assetName={asset.name} canManage={canManageMedia} onChanged={() => setHistoryRefreshKey((current) => current + 1)} />}
|
|
||||||
{tab === 'history' && canReadHistory && <AssetHistoryPanel assetId={asset.id} refreshKey={historyRefreshKey} />}
|
|
||||||
</section>;
|
|
||||||
}
|
|
||||||
@@ -1,276 +0,0 @@
|
|||||||
import { useEffect, useMemo, useState } from 'react';
|
|
||||||
import type { FormEvent } from 'react';
|
|
||||||
import { Link, useSearchParams } from 'react-router';
|
|
||||||
import { useAuth } from '../auth/AuthContext';
|
|
||||||
import { hasAdministratorRole } from '../auth/adminAccess';
|
|
||||||
import { Alert, LoadingBlock, errorMessage } from '../components/Feedback';
|
|
||||||
import { Icon } from '../components/Icon';
|
|
||||||
import { AssetHistoryPanel } from '../features/assets/AssetHistoryPanel';
|
|
||||||
import { assetStatusClass, assetStatusLabel } from '../features/assets/assetPresentation';
|
|
||||||
import {
|
|
||||||
getAssetLineage,
|
|
||||||
listAreaCompanyRelations,
|
|
||||||
listAssetTreeChildren,
|
|
||||||
listInspectionVisits,
|
|
||||||
updateAsset,
|
|
||||||
} from '../lib/api';
|
|
||||||
import type { AreaCompanyRelation, AssetDetail, AssetLineageItem, AssetListItem } from '../lib/api';
|
|
||||||
import {
|
|
||||||
listInspectionActsGlobalF4,
|
|
||||||
type InspectionActStatusF4,
|
|
||||||
} from '../lib/inspectionActF4Api';
|
|
||||||
import { listInspectionReportsF4 } from '../lib/reportWorkflowApi';
|
|
||||||
import './territorialInventory.css';
|
|
||||||
|
|
||||||
type TerritoryTab = 'summary' | 'history';
|
|
||||||
|
|
||||||
function normalized(value: string) {
|
|
||||||
return value
|
|
||||||
.normalize('NFD')
|
|
||||||
.replace(/[\u0300-\u036f]/g, '')
|
|
||||||
.toLowerCase()
|
|
||||||
.replace(/[^a-z0-9]+/g, ' ')
|
|
||||||
.trim();
|
|
||||||
}
|
|
||||||
|
|
||||||
function tokensForType(type: { code: string; name: string }) {
|
|
||||||
return new Set(`${normalized(type.code)} ${normalized(type.name)}`.split(' ').filter(Boolean));
|
|
||||||
}
|
|
||||||
|
|
||||||
function typeTokens(asset: AssetDetail) {
|
|
||||||
return tokensForType(asset.type);
|
|
||||||
}
|
|
||||||
|
|
||||||
export function isTerritorialInventoryAsset(asset: AssetDetail) {
|
|
||||||
const tokens = typeTokens(asset);
|
|
||||||
return tokens.has('departamento') || tokens.has('area') || tokens.has('yacimiento');
|
|
||||||
}
|
|
||||||
|
|
||||||
function isOperationalArea(asset: AssetDetail) {
|
|
||||||
return typeTokens(asset).has('area');
|
|
||||||
}
|
|
||||||
|
|
||||||
function isYacimiento(asset: AssetDetail) {
|
|
||||||
return typeTokens(asset).has('yacimiento');
|
|
||||||
}
|
|
||||||
|
|
||||||
function lineageArea(lineage: AssetLineageItem[]) {
|
|
||||||
return [...lineage].reverse().find((item) => tokensForType(item.type).has('area')) ?? null;
|
|
||||||
}
|
|
||||||
|
|
||||||
function relationRoleLabel(role: AreaCompanyRelation['relationRole']) {
|
|
||||||
if (role === 'OPERATOR') return 'Operadora';
|
|
||||||
if (role === 'TECHNICAL_OPERATOR') return 'Operadora técnica';
|
|
||||||
if (role === 'CONCESSIONAIRE') return 'Concesionaria / titular';
|
|
||||||
if (role === 'PERMIT_HOLDER') return 'Permisionaria';
|
|
||||||
if (role === 'PARTICIPANT') return 'Participante';
|
|
||||||
return 'Vinculada';
|
|
||||||
}
|
|
||||||
|
|
||||||
export function TerritorialInventoryPage({ initialAsset }: { initialAsset: AssetDetail }) {
|
|
||||||
const [params, setParams] = useSearchParams();
|
|
||||||
const requestedTab = params.get('tab') as TerritoryTab | null;
|
|
||||||
const tab: TerritoryTab = requestedTab === 'history' ? 'history' : 'summary';
|
|
||||||
const { user, hasPermission } = useAuth();
|
|
||||||
const canEdit = hasPermission('assets.update');
|
|
||||||
const canCreate = hasPermission('assets.create');
|
|
||||||
const canReadHistory = hasPermission('assets.read_history');
|
|
||||||
const canReadRelations = hasPermission('asset_relations.read');
|
|
||||||
const canReadActs = hasPermission('inspection_acts.read');
|
|
||||||
const canReadReports = hasPermission('inspection_reports.read');
|
|
||||||
const canReadInspections = hasPermission('inspections.read');
|
|
||||||
const canAdvanced = hasAdministratorRole(user);
|
|
||||||
|
|
||||||
const [asset, setAsset] = useState(initialAsset);
|
|
||||||
const [children, setChildren] = useState<AssetListItem[]>([]);
|
|
||||||
const [childrenHasMore, setChildrenHasMore] = useState(false);
|
|
||||||
const [lineage, setLineage] = useState<AssetLineageItem[]>([]);
|
|
||||||
const [relations, setRelations] = useState<AreaCompanyRelation[]>([]);
|
|
||||||
const [loading, setLoading] = useState(true);
|
|
||||||
const [error, setError] = useState('');
|
|
||||||
const [success, setSuccess] = useState('');
|
|
||||||
const [editing, setEditing] = useState(false);
|
|
||||||
const [saving, setSaving] = useState(false);
|
|
||||||
const [name, setName] = useState(initialAsset.name);
|
|
||||||
const [description, setDescription] = useState(initialAsset.description ?? '');
|
|
||||||
const [metrics, setMetrics] = useState({ activeInspections: 0, acts: 0, reports: 0 });
|
|
||||||
|
|
||||||
const area = isOperationalArea(asset);
|
|
||||||
const yacimiento = isYacimiento(asset);
|
|
||||||
const activeRelations = useMemo(() => relations.filter((item) => item.active), [relations]);
|
|
||||||
const relationAreaContext = useMemo(() => {
|
|
||||||
if (area) return { id: asset.id, code: asset.code, name: asset.name };
|
|
||||||
if (asset.operationalArea) return asset.operationalArea;
|
|
||||||
const ancestor = lineageArea(lineage);
|
|
||||||
return ancestor ? { id: ancestor.id, code: ancestor.code, name: ancestor.name } : null;
|
|
||||||
}, [area, asset.id, asset.code, asset.name, asset.operationalArea, lineage]);
|
|
||||||
|
|
||||||
const loadSummary = async () => {
|
|
||||||
setLoading(true);
|
|
||||||
setError('');
|
|
||||||
try {
|
|
||||||
const loadedLineage = await getAssetLineage(asset.id);
|
|
||||||
const ancestorArea = lineageArea(loadedLineage);
|
|
||||||
const relationAreaId = area
|
|
||||||
? asset.id
|
|
||||||
: asset.operationalArea?.id ?? ancestorArea?.id ?? null;
|
|
||||||
const [childPage, loadedRelations] = await Promise.all([
|
|
||||||
listAssetTreeChildren({ parentId: asset.id, limit: 100 }),
|
|
||||||
relationAreaId && canReadRelations
|
|
||||||
? listAreaCompanyRelations({ areaId: relationAreaId, includeHistory: true })
|
|
||||||
: Promise.resolve([]),
|
|
||||||
]);
|
|
||||||
setLineage(loadedLineage);
|
|
||||||
setChildren(childPage.data);
|
|
||||||
setChildrenHasMore(childPage.meta.hasMore);
|
|
||||||
setRelations(loadedRelations);
|
|
||||||
} catch (requestError) {
|
|
||||||
setError(errorMessage(requestError));
|
|
||||||
} finally {
|
|
||||||
setLoading(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
useEffect(() => { void loadSummary(); }, [asset.id, area, canReadRelations]);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (!area) {
|
|
||||||
setMetrics({ activeInspections: 0, acts: 0, reports: 0 });
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
let cancelled = false;
|
|
||||||
const loadMetrics = async () => {
|
|
||||||
try {
|
|
||||||
const actStatuses: InspectionActStatusF4[] = ['SEALED', 'CLOSED', 'RECTIFIED'];
|
|
||||||
const [planned, inProgress, actPages, reportPage] = await Promise.all([
|
|
||||||
canReadInspections ? listInspectionVisits({ areaId: asset.id, status: 'PLANNED', pageSize: 1 }) : Promise.resolve(null),
|
|
||||||
canReadInspections ? listInspectionVisits({ areaId: asset.id, status: 'IN_PROGRESS', pageSize: 1 }) : Promise.resolve(null),
|
|
||||||
canReadActs
|
|
||||||
? Promise.all(actStatuses.map((status) => listInspectionActsGlobalF4({ areaId: asset.id, status, pageSize: 1 })))
|
|
||||||
: Promise.resolve([]),
|
|
||||||
canReadReports ? listInspectionReportsF4({ areaId: asset.id, pageSize: 1 }) : Promise.resolve(null),
|
|
||||||
]);
|
|
||||||
if (cancelled) return;
|
|
||||||
setMetrics({
|
|
||||||
activeInspections: (planned?.meta.total ?? 0) + (inProgress?.meta.total ?? 0),
|
|
||||||
acts: actPages.reduce((total, page) => total + page.meta.total, 0),
|
|
||||||
reports: reportPage?.meta.total ?? 0,
|
|
||||||
});
|
|
||||||
} catch {
|
|
||||||
if (!cancelled) setMetrics({ activeInspections: 0, acts: 0, reports: 0 });
|
|
||||||
}
|
|
||||||
};
|
|
||||||
void loadMetrics();
|
|
||||||
return () => { cancelled = true; };
|
|
||||||
}, [asset.id, area, canReadActs, canReadReports, canReadInspections]);
|
|
||||||
|
|
||||||
const save = async (event: FormEvent) => {
|
|
||||||
event.preventDefault();
|
|
||||||
if (!canEdit || !name.trim()) return;
|
|
||||||
setSaving(true); setError(''); setSuccess('');
|
|
||||||
try {
|
|
||||||
const saved = await updateAsset(asset.id, {
|
|
||||||
name: name.trim(),
|
|
||||||
description: description.trim() || null,
|
|
||||||
});
|
|
||||||
setAsset(saved);
|
|
||||||
setName(saved.name);
|
|
||||||
setDescription(saved.description ?? '');
|
|
||||||
setEditing(false);
|
|
||||||
setSuccess('Datos actualizados.');
|
|
||||||
} catch (requestError) {
|
|
||||||
setError(errorMessage(requestError));
|
|
||||||
} finally {
|
|
||||||
setSaving(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const setTab = (next: TerritoryTab) => {
|
|
||||||
const nextParams = new URLSearchParams(params);
|
|
||||||
next === 'summary' ? nextParams.delete('tab') : nextParams.set('tab', next);
|
|
||||||
nextParams.delete('advanced');
|
|
||||||
setParams(nextParams);
|
|
||||||
};
|
|
||||||
|
|
||||||
return <section className="narrow-section territory-page">
|
|
||||||
<nav className="breadcrumb territory-breadcrumb" aria-label="Ruta territorial">
|
|
||||||
<Link to="/inventarios">Inventarios</Link><span>›</span>
|
|
||||||
<Link to="/inventarios?section=territory">Áreas y yacimientos</Link><span>›</span><strong>{asset.name}</strong>
|
|
||||||
</nav>
|
|
||||||
|
|
||||||
<header className="territory-hero">
|
|
||||||
<div>
|
|
||||||
<span className="eyebrow">{asset.type.name.toUpperCase()}</span>
|
|
||||||
<h1>{asset.name}</h1>
|
|
||||||
<p><strong>{asset.code}</strong></p>
|
|
||||||
</div>
|
|
||||||
<div className="territory-hero-actions">
|
|
||||||
<span className={`status-badge ${assetStatusClass(asset.informationStatus)}`}>{assetStatusLabel(asset.informationStatus)}</span>
|
|
||||||
{canEdit && tab === 'summary' && <button type="button" className="button secondary" onClick={() => setEditing((current) => !current)}><Icon name="edit" />{editing ? 'Cancelar edición' : 'Editar'}</button>}
|
|
||||||
{canCreate && tab === 'summary' && <Link className="button primary" to={`/inventarios/nuevo?parentId=${asset.id}`}><Icon name="plus" />Agregar elemento</Link>}
|
|
||||||
</div>
|
|
||||||
</header>
|
|
||||||
|
|
||||||
<div className="territory-purpose-note"><Icon name="map" /><span>Este nivel organiza el territorio y la navegación. Los hallazgos se cargan sobre elementos inspeccionables, no sobre {asset.type.name.toLowerCase()}s.</span></div>
|
|
||||||
|
|
||||||
<nav className="territory-tabs" aria-label="Secciones territoriales">
|
|
||||||
<button type="button" className={tab === 'summary' ? 'active' : ''} onClick={() => setTab('summary')}>Resumen</button>
|
|
||||||
{canReadHistory && <button type="button" className={tab === 'history' ? 'active' : ''} onClick={() => setTab('history')}>Historial</button>}
|
|
||||||
</nav>
|
|
||||||
|
|
||||||
{error && <Alert>{error}</Alert>}{success && <Alert type="success">{success}</Alert>}
|
|
||||||
|
|
||||||
{tab === 'summary' && <div className="territory-stack">
|
|
||||||
<article className="panel territory-card">
|
|
||||||
<div className="territory-card-heading">
|
|
||||||
<div><span className="eyebrow">DATOS BÁSICOS</span><h2>Identificación</h2></div>
|
|
||||||
</div>
|
|
||||||
{editing ? <form className="territory-edit-form" onSubmit={save}>
|
|
||||||
<label className="field"><span>Nombre</span><input value={name} onChange={(event) => setName(event.target.value)} required maxLength={200} /></label>
|
|
||||||
<label className="field"><span>Descripción <em>opcional</em></span><textarea value={description} onChange={(event) => setDescription(event.target.value)} rows={3} maxLength={4000} /></label>
|
|
||||||
<div className="form-actions"><button type="button" className="button secondary" onClick={() => { setEditing(false); setName(asset.name); setDescription(asset.description ?? ''); }}>Cancelar</button><button className="button primary" disabled={saving}><Icon name="check" />{saving ? 'Guardando…' : 'Guardar'}</button></div>
|
|
||||||
</form> : <div className="territory-data-grid">
|
|
||||||
<div><small>Tipo</small><strong>{asset.type.name}</strong></div>
|
|
||||||
<div><small>Código DH</small><strong>{asset.code}</strong></div>
|
|
||||||
{asset.description && <div className="wide"><small>Descripción</small><strong>{asset.description}</strong></div>}
|
|
||||||
</div>}
|
|
||||||
</article>
|
|
||||||
|
|
||||||
<article className="panel territory-card">
|
|
||||||
<div className="territory-card-heading">
|
|
||||||
<div><span className="eyebrow">CONTENIDO</span><h2>Registros dentro de {asset.name}</h2><p>Acceso directo a los niveles que dependen de este registro.</p></div>
|
|
||||||
<span className="count-pill">{children.length}{childrenHasMore ? '+' : ''}</span>
|
|
||||||
</div>
|
|
||||||
{loading ? <LoadingBlock label="Cargando contenido…" /> : children.length === 0 ? <div className="inline-empty">Todavía no hay registros dentro de {asset.name}.</div> : <div className="territory-child-list">
|
|
||||||
{children.map((child) => <Link to={`/inventarios/${child.id}`} key={child.id} className="territory-child-row">
|
|
||||||
<span className="asset-symbol"><Icon name="layers" /></span>
|
|
||||||
<span><strong>{child.name}</strong><small>{child.type.name} · {child.code}</small></span>
|
|
||||||
<span className={`status-badge ${assetStatusClass(child.informationStatus)}`}>{assetStatusLabel(child.informationStatus)}</span>
|
|
||||||
<Icon name="chevron" size={16} />
|
|
||||||
</Link>)}
|
|
||||||
</div>}
|
|
||||||
{childrenHasMore && <div className="territory-card-actions"><Link className="button secondary" to={`/inventarios?section=territory&parentId=${asset.id}`}>Ver contenido completo</Link></div>}
|
|
||||||
</article>
|
|
||||||
|
|
||||||
{relationAreaContext && canReadRelations && <article className="panel territory-card">
|
|
||||||
<div className="territory-card-heading"><div><span className="eyebrow">OPERACIÓN</span><h2>Empresas vinculadas</h2><p>{area ? 'Quién opera o participa actualmente en esta área.' : yacimiento ? `Empresas que operan o participan en el Área ${relationAreaContext.name}, contexto operativo de este yacimiento.` : `Empresas vinculadas al Área ${relationAreaContext.name}.`}</p></div><span className="count-pill">{activeRelations.length}</span></div>
|
|
||||||
{loading ? <LoadingBlock label="Cargando empresas…" /> : activeRelations.length === 0 ? <div className="inline-empty">No hay empresas con vínculo vigente en el Área {relationAreaContext.name}.</div> : <div className="territory-company-list">
|
|
||||||
{activeRelations.map((relation) => <Link to={`/inventarios/${relation.company.id}`} key={relation.id} className="territory-company-row"><span><strong>{relation.company.name}</strong><small>{relationRoleLabel(relation.relationRole)}{!area ? ` · ${relation.area.name}` : ''}</small></span><Icon name="chevron" size={16} /></Link>)}
|
|
||||||
</div>}
|
|
||||||
</article>}
|
|
||||||
|
|
||||||
{area && (canReadInspections || canReadActs || canReadReports) && <article className="panel territory-card">
|
|
||||||
<div className="territory-card-heading"><div><span className="eyebrow">ACTIVIDAD</span><h2>Actividad del área</h2><p>Resumen documental y operativo, sin mezclarlo con hallazgos de los elementos inspeccionados.</p></div></div>
|
|
||||||
<div className="territory-metrics">
|
|
||||||
{canReadInspections && <div><small>Inspecciones activas</small><strong>{metrics.activeInspections}</strong></div>}
|
|
||||||
{canReadActs && <div><small>Actas emitidas</small><strong>{metrics.acts}</strong></div>}
|
|
||||||
{canReadReports && <div><small>Informes</small><strong>{metrics.reports}</strong></div>}
|
|
||||||
</div>
|
|
||||||
</article>}
|
|
||||||
|
|
||||||
{canAdvanced && <div className="territory-advanced-link"><span>Los datos estructurales, procedencia, ubicación y opciones técnicas quedan fuera de la vista cotidiana.</span><Link to={`/inventarios/${asset.id}?advanced=1`}>Administración avanzada</Link></div>}
|
|
||||||
</div>}
|
|
||||||
|
|
||||||
{tab === 'history' && canReadHistory && <AssetHistoryPanel assetId={asset.id} />}
|
|
||||||
</section>;
|
|
||||||
}
|
|
||||||
@@ -1,105 +0,0 @@
|
|||||||
.company-page { display: grid; gap: 18px; }
|
|
||||||
.company-breadcrumb { margin-bottom: 0; }
|
|
||||||
|
|
||||||
.company-hero {
|
|
||||||
display: flex;
|
|
||||||
align-items: flex-end;
|
|
||||||
justify-content: space-between;
|
|
||||||
gap: 24px;
|
|
||||||
padding: 4px 0 2px;
|
|
||||||
}
|
|
||||||
.company-hero h1 { margin: 6px 0 5px; font-size: clamp(31px, 3.5vw, 44px); line-height: 1.02; letter-spacing: -.045em; }
|
|
||||||
.company-hero p { margin: 0; color: var(--muted); font-size: 13px; }
|
|
||||||
.company-hero-actions { display: flex; align-items: center; gap: 12px; }
|
|
||||||
|
|
||||||
.company-tabs {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 4px;
|
|
||||||
overflow-x: auto;
|
|
||||||
padding: 0 0 1px;
|
|
||||||
border-bottom: 1px solid var(--line);
|
|
||||||
}
|
|
||||||
.company-tabs button {
|
|
||||||
position: relative;
|
|
||||||
min-height: 43px;
|
|
||||||
padding: 9px 13px;
|
|
||||||
border: 0;
|
|
||||||
color: #566178;
|
|
||||||
background: transparent;
|
|
||||||
cursor: pointer;
|
|
||||||
white-space: nowrap;
|
|
||||||
font-size: 12px;
|
|
||||||
font-weight: 700;
|
|
||||||
}
|
|
||||||
.company-tabs button:hover { color: var(--ink); }
|
|
||||||
.company-tabs button.active { color: var(--blue); }
|
|
||||||
.company-tabs button.active::after { content: ''; position: absolute; left: 10px; right: 10px; bottom: -1px; height: 2px; border-radius: 2px; background: var(--blue); }
|
|
||||||
|
|
||||||
.company-stack { display: grid; gap: 15px; }
|
|
||||||
.company-card { padding: 23px; }
|
|
||||||
.company-card-heading { display: flex; align-items: flex-start; justify-content: space-between; gap: 18px; margin-bottom: 18px; }
|
|
||||||
.company-card-heading h2 { margin: 4px 0 4px; }
|
|
||||||
.company-card-heading p { max-width: 680px; margin: 0; color: var(--muted); font-size: 12px; line-height: 1.5; }
|
|
||||||
.company-card-actions { display: flex; justify-content: flex-end; margin-top: 17px; }
|
|
||||||
|
|
||||||
.company-data-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 1px; overflow: hidden; border: 1px solid var(--line); border-radius: 11px; background: var(--line); }
|
|
||||||
.company-data-grid > div { min-height: 78px; padding: 15px 16px; background: #fff; }
|
|
||||||
.company-data-grid small, .company-data-grid strong { display: block; }
|
|
||||||
.company-data-grid small { margin-bottom: 7px; color: var(--muted); font-size: 10px; font-weight: 700; text-transform: uppercase; letter-spacing: .04em; }
|
|
||||||
.company-data-grid strong { font-size: 13px; font-weight: 750; }
|
|
||||||
.company-edit-form { display: grid; gap: 16px; }
|
|
||||||
|
|
||||||
.company-area-list { display: grid; gap: 8px; }
|
|
||||||
.company-area-row { display: flex; align-items: center; justify-content: space-between; gap: 16px; min-height: 62px; padding: 12px 14px; border: 1px solid #e3e7ee; border-radius: 10px; background: #fafbfc; }
|
|
||||||
.company-area-row > a { min-width: 0; text-decoration: none; }
|
|
||||||
.company-area-row > a:hover strong { color: var(--blue); }
|
|
||||||
.company-area-row strong, .company-area-row small { display: block; }
|
|
||||||
.company-area-row strong { font-size: 13px; }
|
|
||||||
.company-area-row small { margin-top: 4px; color: var(--muted); font-size: 10px; }
|
|
||||||
.company-area-row > div { display: flex; align-items: center; gap: 7px; }
|
|
||||||
.company-inline-action { margin-top: 13px; border: 1px dashed #cfd7e5; border-radius: 10px; background: #fbfcfe; }
|
|
||||||
.company-inline-action summary { display: flex; align-items: center; gap: 7px; padding: 13px 14px; cursor: pointer; color: var(--blue); font-size: 12px; font-weight: 750; list-style: none; }
|
|
||||||
.company-inline-action summary::-webkit-details-marker { display: none; }
|
|
||||||
.company-inline-action form { display: grid; gap: 13px; padding: 0 14px 14px; }
|
|
||||||
|
|
||||||
.company-metrics { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 10px; }
|
|
||||||
.company-metrics > div { display: grid; gap: 6px; padding: 16px; border: 1px solid #e2e7ef; border-radius: 11px; background: #f8faff; }
|
|
||||||
.company-metrics small { color: var(--muted); font-size: 10px; font-weight: 700; text-transform: uppercase; letter-spacing: .05em; }
|
|
||||||
.company-metrics strong { color: #173b7a; font-size: 25px; line-height: 1; letter-spacing: -.04em; }
|
|
||||||
|
|
||||||
.company-doc-heading { align-items: center; }
|
|
||||||
.company-doc-counts { display: flex; gap: 7px; }
|
|
||||||
.company-doc-counts span { padding: 6px 9px; border-radius: 999px; color: #536078; background: #f0f3f8; font-size: 10px; font-weight: 750; }
|
|
||||||
.company-document-search { display: flex; align-items: center; gap: 9px; width: 100%; margin-bottom: 17px; padding: 0 12px; border: 1px solid #d8dee8; border-radius: 10px; background: white; }
|
|
||||||
.company-document-search .icon { color: #818ba0; }
|
|
||||||
.company-document-search input { width: 100%; min-height: 43px; border: 0; outline: 0; background: transparent; font-size: 12px; }
|
|
||||||
.company-doc-table table { min-width: 870px; }
|
|
||||||
.company-doc-table td { vertical-align: middle; }
|
|
||||||
|
|
||||||
.company-document-list { display: grid; gap: 8px; }
|
|
||||||
.company-document-list > div { display: flex; align-items: center; justify-content: space-between; gap: 15px; padding: 13px 14px; border: 1px solid #e2e6ed; border-radius: 10px; background: #fbfcfd; }
|
|
||||||
.company-document-list strong, .company-document-list small { display: block; }
|
|
||||||
.company-document-list strong { font-size: 12px; }
|
|
||||||
.company-document-list small { margin-top: 4px; color: var(--muted); font-size: 10px; }
|
|
||||||
.company-more { margin-top: 13px; }
|
|
||||||
.company-more summary { cursor: pointer; color: #59657b; font-size: 11px; font-weight: 750; }
|
|
||||||
.company-identifier-list { display: grid; grid-template-columns: repeat(auto-fit, minmax(180px, 1fr)); gap: 8px; margin-top: 10px; }
|
|
||||||
.company-identifier-list > div { display: grid; gap: 3px; padding: 11px 12px; border: 1px solid var(--line); border-radius: 9px; background: #fafbfc; }
|
|
||||||
.company-identifier-list strong { font-size: 10px; color: var(--blue); }
|
|
||||||
.company-identifier-list span { font-size: 12px; font-weight: 750; }
|
|
||||||
.company-identifier-list small { color: var(--muted); font-size: 9px; }
|
|
||||||
.company-advanced-link { display: flex; align-items: center; justify-content: space-between; gap: 15px; padding: 12px 15px; border: 1px dashed #ccd4e2; border-radius: 10px; color: var(--muted); background: rgba(255,255,255,.55); font-size: 11px; }
|
|
||||||
.company-advanced-link a { color: var(--blue); font-weight: 750; text-decoration: none; }
|
|
||||||
|
|
||||||
@media (max-width: 760px) {
|
|
||||||
.company-hero { align-items: flex-start; flex-direction: column; }
|
|
||||||
.company-hero-actions { width: 100%; justify-content: space-between; }
|
|
||||||
.company-card { padding: 18px; }
|
|
||||||
.company-card-heading { align-items: flex-start; flex-direction: column; }
|
|
||||||
.company-data-grid, .company-metrics { grid-template-columns: 1fr; }
|
|
||||||
.company-area-row { align-items: flex-start; flex-direction: column; }
|
|
||||||
.company-area-row > div { width: 100%; justify-content: space-between; }
|
|
||||||
.company-doc-counts { width: 100%; }
|
|
||||||
.company-advanced-link { align-items: flex-start; flex-direction: column; }
|
|
||||||
}
|
|
||||||
@@ -1,106 +0,0 @@
|
|||||||
.territory-page { display: grid; gap: 18px; }
|
|
||||||
.territory-breadcrumb { margin-bottom: 0; }
|
|
||||||
|
|
||||||
.territory-hero {
|
|
||||||
display: flex;
|
|
||||||
align-items: flex-end;
|
|
||||||
justify-content: space-between;
|
|
||||||
gap: 24px;
|
|
||||||
padding: 4px 0 2px;
|
|
||||||
}
|
|
||||||
.territory-hero h1 { margin: 6px 0 5px; font-size: clamp(31px, 3.5vw, 44px); line-height: 1.02; letter-spacing: -.045em; }
|
|
||||||
.territory-hero p { margin: 0; color: var(--muted); font-size: 13px; }
|
|
||||||
.territory-hero-actions { display: flex; align-items: center; gap: 10px; flex-wrap: wrap; }
|
|
||||||
|
|
||||||
.territory-purpose-note {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 9px;
|
|
||||||
padding: 11px 13px;
|
|
||||||
border: 1px solid #dbe4f2;
|
|
||||||
border-radius: 10px;
|
|
||||||
color: #536078;
|
|
||||||
background: #f7f9fd;
|
|
||||||
font-size: 11px;
|
|
||||||
line-height: 1.45;
|
|
||||||
}
|
|
||||||
.territory-purpose-note .icon { color: var(--blue); flex: 0 0 auto; }
|
|
||||||
|
|
||||||
.territory-tabs {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 4px;
|
|
||||||
overflow-x: auto;
|
|
||||||
padding: 0 0 1px;
|
|
||||||
border-bottom: 1px solid var(--line);
|
|
||||||
}
|
|
||||||
.territory-tabs button {
|
|
||||||
position: relative;
|
|
||||||
min-height: 43px;
|
|
||||||
padding: 9px 13px;
|
|
||||||
border: 0;
|
|
||||||
color: #566178;
|
|
||||||
background: transparent;
|
|
||||||
cursor: pointer;
|
|
||||||
white-space: nowrap;
|
|
||||||
font-size: 12px;
|
|
||||||
font-weight: 700;
|
|
||||||
}
|
|
||||||
.territory-tabs button:hover { color: var(--ink); }
|
|
||||||
.territory-tabs button.active { color: var(--blue); }
|
|
||||||
.territory-tabs button.active::after { content: ''; position: absolute; left: 10px; right: 10px; bottom: -1px; height: 2px; border-radius: 2px; background: var(--blue); }
|
|
||||||
|
|
||||||
.territory-stack { display: grid; gap: 15px; }
|
|
||||||
.territory-card { padding: 22px; }
|
|
||||||
.territory-card-heading { display: flex; align-items: flex-start; justify-content: space-between; gap: 18px; margin-bottom: 16px; }
|
|
||||||
.territory-card-heading h2 { margin: 4px 0; }
|
|
||||||
.territory-card-heading p { max-width: 680px; margin: 0; color: var(--muted); font-size: 12px; line-height: 1.5; }
|
|
||||||
.territory-card-actions { display: flex; justify-content: flex-end; margin-top: 14px; }
|
|
||||||
|
|
||||||
.territory-data-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 1px; overflow: hidden; border: 1px solid var(--line); border-radius: 11px; background: var(--line); }
|
|
||||||
.territory-data-grid > div { min-height: 74px; padding: 15px 16px; background: #fff; }
|
|
||||||
.territory-data-grid > div.wide { grid-column: 1 / -1; }
|
|
||||||
.territory-data-grid small, .territory-data-grid strong { display: block; }
|
|
||||||
.territory-data-grid small { margin-bottom: 7px; color: var(--muted); font-size: 10px; font-weight: 700; text-transform: uppercase; letter-spacing: .04em; }
|
|
||||||
.territory-data-grid strong { font-size: 13px; font-weight: 750; line-height: 1.45; }
|
|
||||||
.territory-edit-form { display: grid; gap: 15px; }
|
|
||||||
|
|
||||||
.territory-child-list, .territory-company-list { display: grid; gap: 8px; }
|
|
||||||
.territory-child-row, .territory-company-row {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 12px;
|
|
||||||
min-height: 60px;
|
|
||||||
padding: 11px 13px;
|
|
||||||
border: 1px solid #e2e7ef;
|
|
||||||
border-radius: 10px;
|
|
||||||
color: inherit;
|
|
||||||
background: #fbfcfd;
|
|
||||||
text-decoration: none;
|
|
||||||
}
|
|
||||||
.territory-child-row:hover, .territory-company-row:hover { border-color: #bfd0ee; background: #f7faff; }
|
|
||||||
.territory-child-row > span:nth-child(2), .territory-company-row > span:first-child { flex: 1; min-width: 0; }
|
|
||||||
.territory-child-row strong, .territory-child-row small, .territory-company-row strong, .territory-company-row small { display: block; }
|
|
||||||
.territory-child-row strong, .territory-company-row strong { font-size: 12px; }
|
|
||||||
.territory-child-row small, .territory-company-row small { margin-top: 4px; color: var(--muted); font-size: 10px; }
|
|
||||||
.territory-child-row > .icon:last-child, .territory-company-row > .icon:last-child { color: #8b96aa; }
|
|
||||||
|
|
||||||
.territory-metrics { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 10px; }
|
|
||||||
.territory-metrics > div { display: grid; gap: 6px; padding: 16px; border: 1px solid #e2e7ef; border-radius: 11px; background: #f8faff; }
|
|
||||||
.territory-metrics small { color: var(--muted); font-size: 10px; font-weight: 700; text-transform: uppercase; letter-spacing: .05em; }
|
|
||||||
.territory-metrics strong { color: #173b7a; font-size: 25px; line-height: 1; letter-spacing: -.04em; }
|
|
||||||
|
|
||||||
.territory-advanced-link { display: flex; align-items: center; justify-content: space-between; gap: 15px; padding: 12px 15px; border: 1px dashed #ccd4e2; border-radius: 10px; color: var(--muted); background: rgba(255,255,255,.55); font-size: 11px; }
|
|
||||||
.territory-advanced-link a { color: var(--blue); font-weight: 750; text-decoration: none; }
|
|
||||||
|
|
||||||
@media (max-width: 760px) {
|
|
||||||
.territory-hero { align-items: flex-start; flex-direction: column; }
|
|
||||||
.territory-hero-actions { width: 100%; }
|
|
||||||
.territory-card { padding: 18px; }
|
|
||||||
.territory-card-heading { align-items: flex-start; flex-direction: column; }
|
|
||||||
.territory-data-grid, .territory-metrics { grid-template-columns: 1fr; }
|
|
||||||
.territory-data-grid > div.wide { grid-column: auto; }
|
|
||||||
.territory-child-row { align-items: flex-start; flex-wrap: wrap; }
|
|
||||||
.territory-child-row .status-badge { margin-left: 44px; }
|
|
||||||
.territory-advanced-link { align-items: flex-start; flex-direction: column; }
|
|
||||||
}
|
|
||||||
@@ -1296,55 +1296,3 @@ code { color: #5e6677; font-family: ui-monospace, monospace; font-size: 9px; }
|
|||||||
/* D5.6.4 · combobox buscable global */
|
/* D5.6.4 · combobox buscable global */
|
||||||
.searchable-select{position:relative;width:100%;min-width:0}.searchable-select-native{position:absolute!important;inset:0;width:1px!important;height:1px!important;opacity:0;pointer-events:none}.searchable-select-trigger{display:flex;width:100%;min-height:41px;align-items:center;justify-content:space-between;gap:10px;padding:9px 11px;border:1px solid #d7dce5;border-radius:8px;background:#fff;color:var(--ink);font-size:13px;text-align:left;cursor:pointer;outline:none}.searchable-select-trigger:hover{border-color:#bcc6d6}.searchable-select-trigger:focus-visible{border-color:#6b95ed;box-shadow:0 0 0 3px rgba(40,100,220,.1)}.searchable-select-trigger:disabled{cursor:not-allowed;color:#9199a8;background:#f1f3f6}.searchable-select-trigger>span{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.searchable-select-trigger .placeholder{color:#7e8796}.searchable-select-trigger .icon{flex:0 0 auto;transform:rotate(90deg)}.searchable-select-popup{position:fixed;z-index:10000;max-height:315px;padding:6px;border:1px solid #ccd4e0;border-radius:10px;background:#fff;box-shadow:0 14px 40px rgba(18,31,53,.18)}.searchable-select-search{display:flex;align-items:center;gap:7px;padding:5px 7px 7px;border-bottom:1px solid var(--line)}.searchable-select-search input{width:100%;min-width:0;height:34px;padding:6px 8px;border:0;outline:0;background:transparent;color:var(--ink);font-size:12px}.searchable-select-options{max-height:245px;overflow:auto;padding-top:4px}.searchable-select-options>button{display:flex;width:100%;align-items:center;justify-content:space-between;gap:8px;padding:8px 9px;border:0;border-radius:7px;background:transparent;color:var(--ink);font-size:12px;text-align:left;cursor:pointer}.searchable-select-options>button:hover,.searchable-select-options>button:focus-visible{background:#f2f5fa;outline:none}.searchable-select-options>button.selected{background:#eef4ff;color:#174ea6;font-weight:750}.searchable-select-options>button:disabled{cursor:not-allowed;color:#a0a7b3;background:transparent}.searchable-select-empty{padding:14px 10px;color:var(--muted);font-size:11px;text-align:center}.select-field>.searchable-select{width:100%}.survey-inline-select.searchable-select{min-width:130px;margin-top:6px;padding:0;border:0;background:transparent}.survey-inline-select.wide.searchable-select{min-width:175px;margin-top:0}.survey-inline-select .searchable-select-trigger{min-height:33px;padding:6px 8px;border-radius:7px;font-size:9px}.operational-context-selectors .searchable-select-trigger{min-height:36px;padding:7px 9px;font-size:10px}.parent-picker .searchable-select-trigger{border-radius:5px 5px 8px 8px}
|
.searchable-select{position:relative;width:100%;min-width:0}.searchable-select-native{position:absolute!important;inset:0;width:1px!important;height:1px!important;opacity:0;pointer-events:none}.searchable-select-trigger{display:flex;width:100%;min-height:41px;align-items:center;justify-content:space-between;gap:10px;padding:9px 11px;border:1px solid #d7dce5;border-radius:8px;background:#fff;color:var(--ink);font-size:13px;text-align:left;cursor:pointer;outline:none}.searchable-select-trigger:hover{border-color:#bcc6d6}.searchable-select-trigger:focus-visible{border-color:#6b95ed;box-shadow:0 0 0 3px rgba(40,100,220,.1)}.searchable-select-trigger:disabled{cursor:not-allowed;color:#9199a8;background:#f1f3f6}.searchable-select-trigger>span{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.searchable-select-trigger .placeholder{color:#7e8796}.searchable-select-trigger .icon{flex:0 0 auto;transform:rotate(90deg)}.searchable-select-popup{position:fixed;z-index:10000;max-height:315px;padding:6px;border:1px solid #ccd4e0;border-radius:10px;background:#fff;box-shadow:0 14px 40px rgba(18,31,53,.18)}.searchable-select-search{display:flex;align-items:center;gap:7px;padding:5px 7px 7px;border-bottom:1px solid var(--line)}.searchable-select-search input{width:100%;min-width:0;height:34px;padding:6px 8px;border:0;outline:0;background:transparent;color:var(--ink);font-size:12px}.searchable-select-options{max-height:245px;overflow:auto;padding-top:4px}.searchable-select-options>button{display:flex;width:100%;align-items:center;justify-content:space-between;gap:8px;padding:8px 9px;border:0;border-radius:7px;background:transparent;color:var(--ink);font-size:12px;text-align:left;cursor:pointer}.searchable-select-options>button:hover,.searchable-select-options>button:focus-visible{background:#f2f5fa;outline:none}.searchable-select-options>button.selected{background:#eef4ff;color:#174ea6;font-weight:750}.searchable-select-options>button:disabled{cursor:not-allowed;color:#a0a7b3;background:transparent}.searchable-select-empty{padding:14px 10px;color:var(--muted);font-size:11px;text-align:center}.select-field>.searchable-select{width:100%}.survey-inline-select.searchable-select{min-width:130px;margin-top:6px;padding:0;border:0;background:transparent}.survey-inline-select.wide.searchable-select{min-width:175px;margin-top:0}.survey-inline-select .searchable-select-trigger{min-height:33px;padding:6px 8px;border-radius:7px;font-size:9px}.operational-context-selectors .searchable-select-trigger{min-height:36px;padding:7px 9px;font-size:10px}.parent-picker .searchable-select-trigger{border-radius:5px 5px 8px 8px}
|
||||||
.inspection-quick-create{max-width:980px;margin-left:auto;margin-right:auto}.inspection-quick-create .form-grid{grid-template-columns:repeat(2,minmax(0,1fr))}.inspection-generated-code{display:flex;align-items:center;justify-content:space-between;gap:12px;margin-bottom:14px;padding:10px 12px;border:1px solid var(--line);border-radius:9px;background:var(--soft)}.inspection-generated-code small{color:var(--muted);font-weight:700}.inspection-generated-code strong{font-size:15px;letter-spacing:.02em}@media(max-width:760px){.inspection-quick-create .form-grid{grid-template-columns:1fr}}
|
.inspection-quick-create{max-width:980px;margin-left:auto;margin-right:auto}.inspection-quick-create .form-grid{grid-template-columns:repeat(2,minmax(0,1fr))}.inspection-generated-code{display:flex;align-items:center;justify-content:space-between;gap:12px;margin-bottom:14px;padding:10px 12px;border:1px solid var(--line);border-radius:9px;background:var(--soft)}.inspection-generated-code small{color:var(--muted);font-weight:700}.inspection-generated-code strong{font-size:15px;letter-spacing:.02em}@media(max-width:760px){.inspection-quick-create .form-grid{grid-template-columns:1fr}}
|
||||||
|
|
||||||
/* Parent choices need fixed-size controls even inside a generic form field. */
|
|
||||||
.inventory-parent-options {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: repeat(auto-fit, minmax(min(100%, 210px), 1fr));
|
|
||||||
gap: 8px;
|
|
||||||
margin: 10px 0 14px;
|
|
||||||
}
|
|
||||||
.inventory-parent-option {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: flex-start;
|
|
||||||
gap: 10px;
|
|
||||||
min-width: 0;
|
|
||||||
min-height: 42px;
|
|
||||||
padding: 10px 12px;
|
|
||||||
border: 1px solid var(--line);
|
|
||||||
border-radius: 8px;
|
|
||||||
background: #fff;
|
|
||||||
color: var(--ink);
|
|
||||||
font-size: 12px;
|
|
||||||
font-weight: 600;
|
|
||||||
line-height: 1.4;
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
.inventory-parent-option input[type="checkbox"] {
|
|
||||||
flex: 0 0 17px;
|
|
||||||
width: 17px;
|
|
||||||
height: 17px;
|
|
||||||
min-height: 17px;
|
|
||||||
padding: 0;
|
|
||||||
margin: 0;
|
|
||||||
accent-color: var(--blue);
|
|
||||||
cursor: inherit;
|
|
||||||
}
|
|
||||||
.inventory-parent-option > span {
|
|
||||||
display: block;
|
|
||||||
min-width: 0;
|
|
||||||
overflow-wrap: anywhere;
|
|
||||||
}
|
|
||||||
.inventory-parent-option:has(input:checked) {
|
|
||||||
border-color: #9db9ed;
|
|
||||||
background: #eef4ff;
|
|
||||||
}
|
|
||||||
.inventory-parent-option:has(input:focus-visible) {
|
|
||||||
outline: 2px solid var(--blue);
|
|
||||||
outline-offset: 2px;
|
|
||||||
}
|
|
||||||
.inventory-parent-option:has(input:disabled) {
|
|
||||||
cursor: default;
|
|
||||||
opacity: .65;
|
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user