Skip to content

Commit 700bf8e

Browse files
authored
Merge pull request #2950 from bcgov/release-v1.1.0
Hotifx: fse export name fixes
2 parents 7a61b66 + a841d6f commit 700bf8e

File tree

1 file changed

+20
-5
lines changed
  • backend/lcfs/web/api/compliance_report

1 file changed

+20
-5
lines changed

backend/lcfs/web/api/compliance_report/export.py

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -682,13 +682,28 @@ async def _load_fse_data(self, cid, is_quarterly) -> List[List[Any]]:
682682
self._format_date(fse.supply_from_date),
683683
self._format_date(fse.supply_to_date),
684684
fse.kwh_usage,
685-
fse.serial_number,
685+
fse.serial_nbr,
686686
fse.manufacturer,
687687
fse.model,
688-
fse.level_of_equipment,
689-
fse.port_count,
690-
fse.intended_use_types,
691-
fse.intended_user_types,
688+
fse.level_of_equipment.name if fse.level_of_equipment else None,
689+
fse.ports,
690+
(
691+
", ".join(
692+
[use_type.type for use_type in fse.intended_use_types]
693+
)
694+
if fse.intended_use_types
695+
else None
696+
),
697+
(
698+
", ".join(
699+
[
700+
user_type.type_name
701+
for user_type in fse.intended_user_types
702+
]
703+
)
704+
if fse.intended_user_types
705+
else None
706+
),
692707
fse.street_address,
693708
fse.city,
694709
fse.postal_code,

0 commit comments

Comments
 (0)