From 8b9927b77bacc34beb3ac4b7a03e6f3ff7e36715 Mon Sep 17 00:00:00 2001
From: Massimo Fabbro <maxfb87@yahoo.it>
Date: Sun, 8 Jun 2025 10:21:15 +0200
Subject: [PATCH] See #6570. Better variable name

---
 src/bonsai/bonsai/bim/module/cost/__init__.py |  2 +-
 src/bonsai/bonsai/bim/module/cost/prop.py     | 10 +++++-----
 src/bonsai/bonsai/bim/module/cost/ui.py       |  4 ++--
 src/bonsai/bonsai/tool/cost.py                | 10 +++++-----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/bonsai/bonsai/bim/module/cost/__init__.py b/src/bonsai/bonsai/bim/module/cost/__init__.py
index 9873bb1646..8f53f85015 100644
--- a/src/bonsai/bonsai/bim/module/cost/__init__.py
+++ b/src/bonsai/bonsai/bim/module/cost/__init__.py
@@ -84,7 +84,7 @@ classes = (
     prop.CostItem,
     prop.CostItemQuantity,
     prop.CostItemType,
-    prop.CostItemsMapping,
+    prop.CostSchedulesMapping,
     prop.ScheduleColumn,
     prop.BIMCostProperties,
     ui.BIM_PT_cost_schedules,
diff --git a/src/bonsai/bonsai/bim/module/cost/prop.py b/src/bonsai/bonsai/bim/module/cost/prop.py
index 67be31c303..fd10660720 100644
--- a/src/bonsai/bonsai/bim/module/cost/prop.py
+++ b/src/bonsai/bonsai/bim/module/cost/prop.py
@@ -175,12 +175,12 @@ class CostItemQuantity(PropertyGroup):
         total_cost_quantity: float
 
 
-class CostItemsMapping(PropertyGroup):
-    cost_item_id: IntProperty(name="cost_item_id")
+class CostSchedulesMapping(PropertyGroup):
+    cost_schedule_id: IntProperty(name="cost_schedule_id")
     csv_filepath: StringProperty(name="filepath")
 
     if TYPE_CHECKING:
-        cost_item_id: int
+        cost_schedule_id: int
         csv_filepath: str
 
 
@@ -289,7 +289,7 @@ class BIMCostProperties(PropertyGroup):
     custom_currency: StringProperty(
         name="Custom Currency", default="USD", description="Custom Currency in ISO 4217 format"
     )
-    cost_schedule_files: CollectionProperty(name="Cost Schedule Files", type=CostItemsMapping)
+    cost_schedule_files: CollectionProperty(name="Cost Schedule Files", type=CostSchedulesMapping)
 
     if TYPE_CHECKING:
         cost_schedule_predefined_types: str
@@ -344,7 +344,7 @@ class BIMCostProperties(PropertyGroup):
         show_cost_item_operators: bool
         currency: str
         custom_currency: str
-        cost_schedule_files: bpy.types.bpy_prop_collection_idprop[CostItemsMapping]
+        cost_schedule_files: bpy.types.bpy_prop_collection_idprop[CostSchedulesMapping]
 
     @property
     def active_cost_item(self) -> Union[CostItem, None]:
diff --git a/src/bonsai/bonsai/bim/module/cost/ui.py b/src/bonsai/bonsai/bim/module/cost/ui.py
index 664b52f264..43aab5d948 100644
--- a/src/bonsai/bonsai/bim/module/cost/ui.py
+++ b/src/bonsai/bonsai/bim/module/cost/ui.py
@@ -76,12 +76,12 @@ class BIM_PT_cost_schedules(Panel):
             col = row0.column()
             col.label(text="Linked CSV:")
             row_1 = col.row(align=True)
-            if self.props.active_cost_schedule_id in [item.cost_item_id for item in self.props.cost_schedule_files]:
+            if self.props.active_cost_schedule_id in [item.cost_schedule_id for item in self.props.cost_schedule_files]:
                 file = next(
                     (
                         item.csv_filepath
                         for item in self.props.cost_schedule_files
-                        if item.cost_item_id == self.props.active_cost_schedule_id
+                        if item.cost_schedule_id == self.props.active_cost_schedule_id
                     ),
                     None,
                 )
diff --git a/src/bonsai/bonsai/tool/cost.py b/src/bonsai/bonsai/tool/cost.py
index 566e5ece71..26e48399cc 100644
--- a/src/bonsai/bonsai/tool/cost.py
+++ b/src/bonsai/bonsai/tool/cost.py
@@ -598,9 +598,9 @@ class Cost(bonsai.core.tool.Cost):
             return
 
         props = cls.get_cost_props()
-        if not props.active_cost_schedule_id in [item.cost_item_id for item in props.cost_schedule_files]:
+        if not props.active_cost_schedule_id in [item.cost_schedule_id for item in props.cost_schedule_files]:
             item = props.cost_schedule_files.add()
-            item.cost_item_id = cost_schedule.id()
+            item.cost_schedule_id = cost_schedule.id()
             item.csv_filepath = file_path
         else:
             return
@@ -612,9 +612,9 @@ class Cost(bonsai.core.tool.Cost):
 
         props = cls.get_cost_props()
         cost_schedule_id = cost_schedule.id()
-        if cost_schedule_id in [item.cost_item_id for item in props.cost_schedule_files]:
+        if cost_schedule_id in [item.cost_schedule_id for item in props.cost_schedule_files]:
             for i, item in enumerate(props.cost_schedule_files):
-                if item.cost_item_id == cost_schedule_id:
+                if item.cost_schedule_id == cost_schedule_id:
                     props.cost_schedule_files.remove(i)
                     print(f"Cost schedule id={cost_schedule_id} csv filepath correctly removed")
                     return
@@ -637,7 +637,7 @@ class Cost(bonsai.core.tool.Cost):
         props = cls.get_cost_props()
         cost_schedule_id = props.active_cost_schedule_id
         file_path = next(
-            (item.csv_filepath for item in props.cost_schedule_files if item.cost_item_id == cost_schedule_id), None
+            (item.csv_filepath for item in props.cost_schedule_files if item.cost_schedule_id == cost_schedule_id), None
         )
         if not file_path:
             return