diff --git a/recommendations/Costs.py b/recommendations/Costs.py index e32278c5..96eb5d0e 100644 --- a/recommendations/Costs.py +++ b/recommendations/Costs.py @@ -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 diff --git a/recommendations/tests/test_lighting_recommendations.py b/recommendations/tests/test_lighting_recommendations.py index 4b1e1d84..dbb621e7 100644 --- a/recommendations/tests/test_lighting_recommendations.py +++ b/recommendations/tests/test_lighting_recommendations.py @@ -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}]