Update app/internal_loads.py

app/internal_loads.py

@@ -49,13 +49,13 @@ def display_internal_loads_page():
     with st.expander("Help & Information"):
         display_internal_loads_help()
     
-    # Initialize rerun flags if not present
-    if "module_rerun_flags" not in st.session_state:
-        st.session_state.module_rerun_flags = {}
+    # Initialize rerun flag if not present
+    if "internal_loads_rerun_pending" not in st.session_state:
+        st.session_state.internal_loads_rerun_pending = False
     
     # Check if rerun is pending
-    if st.session_state.module_rerun_flags.get("internal_loads", False):
-        st.session_state.module_rerun_flags["internal_loads"] = False
+    if st.session_state.internal_loads_rerun_pending:
+        st.session_state.internal_loads_rerun_pending = False
         st.rerun()
     
     # Create tabs for different load types
@@ -240,21 +240,21 @@ def display_people_tab():
             if is_edit:
                 index = editor_state.get("index", 0)
                 st.session_state.project_data["internal_loads"]["people"][index] = people_data
-                st.success(f"People group '{name}' updated!")
+                st.success(f"People Group '{name}' updated!")
             else:
                 st.session_state.project_data["internal_loads"]["people"].append(people_data)
-                st.success(f"People group '{name}' added!")
+                st.success(f"People Group '{name}' added!")
             
             # Clear editor state
             st.session_state.people_editor = {}
             st.session_state.people_action = {"action": "save", "id": str(uuid.uuid4())}
-            st.session_state.module_rerun_flags["internal_loads"] = True
+            st.session_state.internal_loads_rerun_pending = True
         
         elif refresh:
             # Clear editor state
             st.session_state.people_editor = {}
             st.session_state.people_action = {"action": "refresh", "id": str(uuid.uuid4())}
-            st.session_state.module_rerun_flags["internal_loads"] = True
+            st.session_state.internal_loads_rerun_pending = True
 
 def display_lighting_tab():
     """Display the lighting tab content with a two-column layout similar to components.py."""
@@ -397,21 +397,21 @@ def display_lighting_tab():
             if is_edit:
                 index = editor_state.get("index", 0)
                 st.session_state.project_data["internal_loads"]["lighting"][index] = lighting_data
-                st.success(f"Lighting system '{name}' updated!")
+                st.success(f"Lighting System '{name}' updated!")
             else:
                 st.session_state.project_data["internal_loads"]["lighting"].append(lighting_data)
-                st.success(f"Lighting system '{name}' added!")
+                st.success(f"Lighting System '{name}' added!")
             
             # Clear editor state
             st.session_state.lighting_editor = {}
             st.session_state.lighting_action = {"action": "save", "id": str(uuid.uuid4())}
-            st.session_state.module_rerun_flags["internal_loads"] = True
+            st.session_state.internal_loads_rerun_pending = True
         
         elif refresh:
             # Clear editor state
             st.session_state.lighting_editor = {}
             st.session_state.lighting_action = {"action": "refresh", "id": str(uuid.uuid4())}
-            st.session_state.module_rerun_flags["internal_loads"] = True
+            st.session_state.internal_loads_rerun_pending = True
 
 def display_equipment_tab():
     """Display the equipment tab content with a two-column layout similar to components.py."""
@@ -578,13 +578,13 @@ def display_equipment_tab():
             # Clear editor state
             st.session_state.equipment_editor = {}
             st.session_state.equipment_action = {"action": "save", "id": str(uuid.uuid4())}
-            st.session_state.module_rerun_flags["internal_loads"] = True
+            st.session_state.internal_loads_rerun_pending = True
         
         elif refresh:
             # Clear editor state
             st.session_state.equipment_editor = {}
             st.session_state.equipment_action = {"action": "refresh", "id": str(uuid.uuid4())}
-            st.session_state.module_rerun_flags["internal_loads"] = True
+            st.session_state.internal_loads_rerun_pending = True
 
 def display_ventilation_infiltration_tab():
     """Display the ventilation/infiltration tab content with a two-column layout similar to components.py."""
