Update app/component_selection.py

app/component_selection.py

@@ -422,17 +422,23 @@ class ComponentSelectionInterface:
         
         elif wall_method == "File Upload":
             st.info("Upload a CSV or Excel file with columns: Name, Area (m²), U-Value (W/m²·K), Orientation, Wall Type, Wall Group, Shading (%)")
-            uploaded_file = st.file_uploader("Upload Walls File", type=["csv", "xlsx"], key="wall_upload")
+            # Use a unique key for the file uploader to allow clearing
+            if "file_uploaded" not in session_state:
+                session_state.file_uploaded = False
+            if "uploaded_file_key" not in session_state:
+                session_state.uploaded_file_key = 0
+
+            uploaded_file = st.file_uploader("Upload Walls File", type=["csv", "xlsx"], key=f"wall_upload_{session_state.uploaded_file_key}")
             required_cols = ["Name", "Area (m²)", "U-Value (W/m²·K)", "Orientation", "Wall Type", "Wall Group", "Shading (%)"]
+            
             if uploaded_file and st.button("Process File"):
                 try:
                     if uploaded_file.name.endswith('.csv'):
-                        # Try multiple encodings to handle potential issues
                         encodings = ['utf-8', 'latin1', 'windows-1252']
                         df = None
                         for encoding in encodings:
                             try:
-                                uploaded_file.seek(0)  # Reset file pointer
+                                uploaded_file.seek(0)
                                 df = pd.read_csv(uploaded_file, encoding=encoding)
                                 break
                             except UnicodeDecodeError:
@@ -444,7 +450,6 @@ class ComponentSelectionInterface:
                     
                     # Normalize column names
                     df.columns = [col.strip() for col in df.columns]
-                    # Map "Group" to "Wall Group" if present
                     if "Group" in df.columns and "Wall Group" not in df.columns:
                         df.rename(columns={"Group": "Wall Group"}, inplace=True)
                     if not all(col in df.columns for col in required_cols):
@@ -468,9 +473,12 @@ class ComponentSelectionInterface:
                             except ValueError as e:
                                 st.error(f"Error in row: {row['Name']} - {str(e)}")
                         st.success("Walls uploaded and overwritten successfully!")
-                        st.rerun()
+                        # Clear the file uploader by incrementing the key
+                        session_state.uploaded_file_key += 1
+                        session_state.file_uploaded = True
                 except Exception as e:
                     st.error(f"Error processing file: {str(e)}")
+            
             # Provide a downloadable template
             template_df = pd.DataFrame(columns=required_cols)
             buffer = io.BytesIO()
@@ -596,7 +604,7 @@ class ComponentSelectionInterface:
         for comp in components:
             row = {"Name": comp.name, "Area (m²)": comp.area, "U-Value (W/m²·K)": comp.u_value, "Orientation": comp.orientation.value, "ID": comp.id}
             if component_type == ComponentType.WALL:
-                row.update({"Wall Type": comp.wall_type, "Wall Group": comp.wall_group, "Shading (%)": comp.shading_percentage, "Delete": f"delete_{comp.id}"})
+                row.update({"Wall Type": comp.wall_type, "Wall Group": comp.wall_group, "Shading (%)": comp.shading_percentage})
             elif component_type == ComponentType.ROOF:
                 row.update({"Roof Type": comp.roof_type, "Roof Group": comp.roof_group})
             elif component_type == ComponentType.FLOOR:
@@ -612,9 +620,25 @@ class ComponentSelectionInterface:
         display_cols = [col for col in df.columns if col != "ID"]
         
         if component_type == ComponentType.WALL:
-            st.dataframe(df[display_cols], use_container_width=True)
+            # Custom table rendering for walls with delete button in the row
+            st.write("### Walls Table")
+            # Display headers
+            headers = ["Name", "Area (m²)", "U-Value (W/m²·K)", "Orientation", "Wall Type", "Wall Group", "Shading (%)", "Delete"]
+            cols = st.columns([1, 1, 1, 1, 1, 1, 1, 1])
+            for i, header in enumerate(headers):
+                cols[i].write(f"**{header}**")
+            
+            # Display rows
             for i, row in df.iterrows():
-                if st.button("Delete", key=row["Delete"]):
+                cols = st.columns([1, 1, 1, 1, 1, 1, 1, 1])
+                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["Wall 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['walls'] = [c for c in components if c.id != row["ID"]]
@@ -622,8 +646,9 @@ class ComponentSelectionInterface:
                         st.rerun()
                     else:
                         st.warning("Cannot delete preset components.")
-            # Download walls table excluding Delete column
-            csv_df = df[[col for col in display_cols if col != "Delete"]]
+            
+            # Download walls table (excluding Delete column)
+            csv_df = df[["Name", "Area (m²)", "U-Value (W/m²·K)", "Orientation", "Wall Type", "Wall Group", "Shading (%)"]]
             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")