Skip to content

Commit 8b2f47a

Browse files
fix line item rendering display
1 parent 83ba805 commit 8b2f47a

2 files changed

Lines changed: 181 additions & 216 deletions

File tree

src/geophires_x/EconomicsSamCalculations.py

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -282,51 +282,17 @@ def _insert_blank_line_before(before_row_name: str) -> None:
282282

283283
REVENUE_CATEGORY_ROW_NAME = 'REVENUE'
284284
ENERGY_CATEGORY_ROW_NAME = 'ENERGY'
285-
CAPACITY_PAYMENT_REVENUE_ROW_NAME = 'Capacity payment revenue ($)'
286-
287-
_insert_blank_line_before(REVENUE_CATEGORY_ROW_NAME)
288-
# _insert_blank_line_before(CAPACITY_PAYMENT_REVENUE_ROW_NAME)
289285

290286
def _for_operational_years(_row: list[Any]) -> list[Any]:
291287
return [*([''] * (self._pre_revenue_years_count - 1)), 0, *_row]
292288

293289
_insert_row_before(
294290
REVENUE_CATEGORY_ROW_NAME,
295-
f'{self.s_dac_carbon_extracted_annually.Name} ({self.s_dac_carbon_extracted_annually.CurrentUnits})',
291+
f'{self.s_dac_carbon_extracted_annually.Name} ({self.s_dac_carbon_extracted_annually.CurrentUnits.value})',
296292
_for_operational_years(self.s_dac_carbon_extracted_annually.value),
297293
)
298294
_insert_blank_line_before(REVENUE_CATEGORY_ROW_NAME)
299295

300-
# for i, capacity_payment_revenue_source in enumerate([None]):
301-
# if capacity_payment_revenue_source.amount_provided_label is not None:
302-
#
303-
#
304-
# revenue_row_name = f'{capacity_payment_revenue_source.name} revenue ($)'
305-
# _insert_row_before(
306-
# CAPACITY_PAYMENT_REVENUE_ROW_NAME,
307-
# revenue_row_name,
308-
# _for_operational_years(capacity_payment_revenue_source.revenue_usd),
309-
# )
310-
#
311-
# if capacity_payment_revenue_source.price_label is not None:
312-
# _insert_row_before(
313-
# revenue_row_name,
314-
# capacity_payment_revenue_source.price_label.replace('USD', '$'),
315-
# capacity_payment_revenue_source.price,
316-
# )
317-
#
318-
# if len(self.capacity_payment_revenue_sources) > 1 and i < len(self.capacity_payment_revenue_sources) - 1:
319-
# _insert_row_before(
320-
# CAPACITY_PAYMENT_REVENUE_ROW_NAME,
321-
# 'plus:',
322-
# ['' for _it in ret[_get_row_index(revenue_row_name)]][1:],
323-
# )
324-
#
325-
# if len(self.capacity_payment_revenue_sources) > 0:
326-
# _insert_row_before(
327-
# CAPACITY_PAYMENT_REVENUE_ROW_NAME, 'equals:', ['' for _it in ret[_get_row_index(revenue_row_name)]][1:]
328-
# )
329-
330296
return ret
331297

332298
def _insert_calculated_levelized_metrics_line_items(self, cf_ret: list[list[Any]]) -> list[list[Any]]:

0 commit comments

Comments
 (0)