@@ -720,21 +720,21 @@ def display_ventilation_infiltration_tab():
             if is_edit:
                 index = editor_state.get("index", 0)
                 st.session_state.project_data["internal_loads"]["ventilation_infiltration"][index] = vent_inf_data
-                st.success(f"{system_type} system '{name}' updated!")
+                st.success(f"{system_type} System '{name}' updated!")
             else:
                 st.session_state.project_data["internal_loads"]["ventilation_infiltration"].append(vent_inf_data)
-                st.success(f"{system_type} system '{name}' added!")
+                st.success(f"{system_type} System '{name}' added!")
             
             # Clear editor state
             st.session_state.vent_inf_editor = {}
             st.session_state.vent_inf_action = {"action": "save", "id": str(uuid.uuid4())}
-            st.session_state.module_rerun_flags["internal_loads"] = True
+            st.session_state.internal_loads_rerun_pending = True
         
         elif refresh:
             # Clear editor state
             st.session_state.vent_inf_editor = {}
             st.session_state.vent_inf_action = {"action": "refresh", "id": str(uuid.uuid4())}
-            st.session_state.module_rerun_flags["internal_loads"] = True
+            st.session_state.internal_loads_rerun_pending = True
 
 def display_schedules_tab():
     import streamlit as st
@@ -785,7 +785,7 @@ def display_schedules_tab():
             for hour in range(24):
                 st.session_state[f"weekday_slider_{hour}_value"] = 0.0
                 st.session_state[f"weekend_slider_{hour}_value"] = 0.0
-        st.session_state.module_rerun_flags["internal_loads"] = True
+        st.session_state.internal_loads_rerun_pending = True
         st.rerun()
 
     # UI FORM for name/description and actions
@@ -866,75 +866,65 @@ def display_schedules_tab():
 
         # Save logic
         if submitted:
-            action_id = str(uuid.uuid4())
-            if st.session_state.schedule_action.get("id") != action_id:
-                st.session_state.schedule_action = {"action": "save", "id": action_id}
-                if not name.strip():
-                    st.error("Schedule name is required.")
-                elif name in schedules and not editor_state.get("is_edit"):
-                    st.error("A schedule with this name already exists.")
-                else:
-                    schedules[name] = {
-                        "description": description,
-                        "weekday": weekday_values,
-                        "weekend": weekend_values
-                    }
-                    if editor_state.get("is_edit") and editor_state.get("original_name") and editor_state.get("original_name") != name:
-                        if editor_state["original_name"] in schedules:
-                            del schedules[editor_state["original_name"]]
-                    st.session_state.schedule_editor = DEFAULT_STATE.copy()
-                    for hour in range(24):
-                        st.session_state[f"weekday_slider_{hour}_value"] = 0.0
-                        st.session_state[f"weekend_slider_{hour}_value"] = 0.0
-                    st.success(f"Schedule '{name}' saved successfully.")
-                    st.session_state.schedule_action = {"action": None, "id": None}
-                    st.session_state.module_rerun_flags["internal_loads"] = True
-                    st.rerun()
+            if not name.strip():
+                st.error("Schedule name is required.")
+                return
+            if name in schedules and not editor_state.get("is_edit"):
+                st.error("A schedule with this name already exists.")
+                return
+            schedules[name] = {
+                "description": description,
+                "weekday": weekday_values,
+                "weekend": weekend_values
+            }
+            if editor_state.get("is_edit") and editor_state.get("original_name") and editor_state.get("original_name") != name:
+                if editor_state["original_name"] in schedules:
+                    del schedules[editor_state["original_name"]]
+            st.session_state.schedule_editor = DEFAULT_STATE.copy()
+            for hour in range(24):
+                st.session_state[f"weekday_slider_{hour}_value"] = 0.0
+                st.session_state[f"weekend_slider_{hour}_value"] = 0.0
+            st.success(f"Schedule '{name}' saved successfully.")
+            st.session_state.schedule_action = {"action": "save", "id": str(uuid.uuid4())}
+            st.session_state.internal_loads_rerun_pending = True
 
         # Edit logic
         if edit_submitted and saved_schedule:
