diff --git a/src/blenderbim/blenderbim/bim/module/cost/data.py b/src/blenderbim/blenderbim/bim/module/cost/data.py index 12af066c9d..b1a7d6f365 100644 --- a/src/blenderbim/blenderbim/bim/module/cost/data.py +++ b/src/blenderbim/blenderbim/bim/module/cost/data.py @@ -256,7 +256,7 @@ class CostSchedulesData: for cost_value in cost_item.CostValues or []: label = "{0:.2f}".format(ifcopenshell.util.cost.calculate_applied_value(cost_item, cost_value)) label += " = {}".format(ifcopenshell.util.cost.serialise_cost_value(cost_value)) - results.append({"id": cost_value.id(), "label": label}) + results.append({"id": cost_value.id(), "label": label, "name": cost_value.Name}) return results @classmethod diff --git a/src/blenderbim/blenderbim/bim/module/cost/ui.py b/src/blenderbim/blenderbim/bim/module/cost/ui.py index ae7f17da8c..e50e8e3921 100644 --- a/src/blenderbim/blenderbim/bim/module/cost/ui.py +++ b/src/blenderbim/blenderbim/bim/module/cost/ui.py @@ -42,19 +42,21 @@ class BIM_PT_cost_schedules(Panel): CostSchedulesData.load() self.props = context.scene.BIMCostProperties - row = self.layout.row(align=True) if not self.props.active_cost_schedule_id: + row = self.layout.row(align=True) if CostSchedulesData.data["total_cost_schedules"]: + row.alignment = "RIGHT" + row.operator("bim.export_cost_schedules",icon="EXPORT",text="Export All Schedules") + row = self.layout.row(align=True) row.label(text=f"{CostSchedulesData.data['total_cost_schedules']} Cost Schedules Found", icon="TEXT") else: row.label(text="No Cost Schedules found.", icon="TEXT") + row.operator("bim.add_cost_schedule", icon="ADD", text="") + row.operator("import_cost_schedule_csv.bim",icon="IMPORT",text="") for schedule in CostSchedulesData.data["schedules"]: self.draw_cost_schedule_ui(schedule) - row2 = self.layout.row() - row2.alignment = "RIGHT" - row2.operator("bim.export_cost_schedules", text="Export all", icon="EXPORT") def draw_cost_schedule_ui(self, cost_schedule): row = self.layout.row(align=True) @@ -236,6 +238,8 @@ class BIM_PT_cost_schedules(Panel): blenderbim.bim.helper.draw_attributes(self.props.cost_value_attributes, self.layout.box()) def draw_readonly_cost_value_ui(self, layout, cost_value): + if cost_value["name"]: + layout.label(text=f"{cost_value['name']}: ") if self.props.active_cost_value_id == cost_value["id"] and self.props.cost_value_editing_type == "FORMULA": layout.prop(self.props, "cost_value_formula", text="") else: