Update app/component_selection.py

app/component_selection.py

@@ -77,8 +77,8 @@ class BuildingComponent:
 @dataclass
 class Wall(BuildingComponent):
     wall_type: str = "Brick"
-    wall_group: str = "Wall"  # Changed from B/C to Wall for visualization
-    shading_percentage: float = 0.0  # New attribute for shading percentage
+    wall_group: str = "Wall"
+    shading_percentage: float = 0.0
 
     def __post_init__(self):
         super().__post_init__()
@@ -380,7 +380,7 @@ class ComponentSelectionInterface:
             if "add_wall_submitted" not in session_state:
                 session_state.add_wall_submitted = False
             
-            with st.form("add_wall_form", clear_on_submit=True):  # Clear form on submit
+            with st.form("add_wall_form", clear_on_submit=True):
                 col1, col2 = st.columns(2)
                 with col1:
                     name = st.text_input("Name", "New Wall")
@@ -392,10 +392,10 @@ class ComponentSelectionInterface:
                     selected_wall = st.selectbox("Select Wall Type", options=list(wall_options.keys()), key="wall_type_select")
                     component = wall_options[selected_wall]
                     # Update U-value immediately when wall type changes
-                    if "selected_wall" not in session_state or session_state.selected_wall != selected_wall:
-                        session_state.selected_wall = selected_wall
+                    if "prev_selected_wall" not in session_state or session_state.prev_selected_wall != selected_wall:
+                        session_state.prev_selected_wall = selected_wall
                         session_state.u_value = component.u_value
-                    u_value = st.number_input("U-Value (W/m²·K)", min_value=0.0, max_value=9.0, value=session_state.get("u_value", component.u_value), step=0.01)
+                    u_value = st.number_input("U-Value (W/m²·K)", min_value=0.0, max_value=9.0, value=float(session_state.u_value), step=0.01, key=f"u_value_{selected_wall}")
                     shading_percentage = st.slider("Shading Percentage (%)", min_value=0.0, max_value=100.0, value=0.0, step=5.0)
                 
                 submitted = st.form_submit_button("Add Wall")
@@ -430,8 +430,10 @@ class ComponentSelectionInterface:
                     df = pd.read_csv(uploaded_file)
                 else:  # .xlsx
                     df = pd.read_excel(uploaded_file)
-                if not all(col in df.columns for col in required_cols):
-                    st.error("File must contain all required columns!")
+                # Normalize column names for comparison
+                df.columns = [col.strip() for col in df.columns]
+                if not all(col in [c.strip() for c in df.columns] for col in required_cols):
+                    st.error(f"File must contain all required columns: {', '.join(required_cols)}")
                 else:
                     # Overwrite existing walls
                     session_state.components['walls'] = []
@@ -441,10 +443,10 @@ class ComponentSelectionInterface:
                     for _, row in df.iterrows():
                         try:
                             new_wall = Wall(
-                                id=str(uuid.uuid4()), name=row["Name"], u_value=row["U-Value (W/m²·K)"],
-                                area=row["Area (m²)"], orientation=Orientation(row["Orientation"]),
+                                id=str(uuid.uuid4()), name=row["Name"], u_value=float(row["U-Value (W/m²·K)"]),
+                                area=float(row["Area (m²)"]), orientation=Orientation(row["Orientation"]),
                                 wall_type=row["Wall Type"], wall_group="Wall",
-                                shading_percentage=row["Shading (%)"]
+                                shading_percentage=float(row["Shading (%)"])
                             )
                             self.component_library.add_component(new_wall)
                             session_state.components['walls'].append(new_wall)
@@ -455,7 +457,7 @@ class ComponentSelectionInterface:
             # Provide a downloadable template
             template_df = pd.DataFrame(columns=required_cols)
             buffer = io.BytesIO()
-            template_df.to_csv(buffer, index=False)
+            template_df.to_csv(buffer, index=False, encoding='utf-8')
             st.download_button(
                 label="Download Wall Template (CSV)",
                 data=buffer.getvalue(),
@@ -470,7 +472,7 @@ class ComponentSelectionInterface:
         if f"add_{type_name}_submitted" not in session_state:
             session_state[f"add_{type_name}_submitted"] = False
         
-        with st.form(f"add_{type_name}_form", clear_on_submit=True):  # Clear form on submit
+        with st.form(f"add_{type_name}_form", clear_on_submit=True):
             col1, col2 = st.columns(2)
             with col1:
                 name = st.text_input("Name", f"New {type_name.capitalize()}")
@@ -591,25 +593,50 @@ class ComponentSelectionInterface:
         
         df = pd.DataFrame(data)
         display_cols = [col for col in df.columns if col != "ID"]
-        st.dataframe(df[display_cols], use_container_width=True)
         
-        for i, row in df.iterrows():
-            col1, col2 = st.columns([5, 1])  # Adjusted column widths for better alignment
-            with col1:
-                st.write("")  # Placeholder to align with table row
-            with col2:
-                if st.button("Delete", key=f"delete_{row['ID']}"):
+        if component_type == ComponentType.WALL:
+            st.write("Walls Table:")
+            headers = display_cols
+            st.table([headers])  # Display headers
+            for i, row in df.iterrows():
+                cols = st.columns([1, 1, 1, 1, 1, 1, 1, 1])  # 7 columns + 1 for delete
+                cols[0].write(row["Name"])
+                cols[1].write(row["Area (m²)"])
+                cols[2].write(row["U-Value (W/m²·K)"])
+                cols[3].write(row["Orientation"])
+                cols[4].write(row["Wall Type"])
+                cols[5].write(row["Group"])
+                cols[6].write(row["Shading (%)"])
+                if cols[7].button("Delete", key=f"delete_{row['ID']}"):
                     if not row["ID"].startswith("preset_"):
                         self.component_library.remove_component(row["ID"])
-                        session_state.components[type_name + 's'] = [c for c in components if c.id != row["ID"]]
+                        session_state.components['walls'] = [c for c in components if c.id != row["ID"]]
                         st.success(f"Deleted {row['Name']}")
                         st.rerun()
                     else:
                         st.warning("Cannot delete preset components.")
-        
-        if component_type == ComponentType.WALL:
-            csv = df[display_cols].to_csv(index=False, encoding='utf-8')
-            st.download_button(label="Download Walls Table", data=csv, file_name="walls_table.csv", mime="text/csv")
+            # Download walls table as CSV with correct headings
+            csv_df = df[display_cols]
+            csv_buffer = io.BytesIO()
+            csv_df.to_csv(csv_buffer, index=False, encoding='utf-8')
+            st.download_button(label="Download Walls Table", data=csv_buffer.getvalue(), file_name="walls_table.csv", mime="text/csv")
+        else:
+            st.dataframe(df[display_cols], use_container_width=True)
+            for i, row in df.iterrows():
+                col1, col2 = st.columns(2)
+                with col1:
+                    if st.button("Edit", key=f"edit_{row['ID']}"):
+                        session_state[f"edit_{type_name}"] = row["ID"]
+                        st.rerun()
+                with col2:
+                    if st.button("Delete", key=f"delete_{row['ID']}"):
+                        if not row["ID"].startswith("preset_"):
+                            self.component_library.remove_component(row["ID"])
+                            session_state.components[type_name + 's'] = [c for c in components if c.id != row["ID"]]
+                            st.success(f"Deleted {row['Name']}")
+                            st.rerun()
+                        else:
+                            st.warning("Cannot delete preset components.")
         
         if f"edit_{type_name}" in session_state and component_type != ComponentType.WALL:
             self._display_edit_component_form(session_state, component_type, session_state[f"edit_{type_name}"])