fix(f4): remove inspection title from asset dossier
This commit is contained in:
@@ -298,7 +298,7 @@ export class AssetsService {
|
|||||||
|
|
||||||
const [visits, acts, findings, evidence, communications, verificationResults, documents, inspectionReports, media, versions] = await Promise.all([
|
const [visits, acts, findings, evidence, communications, verificationResults, documents, inspectionReports, media, versions] = await Promise.all([
|
||||||
this.dataSource.query(
|
this.dataSource.query(
|
||||||
`SELECT DISTINCT visit.id, visit.code, visit.title, visit.status,
|
`SELECT DISTINCT visit.id, visit.code, visit.status,
|
||||||
visit.planned_start_at AS "plannedStartAt",
|
visit.planned_start_at AS "plannedStartAt",
|
||||||
visit.actual_started_at AS "actualStartedAt",
|
visit.actual_started_at AS "actualStartedAt",
|
||||||
visit.actual_closed_at AS "actualClosedAt",
|
visit.actual_closed_at AS "actualClosedAt",
|
||||||
@@ -322,7 +322,7 @@ export class AssetsService {
|
|||||||
`SELECT DISTINCT act.id, act.visit_id AS "visitId", act.code, act.status,
|
`SELECT DISTINCT act.id, act.visit_id AS "visitId", act.code, act.status,
|
||||||
act.occurred_at AS "occurredAt", act.title, act.summary,
|
act.occurred_at AS "occurredAt", act.title, act.summary,
|
||||||
act.closed_at AS "closedAt", act.current_version AS "currentVersion",
|
act.closed_at AS "closedAt", act.current_version AS "currentVersion",
|
||||||
visit.code AS "visitCode", visit.title AS "visitTitle"
|
visit.code AS "visitCode"
|
||||||
FROM inspection_acts act
|
FROM inspection_acts act
|
||||||
JOIN inspection_visits visit ON visit.id = act.visit_id
|
JOIN inspection_visits visit ON visit.id = act.visit_id
|
||||||
LEFT JOIN inspection_act_assets act_asset
|
LEFT JOIN inspection_act_assets act_asset
|
||||||
@@ -342,7 +342,7 @@ export class AssetsService {
|
|||||||
finding.closed_at AS "closedAt", finding.closure_notes AS "closureNotes",
|
finding.closed_at AS "closedAt", finding.closure_notes AS "closureNotes",
|
||||||
finding.created_at AS "createdAt", finding.updated_at AS "updatedAt",
|
finding.created_at AS "createdAt", finding.updated_at AS "updatedAt",
|
||||||
act.code AS "actCode", act.occurred_at AS "actOccurredAt",
|
act.code AS "actCode", act.occurred_at AS "actOccurredAt",
|
||||||
visit.id AS "visitId", visit.code AS "visitCode", visit.title AS "visitTitle"
|
visit.id AS "visitId", visit.code AS "visitCode"
|
||||||
FROM inspection_findings finding
|
FROM inspection_findings finding
|
||||||
JOIN inspection_acts act ON act.id = finding.act_id
|
JOIN inspection_acts act ON act.id = finding.act_id
|
||||||
JOIN inspection_visits visit ON visit.id = act.visit_id
|
JOIN inspection_visits visit ON visit.id = act.visit_id
|
||||||
@@ -389,7 +389,7 @@ export class AssetsService {
|
|||||||
verification_link.result_recorded_at AS "resultRecordedAt",
|
verification_link.result_recorded_at AS "resultRecordedAt",
|
||||||
verification_link.rescheduled_control_on AS "rescheduledControlOn",
|
verification_link.rescheduled_control_on AS "rescheduledControlOn",
|
||||||
finding.code AS "findingCode", finding.title AS "findingTitle",
|
finding.code AS "findingCode", finding.title AS "findingTitle",
|
||||||
visit.code AS "visitCode", visit.title AS "visitTitle", visit.status AS "visitStatus",
|
visit.code AS "visitCode", visit.status AS "visitStatus",
|
||||||
(SELECT COUNT(*)::integer
|
(SELECT COUNT(*)::integer
|
||||||
FROM inspection_finding_evidence verification_evidence
|
FROM inspection_finding_evidence verification_evidence
|
||||||
WHERE verification_evidence.finding_id = finding.id
|
WHERE verification_evidence.finding_id = finding.id
|
||||||
@@ -484,7 +484,7 @@ export class AssetsService {
|
|||||||
kind: 'INSPECTION',
|
kind: 'INSPECTION',
|
||||||
occurredAt: visit.actualStartedAt ?? visit.plannedStartAt ?? visit.createdAt,
|
occurredAt: visit.actualStartedAt ?? visit.plannedStartAt ?? visit.createdAt,
|
||||||
title: `Inspección ${String(visit.code)}`,
|
title: `Inspección ${String(visit.code)}`,
|
||||||
description: visit.title,
|
description: null,
|
||||||
href: `/inspecciones/${String(visit.id)}`,
|
href: `/inspecciones/${String(visit.id)}`,
|
||||||
meta: { status: visit.status },
|
meta: { status: visit.status },
|
||||||
}));
|
}));
|
||||||
@@ -867,7 +867,7 @@ export class AssetsService {
|
|||||||
private fieldDiscoverySelect(): string {
|
private fieldDiscoverySelect(): string {
|
||||||
return `SELECT discovery.id, discovery.status, discovery.discovery_notes AS "discoveryNotes", discovery.observed_at AS "observedAt", discovery.reviewed_at AS "reviewedAt", discovery.review_notes AS "reviewNotes", discovery.created_at AS "createdAt",
|
return `SELECT discovery.id, discovery.status, discovery.discovery_notes AS "discoveryNotes", discovery.observed_at AS "observedAt", discovery.reviewed_at AS "reviewedAt", discovery.review_notes AS "reviewNotes", discovery.created_at AS "createdAt",
|
||||||
JSONB_BUILD_OBJECT('id',asset.id,'code',asset.code,'name',asset.name,'commonName',asset.common_name,'informationStatus',asset.information_status,'typeId',asset.asset_type_id,'typeName',asset_type.name,'parentId',asset.parent_id,'operationalAreaId',asset.operational_area_id,'operatorCompanyId',asset.operator_company_id) AS asset,
|
JSONB_BUILD_OBJECT('id',asset.id,'code',asset.code,'name',asset.name,'commonName',asset.common_name,'informationStatus',asset.information_status,'typeId',asset.asset_type_id,'typeName',asset_type.name,'parentId',asset.parent_id,'operationalAreaId',asset.operational_area_id,'operatorCompanyId',asset.operator_company_id) AS asset,
|
||||||
JSONB_BUILD_OBJECT('id',visit.id,'code',visit.code,'title',visit.title,'status',visit.status) AS visit,
|
JSONB_BUILD_OBJECT('id',visit.id,'code',visit.code,'status',visit.status) AS visit,
|
||||||
JSONB_BUILD_OBJECT('id',creator.id,'username',creator.username,'firstName',creator.first_name,'lastName',creator.last_name) AS creator,
|
JSONB_BUILD_OBJECT('id',creator.id,'username',creator.username,'firstName',creator.first_name,'lastName',creator.last_name) AS creator,
|
||||||
CASE WHEN reviewer.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',reviewer.id,'username',reviewer.username,'firstName',reviewer.first_name,'lastName',reviewer.last_name) END AS reviewer,
|
CASE WHEN reviewer.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',reviewer.id,'username',reviewer.username,'firstName',reviewer.first_name,'lastName',reviewer.last_name) END AS reviewer,
|
||||||
CASE WHEN matched.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',matched.id,'code',matched.code,'name',matched.name,'commonName',matched.common_name) END AS "matchedAsset"
|
CASE WHEN matched.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',matched.id,'code',matched.code,'name',matched.name,'commonName',matched.common_name) END AS "matchedAsset"
|
||||||
|
|||||||
Reference in New Issue
Block a user