-            action_id = str(uuid.uuid4())
-            if st.session_state.schedule_action.get("id") != action_id:
-                st.session_state.schedule_action = {"action": "edit", "id": action_id}
-                if saved_schedule in DEFAULT_SCHEDULE_TEMPLATES:
-                    st.error("Default schedules cannot be edited.")
-                else:
-                    schedule_data = schedules[saved_schedule]
-                    st.session_state.schedule_editor = {
-                        "is_edit": True,
-                        "original_name": saved_schedule,
-                        "name": saved_schedule,
-                        "description": schedule_data.get("description", ""),
-                        "weekday": schedule_data.get("weekday", [0.0] * 24),
-                        "weekend": schedule_data.get("weekend", [0.0] * 24),
-                        "template": "None"
-                    }
-                    for hour in range(24):
-                        st.session_state[f"weekday_slider_{hour}_value"] = schedule_data.get("weekday", [0.0] * 24)[hour]
-                        st.session_state[f"weekend_slider_{hour}_value"] = schedule_data.get("weekend", [0.0] * 24)[hour]
-                    st.session_state.schedule_action = {"action": None, "id": None}
-                    st.session_state.module_rerun_flags["internal_loads"] = True
-                    st.rerun()
+            if saved_schedule in DEFAULT_SCHEDULE_TEMPLATES:
+                st.error("Default schedules cannot be edited.")
+                return
+            schedule_data = schedules[saved_schedule]
+            st.session_state.schedule_editor = {
+                "is_edit": True,
+                "original_name": saved_schedule,
+                "name": saved_schedule,
+                "description": schedule_data.get("description", ""),
+                "weekday": schedule_data.get("weekday", [0.0] * 24),
+                "weekend": schedule_data.get("weekend", [0.0] * 24),
+                "template": "None"
+            }
+            for hour in range(24):
+                st.session_state[f"weekday_slider_{hour}_value"] = schedule_data.get("weekday", [0.0] * 24)[hour]
+                st.session_state[f"weekend_slider_{hour}_value"] = schedule_data.get("weekend", [0.0] * 24)[hour]
+            st.session_state.schedule_action = {"action": "edit", "id": str(uuid.uuid4())}
+            st.session_state.internal_loads_rerun_pending = True
 
         # Delete logic
         if delete_submitted and saved_schedule:
