F6.1 hotfix · jerarquía de Inspecciones y scope Yacimiento (#37)
Corrige creación de Inspección, separa Departamento→Área→Yacimiento, elimina el UPDATE oculto de checklist en lectura, integra Preparación para campo como etapa de Inspección, limita operaciones Android al Yacimiento, preserva scope en edición, auto-incluye Inventarios accionables, valida Operadora a plannedStartAt y recompila Android 0.15.2/vc24 con el ícono exacto de presentación.
This commit is contained in:
@@ -129,6 +129,7 @@ export class FieldFindingsService {
|
||||
visit.id AS "visitId",
|
||||
visit.code AS "visitCode",
|
||||
visit.status AS "visitStatus",
|
||||
COALESCE(visit.scope_asset_id, visit.operational_area_id) AS "scopeAssetId",
|
||||
visit.operational_area_id AS "areaId",
|
||||
area.code AS "areaCode",
|
||||
area.name AS "areaName",
|
||||
@@ -139,8 +140,7 @@ export class FieldFindingsService {
|
||||
asset_type.code AS "assetTypeCode",
|
||||
asset.inventory_family_id AS "inventoryFamilyId",
|
||||
(
|
||||
asset.operational_area_id=visit.operational_area_id
|
||||
OR asset.id=visit.operational_area_id
|
||||
asset.id=COALESCE(visit.scope_asset_id, visit.operational_area_id)
|
||||
OR EXISTS (
|
||||
WITH RECURSIVE ancestors AS (
|
||||
SELECT id,parent_id FROM assets WHERE id=asset.parent_id
|
||||
@@ -148,9 +148,11 @@ export class FieldFindingsService {
|
||||
SELECT parent.id,parent.parent_id
|
||||
FROM assets parent JOIN ancestors child ON parent.id=child.parent_id
|
||||
)
|
||||
SELECT 1 FROM ancestors WHERE id=visit.operational_area_id LIMIT 1
|
||||
SELECT 1 FROM ancestors
|
||||
WHERE id=COALESCE(visit.scope_asset_id, visit.operational_area_id)
|
||||
LIMIT 1
|
||||
)
|
||||
) AS "insideArea",
|
||||
) AS "insideScope",
|
||||
EXISTS (
|
||||
SELECT 1
|
||||
FROM area_company_relations relation
|
||||
@@ -213,6 +215,7 @@ export class FieldFindingsService {
|
||||
visitId: string;
|
||||
visitCode: string;
|
||||
visitStatus: string;
|
||||
scopeAssetId: string | null;
|
||||
areaId: string | null;
|
||||
areaCode: string | null;
|
||||
areaName: string | null;
|
||||
@@ -222,7 +225,7 @@ export class FieldFindingsService {
|
||||
assetId: string | null;
|
||||
assetTypeCode: string | null;
|
||||
inventoryFamilyId: string | null;
|
||||
insideArea: boolean;
|
||||
insideScope: boolean;
|
||||
operatorRelationValid: boolean;
|
||||
assigned: boolean;
|
||||
selected: boolean;
|
||||
@@ -278,10 +281,10 @@ export class FieldFindingsService {
|
||||
message: 'La Instalación/Subinstalación debe tener una clasificación técnica antes de registrar Hallazgos',
|
||||
});
|
||||
}
|
||||
if (!row.insideArea) {
|
||||
if (!row.insideScope) {
|
||||
throw new BadRequestException({
|
||||
code: 'FIELD_FINDING_INVENTORY_OUTSIDE_CONTEXT',
|
||||
message: 'El Inventario no pertenece al Área de esta inspección',
|
||||
message: 'El Inventario no pertenece al Yacimiento definido como alcance de esta inspección',
|
||||
});
|
||||
}
|
||||
if (!row.selected) {
|
||||
|
||||
Reference in New Issue
Block a user