From 46d9d7cc931edd5acc194be9088fc2eca747c4b1 Mon Sep 17 00:00:00 2001 From: Kevin Hashimoto Date: Tue, 3 Dec 2024 09:16:51 -0800 Subject: [PATCH 1/4] feat: first round seeder changes --- .../db/seeders/common/seed_fuel_data.json | 174 +++++++++++++++++- 1 file changed, 172 insertions(+), 2 deletions(-) diff --git a/backend/lcfs/db/seeders/common/seed_fuel_data.json b/backend/lcfs/db/seeders/common/seed_fuel_data.json index 9f29e04b5..fb71fc4f4 100644 --- a/backend/lcfs/db/seeders/common/seed_fuel_data.json +++ b/backend/lcfs/db/seeders/common/seed_fuel_data.json @@ -97,7 +97,6 @@ "units": "kg", "unrecognized": false }, - { "fuel_type_id": 11, "fuel_type": "Alternative jet fuel", @@ -365,6 +364,51 @@ "end_use_type_id": 21, "type": "Aircraft", "intended_use": true + }, + { + "end_use_type_id": 22, + "type": "Compression-ignition engine- Marine, general", + "intended_use": true + }, + { + "end_use_type_id": 23, + "type": "Compression-ignition engine- Marine, operated within 51 to 75% of load range", + "intended_use": true + }, + { + "end_use_type_id": 24, + "type": "Compression-ignition engine- Marine, operated within 76 to 100% of load range", + "intended_use": true + }, + { + "end_use_type_id": 25, + "type": "Compression-ignition engine- Marine, with methane slip reduction kit- General", + "intended_use": true + }, + { + "end_use_type_id": 26, + "type": "Compression-ignition engine- Marine, with methane slip reduction kit- Operated within 51 to 75% of load range", + "intended_use": true + }, + { + "end_use_type_id": 27, + "type": "Compression-ignition engine- Marine, with methane slip reduction kit- Operated within 76 to 100% of load range", + "intended_use": true + }, + { + "end_use_type_id": 28, + "type": "Compression-ignition engine- Marine, unknown whether kit is installed or average operating load range", + "intended_use": true + }, + { + "end_use_type_id": 29, + "type": "Unknown engine type", + "intended_use": true + }, + { + "end_use_type_id": 30, + "type": "Other (i.e. road transportation)", + "intended_use": true } ], "unit_of_measures": [ @@ -454,6 +498,69 @@ "additional_uci_id": 9, "uom_id": 5, "intensity": 0 + }, + { + "additional_uci_id": 10, + "fuel_type_id": 7, + "uom_id": 5, + "end_use_type_id": 22, + "intensity": 27.3 + }, + { + "additional_uci_id": 11, + "fuel_type_id": 7, + "uom_id": 5, + "end_use_type_id": 23, + "intensity": 17.8 + }, + { + "additional_uci_id": 12, + "fuel_type_id": 7, + "uom_id": 5, + "end_use_type_id": 24, + "intensity": 12.2 + }, + { + "additional_uci_id": 13, + "fuel_type_id": 7, + "uom_id": 5, + "end_use_type_id": 25, + "intensity": 10.6 + }, + { + "additional_uci_id": 14, + "fuel_type_id": 7, + "uom_id": 5, + "end_use_type_id": 26, + "intensity": 8.4 + }, + { + "additional_uci_id": 15, + "fuel_type_id": 7, + "uom_id": 5, + "end_use_type_id": 27, + "intensity": 8.0 + }, + { + "additional_uci_id": 16, + "fuel_type_id": 7, + "uom_id": 5, + "end_use_type_id": 28, + "intensity": 27.3 + }, + { + "additional_uci_id": 17, + "fuel_type_id": 7, + "uom_id": 5, + "end_use_type_id": 29, + "intensity": 27.3 + }, + { + "additional_uci_id": 18, + "fuel_type_id": 7, + "uom_id": 5, + "end_use_type_id": 30, + "intensity": 0 } ], "eers": [ @@ -618,6 +725,69 @@ "fuel_category_id": 3, "fuel_type_id": 11, "ratio": 1.0 + }, + { + "eer_id": 25, + "fuel_category_id": 2, + "fuel_type_id": 7, + "end_use_type_id": 22, + "ratio": 1.0 + }, + { + "eer_id": 26, + "fuel_category_id": 2, + "fuel_type_id": 7, + "end_use_type_id": 23, + "ratio": 1.0 + }, + { + "eer_id": 27, + "fuel_category_id": 2, + "fuel_type_id": 7, + "end_use_type_id": 24, + "ratio": 1.0 + }, + { + "eer_id": 28, + "fuel_category_id": 2, + "fuel_type_id": 7, + "end_use_type_id": 25, + "ratio": 1.0 + }, + { + "eer_id": 29, + "fuel_category_id": 2, + "fuel_type_id": 7, + "end_use_type_id": 26, + "ratio": 1.0 + }, + { + "eer_id": 30, + "fuel_category_id": 2, + "fuel_type_id": 7, + "end_use_type_id": 27, + "ratio": 1.0 + }, + { + "eer_id": 31, + "fuel_category_id": 2, + "fuel_type_id": 7, + "end_use_type_id": 28, + "ratio": 1.0 + }, + { + "eer_id": 32, + "fuel_category_id": 2, + "fuel_type_id": 7, + "end_use_type_id": 29, + "ratio": 0.9 + }, + { + "eer_id": 33, + "fuel_category_id": 2, + "fuel_type_id": 7, + "end_use_type_id": 30, + "ratio": 0.9 } ], "energy_densities": [ @@ -1027,4 +1197,4 @@ "display_order": 4 } ] -} +} \ No newline at end of file From 005ef68c35bc3348550ff34b0bce16f3c12ecec4 Mon Sep 17 00:00:00 2001 From: Kevin Hashimoto Date: Tue, 3 Dec 2024 09:43:18 -0800 Subject: [PATCH 2/4] chore: clean up IDs --- .../db/seeders/common/seed_fuel_data.json | 207 +++++------------- 1 file changed, 51 insertions(+), 156 deletions(-) diff --git a/backend/lcfs/db/seeders/common/seed_fuel_data.json b/backend/lcfs/db/seeders/common/seed_fuel_data.json index fb71fc4f4..a3e7cde3a 100644 --- a/backend/lcfs/db/seeders/common/seed_fuel_data.json +++ b/backend/lcfs/db/seeders/common/seed_fuel_data.json @@ -327,86 +327,51 @@ }, { "end_use_type_id": 14, - "type": "Marine", - "sub_type": "General", - "intended_use": true - }, - { - "end_use_type_id": 15, - "type": "Marine", - "sub_type": "Operated within 51 to 75% of load range" - }, - { - "end_use_type_id": 16, - "type": "Marine", - "sub_type": "Operated within 76 to 100% of load range" - }, - { - "end_use_type_id": 17, - "type": "Marine, w/ methane slip reduction kit", - "sub_type": "General" - }, - { - "end_use_type_id": 18, - "type": "Marine, w/ methane slip reduction kit", - "sub_type": "Operated within 51 to 75% of load range" - }, - { - "end_use_type_id": 19, - "type": "Marine, w/ methane slip reduction kit", - "sub_type": "Operated within 76 to 100% of load range" - }, - { - "end_use_type_id": 20, - "type": "Unknown" - }, - { - "end_use_type_id": 21, "type": "Aircraft", "intended_use": true }, { - "end_use_type_id": 22, + "end_use_type_id": 15, "type": "Compression-ignition engine- Marine, general", "intended_use": true }, { - "end_use_type_id": 23, + "end_use_type_id": 16, "type": "Compression-ignition engine- Marine, operated within 51 to 75% of load range", "intended_use": true }, { - "end_use_type_id": 24, + "end_use_type_id": 17, "type": "Compression-ignition engine- Marine, operated within 76 to 100% of load range", "intended_use": true }, { - "end_use_type_id": 25, + "end_use_type_id": 18, "type": "Compression-ignition engine- Marine, with methane slip reduction kit- General", "intended_use": true }, { - "end_use_type_id": 26, + "end_use_type_id": 19, "type": "Compression-ignition engine- Marine, with methane slip reduction kit- Operated within 51 to 75% of load range", "intended_use": true }, { - "end_use_type_id": 27, + "end_use_type_id": 20, "type": "Compression-ignition engine- Marine, with methane slip reduction kit- Operated within 76 to 100% of load range", "intended_use": true }, { - "end_use_type_id": 28, + "end_use_type_id": 21, "type": "Compression-ignition engine- Marine, unknown whether kit is installed or average operating load range", "intended_use": true }, { - "end_use_type_id": 29, + "end_use_type_id": 22, "type": "Unknown engine type", "intended_use": true }, { - "end_use_type_id": 30, + "end_use_type_id": 23, "type": "Other (i.e. road transportation)", "intended_use": true } @@ -443,61 +408,61 @@ "additional_uci_id": 1, "fuel_type_id": 7, "uom_id": 5, - "end_use_type_id": 14, - "intensity": 27.3 + "intensity": 0 }, { "additional_uci_id": 2, - "fuel_type_id": 7, "uom_id": 5, - "end_use_type_id": 15, - "intensity": 17.8 + "intensity": 0 }, { "additional_uci_id": 3, "fuel_type_id": 7, "uom_id": 5, - "end_use_type_id": 16, - "intensity": 12.2 + "end_use_type_id": 15, + "intensity": 27.3 }, { "additional_uci_id": 4, "fuel_type_id": 7, "uom_id": 5, - "end_use_type_id": 17, - "intensity": 10.6 + "end_use_type_id": 16, + "intensity": 17.8 }, { "additional_uci_id": 5, "fuel_type_id": 7, "uom_id": 5, - "end_use_type_id": 18, - "intensity": 8.4 + "end_use_type_id": 17, + "intensity": 12.2 }, { "additional_uci_id": 6, "fuel_type_id": 7, "uom_id": 5, - "end_use_type_id": 19, - "intensity": 8.0 + "end_use_type_id": 18, + "intensity": 10.6 }, { "additional_uci_id": 7, "fuel_type_id": 7, "uom_id": 5, - "end_use_type_id": 20, - "intensity": 27.3 + "end_use_type_id": 19, + "intensity": 8.4 }, { "additional_uci_id": 8, "fuel_type_id": 7, "uom_id": 5, - "intensity": 0 + "end_use_type_id": 20, + "intensity": 8.0 }, { "additional_uci_id": 9, + "fuel_type_id": 7, "uom_id": 5, - "intensity": 0 + "end_use_type_id": 21, + "intensity": 27.3 }, { "additional_uci_id": 10, @@ -511,55 +476,6 @@ "fuel_type_id": 7, "uom_id": 5, "end_use_type_id": 23, - "intensity": 17.8 - }, - { - "additional_uci_id": 12, - "fuel_type_id": 7, - "uom_id": 5, - "end_use_type_id": 24, - "intensity": 12.2 - }, - { - "additional_uci_id": 13, - "fuel_type_id": 7, - "uom_id": 5, - "end_use_type_id": 25, - "intensity": 10.6 - }, - { - "additional_uci_id": 14, - "fuel_type_id": 7, - "uom_id": 5, - "end_use_type_id": 26, - "intensity": 8.4 - }, - { - "additional_uci_id": 15, - "fuel_type_id": 7, - "uom_id": 5, - "end_use_type_id": 27, - "intensity": 8.0 - }, - { - "additional_uci_id": 16, - "fuel_type_id": 7, - "uom_id": 5, - "end_use_type_id": 28, - "intensity": 27.3 - }, - { - "additional_uci_id": 17, - "fuel_type_id": 7, - "uom_id": 5, - "end_use_type_id": 29, - "intensity": 27.3 - }, - { - "additional_uci_id": 18, - "fuel_type_id": 7, - "uom_id": 5, - "end_use_type_id": 30, "intensity": 0 } ], @@ -656,137 +572,116 @@ "eer_id": 14, "fuel_category_id": 2, "fuel_type_id": 3, - "end_use_type_id": 14, - "ratio": 2.5 - }, - { - "eer_id": 15, - "fuel_category_id": 2, - "fuel_type_id": 3, "end_use_type_id": 10, "ratio": 2.8 }, { - "eer_id": 16, + "eer_id": 15, "fuel_category_id": 2, "fuel_type_id": 3, "end_use_type_id": 11, "ratio": 2.4 }, { - "eer_id": 17, + "eer_id": 16, "fuel_category_id": 2, "fuel_type_id": 3, "end_use_type_id": 2, "ratio": 1.0 }, { - "eer_id": 18, + "eer_id": 17, "fuel_category_id": 2, "fuel_type_id": 6, "end_use_type_id": 3, "ratio": 1.8 }, { - "eer_id": 19, + "eer_id": 18, "fuel_category_id": 2, "fuel_type_id": 6, "end_use_type_id": 2, "ratio": 0.9 }, { - "eer_id": 20, - "fuel_category_id": 2, - "fuel_type_id": 7, - "end_use_type_id": 12, - "ratio": 1.0 - }, - { - "eer_id": 21, - "fuel_category_id": 2, - "fuel_type_id": 7, - "end_use_type_id": 2, - "ratio": 0.9 - }, - { - "eer_id": 22, + "eer_id": 19, "fuel_category_id": 2, "fuel_type_id": 13, "ratio": 0.9 }, { - "eer_id": 23, + "eer_id": 20, "fuel_category_id": 3, "fuel_type_id": 3, "ratio": 2.5 }, { - "eer_id": 24, + "eer_id": 21, "fuel_category_id": 3, "fuel_type_id": 11, "ratio": 1.0 }, { - "eer_id": 25, + "eer_id": 22, "fuel_category_id": 2, "fuel_type_id": 7, - "end_use_type_id": 22, + "end_use_type_id": 15, "ratio": 1.0 }, { - "eer_id": 26, + "eer_id": 23, "fuel_category_id": 2, "fuel_type_id": 7, - "end_use_type_id": 23, + "end_use_type_id": 16, "ratio": 1.0 }, { - "eer_id": 27, + "eer_id": 24, "fuel_category_id": 2, "fuel_type_id": 7, - "end_use_type_id": 24, + "end_use_type_id": 17, "ratio": 1.0 }, { - "eer_id": 28, + "eer_id": 25, "fuel_category_id": 2, "fuel_type_id": 7, - "end_use_type_id": 25, + "end_use_type_id": 18, "ratio": 1.0 }, { - "eer_id": 29, + "eer_id": 26, "fuel_category_id": 2, "fuel_type_id": 7, - "end_use_type_id": 26, + "end_use_type_id": 19, "ratio": 1.0 }, { - "eer_id": 30, + "eer_id": 27, "fuel_category_id": 2, "fuel_type_id": 7, - "end_use_type_id": 27, + "end_use_type_id": 20, "ratio": 1.0 }, { - "eer_id": 31, + "eer_id": 28, "fuel_category_id": 2, "fuel_type_id": 7, - "end_use_type_id": 28, + "end_use_type_id": 21, "ratio": 1.0 }, { - "eer_id": 32, + "eer_id": 29, "fuel_category_id": 2, "fuel_type_id": 7, - "end_use_type_id": 29, + "end_use_type_id": 22, "ratio": 0.9 }, { - "eer_id": 33, + "eer_id": 30, "fuel_category_id": 2, "fuel_type_id": 7, - "end_use_type_id": 30, + "end_use_type_id": 23, "ratio": 0.9 } ], From dca410877dff97a02a6f7bd0278a3c63566d23ec Mon Sep 17 00:00:00 2001 From: Kevin Hashimoto Date: Tue, 3 Dec 2024 09:46:16 -0800 Subject: [PATCH 3/4] fix: end use col width --- frontend/src/views/FuelSupplies/_schema.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/FuelSupplies/_schema.jsx b/frontend/src/views/FuelSupplies/_schema.jsx index 4984dc813..7273986b8 100644 --- a/frontend/src/views/FuelSupplies/_schema.jsx +++ b/frontend/src/views/FuelSupplies/_schema.jsx @@ -251,7 +251,7 @@ export const fuelSupplyColDefs = (optionsData, errors, warnings) => [ } return true }, - minWidth: 260 + minWidth: 400 }, { field: 'provisionOfTheAct', From 9abdf7db1ff04f11ba50f59fd7afea8177be8b0a Mon Sep 17 00:00:00 2001 From: Kevin Hashimoto Date: Tue, 3 Dec 2024 09:50:22 -0800 Subject: [PATCH 4/4] fix: col width for exports --- frontend/src/views/FuelExports/_schema.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/FuelExports/_schema.jsx b/frontend/src/views/FuelExports/_schema.jsx index 3be0ee533..8478ed0cd 100644 --- a/frontend/src/views/FuelExports/_schema.jsx +++ b/frontend/src/views/FuelExports/_schema.jsx @@ -279,7 +279,7 @@ export const fuelExportColDefs = (optionsData, errors) => [ } return true }, - minWidth: 260 + minWidth: 400 }, { field: 'provisionOfTheAct',