-            action_id = str(uuid.uuid4())
-            if st.session_state.schedule_action.get("id") != action_id:
-                st.session_state.schedule_action = {"action": "delete", "id": action_id}
-                if saved_schedule in DEFAULT_SCHEDULE_TEMPLATES:
-                    st.error("Default schedules cannot be deleted.")
-                elif is_schedule_in_use(saved_schedule):
-                    st.error(f"Schedule '{saved_schedule}' is in use and cannot be deleted.")
-                else:
-                    del schedules[saved_schedule]
-                    st.session_state.schedule_editor = DEFAULT_STATE.copy()
-                    for hour in range(24):
-                        st.session_state[f"weekday_slider_{hour}_value"] = 0.0
-                        st.session_state[f"weekend_slider_{hour}_value"] = 0.0
-                    st.success(f"Schedule '{saved_schedule}' deleted!")
-                    st.session_state.schedule_action = {"action": None, "id": None}
-                    st.session_state.module_rerun_flags["internal_loads"] = True
-                    st.rerun()
+            if saved_schedule in DEFAULT_SCHEDULE_TEMPLATES:
+                st.error("Default schedules cannot be deleted.")
+                return
+            if is_schedule_in_use(saved_schedule):
+                st.error(f"Schedule '{saved_schedule}' is in use and cannot be deleted.")
+                return
+            del schedules[saved_schedule]
+            st.session_state.schedule_editor = DEFAULT_STATE.copy()
+            for hour in range(24):
+                st.session_state[f"weekday_slider_{hour}_value"] = 0.0
+                st.session_state[f"weekend_slider_{hour}_value"] = 0.0
+            st.success(f"Schedule '{saved_schedule}' deleted!")
+            st.session_state.schedule_action = {"action": "delete", "id": str(uuid.uuid4())}
+            st.session_state.internal_loads_rerun_pending = True
 
 def is_schedule_in_use(schedule_name: str) -> bool:
     """
@@ -983,7 +973,7 @@ def display_people_table(people_groups: List[Dict[str, Any]]):
         cols[4].write(group.get("zone", "Unknown"))
         
         # Edit button
-        edit_key = f"edit_people_{group['id']}_{idx}"
+        edit_key = f"edit_people_{group['name']}_{idx}"
         with cols[5].container():
             if st.button("Edit", key=edit_key):
                 st.session_state.people_editor = {
@@ -998,16 +988,16 @@ def display_people_table(people_groups: List[Dict[str, Any]]):
                     "is_edit": True
                 }
                 st.session_state.people_action = {"action": "edit", "id": str(uuid.uuid4())}
-                st.session_state.module_rerun_flags["internal_loads"] = True
+                st.session_state.internal_loads_rerun_pending = True
         
         # Delete button
-        delete_key = f"delete_people_{group['id']}_{idx}"
+        delete_key = f"delete_people_{group['name']}_{idx}"
         with cols[6].container():
             if st.button("Delete", key=delete_key):
                 st.session_state.project_data["internal_loads"]["people"].pop(idx)
-                st.success(f"People group '{group['name']}' deleted!")
+                st.success(f"People Group '{group['name']}' deleted!")
                 st.session_state.people_action = {"action": "delete", "id": str(uuid.uuid4())}
-                st.session_state.module_rerun_flags["internal_loads"] = True
+                st.session_state.internal_loads_rerun_pending = True
 
 def display_lighting_table(lighting_systems: List[Dict[str, Any]]):
     """Display lighting systems in a table format with edit/delete buttons."""
@@ -1031,7 +1021,7 @@ def display_lighting_table(lighting_systems: List[Dict[str, Any]]):
         cols[4].write(system.get("zone", "Unknown"))
         
         # Edit button
-        edit_key = f"edit_lighting_{system['id']}_{idx}"
+        edit_key = f"edit_lighting_{system['name']}_{idx}"
         with cols[5].container():
             if st.button("Edit", key=edit_key):
                 st.session_state.lighting_editor = {
@@ -1046,16 +1036,16 @@ def display_lighting_table(lighting_systems: List[Dict[str, Any]]):
                     "is_edit": True
                 }
                 st.session_state.lighting_action = {"action": "edit", "id": str(uuid.uuid4())}
-                st.session_state.module_rerun_flags["internal_loads"] = True
+                st.session_state.internal_loads_rerun_pending = True
         
         # Delete button
-        delete_key = f"delete_lighting_{system['id']}_{idx}"
+        delete_key = f"delete_lighting_{system['name']}_{idx}"
         with cols[6].container():
             if st.button("Delete", key=delete_key):
                 st.session_state.project_data["internal_loads"]["lighting"].pop(idx)
-                st.success(f"Lighting system '{system['name']}' deleted!")
+                st.success(f"Lighting System '{system['name']}' deleted!")
                 st.session_state.lighting_action = {"action": "delete", "id": str(uuid.uuid4())}
-                st.session_state.module_rerun_flags["internal_loads"] = True
+                st.session_state.internal_loads_rerun_pending = True
 
 def display_equipment_table(equipment_systems: List[Dict[str, Any]]):
     """Display equipment systems in a table format with edit/delete buttons."""
@@ -1079,7 +1069,7 @@ def display_equipment_table(equipment_systems: List[Dict[str, Any]]):
         cols[4].write(system.get("zone", "Unknown"))
         
         # Edit button
-        edit_key = f"edit_equipment_{system['id']}_{idx}"
+        edit_key = f"edit_equipment_{system['name']}_{idx}"
         with cols[5].container():
             if st.button("Edit", key=edit_key):
                 st.session_state.equipment_editor = {
@@ -1095,16 +1085,16 @@ def display_equipment_table(equipment_systems: List[Dict[str, Any]]):
                     "is_edit": True
                 }
                 st.session_state.equipment_action = {"action": "edit", "id": str(uuid.uuid4())}
-                st.session_state.module_rerun_flags["internal_loads"] = True
+                st.session_state.internal_loads_rerun_pending = True
         
         # Delete button
-        delete_key = f"delete_equipment_{system['id']}_{idx}"
+        delete_key = f"delete_equipment_{system['name']}_{idx}"
         with cols[6].container():
             if st.button("Delete", key=delete_key):
                 st.session_state.project_data["internal_loads"]["equipment"].pop(idx)
                 st.success(f"Equipment '{system['name']}' deleted!")
                 st.session_state.equipment_action = {"action": "delete", "id": str(uuid.uuid4())}
-                st.session_state.module_rerun_flags["internal_loads"] = True
+                st.session_state.internal_loads_rerun_pending = True
 
 def display_ventilation_infiltration_table(vent_inf_systems: List[Dict[str, Any]]):
     """Display ventilation/infiltration systems in a table format with edit/delete buttons."""
@@ -1129,7 +1119,7 @@ def display_ventilation_infiltration_table(vent_inf_systems: List[Dict[str, Any]
         cols[4].write(system.get("zone", "Unknown"))
         
         # Edit button
-        edit_key = f"edit_vent_inf_{system['id']}_{idx}"
+        edit_key = f"edit_vent_inf_{system['name']}_{idx}"
         with cols[5].container():
             if st.button("Edit", key=edit_key):
                 st.session_state.vent_inf_editor = {
@@ -1144,16 +1134,16 @@ def display_ventilation_infiltration_table(vent_inf_systems: List[Dict[str, Any]
                     "is_edit": True
                 }
                 st.session_state.vent_inf_action = {"action": "edit", "id": str(uuid.uuid4())}
-                st.session_state.module_rerun_flags["internal_loads"] = True
+                st.session_state.internal_loads_rerun_pending = True
         
         # Delete button
-        delete_key = f"delete_vent_inf_{system['id']}_{idx}"
+        delete_key = f"delete_vent_inf_{system['name']}_{idx}"
         with cols[6].container():
             if st.button("Delete", key=delete_key):
                 st.session_state.project_data["internal_loads"]["ventilation_infiltration"].pop(idx)
                 st.success(f"{system.get('system_type', 'System')} '{system['name']}' deleted!")
                 st.session_state.vent_inf_action = {"action": "delete", "id": str(uuid.uuid4())}
-                st.session_state.module_rerun_flags["internal_loads"] = True
+                st.session_state.internal_loads_rerun_pending = True
 
 def display_schedules_table(schedules: Dict[str, Any]):
     """Display schedules in a table format with edit/delete buttons."""
@@ -1206,8 +1196,8 @@ def display_schedules_table(schedules: Dict[str, Any]):
                         "weekday": schedule_data.get("weekday", [0.0] * 24),
                         "weekend": schedule_data.get("weekend", [0.0] * 24)
                     }
-                    st.session_state.module_rerun_flags["internal_loads"] = True
-                    st.rerun()
+                    st.session_state.schedule_action = {"action": "edit", "id": str(uuid.uuid4())}
+                    st.session_state.internal_loads_rerun_pending = True
             
             with col4:
                 if schedule_name not in DEFAULT_SCHEDULE_TEMPLATES:
@@ -1217,7 +1207,7 @@ def display_schedules_table(schedules: Dict[str, Any]):
                         if st.button("Delete", key=f"delete_schedule_{schedule_name}_{i}"):
                             del schedules[schedule_name]
                             st.success(f"Schedule '{schedule_name}' deleted!")
-                            st.session_state.module_rerun_flags["internal_loads"] = True
-                            st.rerun()
+                            st.session_state.schedule_action = {"action": "delete", "id": str(uuid.uuid4())}
+                            st.session_state.internal_loads_rerun_pending = True
                 else:
                     st.write("(Default)")