admin/dh-inspeccion-v2
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 3 Wiki Activity

fix(android): mark F5 Other inventory families correctly

Browse Source
This commit is contained in:
admin
2026-09-08 23:26:36 -03:00
parent a985fba96a
commit 5c78aee5e9
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api-v3/src/inspection-visits/f3-field-inventory-structure.service.ts
+6 -4
View File
@@ -44,6 +44,8 @@ const STRUCTURAL_CHILD: Record<string, string | undefined> = {
instalacion: 'subinstalacion', instalacion: 'subinstalacion',
}; };
const OTHER_FAMILY_SQL = "source_reference LIKE 'SYSTEM:F3.1:OTHER%' OR source_reference LIKE 'F5:SYSTEM:OTHER:%'";
@Injectable() @Injectable()
export class F3FieldInventoryStructureService { export class F3FieldInventoryStructureService {
constructor( constructor(
@@ -202,10 +204,10 @@ export class F3FieldInventoryStructureService {
return this.dataSource.query(` return this.dataSource.query(`
SELECT id,code,name,level,information_labels AS "informationLabels", SELECT id,code,name,level,information_labels AS "informationLabels",
source_reference AS "sourceReference", source_reference AS "sourceReference",
(source_reference LIKE 'SYSTEM:F3.1:OTHER%') AS "isOther" (${OTHER_FAMILY_SQL}) AS "isOther"
FROM inventory_families FROM inventory_families
WHERE level='INSTALLATION' AND is_active=true 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<FamilyRow[]>; `) as Promise<FamilyRow[]>;
} }
if (expectedTypeCode === 'subinstalacion') { if (expectedTypeCode === 'subinstalacion') {
@@ -219,13 +221,13 @@ export class F3FieldInventoryStructureService {
SELECT family.id,family.code,family.name,family.level, SELECT family.id,family.code,family.name,family.level,
family.information_labels AS "informationLabels", family.information_labels AS "informationLabels",
family.source_reference AS "sourceReference", 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 FROM inventory_family_parent_rules rule
JOIN inventory_families family ON family.id=rule.child_family_id JOIN inventory_families family ON family.id=rule.child_family_id
WHERE rule.parent_family_id=$1::uuid WHERE rule.parent_family_id=$1::uuid
AND family.level='SUBINSTALLATION' AND family.level='SUBINSTALLATION'
AND family.is_active=true 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<FamilyRow[]>; `, [parent.inventoryFamilyId]) as Promise<FamilyRow[]>;
} }
return []; return [];