From 5c78aee5e91494ec518c9fed7e25b6e021d3efba Mon Sep 17 00:00:00 2001 From: enlineawork Date: Tue, 8 Sep 2026 23:26:36 -0300 Subject: [PATCH] fix(android): mark F5 Other inventory families correctly --- .../f3-field-inventory-structure.service.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/api-v3/src/inspection-visits/f3-field-inventory-structure.service.ts b/api-v3/src/inspection-visits/f3-field-inventory-structure.service.ts index bd77ca9..f1406bf 100644 --- a/api-v3/src/inspection-visits/f3-field-inventory-structure.service.ts +++ b/api-v3/src/inspection-visits/f3-field-inventory-structure.service.ts @@ -44,6 +44,8 @@ const STRUCTURAL_CHILD: Record = { instalacion: 'subinstalacion', }; +const OTHER_FAMILY_SQL = "source_reference LIKE 'SYSTEM:F3.1:OTHER%' OR source_reference LIKE 'F5:SYSTEM:OTHER:%'"; + @Injectable() export class F3FieldInventoryStructureService { constructor( @@ -202,10 +204,10 @@ export class F3FieldInventoryStructureService { return this.dataSource.query(` SELECT id,code,name,level,information_labels AS "informationLabels", source_reference AS "sourceReference", - (source_reference LIKE 'SYSTEM:F3.1:OTHER%') AS "isOther" + (${OTHER_FAMILY_SQL}) AS "isOther" FROM inventory_families WHERE level='INSTALLATION' AND is_active=true - ORDER BY (source_reference LIKE 'SYSTEM:F3.1:OTHER%') ASC,name,code + ORDER BY (${OTHER_FAMILY_SQL}) ASC,name,code `) as Promise; } if (expectedTypeCode === 'subinstalacion') { @@ -219,13 +221,13 @@ export class F3FieldInventoryStructureService { SELECT family.id,family.code,family.name,family.level, family.information_labels AS "informationLabels", family.source_reference AS "sourceReference", - (family.source_reference LIKE 'SYSTEM:F3.1:OTHER%') AS "isOther" + (family.source_reference LIKE 'SYSTEM:F3.1:OTHER%' OR family.source_reference LIKE 'F5:SYSTEM:OTHER:%') AS "isOther" FROM inventory_family_parent_rules rule JOIN inventory_families family ON family.id=rule.child_family_id WHERE rule.parent_family_id=$1::uuid AND family.level='SUBINSTALLATION' AND family.is_active=true - ORDER BY (family.source_reference LIKE 'SYSTEM:F3.1:OTHER%') ASC,family.name,family.code + ORDER BY (family.source_reference LIKE 'SYSTEM:F3.1:OTHER%' OR family.source_reference LIKE 'F5:SYSTEM:OTHER:%') ASC,family.name,family.code `, [parent.inventoryFamilyId]) as Promise; } return [];