junte/Model
1
0
Fork 0
mirror of https://github.com/Hestia-Homes/Model.git synced 2026-06-08 11:17:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updating costing methodology for leds

Browse source
This commit is contained in:
Khalim Conn-Kowlessar 2025-05-16 15:37:27 +01:00
parent cf00d38b15
commit 714d675c8d
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
etl/customers/thrive/Programme Analysis.py
View file

@ -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

4
recommendations/Costs.py
View file

@ -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