Skip to content
This repository has been archived by the owner on Feb 17, 2025. It is now read-only.

Commit

Permalink
feat: Added column menu button and property search bar to tag compari…
Browse files Browse the repository at this point in the history
…son view (#113)

Also updated table with groupings. Added new fusion text packages. Added equipment conditions.
  • Loading branch information
DanielBohme authored Aug 9, 2023
1 parent fc823d4 commit 0842dd6
Show file tree
Hide file tree
Showing 10 changed files with 334 additions and 165 deletions.
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@
"@equinor/fusion-query": "^3.0.3",
"@equinor/fusion-react-ag-grid-styles": "^29.3.7",
"@equinor/fusion-react-side-sheet": "^1.0.1",
"@equinor/fusion-react-textinput": "^0.6.15",
"@equinor/fusion-wc-textinput": "^0.5.19",
"@floating-ui/react-dom": "^1.3.0",
"@floating-ui/react-dom-interactions": "^0.13.3",
"@lit/reactive-element": "^1.3.0",
Expand Down Expand Up @@ -129,4 +131,4 @@
"typescript": "^5.1.6",
"webpack-hot-middleware": "^2.25.4"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import { ColGroupDef } from "@ag-grid-community/core"
import { InstrumentPurchaserRequirement } from "../../../Models/InstrumentPurchaserRequirement"
import { getPropertyName } from "../../../utils/common"

export const comparisonEquipmentConditionsColumnDefs = (): ColGroupDef[] => [
{
headerName: "Equipment conditions",
children: [
{
field: getPropertyName<InstrumentPurchaserRequirement>("lineNominalSize"),
headerName: "Line nominal size",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("lineInnerDiameter"),
headerName: "Line inner diameter",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("lineMaterial"),
headerName: "Line material",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("flangeStandardOrCode"),
headerName: "Flange standard or code",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("flangeSize"),
headerName: "Flange size",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("flangePressureClass"),
headerName: "Flange pressure class",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("flangeFacing"),
headerName: "Flange facing",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("pipingDesignTemperature"),
headerName: "Piping design temperature",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("pipingDesignPressure"),
headerName: "Piping design pressure",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("fluid"),
headerName: "Fluid",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("phase"),
headerName: "Phase",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("corrosiveCompounds"),
headerName: "Corrosive compounds",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("maximumPressureLoss"),
headerName: "Maximum pressure loss",
},
],
},
]
99 changes: 99 additions & 0 deletions src/Components/TagComparisonTable/ColumnDefs/GeneralColumnDefs.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
import { ColGroupDef } from "@ag-grid-community/core"
import { InstrumentPurchaserRequirement } from "../../../Models/InstrumentPurchaserRequirement"
import { getPropertyName } from "../../../utils/common"

export const comparisonGeneralColumnDefs = (): ColGroupDef[] => [
{
headerName: "General",
children: [
{
field: getPropertyName<InstrumentPurchaserRequirement>("codeRequirement"),
headerName: "Code requirement",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("conformityAssessmentSystemLevel"),
headerName: "Conformity assessment system (CAS) level",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("serviceDescription"),
headerName: "Service description",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("manufacturer"),
headerName: "Manufacturer",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("projectCountry"),
headerName: "Project country",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("projectRegion"),
headerName: "Project region",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("plantEnvironmentalLocation"),
headerName: "Plant environmental location",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("pidNumber"),
headerName: "P&ID number",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("lineOrEquipmentNumber"),
headerName: "Line or equipment number",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("minimumAmbientTemperature"),
headerName: "Minimum ambient temperature",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("maximumAmbientTemperature"),
headerName: "Maximum ambient temperature",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("baseConditions"),
headerName: "Base conditions",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("baseTemperature"),
headerName: "Base temperature",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("basePressure"),
headerName: "Base pressure",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("coatingDurability"),
headerName: "Coating durability",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("silRating"),
headerName: "SIL rating",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("ingressProtection"),
headerName: "Ingress protection",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("exProtection"),
headerName: "EX protection",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("hazardousAreaClassificationStandard"),
headerName: "Hazardous area classification standard",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("explosionHazardClassification"),
headerName: "Explosion hazard classification",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("explosionGroup"),
headerName: "Explosion group",
},
{
field: getPropertyName<InstrumentPurchaserRequirement>("temperatureClass"),
headerName: "Temperature class",
},
],
},
]
39 changes: 39 additions & 0 deletions src/Components/TagComparisonTable/ColumnDefs/TR3111ColumnDefs.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import { ColGroupDef } from "@ag-grid-community/core"
import { TagData } from "../../../Models/TagData"
import { getPropertyName } from "../../../utils/common"

export const comparisonTR3111ColumnDefs = (): ColGroupDef[] => [
{
headerName: "TR3111",
children: [
{
field: getPropertyName<TagData>("tagStatus"),
headerName: "Tag status",
},
{
field: getPropertyName<TagData>("discipline"),
headerName: "Discipline",
},
{
field: getPropertyName<TagData>("contract"),
headerName: "Contract",
},
{
field: getPropertyName<TagData>("contractName"),
headerName: "Contract name",
},
{
field: getPropertyName<TagData>("engineeringCode"),
headerName: "Engineering code",
},
{
field: getPropertyName<TagData>("area"),
headerName: "Area",
},
{
field: getPropertyName<TagData>("purchaseOrder"),
headerName: "Purchase order",
},
],
},
]
11 changes: 11 additions & 0 deletions src/Components/TagComparisonTable/ColumnDefs/TagsColumnDefs..tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { ColDef } from "@ag-grid-community/core"
import { TagData } from "../../../Models/TagData"
import { getPropertyName } from "../../../utils/common"

export const comparisonTagsColumnDefs = (): ColDef[] => [
{
headerName: "Tag number",
field: getPropertyName<TagData>("tagNo"),
pinned: "left",
},
]
102 changes: 0 additions & 102 deletions src/Components/TagComparisonTable/GeneralColumnDefs.tsx

This file was deleted.

37 changes: 0 additions & 37 deletions src/Components/TagComparisonTable/TR3111ColumnDefs.tsx

This file was deleted.

Loading

0 comments on commit 0842dd6

Please sign in to comment.