diff --git a/etl/customers/thrive/Programme Analysis.py b/etl/customers/thrive/Programme Analysis.py index a8f0d920..521cfd30 100644 --- a/etl/customers/thrive/Programme Analysis.py +++ b/etl/customers/thrive/Programme Analysis.py @@ -95,3 +95,20 @@ missed_properties["ECO Eligibility"] = "Property Not Inspected" missed_properties["Data Source"] = "Thrive Tracker" master_list = pd.concat([missed_properties, original_asset_list], ignore_index=True) + +# We were provided with a data update for a sample of properties. We update the data with this information +data_update = pd.read_excel( + "/Users/khalimconn-kowlessar/Documents/hestia/Customers/Thrive/Programme Reconciliation/Thrive Property List " + "13_05.xlsx", + header=0 +) + +new_properties = data_update[~data_update["UPRN"].isin(master_list["thrive_property_id"].astype(str).values)] + + + +data_update = = data_update[["UPRN", ""]] + +# TODO: Flag the Thrive priorities and create a separate project code for these +# TODO: Add the general project code +# TODO: Add the thrive \ No newline at end of file diff --git a/recommendations/Costs.py b/recommendations/Costs.py index b45520ae..e32278c5 100644 --- a/recommendations/Costs.py +++ b/recommendations/Costs.py @@ -625,10 +625,8 @@ class Costs: subtotal_before_profit = material_cost + labour_cost contingency_cost = subtotal_before_profit * contingency - preliminaries_cost = subtotal_before_profit * self.PRELIMINARIES - profit_cost = subtotal_before_profit * self.PROFIT_MARGIN - subtotal_before_vat = subtotal_before_profit + contingency_cost + preliminaries_cost + profit_cost + subtotal_before_vat = subtotal_before_profit + contingency_cost vat_cost = subtotal_before_vat * self.VAT_RATE total_cost = subtotal_before_vat + vat_cost