diff --git a/etl/eligibility/ha_15_32/ha_analysis_batch_3.py b/etl/eligibility/ha_15_32/ha_analysis_batch_3.py index ec9469dc..0daf239b 100644 --- a/etl/eligibility/ha_15_32/ha_analysis_batch_3.py +++ b/etl/eligibility/ha_15_32/ha_analysis_batch_3.py @@ -2926,9 +2926,10 @@ def forecast_remaining_sales(loader): ) # Calculate the delta compared to Warmfront's original estimate - eco4_delta_vs_original_estimate = 100 * ( - eco4_post_ciga_total_results["ECO4 - post CIGA - #"] - original_warmfront_eco4 - ) / original_warmfront_eco4 + eco4_delta_vs_original_estimate = ( + eco4_post_ciga_total_results[ + "ECO4 - post CIGA - #"] - original_warmfront_eco4 + ) / original_warmfront_eco4 eco4_post_ciga_remaining_results = calculate_eco4_post_ciga( eligiblity_counts=eligiblity_counts_remaining, @@ -2967,11 +2968,11 @@ def forecast_remaining_sales(loader): # GBIS delta if original_warmfront_gbis == 0: - gbis_delta_vs_original_estimate = 100 * gbis_total + gbis_delta_vs_original_estimate = gbis_total else: - gbis_delta_vs_original_estimate = 100 * ( - gbis_total - original_warmfront_gbis - ) / original_warmfront_gbis + gbis_delta_vs_original_estimate = ( + gbis_total - original_warmfront_gbis + ) / original_warmfront_gbis to_append = { ("", "", "", "HA Name"): ha_name, @@ -3125,27 +3126,23 @@ def forecast_remaining_sales(loader): }, { ("", "", "", "HA Name"): "ECO4 Remaining - November - #", - ("", "Original Warmfront estimate", "Total - #", "ECO4 - November"): str( - headline_eco4_original_remaining - ) + ("", "Original Warmfront estimate", "Total - #", "ECO4 - November"): headline_eco4_original_remaining + }, { ("", "", "", "HA Name"): "ECO4 Remaining - November - £", - ("", "Original Warmfront estimate", "Total - #", "ECO4 - November"): "£" + str( - headline_eco4_original_remaining_revenue - ) + ( + "", "Original Warmfront estimate", "Total - #", + "ECO4 - November"): headline_eco4_original_remaining_revenue }, { ("", "", "", "HA Name"): "ECO4 Remaining - postcode list - #", - ("", "Original Warmfront estimate", "Total - #", "ECO4 - November"): str( - headline_eco4_postcode_list_remaining - ) + ("", "Original Warmfront estimate", "Total - #", "ECO4 - November"): headline_eco4_postcode_list_remaining }, { ("", "", "", "HA Name"): "ECO4 Remaining - postcode list - £", - ("", "Original Warmfront estimate", "Total - #", "ECO4 - November"): "£" + str( - headline_eco4_postcode_list_remaining_revenue - ) + ("", "Original Warmfront estimate", "Total - #", + "ECO4 - November"): headline_eco4_postcode_list_remaining_revenue }, { ("", "", "", "HA Name"): "ECO4 delta %", @@ -3153,27 +3150,22 @@ def forecast_remaining_sales(loader): }, { ("", "", "", "HA Name"): "GBIS Remaining - November - #", - ("", "Original Warmfront estimate", "Total - #", "ECO4 - November"): str( - headline_gbis_original_remaining - ) + ("", "Original Warmfront estimate", "Total - #", "ECO4 - November"): headline_gbis_original_remaining }, { ("", "", "", "HA Name"): "GBIS Remaining - November - £", - ("", "Original Warmfront estimate", "Total - #", "ECO4 - November"): "£" + str( - headline_gbis_original_remaining_revenue - ) + ( + "", "Original Warmfront estimate", "Total - #", + "ECO4 - November"): headline_gbis_original_remaining_revenue }, { ("", "", "", "HA Name"): "GBIS Remaining - post code list - #", - ("", "Original Warmfront estimate", "Total - #", "ECO4 - November"): str( - headline_gbis_postcode_list_remaining - ) + ("", "Original Warmfront estimate", "Total - #", "ECO4 - November"): headline_gbis_postcode_list_remaining }, { ("", "", "", "HA Name"): "GBIS Remaining - post code list - £", - ("", "Original Warmfront estimate", "Total - #", "ECO4 - November"): "£" + str( - headline_gbis_postcode_list_remaining_revenue - ) + ("", "Original Warmfront estimate", "Total - #", + "ECO4 - November"): headline_gbis_postcode_list_remaining_revenue }, { ("", "", "", "HA Name"): "GBIS delta %", @@ -3182,15 +3174,13 @@ def forecast_remaining_sales(loader): # Total revenue { ("", "", "", "HA Name"): "Total Remaining - November - £", - ("", "Original Warmfront estimate", "Total - #", "ECO4 - November"): "£" + str( - headline_original_total_revenue_remaining - ) + ("", "Original Warmfront estimate", "Total - #", + "ECO4 - November"): headline_original_total_revenue_remaining }, { ("", "", "", "HA Name"): "Total Remaining - post code list - £", - ("", "Original Warmfront estimate", "Total - #", "ECO4 - November"): "£" + str( - headline_postcode_list_total_revenue_remaining - ) + ("", "Original Warmfront estimate", "Total - #", + "ECO4 - November"): headline_postcode_list_total_revenue_remaining }, { ("", "", "", "HA Name"): "Total Remaining delta %",