feat: Add more TR3111 properties to tag comparison view

Also removed extra Area property from NORSOK view
equinor · Sep 15, 2023 · 6a69a55 · 6a69a55
1 parent 1d11f7f
commit 6a69a55
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git 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
@@ -34,6 +34,14 @@ export const comparisonTR3111ColumnDefs = (): ColGroupDef[] => [
                 field: getPropertyName<TagData>("purchaseOrder"),
                 headerName: "Purchase order",
             },
+            {
+                field: getPropertyName<TagData>("sequence"),
+                headerName: "Sequence",
+            },
+            {
+                field: getPropertyName<TagData>("system"),
+                headerName: "System",
+            },
         ],
     },
 ]
diff --git 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
@@ -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;