Merge branch 'release-0.2.0' into LCFS-1446-FuelCodeFeedstockTranspor…

…tMode-FnishedFuelTransportModeNotDisplayed
bcgov · Dec 17, 2024 · 6d327d8 · 6d327d8
2 parents 992dca5 + bb9e0e6
commit 6d327d8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/frontend/src/assets/locales/en/fuelExport.json b/frontend/src/assets/locales/en/fuelExport.json
@@ -12,10 +12,10 @@
   "fuelExportColLabels": {
     "complianceReportId": "Compliance Report ID",
     "fuelExportId": "Fuel export ID",
-    "fuelTypeId": "Fuel type",
+    "fuelType": "Fuel type",
     "exportDate": "Export date",
     "fuelTypeOther": "Fuel type other",
-    "fuelCategoryId": "Fuel catgory",
+    "fuelCategory": "Fuel catgory",
     "endUse": "End use",
     "provisionOfTheActId": "Determining carbon intensity",
     "fuelCode": "Fuel code",

diff --git a/frontend/src/views/FuelExports/_schema.jsx b/frontend/src/views/FuelExports/_schema.jsx
@@ -113,7 +113,7 @@ export const fuelExportColDefs = (optionsData, errors, gridReady) => [
   {
     field: 'fuelType',
     headerComponent: RequiredHeader,
-    headerName: i18n.t('fuelExport:fuelExportColLabels.fuelTypeId'),
+    headerName: i18n.t('fuelExport:fuelExportColLabels.fuelType'),
     cellEditor: AutocompleteCellEditor,
     cellRenderer: (params) =>
       params.value ||
@@ -182,7 +182,7 @@ export const fuelExportColDefs = (optionsData, errors, gridReady) => [
   {
     field: 'fuelCategory',
     headerComponent: RequiredHeader,
-    headerName: i18n.t('fuelExport:fuelExportColLabels.fuelCategoryId'),
+    headerName: i18n.t('fuelExport:fuelExportColLabels.fuelCategory'),
     cellEditor: AutocompleteCellEditor,
     cellRenderer: (params) =>
       params.value ||