From 6a69a551b3ff42f48b28bf1819c7e8cced7eeaa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20B=C3=B6hme?= Date: Fri, 15 Sep 2023 13:10:49 +0200 Subject: [PATCH] feat: Add more TR3111 properties to tag comparison view Also removed extra Area property from NORSOK view --- src/Components/NORSOKTable/RowData/GeneralRowData.tsx | 10 ---------- .../TagComparisonTable/ColumnDefs/TR3111ColumnDefs.tsx | 8 ++++++++ src/Models/TagData.ts | 2 ++ src/types.d.ts | 10 ++++++++++ 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/Components/NORSOKTable/RowData/GeneralRowData.tsx b/src/Components/NORSOKTable/RowData/GeneralRowData.tsx index f05311cb..5f9ee955 100644 --- a/src/Components/NORSOKTable/RowData/GeneralRowData.tsx +++ b/src/Components/NORSOKTable/RowData/GeneralRowData.tsx @@ -62,16 +62,6 @@ export const generalRowData = (datasheet: InstrumentTagData): TableRow[] => [ additionalNotes: "", property: "setalarmPoint", }, - { - refClause: "", - description: "Area", - purchaserReq: datasheet.area, - purchaserReqUOM: "", - supplierOfferedVal: "", - supplierOfferedValUOM: "", - additionalNotes: "", - property: "area", - }, { refClause: "", description: "P.O. number", diff --git a/src/Components/TagComparisonTable/ColumnDefs/TR3111ColumnDefs.tsx b/src/Components/TagComparisonTable/ColumnDefs/TR3111ColumnDefs.tsx index 5679443e..1d329333 100644 --- a/src/Components/TagComparisonTable/ColumnDefs/TR3111ColumnDefs.tsx +++ b/src/Components/TagComparisonTable/ColumnDefs/TR3111ColumnDefs.tsx @@ -34,6 +34,14 @@ export const comparisonTR3111ColumnDefs = (): ColGroupDef[] => [ field: getPropertyName("purchaseOrder"), headerName: "Purchase order", }, + { + field: getPropertyName("sequence"), + headerName: "Sequence", + }, + { + field: getPropertyName("system"), + headerName: "System", + }, ], }, ] diff --git a/src/Models/TagData.ts b/src/Models/TagData.ts index 6e576047..9e4c21f9 100644 --- a/src/Models/TagData.ts +++ b/src/Models/TagData.ts @@ -13,6 +13,8 @@ export class TagData implements Components.Schemas.TagDataDto { tagStatus?: string | null; engineeringCode?: string | null; purchaseOrder?: string | null; + sequence?: string | null; + system?: string | null; version?: number; // int32 review?: TagDataReview; revisionContainer?: RevisionContainer; diff --git a/src/types.d.ts b/src/types.d.ts index 1509ab05..5a44f33d 100644 --- a/src/types.d.ts +++ b/src/types.d.ts @@ -343,6 +343,8 @@ declare namespace Components { tagStatus?: string | null; engineeringCode?: string | null; purchaseOrder?: string | null; + sequence?: string | null; + system?: string | null; version?: number; // int32 review?: TagDataReviewDto; revisionContainer?: RevisionContainerDto; @@ -383,6 +385,8 @@ declare namespace Components { tagStatus?: string | null; engineeringCode?: string | null; purchaseOrder?: string | null; + sequence?: string | null; + system?: string | null; version?: number; // int32 review?: TagDataReviewDto; revisionContainer?: RevisionContainerDto; @@ -797,6 +801,8 @@ declare namespace Components { tagStatus?: string | null; engineeringCode?: string | null; purchaseOrder?: string | null; + sequence?: string | null; + system?: string | null; version?: number; // int32 review?: TagDataReviewDto; revisionContainer?: RevisionContainerDto; @@ -1521,6 +1527,8 @@ declare namespace Components { tagStatus?: string | null; engineeringCode?: string | null; purchaseOrder?: string | null; + sequence?: string | null; + system?: string | null; version?: number; // int32 review?: TagDataReviewDto; revisionContainer?: RevisionContainerDto; @@ -1575,6 +1583,8 @@ declare namespace Components { tagStatus?: string | null; engineeringCode?: string | null; purchaseOrder?: string | null; + sequence?: string | null; + system?: string | null; version?: number; // int32 review?: TagDataReviewDto; revisionContainer?: RevisionContainerDto;