Update app/building_info_form.py

app/building_info_form.py

@@ -66,7 +66,6 @@ class BuildingInfoForm:
             if key not in session_state["building_info"]:
                 session_state["building_info"][key] = default_value
         
-        # Track if data is saved
         if "data_saved" not in session_state:
             session_state["data_saved"] = False
         
@@ -131,6 +130,8 @@ class BuildingInfoForm:
                 help="Enter the total floor area of the building in square meters (optional if width and depth provided)"
             )
             
+            st.markdown("OR")  # Added OR between area and width/depth
+            
             col1, col2 = st.columns(2)
             with col1:
                 session_state["building_info"]["width"] = st.number_input(
@@ -149,6 +150,7 @@ class BuildingInfoForm:
                     help="Enter the building's depth in meters (optional if area provided)"
                 )
             
+            st.subheader("Building Orientation")  # Changed to subheader
             session_state["building_info"]["orientation"] = st.selectbox(
                 "Building Orientation",
                 ["NORTH", "NORTHEAST", "EAST", "SOUTHEAST", "SOUTH", "SOUTHWEST", "WEST", "NORTHWEST"],
@@ -156,6 +158,7 @@ class BuildingInfoForm:
                 help="Select the direction of the building's main facade"
             )
             
+            st.subheader("Operating Hours")  # Changed to subheader
             session_state["building_info"]["operating_hours"] = st.text_input(
                 "Operating Hours",
                 value=session_state["building_info"]["operating_hours"],
@@ -165,26 +168,44 @@ class BuildingInfoForm:
             submitted = st.form_submit_button("Save Building Information")
             
             if submitted:
-                # Logic for handling dimensions
-                if session_state["building_info"]["width"] > 0 and session_state["building_info"]["depth"] > 0:
-                    calculated_area = session_state["building_info"]["width"] * session_state["building_info"]["depth"]
-                    # If no area provided or area is 0, use calculated area
-                    if session_state["building_info"]["floor_area"] == 0:
-                        session_state["building_info"]["floor_area"] = calculated_area
-                    # If area is provided, keep it (overrides calculated)
-                
-                total_volume = session_state["building_info"]["floor_area"] * session_state["building_info"]["building_height"]
-                
-                st.success("Building information saved successfully!")
-                st.info(f"Total Floor Area: {session_state['building_info']['floor_area']:.1f} m²")
-                st.info(f"Total Building Volume: {total_volume:.1f} m³")
-                session_state["data_saved"] = True
+                # Validate before saving
+                valid, errors = self.validate_building_info(session_state["building_info"])
+                if not valid:
+                    for error in errors:
+                        st.error(error)
+                else:
+                    # Logic for handling dimensions
+                    if session_state["building_info"]["width"] > 0 and session_state["building_info"]["depth"] > 0:
+                        calculated_area = session_state["building_info"]["width"] * session_state["building_info"]["depth"]
+                        # If no area provided or area is 0, use calculated area
+                        if session_state["building_info"]["floor_area"] == 0:
+                            session_state["building_info"]["floor_area"] = calculated_area
+                        # If area is provided, keep it
+                    
+                    total_volume = session_state["building_info"]["floor_area"] * session_state["building_info"]["building_height"]
+                    
+                    # Store results in session state to persist across rerenders
+                    session_state["save_results"] = {
+                        "success": "Building information saved successfully!",
+                        "area": f"Total Floor Area: {session_state['building_info']['floor_area']:.1f} m²",
+                        "volume": f"Total Building Volume: {total_volume:.1f} m³"
+                    }
+                    session_state["data_saved"] = True
+        
+        # Display saved results if they exist
+        if "save_results" in session_state and session_state["data_saved"]:
+            st.success(session_state["save_results"]["success"])
+            st.info(session_state["save_results"]["area"])
+            st.info(session_state["save_results"]["volume"])
         
-        # Separate proceed button outside form
+        # Separate proceed button
         if session_state["data_saved"]:
             if st.button("Proceed to Climate Data"):
                 session_state["page"] = "Climate Data"
-                session_state["data_saved"] = False  # Reset for next use
+                # Clear saved state to reset form
+                if "save_results" in session_state:
+                    del session_state["save_results"]
+                session_state["data_saved"] = False
     
     @staticmethod
     def validate_building_info(building_info: Dict[str, Any]) -> Tuple[bool, List[str]]:
@@ -198,7 +219,6 @@ class BuildingInfoForm:
                 valid = False
                 errors.append(f"Missing required field: {field}")
         
-        # Must have either area or both width and depth
         if building_info.get("floor_area", 0) <= 0 and (building_info.get("width", 0) <= 0 or building_info.get("depth", 0) <= 0):
             valid = False
             errors.append("Must provide either floor area or both width and depth dimensions")