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

Merge pull request #442 from Hestia-Homes/remote-assessment-api

Browse source 
Fixing bug when updating lighting cost calcs
This commit is contained in:
KhalimCK 2025-05-16 15:46:50 +01:00 • committed by GitHub
commit 7992218f0b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
recommendations/Costs.py
View file

@ -639,9 +639,7 @@ class Costs:
"subtotal": subtotal_before_vat,
"vat": vat_cost,
"contingency": contingency_cost,
"preliminaries": preliminaries_cost,
"material": material_cost,
"profit": profit_cost,
"labour_hours": labour_hours,
"labour_days": labour_days,
"labour_cost": labour_cost

20
recommendations/tests/test_lighting_recommendations.py
View file

@ -44,15 +44,11 @@ class TestLightingRecommendations:
{'phase': 0, 'parts': [], 'type': 'low_energy_lighting', 'measure_type': 'low_energy_lighting',
'description': 'Install low energy lighting in 4 outlets', 'starting_u_value': None, 'new_u_value': None,
'already_installed': False, 'sap_points': 0.4, 'kwh_savings': 219.0, 'energy_cost_savings': 54.4434,
'co2_equivalent_savings': 0.035478, 'description_simulation': {
'lighting-energy-eff': 'Very Good',
'lighting-description': 'Low energy '
'lighting in all '
'fixed outlets',
'low-energy-lighting': 100
},
'total': 240.24,
'subtotal': 200.20000000000002, 'vat': 40.040000000000006, 'contingency': 14.3, 'preliminaries': 14.3,
'material': 80.0, 'profit': 28.6, 'labour_hours': 3.2, 'labour_days': 0.4, 'labour_cost': 63.0,
'survey': False}
]
'co2_equivalent_savings': 0.035478, 'description_simulation': {'lighting-energy-eff': 'Very Good',
'lighting-description': 'Low energy '
'lighting in all '
'fixed outlets',
'low-energy-lighting': 100},
'total': 240.24, 'subtotal': 200.20000000000002, 'vat': 40.040000000000006, 'contingency': 14.3,
'preliminaries': 14.3, 'material': 80.0, 'profit': 28.6, 'labour_hours': 3.2, 'labour_days': 0.4,
'labour_cost': 63.0, 'survey': False}]