Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-10 01:41:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

UoM and unit rates are now shown for schedule of rates in costing

Browse Source
This commit is contained in:
Dion Moult
2021-08-17 09:44:43 +10:00
parent 2284f7b16e
commit f2aec9440f
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcopenshell-python/ifcopenshell/api/cost/data.py
+4 -3
View File
@@ -111,19 +111,20 @@ class Data:
data["TotalAppliedValue"] = 0.0
data["CategoryValues"] = {}
for cost_value in cost_item.CostValues or []:
cls.load_cost_item_value(data, cost_item, cost_value)
cls.load_cost_item_value(cost_item, data, cost_value)
data["CostValues"].append(cost_value.id())
data["TotalAppliedValue"] += cls.cost_values[cost_value.id()]["AppliedValue"]
data["TotalCostValue"] = data["TotalCostQuantity"] * data["TotalAppliedValue"]
@classmethod
def load_cost_item_value(cls, cost_item_data, cost_item, cost_value):
def load_cost_item_value(cls, cost_item, cost_item_data, cost_value):
value_data = cost_value.get_info()
del value_data["AppliedValue"]
if value_data["UnitBasis"]:
data = cost_value.UnitBasis.get_info()
data["ValueComponent"] = data["ValueComponent"].wrappedValue
data["UnitComponent"] = data["UnitComponent"].id()
data["UnitSymbol"] = ifcopenshell.util.unit.get_unit_symbol(cost_value.UnitBasis.UnitComponent)
value_data["UnitBasis"] = data
if value_data["ApplicableDate"]:
value_data["ApplicableDate"] = ifcopenshell.util.date.ifc2datetime(value_data["ApplicableDate"])
@@ -138,7 +139,7 @@ class Data:
cls.cost_values[cost_value.id()] = value_data
for component in cost_value.Components or []:
cls.load_cost_item_value(cost_item_data, cost_item, component)
cls.load_cost_item_value(cost_item, cost_item_data, component)
@classmethod
def calculate_applied_value(cls, cost_item, cost_value, category_filter=None):